Commit 644d3a08 authored by Ken Chen's avatar Ken Chen Committed by Linus Torvalds

[PATCH] aio: clean up debug code

Clean up code that was previously used for debug purpose.  Remove aio_run,
aio_wakeups, iocb->ki_queued and iocb->ki_kicked.  Also clean up unused
variable count in __aio_run_iocbs() and debug code in read_events().
Signed-off-by: default avatarKen Chen <kenneth.w.chen@intel.com>
Cc: Benjamin LaHaise <bcrl@kvack.org>
Cc: Suparna Bhattacharya <suparna@in.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4bf69b2a
...@@ -40,9 +40,6 @@ ...@@ -40,9 +40,6 @@
#define dprintk(x...) do { ; } while (0) #define dprintk(x...) do { ; } while (0)
#endif #endif
static long aio_run = 0; /* for testing only */
static long aio_wakeups = 0; /* for testing only */
/*------ sysctl variables----*/ /*------ sysctl variables----*/
atomic_t aio_nr = ATOMIC_INIT(0); /* current system wide number of aio requests */ atomic_t aio_nr = ATOMIC_INIT(0); /* current system wide number of aio requests */
unsigned aio_max_nr = 0x10000; /* system wide maximum number of aio requests */ unsigned aio_max_nr = 0x10000; /* system wide maximum number of aio requests */
...@@ -617,7 +614,6 @@ static inline int __queue_kicked_iocb(struct kiocb *iocb) ...@@ -617,7 +614,6 @@ static inline int __queue_kicked_iocb(struct kiocb *iocb)
if (list_empty(&iocb->ki_run_list)) { if (list_empty(&iocb->ki_run_list)) {
list_add_tail(&iocb->ki_run_list, list_add_tail(&iocb->ki_run_list,
&ctx->run_list); &ctx->run_list);
iocb->ki_queued++;
return 1; return 1;
} }
return 0; return 0;
...@@ -658,10 +654,8 @@ static ssize_t aio_run_iocb(struct kiocb *iocb) ...@@ -658,10 +654,8 @@ static ssize_t aio_run_iocb(struct kiocb *iocb)
} }
if (!(iocb->ki_retried & 0xff)) { if (!(iocb->ki_retried & 0xff)) {
pr_debug("%ld retry: %d of %d (kick %ld, Q %ld run %ld, wake %ld)\n", pr_debug("%ld retry: %d of %d\n", iocb->ki_retried,
iocb->ki_retried, iocb->ki_nbytes - iocb->ki_left, iocb->ki_nbytes);
iocb->ki_nbytes - iocb->ki_left, iocb->ki_nbytes,
iocb->ki_kicked, iocb->ki_queued, aio_run, aio_wakeups);
} }
if (!(retry = iocb->ki_retry)) { if (!(retry = iocb->ki_retry)) {
...@@ -768,7 +762,6 @@ out: ...@@ -768,7 +762,6 @@ out:
static int __aio_run_iocbs(struct kioctx *ctx) static int __aio_run_iocbs(struct kioctx *ctx)
{ {
struct kiocb *iocb; struct kiocb *iocb;
int count = 0;
LIST_HEAD(run_list); LIST_HEAD(run_list);
list_splice_init(&ctx->run_list, &run_list); list_splice_init(&ctx->run_list, &run_list);
...@@ -783,9 +776,7 @@ static int __aio_run_iocbs(struct kioctx *ctx) ...@@ -783,9 +776,7 @@ static int __aio_run_iocbs(struct kioctx *ctx)
aio_run_iocb(iocb); aio_run_iocb(iocb);
if (__aio_put_req(ctx, iocb)) /* drop extra ref */ if (__aio_put_req(ctx, iocb)) /* drop extra ref */
put_ioctx(ctx); put_ioctx(ctx);
count++;
} }
aio_run++;
if (!list_empty(&ctx->run_list)) if (!list_empty(&ctx->run_list))
return 1; return 1;
return 0; return 0;
...@@ -884,10 +875,8 @@ static void queue_kicked_iocb(struct kiocb *iocb) ...@@ -884,10 +875,8 @@ static void queue_kicked_iocb(struct kiocb *iocb)
spin_lock_irqsave(&ctx->ctx_lock, flags); spin_lock_irqsave(&ctx->ctx_lock, flags);
run = __queue_kicked_iocb(iocb); run = __queue_kicked_iocb(iocb);
spin_unlock_irqrestore(&ctx->ctx_lock, flags); spin_unlock_irqrestore(&ctx->ctx_lock, flags);
if (run) { if (run)
aio_queue_work(ctx); aio_queue_work(ctx);
aio_wakeups++;
}
} }
/* /*
...@@ -907,7 +896,6 @@ void fastcall kick_iocb(struct kiocb *iocb) ...@@ -907,7 +896,6 @@ void fastcall kick_iocb(struct kiocb *iocb)
return; return;
} }
iocb->ki_kicked++;
/* If its already kicked we shouldn't queue it again */ /* If its already kicked we shouldn't queue it again */
if (!kiocbTryKick(iocb)) { if (!kiocbTryKick(iocb)) {
queue_kicked_iocb(iocb); queue_kicked_iocb(iocb);
...@@ -1003,10 +991,8 @@ int fastcall aio_complete(struct kiocb *iocb, long res, long res2) ...@@ -1003,10 +991,8 @@ int fastcall aio_complete(struct kiocb *iocb, long res, long res2)
pr_debug("added to ring %p at [%lu]\n", iocb, tail); pr_debug("added to ring %p at [%lu]\n", iocb, tail);
pr_debug("%ld retries: %d of %d (kicked %ld, Q %ld run %ld wake %ld)\n", pr_debug("%ld retries: %d of %d\n", iocb->ki_retried,
iocb->ki_retried, iocb->ki_nbytes - iocb->ki_left, iocb->ki_nbytes);
iocb->ki_nbytes - iocb->ki_left, iocb->ki_nbytes,
iocb->ki_kicked, iocb->ki_queued, aio_run, aio_wakeups);
put_rq: put_rq:
/* everything turned out well, dispose of the aiocb. */ /* everything turned out well, dispose of the aiocb. */
ret = __aio_put_req(ctx, iocb); ret = __aio_put_req(ctx, iocb);
...@@ -1114,7 +1100,6 @@ static int read_events(struct kioctx *ctx, ...@@ -1114,7 +1100,6 @@ static int read_events(struct kioctx *ctx,
int i = 0; int i = 0;
struct io_event ent; struct io_event ent;
struct aio_timeout to; struct aio_timeout to;
int event_loop = 0; /* testing only */
int retry = 0; int retry = 0;
/* needed to zero any padding within an entry (there shouldn't be /* needed to zero any padding within an entry (there shouldn't be
...@@ -1181,7 +1166,6 @@ retry: ...@@ -1181,7 +1166,6 @@ retry:
if (to.timed_out) /* Only check after read evt */ if (to.timed_out) /* Only check after read evt */
break; break;
schedule(); schedule();
event_loop++;
if (signal_pending(tsk)) { if (signal_pending(tsk)) {
ret = -EINTR; ret = -EINTR;
break; break;
...@@ -1209,9 +1193,6 @@ retry: ...@@ -1209,9 +1193,6 @@ retry:
if (timeout) if (timeout)
clear_timeout(&to); clear_timeout(&to);
out: out:
pr_debug("event loop executed %d times\n", event_loop);
pr_debug("aio_run %ld\n", aio_run);
pr_debug("aio_wakeups %ld\n", aio_wakeups);
return i ? i : ret; return i ? i : ret;
} }
...@@ -1526,10 +1507,6 @@ int fastcall io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb, ...@@ -1526,10 +1507,6 @@ int fastcall io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
init_waitqueue_func_entry(&req->ki_wait, aio_wake_function); init_waitqueue_func_entry(&req->ki_wait, aio_wake_function);
INIT_LIST_HEAD(&req->ki_wait.task_list); INIT_LIST_HEAD(&req->ki_wait.task_list);
req->ki_retried = 0; req->ki_retried = 0;
req->ki_kicked = 0;
req->ki_queued = 0;
aio_run = 0;
aio_wakeups = 0;
ret = aio_setup_iocb(req); ret = aio_setup_iocb(req);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment