www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

Use 2 sep hashing functions to account for collisions...

Browse Source 
Safe enough

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1208897 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2011-12-01 00:02:30 +00:00
parent 4554d337cc
commit 1eeb516b64
3 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/proxy/mod_proxy.c
View File

@@ -2428,9 +2428,11 @@ static void child_init(apr_pool_t *p, server_rec *s)
PROXY_STRNCPY(conf->forward->s->name, "proxy:forward"); PROXY_STRNCPY(conf->forward->s->name, "proxy:forward");
PROXY_STRNCPY(conf->forward->s->hostname, "*"); PROXY_STRNCPY(conf->forward->s->hostname, "*");
PROXY_STRNCPY(conf->forward->s->scheme, "*"); PROXY_STRNCPY(conf->forward->s->scheme, "*");
conf->forward->hash = conf->forward->s->hash = conf->forward->hash.def = conf->forward->s->hash.def =
ap_proxy_hashfunc(conf->forward->s->name, PROXY_HASHFUNC_DEFAULT); ap_proxy_hashfunc(conf->forward->s->name, PROXY_HASHFUNC_DEFAULT);
/* Do not disable worker in case of errors */ conf->forward->hash.fnv = conf->forward->s->hash.fnv =
ap_proxy_hashfunc(conf->forward->s->name, PROXY_HASHFUNC_FNV);
/* Do not disable worker in case of errors */
conf->forward->s->status |= PROXY_WORKER_IGNORE_ERRORS; conf->forward->s->status |= PROXY_WORKER_IGNORE_ERRORS;
/* Disable address cache for generic forward worker */ /* Disable address cache for generic forward worker */
conf->forward->s->is_address_reusable = 0; conf->forward->s->is_address_reusable = 0;
@@ -2441,8 +2443,10 @@ static void child_init(apr_pool_t *p, server_rec *s)
PROXY_STRNCPY(reverse->s->name, "proxy:reverse"); PROXY_STRNCPY(reverse->s->name, "proxy:reverse");
PROXY_STRNCPY(reverse->s->hostname, "*"); PROXY_STRNCPY(reverse->s->hostname, "*");
PROXY_STRNCPY(reverse->s->scheme, "*"); PROXY_STRNCPY(reverse->s->scheme, "*");
reverse->hash = reverse->s->hash = reverse->hash.def = reverse->s->hash.def =
ap_proxy_hashfunc(reverse->s->name, PROXY_HASHFUNC_DEFAULT); ap_proxy_hashfunc(reverse->s->name, PROXY_HASHFUNC_DEFAULT);
reverse->hash.fnv = reverse->s->hash.fnv =
ap_proxy_hashfunc(reverse->s->name, PROXY_HASHFUNC_FNV);
/* Do not disable worker in case of errors */ /* Do not disable worker in case of errors */
reverse->s->status |= PROXY_WORKER_IGNORE_ERRORS; reverse->s->status |= PROXY_WORKER_IGNORE_ERRORS;
/* Disable address cache for generic reverse worker */ /* Disable address cache for generic reverse worker */

13
modules/proxy/mod_proxy.h
View File

@@ -320,6 +320,11 @@ do { \
(w)->s->io_buffer_size_set = (c)->io_buffer_size_set; \ (w)->s->io_buffer_size_set = (c)->io_buffer_size_set; \
} while (0) } while (0)
/* use 2 hashes */
typedef struct {
unsigned int def;
unsigned int fnv;
} proxy_hashes ;
/* Runtime worker status informations. Shared in scoreboard */ /* Runtime worker status informations. Shared in scoreboard */
typedef struct { typedef struct {
@@ -338,7 +343,7 @@ typedef struct {
int hmax; /* Hard maximum on the total number of connections */ int hmax; /* Hard maximum on the total number of connections */
int flush_wait; /* poll wait time in microseconds if flush_auto */ int flush_wait; /* poll wait time in microseconds if flush_auto */
int index; /* shm array index */ int index; /* shm array index */
unsigned int hash; /* hash of worker name */ proxy_hashes hash; /* hash of worker name */
unsigned int status; /* worker status bitfield */ unsigned int status; /* worker status bitfield */
enum { enum {
flush_off, flush_off,
@@ -381,7 +386,7 @@ typedef struct {
/* Worker configuration */ /* Worker configuration */
struct proxy_worker { struct proxy_worker {
unsigned int hash; /* hash of worker name */ proxy_hashes hash; /* hash of worker name */
unsigned int local_status; /* status of per-process worker */ unsigned int local_status; /* status of per-process worker */
proxy_conn_pool *cp; /* Connection pool to use */ proxy_conn_pool *cp; /* Connection pool to use */
proxy_worker_shared *s; /* Shared data */ proxy_worker_shared *s; /* Shared data */
@@ -409,7 +414,7 @@ typedef struct {
apr_time_t wupdated; /* timestamp of last change to workers list */ apr_time_t wupdated; /* timestamp of last change to workers list */
int max_attempts; /* Number of attempts before failing */ int max_attempts; /* Number of attempts before failing */
int index; /* shm array index */ int index; /* shm array index */
unsigned int hash; proxy_hashes hash;
unsigned int sticky_force:1; /* Disable failover for sticky sessions */ unsigned int sticky_force:1; /* Disable failover for sticky sessions */
unsigned int scolonsep:1; /* true if ';' seps sticky session paths */ unsigned int scolonsep:1; /* true if ';' seps sticky session paths */
unsigned int max_attempts_set:1; unsigned int max_attempts_set:1;
@@ -428,7 +433,7 @@ struct proxy_balancer {
ap_slotmem_provider_t *storage; ap_slotmem_provider_t *storage;
int growth; /* number of post-config workers can added */ int growth; /* number of post-config workers can added */
int max_workers; /* maximum number of allowed workers */ int max_workers; /* maximum number of allowed workers */
unsigned int hash; proxy_hashes hash;
apr_time_t wupdated; /* timestamp of last change to workers list */ apr_time_t wupdated; /* timestamp of last change to workers list */
proxy_balancer_method *lbmethod; proxy_balancer_method *lbmethod;
apr_global_mutex_t *gmutex; /* global lock for updating list of workers */ apr_global_mutex_t *gmutex; /* global lock for updating list of workers */

17
modules/proxy/proxy_util.c
View File

@@ -1298,7 +1298,7 @@ PROXY_DECLARE(proxy_balancer *) ap_proxy_get_balancer(apr_pool_t *p,
proxy_balancer *balancer; proxy_balancer *balancer;
char *c, *uri = apr_pstrdup(p, url); char *c, *uri = apr_pstrdup(p, url);
int i; int i;
unsigned int hash; proxy_hashes hash;
ap_str_tolower(uri); ap_str_tolower(uri);
c = strchr(uri, ':'); c = strchr(uri, ':');
@@ -1309,10 +1309,11 @@ PROXY_DECLARE(proxy_balancer *) ap_proxy_get_balancer(apr_pool_t *p,
if ((c = strchr(c + 3, '/'))) { if ((c = strchr(c + 3, '/'))) {
*c = '\0'; *c = '\0';
} }
hash = ap_proxy_hashfunc(uri, PROXY_HASHFUNC_DEFAULT); hash.def = ap_proxy_hashfunc(uri, PROXY_HASHFUNC_DEFAULT);
hash.fnv = ap_proxy_hashfunc(uri, PROXY_HASHFUNC_FNV);
balancer = (proxy_balancer *)conf->balancers->elts; balancer = (proxy_balancer *)conf->balancers->elts;
for (i = 0; i < conf->balancers->nelts; i++) { for (i = 0; i < conf->balancers->nelts; i++) {
if (balancer->hash == hash) { if (balancer->hash.def == hash.def && balancer->hash.fnv == hash.fnv) {
if (!care || !balancer->s->inactive) { if (!care || !balancer->s->inactive) {
return balancer; return balancer;
} }
@@ -1401,7 +1402,8 @@ PROXY_DECLARE(char *) ap_proxy_define_balancer(apr_pool_t *p,
if (PROXY_STRNCPY(bshared->sname, sname) != APR_SUCCESS) { if (PROXY_STRNCPY(bshared->sname, sname) != APR_SUCCESS) {
return apr_psprintf(p, "balancer safe-name (%s) too long", sname); return apr_psprintf(p, "balancer safe-name (%s) too long", sname);
} }
bshared->hash = ap_proxy_hashfunc(bshared->name, PROXY_HASHFUNC_DEFAULT); bshared->hash.def = ap_proxy_hashfunc(bshared->name, PROXY_HASHFUNC_DEFAULT);
bshared->hash.fnv = ap_proxy_hashfunc(bshared->name, PROXY_HASHFUNC_FNV);
(*balancer)->hash = bshared->hash; (*balancer)->hash = bshared->hash;
/* Retrieve a UUID and store the nonce for the lifetime of /* Retrieve a UUID and store the nonce for the lifetime of
@@ -1835,7 +1837,8 @@ PROXY_DECLARE(char *) ap_proxy_define_worker(apr_pool_t *p,
wshared->is_address_reusable = 1; wshared->is_address_reusable = 1;
wshared->lbfactor = 1; wshared->lbfactor = 1;
wshared->smax = -1; wshared->smax = -1;
wshared->hash = ap_proxy_hashfunc(wshared->name, PROXY_HASHFUNC_DEFAULT); wshared->hash.def = ap_proxy_hashfunc(wshared->name, PROXY_HASHFUNC_DEFAULT);
wshared->hash.fnv = ap_proxy_hashfunc(wshared->name, PROXY_HASHFUNC_FNV);
wshared->was_malloced = (do_malloc != 0); wshared->was_malloced = (do_malloc != 0);
(*worker)->hash = wshared->hash; (*worker)->hash = wshared->hash;
@@ -2985,13 +2988,13 @@ PROXY_DECLARE(apr_status_t) ap_proxy_sync_balancer(proxy_balancer *b, server_rec
/* account for possible "holes" in the slotmem /* account for possible "holes" in the slotmem
* (eg: slots 0-2 are used, but 3 isn't, but 4-5 is) * (eg: slots 0-2 are used, but 3 isn't, but 4-5 is)
*/ */
if (!shm->hash) if (!shm->hash.def || !shm->hash.fnv)
continue; continue;
found = 0; found = 0;
workers = (proxy_worker **)b->workers->elts; workers = (proxy_worker **)b->workers->elts;
for (i = 0; i < b->workers->nelts; i++, workers++) { for (i = 0; i < b->workers->nelts; i++, workers++) {
proxy_worker *worker = *workers; proxy_worker *worker = *workers;
if (worker->hash == shm->hash) { if (worker->hash.def == shm->hash.def && worker->hash.fnv == shm->hash.fnv) {
found = 1; found = 1;
break; break;
} }