Commit f8714485 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Add these in from trunk... 

We can easily remove should we wish to maintain the
2.2 dev struct...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/httpd-2.2-proxy@772263 13f79535-47bb-0310-9956-ffa450edef68
parent ec29e37b

modules/proxy/balancers/.deps

0 → 100644
+0 −0

Empty file added.

modules/proxy/balancers/Makefile.in

0 → 100644
+3 −0
Original line number Original line Diff line number Diff line 
# a modules Makefile has no explicit targets -- they will be defined by

# whatever modules are enabled. just grab special.mk to deal with this.

include $(top_srcdir)/build/special.mk

modules/proxy/balancers/config2.m4

0 → 100644
+8 −0
Original line number Original line Diff line number Diff line 
APACHE_MODPATH_INIT(proxy/balancers)



APACHE_MODULE(lbmethod_byrequests, Apache proxy Load balancing by request counting, , , $proxy_mods_enable)

APACHE_MODULE(lbmethod_bytraffic, Apache proxy Load balancing by traffic counting, , , $proxy_mods_enable)

APACHE_MODULE(lbmethod_bybusyness, Apache proxy Load balancing by busyness, , , $proxy_mods_enable)

APACHE_MODULE(lbmethod_heartbeat, Apache proxy Load balancing from Heartbeats, , , $proxy_mods_enable)



APACHE_MODPATH_FINISH

modules/proxy/balancers/mod_lbmethod_bybusyness.c

0 → 100644
+139 −0
Original line number Original line Diff line number Diff line 
/* Licensed to the Apache Software Foundation (ASF) under one or more

 * contributor license agreements.  See the NOTICE file distributed with

 * this work for additional information regarding copyright ownership.

 * The ASF licenses this file to You under the Apache License, Version 2.0

 * (the "License"); you may not use this file except in compliance with

 * the License.  You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "mod_proxy.h"

#include "scoreboard.h"

#include "ap_mpm.h"

#include "apr_version.h"

#include "apr_hooks.h"



module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module;



static proxy_worker *find_best_bybusyness(proxy_balancer *balancer,

                                request_rec *r)

{



    int i;

    proxy_worker **worker;

    proxy_worker *mycandidate = NULL;

    int cur_lbset = 0;

    int max_lbset = 0;

    int checking_standby;

    int checked_standby;



    int total_factor = 0;

    

    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,

                 "proxy: Entering bybusyness for BALANCER (%s)",

                 balancer->name);



    /* First try to see if we have available candidate */

    do {



        checking_standby = checked_standby = 0;

        while (!mycandidate && !checked_standby) {



            worker = (proxy_worker **)balancer->workers->elts;

            for (i = 0; i < balancer->workers->nelts; i++, worker++) {

                if  (!checking_standby) {    /* first time through */

                    if ((*worker)->s->lbset > max_lbset)

                        max_lbset = (*worker)->s->lbset;

                }



                if ((*worker)->s->lbset != cur_lbset)

                    continue;



                if ( (checking_standby ? !PROXY_WORKER_IS_STANDBY(*worker) : PROXY_WORKER_IS_STANDBY(*worker)) )

                    continue;



                /* If the worker is in error state run

                 * retry on that worker. It will be marked as

                 * operational if the retry timeout is elapsed.

                 * The worker might still be unusable, but we try

                 * anyway.

                 */

                if (!PROXY_WORKER_IS_USABLE(*worker))

                    ap_proxy_retry_worker("BALANCER", *worker, r->server);



                /* Take into calculation only the workers that are

                 * not in error state or not disabled.

                 */

                if (PROXY_WORKER_IS_USABLE(*worker)) {



                    (*worker)->s->lbstatus += (*worker)->s->lbfactor;

                    total_factor += (*worker)->s->lbfactor;

                    

                    if (!mycandidate

                        || (*worker)->s->busy < mycandidate->s->busy

                        || ((*worker)->s->busy == mycandidate->s->busy && (*worker)->s->lbstatus > mycandidate->s->lbstatus))

                        mycandidate = *worker;



                }



            }



            checked_standby = checking_standby++;



        }



        cur_lbset++;



    } while (cur_lbset <= max_lbset && !mycandidate);



    if (mycandidate) {

        mycandidate->s->lbstatus -= total_factor;

        ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,

                     "proxy: bybusyness selected worker \"%s\" : busy %" APR_SIZE_T_FMT " : lbstatus %d",

                     mycandidate->name, mycandidate->s->busy, mycandidate->s->lbstatus);



    }



    return mycandidate;



}



static apr_status_t reset(proxy_balancer *balancer, request_rec *r) {

        return APR_SUCCESS;

}



static apr_status_t age(proxy_balancer *balancer, request_rec *r) {

        return APR_SUCCESS;

}



static const proxy_balancer_method bybusyness =

{

    "bybusyness",

    &find_best_bybusyness,

    &reset,

    &age,

    NULL

};





static void register_hook(apr_pool_t *p)

{

    ap_register_provider(p, PROXY_LBMETHOD, "bybusyness", "0", &bybusyness);

}



module AP_MODULE_DECLARE_DATA lbmethod_bybusyness_module = {

    STANDARD20_MODULE_STUFF,

    NULL,       /* create per-directory config structure */

    NULL,       /* merge per-directory config structures */

    NULL,       /* create per-server config structure */

    NULL,       /* merge per-server config structures */

    NULL,       /* command apr_table_t */

    register_hook /* register hooks */

};

modules/proxy/balancers/mod_lbmethod_bybusyness.dsp

0 → 100644
+123 −0
Original line number Original line Diff line number Diff line 
# Microsoft Developer Studio Project File - Name="mod_lbmethod_bybusyness" - Package Owner=<4>

# Microsoft Developer Studio Generated Build File, Format Version 6.00

# ** DO NOT EDIT **



# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102



CFG=mod_lbmethod_bybusyness - Win32 Release

!MESSAGE This is not a valid makefile. To build this project using NMAKE,

!MESSAGE use the Export Makefile command and run

!MESSAGE 

!MESSAGE NMAKE /f "mod_lbmethod_bybusyness.mak".

!MESSAGE 

!MESSAGE You can specify a configuration when running NMAKE

!MESSAGE by defining the macro CFG on the command line. For example:

!MESSAGE 

!MESSAGE NMAKE /f "mod_lbmethod_bybusyness.mak" CFG="mod_lbmethod_bybusyness - Win32 Release"

!MESSAGE 

!MESSAGE Possible choices for configuration are:

!MESSAGE 

!MESSAGE "mod_lbmethod_bybusyness - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

!MESSAGE "mod_lbmethod_bybusyness - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

!MESSAGE 



# Begin Project

# PROP AllowPerConfigDependencies 0

# PROP Scc_ProjName ""

# PROP Scc_LocalPath ""

CPP=cl.exe

MTL=midl.exe

RSC=rc.exe



!IF  "$(CFG)" == "mod_lbmethod_bybusyness - Win32 Release"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 0

# PROP BASE Output_Dir "Release"

# PROP BASE Intermediate_Dir "Release"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 0

# PROP Output_Dir "Release"

# PROP Intermediate_Dir "Release"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MD /W3 /O2 /Oy- /Zi /I ".." /I "../../../include" /I "../../../srclib/apr/include" /I "../../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_lbmethod_bybusyness_src" /FD /c

# ADD BASE MTL /nologo /D "NDEBUG" /win32

# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x809 /d "NDEBUG"

# ADD RSC /l 0x409 /fo"Release/mod_lbmethod_bybusyness.res" /i "../../../include" /i "../../../srclib/apr/include" /d "NDEBUG" /d BIN_NAME="mod_lbmethod_bybusyness.so" /d LONG_NAME="lbmethod_bybusyness_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /out:".\Release\mod_lbmethod_bybusyness.so" /base:@..\..\..\os\win32\BaseAddr.ref,mod_lbmethod_bybusyness.so

# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_lbmethod_bybusyness.so" /base:@..\..\..\os\win32\BaseAddr.ref,mod_lbmethod_bybusyness.so /opt:ref

# Begin Special Build Tool

TargetPath=.\Release\mod_lbmethod_bybusyness.so

SOURCE="$(InputPath)"

PostBuild_Desc=Embed .manifest

PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2

# End Special Build Tool



!ELSEIF  "$(CFG)" == "mod_lbmethod_bybusyness - Win32 Debug"



# PROP BASE Use_MFC 0

# PROP BASE Use_Debug_Libraries 1

# PROP BASE Output_Dir "Debug"

# PROP BASE Intermediate_Dir "Debug"

# PROP BASE Target_Dir ""

# PROP Use_MFC 0

# PROP Use_Debug_Libraries 1

# PROP Output_Dir "Debug"

# PROP Intermediate_Dir "Debug"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MDd /W3 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I ".." /I "../../../include" /I "../../../srclib/apr/include" /I "../../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_lbmethod_bybusyness_src" /FD /c

# ADD BASE MTL /nologo /D "_DEBUG" /win32

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x809 /d "_DEBUG"

# ADD RSC /l 0x409 /fo"Debug/mod_lbmethod_bybusyness.res" /i "../../../include" /i "../../../srclib/apr/include" /d "_DEBUG" /d BIN_NAME="mod_lbmethod_bybusyness.so" /d LONG_NAME="lbmethod_bybusyness_module for Apache"

BSC32=bscmake.exe

# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_lbmethod_bybusyness.so" /base:@..\..\..\os\win32\BaseAddr.ref,mod_lbmethod_bybusyness.so

# ADD LINK32 kernel32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_lbmethod_bybusyness.so" /base:@..\..\..\os\win32\BaseAddr.ref,mod_lbmethod_bybusyness.so

# Begin Special Build Tool

TargetPath=.\Debug\mod_lbmethod_bybusyness.so

SOURCE="$(InputPath)"

PostBuild_Desc=Embed .manifest

PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2

# End Special Build Tool



!ENDIF 



# Begin Target



# Name "mod_lbmethod_bybusyness - Win32 Release"

# Name "mod_lbmethod_bybusyness - Win32 Debug"

# Begin Group "Source Files"



# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"

# Begin Source File



SOURCE=.\mod_lbmethod_bybusyness.c

# End Source File

# End Group

# Begin Group "Header Files"



# PROP Default_Filter ".h"

# Begin Source File



SOURCE=..\mod_proxy.h

# End Source File

# End Group

# Begin Source File



SOURCE=..\..\..\build\win32\httpd.rc

# End Source File

# End Target

# End Project