Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

eliminate a number of ranges: about 18,000 /16 networks are empty,

Browse source 
this change saves about 70K/140K on 32/64-bit platforms
This commit is contained in:
Igor Sysoev 2010-06-24 15:26:05 +00:00
parent f3a714a6ba
commit 09eb3358d2
1 changed files with 22 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/http/modules/ngx_http_geo_module.c
View file

@ -10,20 +10,14 @@
typedef struct { typedef struct {
ngx_http_variable_value_t *value;
u_short start; u_short start;
u_short end; u_short end;
ngx_http_variable_value_t *value;
} ngx_http_geo_range_t; } ngx_http_geo_range_t;
typedef struct { typedef struct {
ngx_http_geo_range_t *ranges; ngx_http_geo_range_t *low[0x10000];
ngx_uint_t n;
} ngx_http_geo_low_ranges_t;
typedef struct {
ngx_http_geo_low_ranges_t low[0x10000];
ngx_http_variable_value_t *default_value; ngx_http_variable_value_t *default_value;
} ngx_http_geo_high_ranges_t; } ngx_http_geo_high_ranges_t;
@ -154,23 +148,24 @@ ngx_http_geo_range_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
ngx_http_geo_ctx_t *ctx = (ngx_http_geo_ctx_t *) data; ngx_http_geo_ctx_t *ctx = (ngx_http_geo_ctx_t *) data;
in_addr_t addr; in_addr_t addr;
ngx_uint_t i, n; ngx_uint_t n;
ngx_http_geo_range_t *range; ngx_http_geo_range_t *range;
*v = *ctx->u.high->default_value; *v = *ctx->u.high->default_value;
addr = ngx_http_geo_addr(r, ctx); addr = ngx_http_geo_addr(r, ctx);
range = ctx->u.high->low[addr >> 16].ranges; range = ctx->u.high->low[addr >> 16];
n = addr & 0xffff; if (range) {
n = addr & 0xffff;
for (i = 0; i < ctx->u.high->low[addr >> 16].n; i++) { do {
if (n >= (ngx_uint_t) range[i].start && n <= (ngx_uint_t) range[i].end) if (n >= (ngx_uint_t) range->start && n <= (ngx_uint_t) range->end)
{ {
*v = *range[i].value; *v = *range->value;
break; break;
} }
} while ((++range)->value);
} }
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
@ -262,6 +257,7 @@ static char *
ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{ {
char *rv; char *rv;
void **p;
size_t len; size_t len;
ngx_str_t *value, name; ngx_str_t *value, name;
ngx_uint_t i; ngx_uint_t i;
@ -335,22 +331,21 @@ ngx_http_geo_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
if (ctx.high) { if (ctx.high) {
for (i = 0; i < 0x10000; i++) { for (i = 0; i < 0x10000; i++) {
a = (ngx_array_t *) ctx.high->low[i].ranges; a = (ngx_array_t *) ctx.high->low[i];
if (a == NULL || a->nelts == 0) { if (a == NULL || a->nelts == 0) {
continue; continue;
} }
ctx.high->low[i].n = a->nelts;
len = a->nelts * sizeof(ngx_http_geo_range_t); len = a->nelts * sizeof(ngx_http_geo_range_t);
ctx.high->low[i].ranges = ngx_palloc(cf->pool, len); ctx.high->low[i] = ngx_palloc(cf->pool, len + sizeof(void *));
if (ctx.high->low[i].ranges == NULL) { if (ctx.high->low[i] == NULL) {
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
ngx_memcpy(ctx.high->low[i].ranges, a->elts, len); p = (void **) ngx_cpymem(ctx.high->low[i], a->elts, len);
*p = NULL;
} }
geo->u.high = ctx.high; geo->u.high = ctx.high;
@ -611,7 +606,7 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
e = 0xffff; e = 0xffff;
} }
a = (ngx_array_t *) ctx->high->low[h].ranges; a = (ngx_array_t *) ctx->high->low[h];
if (a == NULL) { if (a == NULL) {
a = ngx_array_create(ctx->temp_pool, 64, a = ngx_array_create(ctx->temp_pool, 64,
@ -620,7 +615,7 @@ ngx_http_geo_add_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
return NGX_CONF_ERROR; return NGX_CONF_ERROR;
} }
ctx->high->low[h].ranges = (ngx_http_geo_range_t *) a; ctx->high->low[h] = (ngx_http_geo_range_t *) a;
} }
i = a->nelts; i = a->nelts;
@ -808,7 +803,7 @@ ngx_http_geo_delete_range(ngx_conf_t *cf, ngx_http_geo_conf_ctx_t *ctx,
e = 0xffff; e = 0xffff;
} }
a = (ngx_array_t *) ctx->high->low[h].ranges; a = (ngx_array_t *) ctx->high->low[h];
if (a == NULL) { if (a == NULL) {
warn = 1; warn = 1;