From: Jim Jagielski <jim@apache.org>
Date: Tue, 3 Jul 2007 18:13:27 +0000 (+0000)
Subject: Rename relatively useless struct element for something more
X-Git-Tag: 2.3.0~1736
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=368e758aee272b0599b676c7d56f75b5dd60b61a;p=apache

Rename relatively useless struct element for something more
defining. Also, if we were unable to ap_queue_push(), then
push2worker should report failure.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@552937 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/experimental/event/event.c b/server/mpm/experimental/event/event.c
index d0128e5101..3dbf39a937 100644
--- a/server/mpm/experimental/event/event.c
+++ b/server/mpm/experimental/event/event.c
@@ -196,7 +196,7 @@ typedef enum
 typedef struct
 {
     poll_type_e type;
-    int status;        /*XXX what is this for?  0 and 1 don't make it clear */
+    int bypass_push;
     void *baton;
 } listener_poll_type;
 
@@ -584,7 +584,7 @@ static int process_socket(apr_pool_t * p, apr_socket_t * sock,
         cs->pfd.reqevents = APR_POLLIN;
         cs->pfd.desc.s = sock;
         pt->type = PT_CSD;
-        pt->status = 1;
+        pt->bypass_push = 1;
         pt->baton = cs;
         cs->pfd.client_data = pt;
         APR_RING_ELEM_INIT(cs, timeout_list);
@@ -665,7 +665,7 @@ read_request:
             apr_thread_mutex_lock(timeout_mutex);
             APR_RING_INSERT_TAIL(&timeout_head, cs, conn_state_t, timeout_list);
             apr_thread_mutex_unlock(timeout_mutex);
-            pt->status = 0;
+            pt->bypass_push = 0;
             cs->pfd.reqevents = APR_POLLOUT | APR_POLLHUP | APR_POLLERR;
             rc = apr_pollset_add(event_pollset, &cs->pfd);
             return 1;
@@ -707,7 +707,7 @@ read_request:
         APR_RING_INSERT_TAIL(&keepalive_timeout_head, cs, conn_state_t, timeout_list);
         apr_thread_mutex_unlock(timeout_mutex);
 
-        pt->status = 0;
+        pt->bypass_push = 0;
         /* Add work to pollset. */
         cs->pfd.reqevents = APR_POLLIN;
         rc = apr_pollset_add(event_pollset, &cs->pfd);
@@ -817,11 +817,11 @@ static apr_status_t push2worker(const apr_pollfd_t * pfd,
     conn_state_t *cs = (conn_state_t *) pt->baton;
     apr_status_t rc;
 
-    if (pt->status == 1) {
-        return 0;
+    if (pt->bypass_push) {
+        return APR_SUCCESS;
     }
 
-    pt->status = 1;
+    pt->bypass_push = 1;
 
     rc = apr_pollset_remove(pollset, pfd);
 
@@ -848,7 +848,7 @@ static apr_status_t push2worker(const apr_pollfd_t * pfd,
         ap_push_pool(worker_queue_info, cs->p);
     }
 
-    return APR_SUCCESS;
+    return rc;
 }
 
 /* get_worker: