details: http://hg.nginx.org/nginx/rev/9053fdcea4b7
branches:
changeset: 5508:9053fdcea4b7
user: Valentin Bartenev <vbart@nginx.com>
date: Tue Jan 14 16:24:45 2014 +0400
description:
SPDY: better name for queued frames counter.

No functional changes.

diffstat:

src/http/ngx_http_spdy.c | 6 +++---
src/http/ngx_http_spdy.h | 3 ++-
src/http/ngx_http_spdy_filter_module.c | 14 +++++++-------
3 files changed, 12 insertions(+), 11 deletions(-)

diffs (95 lines):

diff -r a30bba3c72e8 -r 9053fdcea4b7 src/http/ngx_http_spdy.c
--- 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 @@ ngx_http_spdy_finalize_connection(ngx_ht

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;
diff -r a30bba3c72e8 -r 9053fdcea4b7 src/http/ngx_http_spdy.h
--- 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 @@ struct ngx_http_spdy_stream_s {
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;

diff -r a30bba3c72e8 -r 9053fdcea4b7 src/http/ngx_http_spdy_filter_module.c
--- 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 @@ ngx_http_spdy_header_filter(ngx_http_req
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 @@ ngx_http_spdy_body_filter(ngx_http_reque

if (in == NULL || r->header_only) {

- if (stream->waiting) {
+ if (stream->queued) {
return NGX_AGAIN;
}

@@ -695,7 +695,7 @@ ngx_http_spdy_body_filter(ngx_http_reque

ngx_http_spdy_queue_frame(stream->connection, frame);

- stream->waiting++;
+ stream->queued++;

r->main->blocked++;

@@ -800,7 +800,7 @@ ngx_http_spdy_filter_send(ngx_connection

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 @@ ngx_http_spdy_handle_frame(ngx_http_spdy
frame->free = stream->free_frames;
stream->free_frames = frame;

- stream->waiting--;
+ stream->queued--;
}


@@ -965,7 +965,7 @@ ngx_http_spdy_filter_cleanup(void *data)
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 @@ ngx_http_spdy_filter_cleanup(void *data)

if (frame->stream == stream && !frame->blocked) {

- stream->waiting--;
+ stream->queued--;
r->blocked--;

*fn = frame->next;

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel