From: Jim Jagielski Date: Mon, 25 Nov 2013 21:10:05 +0000 (+0000) Subject: naming suggestion re: trawick X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43a72ad83ef74c2f52b0dfde534b138dbfc43cb1;p=thirdparty%2Fapache%2Fhttpd.git naming suggestion re: trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1545408 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/mpm/event/fdqueue.c b/server/mpm/event/fdqueue.c index 2ffa8880491..29fc5c9cdbc 100644 --- a/server/mpm/event/fdqueue.c +++ b/server/mpm/event/fdqueue.c @@ -127,9 +127,9 @@ apr_status_t ap_queue_info_set_idle(fd_queue_info_t * queue_info, apr_status_t ap_queue_info_try_get_idler(fd_queue_info_t * queue_info) { - int prev_idlers; - prev_idlers = apr_atomic_add32((apr_uint32_t *)&(queue_info->idlers), -1) - zero_pt; - if (prev_idlers <= 0) { + int new_idlers; + new_idlers = apr_atomic_add32((apr_uint32_t *)&(queue_info->idlers), -1) - zero_pt; + if (--new_idlers <= 0) { apr_atomic_inc32((apr_uint32_t *)&(queue_info->idlers)); /* back out dec */ return APR_EAGAIN; } diff --git a/server/mpm/eventopt/fdqueue.c b/server/mpm/eventopt/fdqueue.c index d372dcd9cf1..90a2676af36 100644 --- a/server/mpm/eventopt/fdqueue.c +++ b/server/mpm/eventopt/fdqueue.c @@ -127,9 +127,9 @@ apr_status_t ap_queue_info_set_idle(fd_queue_info_t * queue_info, apr_status_t ap_queue_info_try_get_idler(fd_queue_info_t * queue_info) { - int prev_idlers; - prev_idlers = apr_atomic_add32((apr_uint32_t *)&(queue_info->idlers), -1) - zero_pt; - if (prev_idlers <= 0) { + int new_idlers; + new_idlers = apr_atomic_add32((apr_uint32_t *)&(queue_info->idlers), -1) - zero_pt; + if (--new_idlers <= 0) { apr_atomic_inc32((apr_uint32_t *)&(queue_info->idlers)); /* back out dec */ return APR_EAGAIN; }