Mercurial > hg > nginx
changeset 5508:9053fdcea4b7
SPDY: better name for queued frames counter.
No functional changes.
author | Valentin Bartenev <vbart@nginx.com> |
---|---|
date | Tue, 14 Jan 2014 16:24:45 +0400 |
parents | a30bba3c72e8 |
children | 877a7bd72070 |
files | src/http/ngx_http_spdy.c src/http/ngx_http_spdy.h src/http/ngx_http_spdy_filter_module.c |
diffstat | 3 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_spdy.c Tue Jan 14 16:24:45 2014 +0400 +++ b/src/http/ngx_http_spdy.c Tue Jan 14 16:24:45 2014 +0400 @@ -2861,9 +2861,9 @@ fc->error = 1; - if (stream->waiting) { - r->blocked -= stream->waiting; - stream->waiting = 0; + if (stream->queued) { + r->blocked -= stream->queued; + stream->queued = 0; ev = fc->write; ev->delayed = 0;
--- a/src/http/ngx_http_spdy.h Tue Jan 14 16:24:45 2014 +0400 +++ b/src/http/ngx_http_spdy.h Tue Jan 14 16:24:45 2014 +0400 @@ -119,7 +119,8 @@ ngx_http_spdy_stream_t *next; ngx_uint_t header_buffers; - ngx_uint_t waiting; + ngx_uint_t queued; + ngx_http_spdy_out_frame_t *free_frames; ngx_chain_t *free_data_headers;
--- a/src/http/ngx_http_spdy_filter_module.c Tue Jan 14 16:24:45 2014 +0400 +++ b/src/http/ngx_http_spdy_filter_module.c Tue Jan 14 16:24:45 2014 +0400 @@ -607,7 +607,7 @@ cln->handler = ngx_http_spdy_filter_cleanup; cln->data = stream; - stream->waiting = 1; + stream->queued = 1; return ngx_http_spdy_filter_send(c, stream); } @@ -633,7 +633,7 @@ if (in == NULL || r->header_only) { - if (stream->waiting) { + if (stream->queued) { return NGX_AGAIN; } @@ -695,7 +695,7 @@ ngx_http_spdy_queue_frame(stream->connection, frame); - stream->waiting++; + stream->queued++; r->main->blocked++; @@ -800,7 +800,7 @@ stream->blocked = 0; - if (stream->waiting) { + if (stream->queued) { fc->buffered |= NGX_SPDY_WRITE_BUFFERED; fc->write->delayed = 1; return NGX_AGAIN; @@ -932,7 +932,7 @@ frame->free = stream->free_frames; stream->free_frames = frame; - stream->waiting--; + stream->queued--; } @@ -965,7 +965,7 @@ ngx_http_request_t *r; ngx_http_spdy_out_frame_t *frame, **fn; - if (stream->waiting == 0) { + if (stream->queued == 0) { return; } @@ -982,7 +982,7 @@ if (frame->stream == stream && !frame->blocked) { - stream->waiting--; + stream->queued--; r->blocked--; *fn = frame->next;