details: http://hg.nginx.org/nginx/rev/ed1101bbf19f
branches:
changeset: 7007:ed1101bbf19f
user: Ruslan Ermilov <ru@nginx.com>
date: Fri May 26 22:52:48 2017 +0300
description:
Introduced ngx_tcp_nodelay().

diffstat:

src/core/ngx_connection.c | 43 ++++++++++++++++
src/core/ngx_connection.h | 1 +
src/http/ngx_http_request.c | 27 +---------
src/http/ngx_http_upstream.c | 96 ++++++-----------------------------
src/http/v2/ngx_http_v2.c | 25 +--------
src/stream/ngx_stream_core_module.c | 19 +------
src/stream/ngx_stream_proxy_module.c | 19 +------
7 files changed, 72 insertions(+), 158 deletions(-)

diffs (366 lines):

diff -r 9552758a786e -r ed1101bbf19f src/core/ngx_connection.c
--- a/src/core/ngx_connection.c Thu May 25 15:57:59 2017 +0300
+++ b/src/core/ngx_connection.c Fri May 26 22:52:48 2017 +0300
@@ -1346,6 +1346,49 @@ ngx_connection_local_sockaddr(ngx_connec


ngx_int_t
+ngx_tcp_nodelay(ngx_connection_t *c)
+{
+ int tcp_nodelay;
+
+ if (c->tcp_nodelay != NGX_TCP_NODELAY_UNSET) {
+ return NGX_OK;
+ }
+
+ ngx_log_debug0(NGX_LOG_DEBUG_CORE, c->log, 0, "tcp_nodelay");
+
+ tcp_nodelay = 1;
+
+ if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
+ (const void *) &tcp_nodelay, sizeof(int))
+ == -1)
+ {
+#if (NGX_SOLARIS)
+ if (c->log_error == NGX_ERROR_INFO) {
+
+ /* Solaris returns EINVAL if a socket has been shut down */
+ c->log_error = NGX_ERROR_IGNORE_EINVAL;
+
+ ngx_connection_error(c, ngx_socket_errno,
+ "setsockopt(TCP_NODELAY) failed");
+
+ c->log_error = NGX_ERROR_INFO;
+
+ return NGX_ERROR;
+ }
+#endif
+
+ ngx_connection_error(c, ngx_socket_errno,
+ "setsockopt(TCP_NODELAY) failed");
+ return NGX_ERROR;
+ }
+
+ c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+
+ return NGX_OK;
+}
+
+
+ngx_int_t
ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text)
{
ngx_uint_t level;
diff -r 9552758a786e -r ed1101bbf19f src/core/ngx_connection.h
--- a/src/core/ngx_connection.h Thu May 25 15:57:59 2017 +0300
+++ b/src/core/ngx_connection.h Fri May 26 22:52:48 2017 +0300
@@ -214,6 +214,7 @@ void ngx_close_connection(ngx_connection
void ngx_close_idle_connections(ngx_cycle_t *cycle);
ngx_int_t ngx_connection_local_sockaddr(ngx_connection_t *c, ngx_str_t *s,
ngx_uint_t port);
+ngx_int_t ngx_tcp_nodelay(ngx_connection_t *c);
ngx_int_t ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text);

ngx_connection_t *ngx_get_connection(ngx_socket_t s, ngx_log_t *log);
diff -r 9552758a786e -r ed1101bbf19f src/http/ngx_http_request.c
--- a/src/http/ngx_http_request.c Thu May 25 15:57:59 2017 +0300
+++ b/src/http/ngx_http_request.c Fri May 26 22:52:48 2017 +0300
@@ -3061,30 +3061,9 @@ ngx_http_set_keepalive(ngx_http_request_
tcp_nodelay = 1;
}

- if (tcp_nodelay
- && clcf->tcp_nodelay
- && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
- {
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
- if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
- (const void *) &tcp_nodelay, sizeof(int))
- == -1)
- {
-#if (NGX_SOLARIS)
- /* Solaris returns EINVAL if a socket has been shut down */
- c->log_error = NGX_ERROR_IGNORE_EINVAL;
-#endif
-
- ngx_connection_error(c, ngx_socket_errno,
- "setsockopt(TCP_NODELAY) failed");
-
- c->log_error = NGX_ERROR_INFO;
- ngx_http_close_connection(c);
- return;
- }
-
- c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+ if (tcp_nodelay && clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
+ ngx_http_close_connection(c);
+ return;
}

#if 0
diff -r 9552758a786e -r ed1101bbf19f src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c Thu May 25 15:57:59 2017 +0300
+++ b/src/http/ngx_http_upstream.c Fri May 26 22:52:48 2017 +0300
@@ -1606,7 +1606,6 @@ static void
ngx_http_upstream_ssl_init_connection(ngx_http_request_t *r,
ngx_http_upstream_t *u, ngx_connection_t *c)
{
- int tcp_nodelay;
ngx_int_t rc;
ngx_http_core_loc_conf_t *clcf;

@@ -1646,22 +1645,10 @@ ngx_http_upstream_ssl_init_connection(ng

clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);

- if (clcf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
- tcp_nodelay = 1;
-
- if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
- (const void *) &tcp_nodelay, sizeof(int)) == -1)
- {
- ngx_connection_error(c, ngx_socket_errno,
- "setsockopt(TCP_NODELAY) failed");
- ngx_http_upstream_finalize_request(r, u,
+ if (clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
+ ngx_http_upstream_finalize_request(r, u,
NGX_HTTP_INTERNAL_SERVER_ERROR);
- return;
- }
-
- c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+ return;
}
}

@@ -2014,7 +2001,6 @@ static ngx_int_t
ngx_http_upstream_send_request_body(ngx_http_request_t *r,
ngx_http_upstream_t *u, ngx_uint_t do_write)
{
- int tcp_nodelay;
ngx_int_t rc;
ngx_chain_t *out, *cl, *ln;
ngx_connection_t *c;
@@ -2051,20 +2037,8 @@ ngx_http_upstream_send_request_body(ngx_
c = u->peer.connection;
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);

- if (clcf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
- tcp_nodelay = 1;
-
- if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
- (const void *) &tcp_nodelay, sizeof(int)) == -1)
- {
- ngx_connection_error(c, ngx_socket_errno,
- "setsockopt(TCP_NODELAY) failed");
- return NGX_ERROR;
- }
-
- c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+ if (clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
+ return NGX_ERROR;
}

r->read_event_handler = ngx_http_upstream_read_request_handler;
@@ -2822,7 +2796,6 @@ ngx_http_upstream_process_body_in_memory
static void
ngx_http_upstream_send_response(ngx_http_request_t *r, ngx_http_upstream_t *u)
{
- int tcp_nodelay;
ssize_t n;
ngx_int_t rc;
ngx_event_pipe_t *p;
@@ -2903,21 +2876,9 @@ ngx_http_upstream_send_response(ngx_http
return;
}

- if (clcf->tcp_nodelay && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
- tcp_nodelay = 1;
-
- if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
- (const void *) &tcp_nodelay, sizeof(int)) == -1)
- {
- ngx_connection_error(c, ngx_socket_errno,
- "setsockopt(TCP_NODELAY) failed");
- ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
- return;
- }
-
- c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+ if (clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
+ ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
+ return;
}

n = u->buffer.last - u->buffer.pos;
@@ -3176,7 +3137,6 @@ ngx_http_upstream_send_response(ngx_http
static void
ngx_http_upstream_upgrade(ngx_http_request_t *r, ngx_http_upstream_t *u)
{
- int tcp_nodelay;
ngx_connection_t *c;
ngx_http_core_loc_conf_t *clcf;

@@ -3194,37 +3154,15 @@ ngx_http_upstream_upgrade(ngx_http_reque
r->write_event_handler = ngx_http_upstream_upgraded_write_downstream;

if (clcf->tcp_nodelay) {
- tcp_nodelay = 1;
-
- if (c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
- if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
- (const void *) &tcp_nodelay, sizeof(int)) == -1)
- {
- ngx_connection_error(c, ngx_socket_errno,
- "setsockopt(TCP_NODELAY) failed");
- ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
- return;
- }
-
- c->tcp_nodelay = NGX_TCP_NODELAY_SET;
- }
-
- if (u->peer.connection->tcp_nodelay == NGX_TCP_NODELAY_UNSET) {
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, u->peer.connection->log, 0,
- "tcp_nodelay");
-
- if (setsockopt(u->peer.connection->fd, IPPROTO_TCP, TCP_NODELAY,
- (const void *) &tcp_nodelay, sizeof(int)) == -1)
- {
- ngx_connection_error(u->peer.connection, ngx_socket_errno,
- "setsockopt(TCP_NODELAY) failed");
- ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
- return;
- }
-
- u->peer.connection->tcp_nodelay = NGX_TCP_NODELAY_SET;
+
+ if (ngx_tcp_nodelay(c) != NGX_OK) {
+ ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
+ return;
+ }
+
+ if (ngx_tcp_nodelay(u->peer.connection) != NGX_OK) {
+ ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
+ return;
}
}

diff -r 9552758a786e -r ed1101bbf19f src/http/v2/ngx_http_v2.c
--- a/src/http/v2/ngx_http_v2.c Thu May 25 15:57:59 2017 +0300
+++ b/src/http/v2/ngx_http_v2.c Fri May 26 22:52:48 2017 +0300
@@ -529,29 +529,8 @@ ngx_http_v2_send_output_queue(ngx_http_v
tcp_nodelay = 1;
}

- if (tcp_nodelay
- && clcf->tcp_nodelay
- && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
- {
- ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay");
-
- if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
- (const void *) &tcp_nodelay, sizeof(int))
- == -1)
- {
-#if (NGX_SOLARIS)
- /* Solaris returns EINVAL if a socket has been shut down */
- c->log_error = NGX_ERROR_IGNORE_EINVAL;
-#endif
-
- ngx_connection_error(c, ngx_socket_errno,
- "setsockopt(TCP_NODELAY) failed");
-
- c->log_error = NGX_ERROR_INFO;
- goto error;
- }
-
- c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+ if (tcp_nodelay && clcf->tcp_nodelay && ngx_tcp_nodelay(c) != NGX_OK) {
+ goto error;
}

for ( /* void */ ; out; out = fn) {
diff -r 9552758a786e -r ed1101bbf19f src/stream/ngx_stream_core_module.c
--- a/src/stream/ngx_stream_core_module.c Thu May 25 15:57:59 2017 +0300
+++ b/src/stream/ngx_stream_core_module.c Fri May 26 22:52:48 2017 +0300
@@ -309,7 +309,6 @@ ngx_int_t
ngx_stream_core_content_phase(ngx_stream_session_t *s,
ngx_stream_phase_handler_t *ph)
{
- int tcp_nodelay;
ngx_connection_t *c;
ngx_stream_core_srv_conf_t *cscf;

@@ -321,22 +320,10 @@ ngx_stream_core_content_phase(ngx_stream

if (c->type == SOCK_STREAM
&& cscf->tcp_nodelay
- && c->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
+ && ngx_tcp_nodelay(c) != NGX_OK)
{
- ngx_log_debug0(NGX_LOG_DEBUG_STREAM, c->log, 0, "tcp_nodelay");
-
- tcp_nodelay = 1;
-
- if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY,
- (const void *) &tcp_nodelay, sizeof(int)) == -1)
- {
- ngx_connection_error(c, ngx_socket_errno,
- "setsockopt(TCP_NODELAY) failed");
- ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
- return NGX_OK;
- }
-
- c->tcp_nodelay = NGX_TCP_NODELAY_SET;
+ ngx_stream_finalize_session(s, NGX_STREAM_INTERNAL_SERVER_ERROR);
+ return NGX_OK;
}

cscf->handler(s);
diff -r 9552758a786e -r ed1101bbf19f src/stream/ngx_stream_proxy_module.c
--- a/src/stream/ngx_stream_proxy_module.c Thu May 25 15:57:59 2017 +0300
+++ b/src/stream/ngx_stream_proxy_module.c Fri May 26 22:52:48 2017 +0300
@@ -729,7 +729,6 @@ ngx_stream_proxy_connect(ngx_stream_sess
static void
ngx_stream_proxy_init_upstream(ngx_stream_session_t *s)
{
- int tcp_nodelay;
u_char *p;
ngx_chain_t *cl;
ngx_connection_t *c, *pc;
@@ -745,22 +744,10 @@ ngx_stream_proxy_init_upstream(ngx_strea

if (pc->type == SOCK_STREAM
&& cscf->tcp_nodelay
- && pc->tcp_nodelay == NGX_TCP_NODELAY_UNSET)
+ && ngx_tcp_nodelay(pc) != NGX_OK)
{
- ngx_log_debug0(NGX_LOG_DEBUG_STREAM, pc->log, 0, "tcp_nodelay");
-
- tcp_nodelay = 1;
-
- if (setsockopt(pc->fd, IPPROTO_TCP, TCP_NODELAY,
- (const void *) &tcp_nodelay, sizeof(int)) == -1)
- {
- ngx_connection_error(pc, ngx_socket_errno,
- "setsockopt(TCP_NODELAY) failed");
- ngx_stream_proxy_next_upstream(s);
- return;
- }
-
- pc->tcp_nodelay = NGX_TCP_NODELAY_SET;
+ ngx_stream_proxy_next_upstream(s);
+ return;
}

pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel