mod_proxy: Follow up to r1912245: ap_proxy_ prefix for extern functions.

Even if they are not part of the API (not in mod_proxy.h) hence requires no
MMN bump, {get,set,increment_,decrement_}busy_count() being AP_PROXY_DECLARE()d
could name-collide with a third-party module's functions.

Rename them using the ap_proxy_ prefix, with an underscore after the verb for
for all of them too (for consistency), that is:
    ap_proxy_{get,set,increment,decrement}_busy_count()

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

diff --git a/modules/proxy/balancers/mod_lbmethod_bybusyness.c b/modules/proxy/balancers/mod_lbmethod_bybusyness.c
index e714715eb3672b2352752fb3cfc88b1d62514282..c2efa2f9a9d2179755149a8ff0d1f2f98f299521 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_bybusyness.c
+++ b/modules/proxy/balancers/mod_lbmethod_bybusyness.c
@@ -30,13 +30,13 @@ static APR_OPTIONAL_FN_TYPE(proxy_balancer_get_best_worker)
 static int is_best_bybusyness(proxy_worker *current, proxy_worker *prev_best, void *baton)
 {
     int *total_factor = (int *)baton;
-    apr_size_t current_busy = getbusy_count(current);
+    apr_size_t current_busy = ap_proxy_get_busy_count(current);
     apr_size_t prev_best_busy = 0;
 
     current->s->lbstatus += current->s->lbfactor;
     *total_factor += current->s->lbfactor;
     if (prev_best)
-        prev_best_busy = getbusy_count(prev_best);
+        prev_best_busy = ap_proxy_get_busy_count(prev_best);
      
 
     return (
@@ -72,7 +72,7 @@ static apr_status_t reset(proxy_balancer *balancer, server_rec *s)
     worker = (proxy_worker **)balancer->workers->elts;
     for (i = 0; i < balancer->workers->nelts; i++, worker++) {
         (*worker)->s->lbstatus = 0;
-        setbusy_count(*worker, 0); 
+        ap_proxy_set_busy_count(*worker, 0); 
     }
     return APR_SUCCESS;
 }

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index c42d0d6c393c554320558099a109a7f9d9643412..ea1b034d00e9546e27b0a9e17fc81511a5b84471 100644 (file)
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -623,8 +623,8 @@ static int proxy_balancer_pre_request(proxy_worker **worker,
         *worker = runtime;
     }
 
-    increment_busy_count(*worker);
-    apr_pool_cleanup_register(r->pool, *worker, decrement_busy_count,
+    ap_proxy_increment_busy_count(*worker);
+    apr_pool_cleanup_register(r->pool, *worker, ap_proxy_decrement_busy_count,
                               apr_pool_cleanup_null);
 
     /* Add balancer/worker info to env. */
@@ -1563,7 +1563,7 @@ static void balancer_display_page(request_rec *r, proxy_server_conf *conf,
                           "</httpd:redirect>\n", NULL);
                 ap_rprintf(r,
                            "          <httpd:busy>%" APR_SIZE_T_FMT "</httpd:busy>\n",
-                           getbusy_count(worker));
+                           ap_proxy_get_busy_count(worker));
                 ap_rprintf(r, "          <httpd:lbset>%d</httpd:lbset>\n",
                            worker->s->lbset);
                 /* End proxy_worker_stat */
@@ -1736,7 +1736,7 @@ static void balancer_display_page(request_rec *r, proxy_server_conf *conf,
                 ap_rvputs(r, ap_proxy_parse_wstatus(r->pool, worker), NULL);
                 ap_rputs("</td>", r);
                 ap_rprintf(r, "<td>%" APR_SIZE_T_FMT "</td>", worker->s->elected);
-                ap_rprintf(r, "<td>%" APR_SIZE_T_FMT "</td>", getbusy_count(worker));
+                ap_rprintf(r, "<td>%" APR_SIZE_T_FMT "</td>", ap_proxy_get_busy_count(worker));
                 ap_rprintf(r, "<td>%d</td><td>", worker->s->lbstatus);
                 ap_rputs(apr_strfsize(worker->s->transferred, fbuf), r);
                 ap_rputs("</td><td>", r);

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 19fb22e6a17c5d848588f180637c82cc318a578e..155d82be36f21a11703cf1467e06ee6c18188e51 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -5392,7 +5392,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_tunnel_create(proxy_tunnel_rec **ptunnel,
     return APR_SUCCESS;
 }
 
-PROXY_DECLARE(apr_status_t) decrement_busy_count(void *worker_)
+PROXY_DECLARE(apr_status_t) ap_proxy_decrement_busy_count(void *worker_)
 {
     apr_size_t val;
     proxy_worker *worker = worker_;
@@ -5435,7 +5435,7 @@ PROXY_DECLARE(apr_status_t) decrement_busy_count(void *worker_)
     return APR_SUCCESS;
 }
 
-PROXY_DECLARE(void) increment_busy_count(proxy_worker *worker)
+PROXY_DECLARE(void) ap_proxy_increment_busy_count(proxy_worker *worker)
 {
     apr_size_t val;
 #if APR_SIZEOF_VOIDP == 4
@@ -5475,7 +5475,7 @@ PROXY_DECLARE(void) increment_busy_count(proxy_worker *worker)
 #endif
 }
 
-PROXY_DECLARE(apr_size_t) getbusy_count(proxy_worker *worker)
+PROXY_DECLARE(apr_size_t) ap_proxy_get_busy_count(proxy_worker *worker)
 {
     apr_size_t val;
 #if APR_SIZEOF_VOIDP == 4
@@ -5494,7 +5494,7 @@ PROXY_DECLARE(apr_size_t) getbusy_count(proxy_worker *worker)
     return val;
 }
 
-PROXY_DECLARE(void) setbusy_count(proxy_worker *worker, apr_size_t to)
+PROXY_DECLARE(void) ap_proxy_set_busy_count(proxy_worker *worker, apr_size_t to)
 {
 #if APR_SIZEOF_VOIDP == 4
     AP_DEBUG_ASSERT(sizeof(apr_size_t) == sizeof(apr_uint32_t));

diff --git a/modules/proxy/proxy_util.h b/modules/proxy/proxy_util.h
index 0dde2487bb2b682045dfd43f74325922d5eaf044..42d0f89811aaf329f490180715db00d772c122af 100644 (file)
--- a/modules/proxy/proxy_util.h
+++ b/modules/proxy/proxy_util.h
@@ -46,7 +46,7 @@ void proxy_util_register_hooks(apr_pool_t *p);
  * @param worker Pointer to the worker structure.
  * @return      apr_size_t value atomically read for the worker.
  */
-PROXY_DECLARE(apr_size_t) getbusy_count(proxy_worker *worker);
+PROXY_DECLARE(apr_size_t) ap_proxy_get_busy_count(proxy_worker *worker);
 
 /*
  * Set the busy counter from the shared worker memory
@@ -55,7 +55,7 @@ PROXY_DECLARE(apr_size_t) getbusy_count(proxy_worker *worker);
  * @param to value to set the busy counter.
  * @return      void
  */
-PROXY_DECLARE(void) setbusy_count(proxy_worker *worker, apr_size_t to);
+PROXY_DECLARE(void) ap_proxy_set_busy_count(proxy_worker *worker, apr_size_t to);
 
 /*
  * decrement the busy counter from the shared worker memory
@@ -65,7 +65,7 @@ PROXY_DECLARE(void) setbusy_count(proxy_worker *worker, apr_size_t to);
  * @param worker_ Pointer to the worker structure.
  * @return      apr_status_t returns APR_SUCCESS.
  */
-PROXY_DECLARE(apr_status_t) decrement_busy_count(void *worker_);
+PROXY_DECLARE(apr_status_t) ap_proxy_decrement_busy_count(void *worker_);
 
 /*
  * increment the busy counter from the shared worker memory
@@ -73,7 +73,7 @@ PROXY_DECLARE(apr_status_t) decrement_busy_count(void *worker_);
  * @param worker Pointer to the worker structure.
  * @return      void
  */
-PROXY_DECLARE(void) increment_busy_count(proxy_worker *worker);
+PROXY_DECLARE(void) ap_proxy_increment_busy_count(proxy_worker *worker);
 
 /** @} */