details: http://hg.nginx.org/nginx/rev/f9c83484d9ce
branches:
changeset: 5850:f9c83484d9ce
user: Valentin Bartenev <vbart@nginx.com>
date: Wed Aug 13 15:11:45 2014 +0400
description:
Moved the code for adjusting sent buffers in a separate function.

diffstat:

src/core/ngx_buf.c | 46 ++++++++++++++++++++++++++++++
src/core/ngx_buf.h | 1 +
src/os/unix/ngx_darwin_sendfile_chain.c | 37 +-----------------------
src/os/unix/ngx_freebsd_sendfile_chain.c | 37 +-----------------------
src/os/unix/ngx_linux_sendfile_chain.c | 37 +-----------------------
src/os/unix/ngx_solaris_sendfilev_chain.c | 37 +-----------------------
src/os/unix/ngx_writev_chain.c | 24 +---------------
src/os/win32/ngx_wsasend_chain.c | 47 +-----------------------------
8 files changed, 54 insertions(+), 212 deletions(-)

diffs (truncated from 349 to 300 lines):

diff -r 810e97260edc -r f9c83484d9ce src/core/ngx_buf.c
--- a/src/core/ngx_buf.c Wed Aug 13 15:11:45 2014 +0400
+++ b/src/core/ngx_buf.c Wed Aug 13 15:11:45 2014 +0400
@@ -218,3 +218,49 @@ ngx_chain_update_chains(ngx_pool_t *p, n
*free = cl;
}
}
+
+
+ngx_chain_t *
+ngx_handle_sent_chain(ngx_chain_t *in, off_t sent)
+{
+ off_t size;
+
+ for ( /* void */ ; in; in = in->next) {
+
+ if (ngx_buf_special(in->buf)) {
+ continue;
+ }
+
+ if (sent == 0) {
+ break;
+ }
+
+ size = ngx_buf_size(in->buf);
+
+ if (sent >= size) {
+ sent -= size;
+
+ if (ngx_buf_in_memory(in->buf)) {
+ in->buf->pos = in->buf->last;
+ }
+
+ if (in->buf->in_file) {
+ in->buf->file_pos = in->buf->file_last;
+ }
+
+ continue;
+ }
+
+ if (ngx_buf_in_memory(in->buf)) {
+ in->buf->pos += (size_t) sent;
+ }
+
+ if (in->buf->in_file) {
+ in->buf->file_pos += sent;
+ }
+
+ break;
+ }
+
+ return in;
+}
diff -r 810e97260edc -r f9c83484d9ce src/core/ngx_buf.h
--- a/src/core/ngx_buf.h Wed Aug 13 15:11:45 2014 +0400
+++ b/src/core/ngx_buf.h Wed Aug 13 15:11:45 2014 +0400
@@ -158,5 +158,6 @@ ngx_chain_t *ngx_chain_get_free_buf(ngx_
void ngx_chain_update_chains(ngx_pool_t *p, ngx_chain_t **free,
ngx_chain_t **busy, ngx_chain_t **out, ngx_buf_tag_t tag);

+ngx_chain_t *ngx_handle_sent_chain(ngx_chain_t *in, off_t sent);

#endif /* _NGX_BUF_H_INCLUDED_ */
diff -r 810e97260edc -r f9c83484d9ce src/os/unix/ngx_darwin_sendfile_chain.c
--- a/src/os/unix/ngx_darwin_sendfile_chain.c Wed Aug 13 15:11:45 2014 +0400
+++ b/src/os/unix/ngx_darwin_sendfile_chain.c Wed Aug 13 15:11:45 2014 +0400
@@ -317,42 +317,7 @@ ngx_darwin_sendfile_chain(ngx_connection

c->sent += sent;

- for ( /* void */ ; in; in = in->next) {
-
- if (ngx_buf_special(in->buf)) {
- continue;
- }
-
- if (sent == 0) {
- break;
- }
-
- size = ngx_buf_size(in->buf);
-
- if (sent >= size) {
- sent -= size;
-
- if (ngx_buf_in_memory(in->buf)) {
- in->buf->pos = in->buf->last;
- }
-
- if (in->buf->in_file) {
- in->buf->file_pos = in->buf->file_last;
- }
-
- continue;
- }
-
- if (ngx_buf_in_memory(in->buf)) {
- in->buf->pos += (size_t) sent;
- }
-
- if (in->buf->in_file) {
- in->buf->file_pos += sent;
- }
-
- break;
- }
+ in = ngx_handle_sent_chain(in, sent);

if (eintr) {
continue;
diff -r 810e97260edc -r f9c83484d9ce src/os/unix/ngx_freebsd_sendfile_chain.c
--- a/src/os/unix/ngx_freebsd_sendfile_chain.c Wed Aug 13 15:11:45 2014 +0400
+++ b/src/os/unix/ngx_freebsd_sendfile_chain.c Wed Aug 13 15:11:45 2014 +0400
@@ -368,42 +368,7 @@ ngx_freebsd_sendfile_chain(ngx_connectio

c->sent += sent;

- for ( /* void */ ; in; in = in->next) {
-
- if (ngx_buf_special(in->buf)) {
- continue;
- }
-
- if (sent == 0) {
- break;
- }
-
- size = ngx_buf_size(in->buf);
-
- if (sent >= size) {
- sent -= size;
-
- if (ngx_buf_in_memory(in->buf)) {
- in->buf->pos = in->buf->last;
- }
-
- if (in->buf->in_file) {
- in->buf->file_pos = in->buf->file_last;
- }
-
- continue;
- }
-
- if (ngx_buf_in_memory(in->buf)) {
- in->buf->pos += (size_t) sent;
- }
-
- if (in->buf->in_file) {
- in->buf->file_pos += sent;
- }
-
- break;
- }
+ in = ngx_handle_sent_chain(in, sent);

#if (NGX_HAVE_AIO_SENDFILE)
if (c->busy_sendfile) {
diff -r 810e97260edc -r f9c83484d9ce src/os/unix/ngx_linux_sendfile_chain.c
--- a/src/os/unix/ngx_linux_sendfile_chain.c Wed Aug 13 15:11:45 2014 +0400
+++ b/src/os/unix/ngx_linux_sendfile_chain.c Wed Aug 13 15:11:45 2014 +0400
@@ -325,42 +325,7 @@ ngx_linux_sendfile_chain(ngx_connection_

c->sent += sent;

- for ( /* void */ ; in; in = in->next) {
-
- if (ngx_buf_special(in->buf)) {
- continue;
- }
-
- if (sent == 0) {
- break;
- }
-
- size = ngx_buf_size(in->buf);
-
- if (sent >= size) {
- sent -= size;
-
- if (ngx_buf_in_memory(in->buf)) {
- in->buf->pos = in->buf->last;
- }
-
- if (in->buf->in_file) {
- in->buf->file_pos = in->buf->file_last;
- }
-
- continue;
- }
-
- if (ngx_buf_in_memory(in->buf)) {
- in->buf->pos += (size_t) sent;
- }
-
- if (in->buf->in_file) {
- in->buf->file_pos += sent;
- }
-
- break;
- }
+ in = ngx_handle_sent_chain(in, sent);

if (eintr) {
continue;
diff -r 810e97260edc -r f9c83484d9ce src/os/unix/ngx_solaris_sendfilev_chain.c
--- a/src/os/unix/ngx_solaris_sendfilev_chain.c Wed Aug 13 15:11:45 2014 +0400
+++ b/src/os/unix/ngx_solaris_sendfilev_chain.c Wed Aug 13 15:11:45 2014 +0400
@@ -207,42 +207,7 @@ ngx_solaris_sendfilev_chain(ngx_connecti

c->sent += sent;

- for ( /* void */ ; in; in = in->next) {
-
- if (ngx_buf_special(in->buf)) {
- continue;
- }
-
- if (sent == 0) {
- break;
- }
-
- size = ngx_buf_size(in->buf);
-
- if ((off_t) sent >= size) {
- sent = (size_t) ((off_t) sent - size);
-
- if (ngx_buf_in_memory(in->buf)) {
- in->buf->pos = in->buf->last;
- }
-
- if (in->buf->in_file) {
- in->buf->file_pos = in->buf->file_last;
- }
-
- continue;
- }
-
- if (ngx_buf_in_memory(in->buf)) {
- in->buf->pos += sent;
- }
-
- if (in->buf->in_file) {
- in->buf->file_pos += sent;
- }
-
- break;
- }
+ in = ngx_handle_sent_chain(in, sent);

if (eintr) {
continue;
diff -r 810e97260edc -r f9c83484d9ce src/os/unix/ngx_writev_chain.c
--- a/src/os/unix/ngx_writev_chain.c Wed Aug 13 15:11:45 2014 +0400
+++ b/src/os/unix/ngx_writev_chain.c Wed Aug 13 15:11:45 2014 +0400
@@ -143,29 +143,7 @@ ngx_writev_chain(ngx_connection_t *c, ng

c->sent += sent;

- for (cl = in; cl; cl = cl->next) {
-
- if (ngx_buf_special(cl->buf)) {
- continue;
- }
-
- if (sent == 0) {
- break;
- }
-
- size = cl->buf->last - cl->buf->pos;
-
- if (sent >= size) {
- sent -= size;
- cl->buf->pos = cl->buf->last;
-
- continue;
- }
-
- cl->buf->pos += sent;
-
- break;
- }
+ cl = ngx_handle_sent_chain(in, sent);

if (eintr) {
continue;
diff -r 810e97260edc -r f9c83484d9ce src/os/win32/ngx_wsasend_chain.c
--- a/src/os/win32/ngx_wsasend_chain.c Wed Aug 13 15:11:45 2014 +0400
+++ b/src/os/win32/ngx_wsasend_chain.c Wed Aug 13 15:11:45 2014 +0400
@@ -119,29 +119,7 @@ ngx_wsasend_chain(ngx_connection_t *c, n

c->sent += sent;

- for (cl = in; cl; cl = cl->next) {
-
- if (ngx_buf_special(cl->buf)) {
- continue;
- }
-
- if (sent == 0) {
- break;

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