summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShehjar Tikoo <shehjart@zresearch.com>2009-02-19 05:25:44 -0800
committerAnand V. Avati <avati@dev.gluster.com>2009-02-19 07:08:22 -0800
commit6a250d9087014551c5085a534248982b195f819f (patch)
treee44f657e9cbb35e9c1f70e8c730048e5e09b95f4
parent91df2dbcb10813d17053f715ae40a50b7499f4bc (diff)
Remove dead code.
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
-rw-r--r--xlators/performance/io-threads/src/io-threads.c33
-rw-r--r--xlators/performance/io-threads/src/io-threads.h7
2 files changed, 0 insertions, 40 deletions
diff --git a/xlators/performance/io-threads/src/io-threads.c b/xlators/performance/io-threads/src/io-threads.c
index 5acdd627da4..27140a39821 100644
--- a/xlators/performance/io-threads/src/io-threads.c
+++ b/xlators/performance/io-threads/src/io-threads.c
@@ -1031,10 +1031,6 @@ iot_queue (iot_worker_t *worker,
pthread_mutex_lock (&conf->lock);
- /*
- while (worker->queue_size >= worker->queue_limit)
- pthread_cond_wait (&worker->q_cond, &worker->lock);
- */
if (conf->cache_size) {
while (frame_size && (conf->current_size >= conf->cache_size))
pthread_cond_wait (&conf->q_cond, &conf->lock);
@@ -1069,9 +1065,6 @@ iot_dequeue (iot_worker_t *worker)
pthread_mutex_lock (&conf->lock);
while (!worker->queue_size)
- /*
- pthread_cond_wait (&worker->dq_cond, &worker->lock);
- */
pthread_cond_wait (&worker->dq_cond, &conf->lock);
queue = worker->queue.next;
@@ -1110,23 +1103,6 @@ iot_worker (void *arg)
}
}
-#if 0
-static void *
-iot_reply (void *arg)
-{
- iot_worker_t *reply = arg;
-
- while (1) {
- call_stub_t *stub;
-
- stub = iot_dequeue (reply);
- FREE (stub->frame->local);
- stub->frame->local = NULL;
- call_resume (stub);
- }
-}
-#endif
-
static void
workers_init (iot_conf_t *conf)
{
@@ -1148,16 +1124,7 @@ workers_init (iot_conf_t *conf)
worker->queue.next = &worker->queue;
worker->queue.prev = &worker->queue;
- /*
- pthread_mutex_init (&worker->lock, NULL);
- pthread_cond_init (&worker->q_cond, NULL);
- */
pthread_cond_init (&worker->dq_cond, NULL);
-
- /*
- worker->queue_limit = conf->queue_limit;
- */
-
worker->conf = conf;
pthread_create (&worker->thread, NULL, iot_worker, worker);
diff --git a/xlators/performance/io-threads/src/io-threads.h b/xlators/performance/io-threads/src/io-threads.h
index 6595d3e277b..db578115750 100644
--- a/xlators/performance/io-threads/src/io-threads.h
+++ b/xlators/performance/io-threads/src/io-threads.h
@@ -58,15 +58,8 @@ struct iot_worker {
struct iot_conf *conf;
int64_t q,dq;
pthread_cond_t dq_cond;
- /*
- pthread_cond_t q_cond;
- pthread_mutex_t lock;
- */
int32_t fd_count;
int32_t queue_size;
- /*
- int32_t queue_limit;
- */
pthread_t thread;
};