@@ -98,32 +98,12 @@ static void cq_init(CQ *cq) { cq->tail = NULL; } -#if 0 -/* - * Waits for work on a connection queue. - */ -static CQ_ITEM *cq_pop(CQ *cq) { - CQ_ITEM *item; - - pthread_mutex_lock(&cq->lock); - while (NULL == cq->head) - pthread_cond_wait(&cq->cond, &cq->lock); - item = cq->head; - cq->head = item->next; - if (NULL == cq->head) - cq->tail = NULL; - pthread_mutex_unlock(&cq->lock); - - return item; -} -#endif - /* * Looks for an item on a connection queue, but doesn't block if there isn't * one. * Returns the item, or NULL if no item is available */ -static CQ_ITEM *cq_peek(CQ *cq) { +static CQ_ITEM *cq_pop(CQ *cq) { CQ_ITEM *item; pthread_mutex_lock(&cq->lock); @@ -341,7 +321,7 @@ static void thread_libevent_process(int fd, short which, void *arg) { if (settings.verbose > 0) fprintf(stderr, "Can't read from libevent pipe\n"); - item = cq_peek(&me->new_conn_queue); + item = cq_pop(&me->new_conn_queue); if (NULL != item) { conn *c = conn_new(item->sfd, item->init_state, item->event_flags, thread.c 8b03e781cf885c177d1c4b7ef0d846f893e53eec Toru Maesaka dev@torum.net http://github.com/tmaesaka/memcached/commit/df5d1bf9d87428d3e777782d9b676baf37667b53 df5d1bf9d87428d3e777782d9b676baf37667b53 2008-10-14T20:20:47-07:00 2008-10-14T20:20:47-07:00 Removed dead code and renamed cq_peek to cq_pop c675fc0f6d61e9433e15633fb1cb02f5b494b846 Toru Maesaka dev@torum.net