httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ruediger Pluem <rpl...@apache.org>
Subject Re: svn commit: r573264 - /httpd/httpd/trunk/include/scoreboard.h
Date Tue, 11 Sep 2007 20:02:43 GMT


On 09/11/2007 06:09 PM, jean-frederic clere wrote:
> Plüm wrote:
>>> -----Ursprüngliche Nachricht-----
>>> Von: jean-frederic clere
>>> Gesendet: Montag, 10. September 2007 16:38
>>> An: dev@httpd.apache.org
>>> Betreff: Re: svn commit: r573264 - 
>>> /httpd/httpd/trunk/include/scoreboard.h
>>>
>>>
>>> Jim Jagielski wrote:
>>>> On Sep 10, 2007, at 6:37 AM, Plüm, Rüdiger, VF-Group wrote:
>>>>
>>>>>> For example what about adding:
>>>>>> static APR_OPTIONAL_FN_TYPE(ap_proxy_lb_worker_size)
>>>>>> *proxy_lb_worker_size;
>>>>>> and use a void * in scoreboard and an int for the size?
>>>>> For me this sounds fine, but I would guess that Jim doesn't like
>>>>> the void * idea in the scoreboard.
>>>>>
>>>> I don't mind it at all, if we use it because we don't know
>>>> what will be stored away or because we may use the storage
>>>> differently at different times. But this is never the
>>>> case. lb_score always is proxy_worker_stat.
>>>>
>>>>
>>> The attached patch remove "lb_score" from scoreboard.c.
>>>
>>> Comments?
>> 1. IMHO requires a minor bump.
> 
> Find a patch that covers all the points you raised below.
> 
> More comments?

Index: server/scoreboard.c
===================================================================
--- server/scoreboard.c»(revision 574500)
+++ server/scoreboard.c»(working copy)
@@ -490,8 +499,10 @@
·
 AP_DECLARE(lb_score *) ap_get_scoreboard_lb(int lb_num)
 {
-    if (((lb_num < 0) || (lb_limit < lb_num))) {
+    char *ptr;
+    if (((lb_num < 0) || (lb_limit < lb_num)) || worker_size==0) {

I do not understand the setting of the brackets here. I suppose this should be:

if ((lb_num < 0) || (lb_limit < lb_num) || (worker_size == 0)) {

instead.


Index: modules/proxy/mod_proxy_balancer.c
===================================================================
--- modules/proxy/mod_proxy_balancer.c»·(revision 574500)
+++ modules/proxy/mod_proxy_balancer.c»·(working copy)
@@ -19,7 +19,6 @@
 #define CORE_PRIVATE
·
 #include "mod_proxy.h"
-#include "scoreboard.h"

Due to r574485 scoreboard.h is needed by mod_proxy_balancer to access
ap_get_scoreboard_lb. So this patch to mod_proxy_balancer.c should be
removed from your patch.



Regards

Rüdiger

Mime
View raw message