IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix English grammar

Browse Source
This commit is contained in:
Igor Sysoev
2007-10-14 18:56:15 +00:00
parent 47a1ebb050
commit 2d3f3f6eb6
28 changed files with 147 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/event/ngx_event_busy_lock.c
View File

@@ -9,7 +9,7 @@
#include <ngx_event.h>
static ngx_int_t ngx_event_busy_lock_look_cachable(ngx_event_busy_lock_t *bl,
static ngx_int_t ngx_event_busy_lock_look_cacheable(ngx_event_busy_lock_t *bl,
ngx_event_busy_lock_ctx_t *ctx);
static void ngx_event_busy_lock_handler(ngx_event_t *ev);
static void ngx_event_busy_lock_posted_handler(ngx_event_t *ev);
@@ -65,14 +65,14 @@ ngx_event_busy_lock(ngx_event_busy_lock_t *bl, ngx_event_busy_lock_ctx_t *ctx)
ngx_int_t
ngx_event_busy_lock_cachable(ngx_event_busy_lock_t *bl,
ngx_event_busy_lock_cacheable(ngx_event_busy_lock_t *bl,
ngx_event_busy_lock_ctx_t *ctx)
{
ngx_int_t rc;
ngx_mutex_lock(bl->mutex);
rc = ngx_event_busy_lock_look_cachable(bl, ctx);
rc = ngx_event_busy_lock_look_cacheable(bl, ctx);
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, ctx->event->log, 0,
"event busy lock: %d w:%d mw:%d",
@@ -201,14 +201,14 @@ ngx_event_busy_lock_cancel(ngx_event_busy_lock_t *bl,
static ngx_int_t
ngx_event_busy_lock_look_cachable(ngx_event_busy_lock_t *bl,
ngx_event_busy_lock_look_cacheable(ngx_event_busy_lock_t *bl,
ngx_event_busy_lock_ctx_t *ctx)
{
ngx_int_t free;
ngx_uint_t i, bit, cachable, mask;
ngx_uint_t i, bit, cacheable, mask;
bit = 0;
cachable = 0;
cacheable = 0;
free = -1;
#if (NGX_SUPPRESS_WARN)
@@ -227,14 +227,14 @@ ngx_event_busy_lock_look_cachable(ngx_event_busy_lock_t *bl,
ctx->slot = i;
return NGX_AGAIN;
}
cachable++;
cacheable++;
} else if (free == -1) {
free = i;
}
if (cachable == bl->cachable) {
if (free == -1 && cachable < bl->max_busy) {
if (cacheable == bl->cacheable) {
if (free == -1 && cacheable < bl->max_busy) {
free = i + 1;
}
@@ -259,7 +259,7 @@ ngx_event_busy_lock_look_cachable(ngx_event_busy_lock_t *bl,
bl->md5_mask[free / 8] |= 1 << (free & 7);
ctx->slot = free;
bl->cachable++;
bl->cacheable++;
bl->busy++;
return NGX_OK;

4
src/event/ngx_event_busy_lock.h
View File

@@ -34,7 +34,7 @@ struct ngx_event_busy_lock_ctx_s {
typedef struct {
u_char *md5_mask;
char *md5;
ngx_uint_t cachable;
ngx_uint_t cacheable;
ngx_uint_t busy;
ngx_uint_t max_busy;
@@ -53,7 +53,7 @@ typedef struct {
ngx_int_t ngx_event_busy_lock(ngx_event_busy_lock_t *bl,
ngx_event_busy_lock_ctx_t *ctx);
ngx_int_t ngx_event_busy_lock_cachable(ngx_event_busy_lock_t *bl,
ngx_int_t ngx_event_busy_lock_cacheable(ngx_event_busy_lock_t *bl,
ngx_event_busy_lock_ctx_t *ctx);
void ngx_event_busy_unlock(ngx_event_busy_lock_t *bl,
ngx_event_busy_lock_ctx_t *ctx);

12
src/event/ngx_event_pipe.c
View File

@@ -192,7 +192,7 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
chain->buf = b;
chain->next = NULL;
} else if (!p->cachable
} else if (!p->cacheable
&& p->downstream->data == p->output_ctx
&& p->downstream->write->ready
&& !p->downstream->write->delayed)
@@ -209,7 +209,7 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
break;
} else if (p->cachable
} else if (p->cacheable
|| p->temp_file->offset < p->max_temp_file_size)
{
@@ -406,7 +406,7 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
}
}
if (p->cachable && p->in) {
if (p->cacheable && p->in) {
if (ngx_event_pipe_write_chain_to_temp_file(p) == NGX_ABORT) {
return NGX_ABORT;
}
@@ -542,7 +542,7 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
ngx_event_pipe_free_shadow_raw_buf(&p->free_raw_bufs, cl->buf);
} else if (!p->cachable && p->in) {
} else if (!p->cacheable && p->in) {
cl = p->in;
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, p->log, 0,
@@ -612,7 +612,7 @@ ngx_event_pipe_write_to_downstream(ngx_event_pipe_t *p)
for (cl = p->free; cl; cl = cl->next) {
if (cl->buf->temp_file) {
if (p->cachable || !p->cyclic_temp_file) {
if (p->cacheable || !p->cyclic_temp_file) {
continue;
}
@@ -659,7 +659,7 @@ ngx_event_pipe_write_chain_to_temp_file(ngx_event_pipe_t *p)
out = p->in;
}
if (!p->cachable) {
if (!p->cacheable) {
size = 0;
cl = out;

2
src/event/ngx_event_pipe.h
View File

@@ -47,7 +47,7 @@ struct ngx_event_pipe_s {
void *output_ctx;
unsigned read:1;
unsigned cachable:1;
unsigned cacheable:1;
unsigned single_buf:1;
unsigned free_bufs:1;
unsigned upstream_done:1;