Mercurial > hg > nginx-ranges

comparison src/event/ngx_event_accept.c @ 635:e67b227c8dbb default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents 3036c1836a24
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
24 ngx_event_t *rev, *wev; 24 ngx_event_t *rev, *wev;
25 ngx_listening_t *ls; 25 ngx_listening_t *ls;
26 ngx_connection_t *c, *lc; 26 ngx_connection_t *c, *lc;
27 ngx_event_conf_t *ecf; 27 ngx_event_conf_t *ecf;
28 u_char sa[NGX_SOCKADDRLEN]; 28 u_char sa[NGX_SOCKADDRLEN];
29 #if (NGX_HAVE_ACCEPT4)
30 static ngx_uint_t use_accept4 = 1;
31 #endif
29 32
30 ecf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_event_core_module); 33 ecf = ngx_event_get_conf(ngx_cycle->conf_ctx, ngx_event_core_module);
31 34
32 if (ngx_event_flags & NGX_USE_RTSIG_EVENT) { 35 if (ngx_event_flags & NGX_USE_RTSIG_EVENT) {
33 ev->available = 1; 36 ev->available = 1;
44 "accept on %V, ready: %d", &ls->addr_text, ev->available); 47 "accept on %V, ready: %d", &ls->addr_text, ev->available);
45 48
46 do { 49 do {
47 socklen = NGX_SOCKADDRLEN; 50 socklen = NGX_SOCKADDRLEN;
48 51
52 #if (NGX_HAVE_ACCEPT4)
53 if (use_accept4) {
54 s = accept4(lc->fd, (struct sockaddr *) sa, &socklen,
55 SOCK_NONBLOCK);
56 } else {
57 s = accept(lc->fd, (struct sockaddr *) sa, &socklen);
58 }
59 #else
49 s = accept(lc->fd, (struct sockaddr *) sa, &socklen); 60 s = accept(lc->fd, (struct sockaddr *) sa, &socklen);
61 #endif
50 62
51 if (s == -1) { 63 if (s == -1) {
52 err = ngx_socket_errno; 64 err = ngx_socket_errno;
53 65
54 if (err == NGX_EAGAIN) { 66 if (err == NGX_EAGAIN) {
55 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, err, 67 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, err,
56 "accept() not ready"); 68 "accept() not ready");
57 return; 69 return;
58 } 70 }
59 71
72 #if (NGX_HAVE_ACCEPT4)
73 ngx_log_error((ngx_uint_t) ((err == NGX_ECONNABORTED) ?
74 NGX_LOG_ERR : NGX_LOG_ALERT),
75 ev->log, err,
76 use_accept4 ? "accept4() failed" : "accept() failed");
77
78 if (use_accept4 && err == NGX_ENOSYS) {
79 use_accept4 = 0;
80 ngx_inherited_nonblocking = 0;
81 continue;
82 }
83 #else
60 ngx_log_error((ngx_uint_t) ((err == NGX_ECONNABORTED) ? 84 ngx_log_error((ngx_uint_t) ((err == NGX_ECONNABORTED) ?
61 NGX_LOG_ERR : NGX_LOG_ALERT), 85 NGX_LOG_ERR : NGX_LOG_ALERT),
62 ev->log, err, "accept() failed"); 86 ev->log, err, "accept() failed");
87 #endif
63 88
64 if (err == NGX_ECONNABORTED) { 89 if (err == NGX_ECONNABORTED) {
65 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { 90 if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) {
66 ev->available--; 91 ev->available--;
67 } 92 }