* [patch 2/2] epoll remove debugging code
@ 2009-01-27 20:54 Davide Libenzi
2009-01-29 8:12 ` Andrew Morton
0 siblings, 1 reply; 4+ messages in thread
From: Davide Libenzi @ 2009-01-27 20:54 UTC (permalink / raw)
To: Linux Kernel Mailing List; +Cc: Andrew Morton
This patch remove debugging code from epoll. There's no need for it to be
included into mainline code.
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
- Davide
---
fs/eventpoll.c | 60 +++------------------------------------------------------
1 file changed, 4 insertions(+), 56 deletions(-)
Index: linux-2.6.mod/fs/eventpoll.c
===================================================================
--- linux-2.6.mod.orig/fs/eventpoll.c 2009-01-26 23:13:28.000000000 -0800
+++ linux-2.6.mod/fs/eventpoll.c 2009-01-26 23:13:31.000000000 -0800
@@ -71,24 +71,6 @@
* a better scalability.
*/
-#define DEBUG_EPOLL 0
-
-#if DEBUG_EPOLL > 0
-#define DPRINTK(x) printk x
-#define DNPRINTK(n, x) do { if ((n) <= DEBUG_EPOLL) printk x; } while (0)
-#else /* #if DEBUG_EPOLL > 0 */
-#define DPRINTK(x) (void) 0
-#define DNPRINTK(n, x) (void) 0
-#endif /* #if DEBUG_EPOLL > 0 */
-
-#define DEBUG_EPI 0
-
-#if DEBUG_EPI != 0
-#define EPI_SLAB_DEBUG (SLAB_DEBUG_FREE | SLAB_RED_ZONE /* | SLAB_POISON */)
-#else /* #if DEBUG_EPI != 0 */
-#define EPI_SLAB_DEBUG 0
-#endif /* #if DEBUG_EPI != 0 */
-
/* Epoll private bits inside the event mask */
#define EP_PRIVATE_BITS (EPOLLONESHOT | EPOLLET)
@@ -580,9 +562,6 @@
atomic_dec(&ep->user->epoll_watches);
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_remove(%p, %p)\n",
- current, ep, file));
-
return 0;
}
@@ -634,12 +613,9 @@
static int ep_eventpoll_release(struct inode *inode, struct file *file)
{
- struct eventpoll *ep = file->private_data;
-
- if (ep)
- ep_free(ep);
+ if (file->private_data)
+ ep_free((struct eventpoll *) file->private_data);
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: close() ep=%p\n", current, ep));
return 0;
}
@@ -764,8 +740,6 @@
*pep = ep;
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_alloc() ep=%p\n",
- current, ep));
return 0;
free_uid:
@@ -799,9 +773,6 @@
}
}
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_find(%p) -> %p\n",
- current, file, epir));
-
return epir;
}
@@ -817,9 +788,6 @@
struct epitem *epi = ep_item_from_wait(wait);
struct eventpoll *ep = epi->ep;
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: poll_callback(%p) epi=%p ep=%p\n",
- current, epi->ffd.file, epi, ep));
-
spin_lock_irqsave(&ep->lock, flags);
/*
@@ -991,9 +959,6 @@
if (pwake)
ep_poll_safewake(&ep->poll_wait);
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_insert(%p, %p, %d)\n",
- current, ep, tfile, fd));
-
return 0;
error_unregister:
@@ -1213,9 +1178,6 @@
/* Check the EPOLL_* constant for consistency. */
BUILD_BUG_ON(EPOLL_CLOEXEC != O_CLOEXEC);
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d)\n",
- current, flags));
-
error = -EINVAL;
if (flags & ~EPOLL_CLOEXEC)
goto error_return;
@@ -1239,8 +1201,6 @@
atomic_inc(&ep->user->epoll_devs);
error_return:
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d) = %d\n",
- current, flags, error));
return error;
}
@@ -1267,9 +1227,6 @@
struct epitem *epi;
struct epoll_event epds;
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_ctl(%d, %d, %d, %p)\n",
- current, epfd, op, fd, event));
-
error = -EFAULT;
if (ep_op_has_event(op) &&
copy_from_user(&epds, event, sizeof(struct epoll_event)))
@@ -1346,8 +1303,6 @@
error_fput:
fput(file);
error_return:
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_ctl(%d, %d, %d, %p) = %d\n",
- current, epfd, op, fd, event, error));
return error;
}
@@ -1363,9 +1318,6 @@
struct file *file;
struct eventpoll *ep;
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_wait(%d, %p, %d, %d)\n",
- current, epfd, events, maxevents, timeout));
-
/* The maximum number of event must be greater than zero */
if (maxevents <= 0 || maxevents > EP_MAX_EVENTS)
return -EINVAL;
@@ -1402,8 +1354,6 @@
error_fput:
fput(file);
error_return:
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_wait(%d, %p, %d, %d) = %d\n",
- current, epfd, events, maxevents, timeout, error));
return error;
}
@@ -1473,13 +1423,11 @@
/* Allocates slab cache used to allocate "struct epitem" items */
epi_cache = kmem_cache_create("eventpoll_epi", sizeof(struct epitem),
- 0, SLAB_HWCACHE_ALIGN|EPI_SLAB_DEBUG|SLAB_PANIC,
- NULL);
+ 0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL);
/* Allocates slab cache used to allocate "struct eppoll_entry" */
pwq_cache = kmem_cache_create("eventpoll_pwq",
- sizeof(struct eppoll_entry), 0,
- EPI_SLAB_DEBUG|SLAB_PANIC, NULL);
+ sizeof(struct eppoll_entry), 0, SLAB_PANIC, NULL);
return 0;
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch 2/2] epoll remove debugging code
2009-01-27 20:54 [patch 2/2] epoll remove debugging code Davide Libenzi
@ 2009-01-29 8:12 ` Andrew Morton
2009-01-29 18:18 ` Davide Libenzi
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2009-01-29 8:12 UTC (permalink / raw)
To: Davide Libenzi; +Cc: Linux Kernel Mailing List
On Tue, 27 Jan 2009 12:54:58 -0800 (PST) Davide Libenzi <davidel@xmailserver.org> wrote:
> static int ep_eventpoll_release(struct inode *inode, struct file *file)
> {
> - struct eventpoll *ep = file->private_data;
> -
> - if (ep)
> - ep_free(ep);
> + if (file->private_data)
> + ep_free((struct eventpoll *) file->private_data);
>
The old version was better, IMO.
You could just do
if (file->private_data)
ep_free(file->private_data);
but personally, I do like to see the purported type mentioned in there
somewhere. But preferably not in a typecast.
Oh well.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [patch 2/2] epoll remove debugging code
2009-01-29 8:12 ` Andrew Morton
@ 2009-01-29 18:18 ` Davide Libenzi
0 siblings, 0 replies; 4+ messages in thread
From: Davide Libenzi @ 2009-01-29 18:18 UTC (permalink / raw)
To: Andrew Morton; +Cc: Linux Kernel Mailing List
On Thu, 29 Jan 2009, Andrew Morton wrote:
> On Tue, 27 Jan 2009 12:54:58 -0800 (PST) Davide Libenzi <davidel@xmailserver.org> wrote:
>
> > static int ep_eventpoll_release(struct inode *inode, struct file *file)
> > {
> > - struct eventpoll *ep = file->private_data;
> > -
> > - if (ep)
> > - ep_free(ep);
> > + if (file->private_data)
> > + ep_free((struct eventpoll *) file->private_data);
> >
>
> The old version was better, IMO.
>
> You could just do
>
> if (file->private_data)
> ep_free(file->private_data);
>
> but personally, I do like to see the purported type mentioned in there
> somewhere. But preferably not in a typecast.
I thought you liked less lines of code :) It's OK with me if you want it
back the way it was.
- Davide
^ permalink raw reply [flat|nested] 4+ messages in thread
* [patch 2/2] epoll: remove debugging code
@ 2009-01-30 0:51 Davide Libenzi
0 siblings, 0 replies; 4+ messages in thread
From: Davide Libenzi @ 2009-01-30 0:51 UTC (permalink / raw)
To: Linux Kernel Mailing List; +Cc: Andrew Morton
This patch remove debugging code from epoll. There's no need for it to be
included into mainline code.
Signed-off-by: Davide Libenzi <davidel@xmailserver.org>
- Davide
---
fs/eventpoll.c | 78 ++++++++-------------------------------------------------
1 file changed, 11 insertions(+), 67 deletions(-)
Index: linux-2.6.mod/fs/eventpoll.c
===================================================================
--- linux-2.6.mod.orig/fs/eventpoll.c 2009-01-29 15:59:38.000000000 -0800
+++ linux-2.6.mod/fs/eventpoll.c 2009-01-29 15:59:44.000000000 -0800
@@ -71,24 +71,6 @@
* a better scalability.
*/
-#define DEBUG_EPOLL 0
-
-#if DEBUG_EPOLL > 0
-#define DPRINTK(x) printk x
-#define DNPRINTK(n, x) do { if ((n) <= DEBUG_EPOLL) printk x; } while (0)
-#else /* #if DEBUG_EPOLL > 0 */
-#define DPRINTK(x) (void) 0
-#define DNPRINTK(n, x) (void) 0
-#endif /* #if DEBUG_EPOLL > 0 */
-
-#define DEBUG_EPI 0
-
-#if DEBUG_EPI != 0
-#define EPI_SLAB_DEBUG (SLAB_DEBUG_FREE | SLAB_RED_ZONE /* | SLAB_POISON */)
-#else /* #if DEBUG_EPI != 0 */
-#define EPI_SLAB_DEBUG 0
-#endif /* #if DEBUG_EPI != 0 */
-
/* Epoll private bits inside the event mask */
#define EP_PRIVATE_BITS (EPOLLONESHOT | EPOLLET)
@@ -567,9 +549,6 @@ static int ep_remove(struct eventpoll *e
atomic_dec(&ep->user->epoll_watches);
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_remove(%p, %p)\n",
- current, ep, file));
-
return 0;
}
@@ -625,7 +604,6 @@ static int ep_eventpoll_release(struct i
if (ep)
ep_free(ep);
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: close() ep=%p\n", current, ep));
return 0;
}
@@ -748,8 +726,6 @@ static int ep_alloc(struct eventpoll **p
*pep = ep;
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_alloc() ep=%p\n",
- current, ep));
return 0;
free_uid:
@@ -783,9 +759,6 @@ static struct epitem *ep_find(struct eve
}
}
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_find(%p) -> %p\n",
- current, file, epir));
-
return epir;
}
@@ -801,9 +774,6 @@ static int ep_poll_callback(wait_queue_t
struct epitem *epi = ep_item_from_wait(wait);
struct eventpoll *ep = epi->ep;
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: poll_callback(%p) epi=%p ep=%p\n",
- current, epi->ffd.file, epi, ep));
-
spin_lock_irqsave(&ep->lock, flags);
/*
@@ -976,9 +946,6 @@ static int ep_insert(struct eventpoll *e
if (pwake)
ep_poll_safewake(&ep->poll_wait);
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: ep_insert(%p, %p, %d)\n",
- current, ep, tfile, fd));
-
return 0;
error_unregister:
@@ -1195,41 +1162,30 @@ retry:
*/
SYSCALL_DEFINE1(epoll_create1, int, flags)
{
- int error, fd = -1;
- struct eventpoll *ep;
+ int error;
+ struct eventpoll *ep = NULL;
/* Check the EPOLL_* constant for consistency. */
BUILD_BUG_ON(EPOLL_CLOEXEC != O_CLOEXEC);
if (flags & ~EPOLL_CLOEXEC)
return -EINVAL;
-
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d)\n",
- current, flags));
-
/*
- * Create the internal data structure ( "struct eventpoll" ).
+ * Create the internal data structure ("struct eventpoll").
*/
error = ep_alloc(&ep);
- if (error < 0) {
- fd = error;
- goto error_return;
- }
-
+ if (error < 0)
+ return error;
/*
* Creates all the items needed to setup an eventpoll file. That is,
* a file structure and a free file descriptor.
*/
- fd = anon_inode_getfd("[eventpoll]", &eventpoll_fops, ep,
- flags & O_CLOEXEC);
- if (fd < 0)
+ error = anon_inode_getfd("[eventpoll]", &eventpoll_fops, ep,
+ flags & O_CLOEXEC);
+ if (error < 0)
ep_free(ep);
-error_return:
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_create(%d) = %d\n",
- current, flags, fd));
-
- return fd;
+ return error;
}
SYSCALL_DEFINE1(epoll_create, int, size)
@@ -1254,9 +1210,6 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, in
struct epitem *epi;
struct epoll_event epds;
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_ctl(%d, %d, %d, %p)\n",
- current, epfd, op, fd, event));
-
error = -EFAULT;
if (ep_op_has_event(op) &&
copy_from_user(&epds, event, sizeof(struct epoll_event)))
@@ -1333,8 +1286,6 @@ error_tgt_fput:
error_fput:
fput(file);
error_return:
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_ctl(%d, %d, %d, %p) = %d\n",
- current, epfd, op, fd, event, error));
return error;
}
@@ -1350,9 +1301,6 @@ SYSCALL_DEFINE4(epoll_wait, int, epfd, s
struct file *file;
struct eventpoll *ep;
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_wait(%d, %p, %d, %d)\n",
- current, epfd, events, maxevents, timeout));
-
/* The maximum number of event must be greater than zero */
if (maxevents <= 0 || maxevents > EP_MAX_EVENTS)
return -EINVAL;
@@ -1389,8 +1337,6 @@ SYSCALL_DEFINE4(epoll_wait, int, epfd, s
error_fput:
fput(file);
error_return:
- DNPRINTK(3, (KERN_INFO "[%p] eventpoll: sys_epoll_wait(%d, %p, %d, %d) = %d\n",
- current, epfd, events, maxevents, timeout, error));
return error;
}
@@ -1462,13 +1408,11 @@ static int __init eventpoll_init(void)
/* Allocates slab cache used to allocate "struct epitem" items */
epi_cache = kmem_cache_create("eventpoll_epi", sizeof(struct epitem),
- 0, SLAB_HWCACHE_ALIGN|EPI_SLAB_DEBUG|SLAB_PANIC,
- NULL);
+ 0, SLAB_HWCACHE_ALIGN | SLAB_PANIC, NULL);
/* Allocates slab cache used to allocate "struct eppoll_entry" */
pwq_cache = kmem_cache_create("eventpoll_pwq",
- sizeof(struct eppoll_entry), 0,
- EPI_SLAB_DEBUG|SLAB_PANIC, NULL);
+ sizeof(struct eppoll_entry), 0, SLAB_PANIC, NULL);
return 0;
}
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-01-30 0:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-01-27 20:54 [patch 2/2] epoll remove debugging code Davide Libenzi
2009-01-29 8:12 ` Andrew Morton
2009-01-29 18:18 ` Davide Libenzi
2009-01-30 0:51 [patch 2/2] epoll: " Davide Libenzi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®