mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 09:42:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.0.7-2004-07-02-19:54:34 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-07-02 15:54:34 +00:00
parent 46cd7c2a9b
commit 98c1cf18c1
23 changed files with 180 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/event/modules/ngx_devpoll_module.c
View File

@ -236,7 +236,6 @@ static int ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags)
} }
ev->active = 0; ev->active = 0;
ev->posted = 0;
if (flags & NGX_CLOSE_EVENT) { if (flags & NGX_CLOSE_EVENT) {
return NGX_OK; return NGX_OK;

2
src/event/modules/ngx_epoll_module.c
View File

@ -264,7 +264,6 @@ static int ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags)
if (flags & NGX_CLOSE_EVENT) { if (flags & NGX_CLOSE_EVENT) {
ev->active = 0; ev->active = 0;
ev->posted = 0;
return NGX_OK; return NGX_OK;
} }
@ -301,7 +300,6 @@ static int ngx_epoll_del_event(ngx_event_t *ev, int event, u_int flags)
} }
ev->active = 0; ev->active = 0;
ev->posted = 0;
return NGX_OK; return NGX_OK;
} }

18
src/event/modules/ngx_kqueue_module.c
View File

@ -237,12 +237,6 @@ static ngx_int_t ngx_kqueue_del_event(ngx_event_t *ev, int event, u_int flags)
ev->active = 0; ev->active = 0;
ev->disabled = 0; ev->disabled = 0;
if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
return NGX_ERROR;
}
ev->posted = 0;
ngx_mutex_unlock(ngx_posted_events_mutex);
if (ngx_thread_main() if (ngx_thread_main()
&& nchanges > 0 && nchanges > 0
&& ev->index < (u_int) nchanges && ev->index < (u_int) nchanges
@ -512,7 +506,7 @@ static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle)
instance = (uintptr_t) ev & 1; instance = (uintptr_t) ev & 1;
ev = (ngx_event_t *) ((uintptr_t) ev & (uintptr_t) ~1); ev = (ngx_event_t *) ((uintptr_t) ev & (uintptr_t) ~1);
if (!ev->active || ev->instance != instance) { if (ev->closed || ev->instance != instance) {
/* /*
* the stale event from a file descriptor * the stale event from a file descriptor
@ -530,7 +524,9 @@ static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle)
ev->returned_instance = instance; ev->returned_instance = instance;
if (!ev->accept && (ngx_threaded || ngx_accept_mutex_held)) { #if (NGX_THREADS)
if (ngx_threaded && !ev->accept) {
ev->posted_ready = 1; ev->posted_ready = 1;
ev->posted_available += event_list[i].data; ev->posted_available += event_list[i].data;
@ -544,10 +540,12 @@ static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle)
continue; continue;
} }
#endif
ev->available = event_list[i].data; ev->available = event_list[i].data;
if (event_list[i].flags & EV_EOF) { if (event_list[i].flags & EV_EOF) {
ev->kq_eof = 1; ev->pending_eof = 1;
ev->kq_errno = event_list[i].fflags; ev->kq_errno = event_list[i].fflags;
} }
@ -578,12 +576,10 @@ static ngx_int_t ngx_kqueue_process_events(ngx_cycle_t *cycle)
continue; continue;
} }
#if 0
if (!ev->accept) { if (!ev->accept) {
ngx_post_event(ev); ngx_post_event(ev);
continue; continue;
} }
#endif
if (ngx_accept_disabled > 0) { if (ngx_accept_disabled > 0) {
continue; continue;

1
src/event/modules/ngx_poll_module.c
View File

@ -181,7 +181,6 @@ static ngx_int_t ngx_poll_del_event(ngx_event_t *ev, int event, u_int flags)
c = ev->data; c = ev->data;
ev->active = 0; ev->active = 0;
ev->posted = 0;
if (ev->index == NGX_INVALID_INDEX) { if (ev->index == NGX_INVALID_INDEX) {
ngx_log_error(NGX_LOG_ALERT, ev->log, 0, ngx_log_error(NGX_LOG_ALERT, ev->log, 0,

4
src/event/modules/ngx_rtsig_module.c
View File

@ -249,8 +249,6 @@ static ngx_int_t ngx_rtsig_del_connection(ngx_connection_t *c, u_int flags)
if (flags & NGX_CLOSE_EVENT) { if (flags & NGX_CLOSE_EVENT) {
c->read->active = 0; c->read->active = 0;
c->write->active = 0; c->write->active = 0;
c->read->posted = 0;
c->write->posted = 0;
return NGX_OK; return NGX_OK;
} }
@ -262,8 +260,6 @@ static ngx_int_t ngx_rtsig_del_connection(ngx_connection_t *c, u_int flags)
c->read->active = 0; c->read->active = 0;
c->write->active = 0; c->write->active = 0;
c->read->posted = 0;
c->write->posted = 0;
return NGX_OK; return NGX_OK;
} }

1
src/event/modules/ngx_select_module.c
View File

@ -203,7 +203,6 @@ static ngx_int_t ngx_select_del_event(ngx_event_t *ev, int event, u_int flags)
c = ev->data; c = ev->data;
ev->active = 0; ev->active = 0;
ev->posted = 0;
if (ev->index == NGX_INVALID_INDEX) { if (ev->index == NGX_INVALID_INDEX) {
return NGX_OK; return NGX_OK;

10
src/event/ngx_event.c
View File

@ -276,12 +276,22 @@ static ngx_int_t ngx_event_process_init(ngx_cycle_t *cycle)
return NGX_ERROR; return NGX_ERROR;
} }
rev = cycle->read_events;
for (i = 0; i < cycle->connection_n; i++) {
rev[i].closed = 1;
}
cycle->write_events = ngx_alloc(sizeof(ngx_event_t) * ecf->connections, cycle->write_events = ngx_alloc(sizeof(ngx_event_t) * ecf->connections,
cycle->log); cycle->log);
if (cycle->write_events == NULL) { if (cycle->write_events == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
wev = cycle->write_events;
for (i = 0; i < cycle->connection_n; i++) {
wev[i].closed = 1;
}
/* for each listening socket */ /* for each listening socket */
s = cycle->listening.elts; s = cycle->listening.elts;

109
src/event/ngx_event.h
View File

@ -34,89 +34,57 @@ typedef struct {
struct ngx_event_s { struct ngx_event_s {
void *data; void *data;
/* TODO rename to handler */ unsigned write:1;
ngx_event_handler_pt event_handler;
u_int index; unsigned accept:1;
/* the link of the posted queue or the event mutecies queues */ unsigned oneshot:1;
ngx_event_t *next;
ngx_log_t *log;
/*
* The inline of "ngx_rbtree_t rbtree;".
*
* It allows to pack the rbtree_color and the various event bit flags into
* the single "int". We also use "unsigned char" and then "unsigned short"
* because otherwise MSVC 6.0 uses an additional "int" for the bit flags.
* We use "char rbtree_color" instead of "unsigned int rbtree_color:1"
* because it preserves the bits order on the big endian platforms.
*/
ngx_int_t rbtree_key;
void *rbtree_left;
void *rbtree_right;
void *rbtree_parent;
char rbtree_color;
unsigned char oneshot:1;
unsigned char write:1;
/* used to detect the stale events in kqueue, rt signals and epoll */ /* used to detect the stale events in kqueue, rt signals and epoll */
unsigned char use_instance:1; unsigned use_instance:1;
unsigned char instance:1; unsigned instance:1;
unsigned char returned_instance:1; unsigned returned_instance:1;
/* /*
* the event was passed or would be passed to a kernel; * the event was passed or would be passed to a kernel;
* in aio mode - operation was posted. * in aio mode - operation was posted.
*/ */
unsigned char active:1; unsigned active:1;
unsigned char disabled:1; unsigned disabled:1;
unsigned char posted:1;
/* the ready event; in aio mode 0 means that no operation can be posted */ /* the ready event; in aio mode 0 means that no operation can be posted */
unsigned short ready:1; unsigned ready:1;
/* aio operation is complete */ /* aio operation is complete */
unsigned short complete:1; unsigned complete:1;
unsigned short eof:1; unsigned eof:1;
unsigned short error:1; unsigned error:1;
unsigned short timedout:1; unsigned timedout:1;
unsigned short timer_set:1; unsigned timer_set:1;
unsigned short delayed:1; unsigned delayed:1;
unsigned short read_discarded:1; unsigned read_discarded:1;
unsigned short unexpected_eof:1; unsigned unexpected_eof:1;
unsigned short accept:1; unsigned deferred_accept:1;
unsigned short deferred_accept:1; unsigned overflow:1;
unsigned short overflow:1; /* the pending eof reported by kqueue or in aio chain operation */
unsigned pending_eof:1;
/* TODO: aio_eof and kq_eof can be the single pending_eof */
/* the pending eof in aio chain operation */
unsigned short aio_eof:1;
/* the pending eof reported by kqueue */
unsigned short kq_eof:1;
#if (WIN32) #if (WIN32)
/* setsockopt(SO_UPDATE_ACCEPT_CONTEXT) was succesfull */ /* setsockopt(SO_UPDATE_ACCEPT_CONTEXT) was succesfull */
unsigned short accept_context_updated:1; unsigned accept_context_updated:1;
#endif #endif
#if (HAVE_KQUEUE) #if (HAVE_KQUEUE)
unsigned short kq_vnode:1; unsigned kq_vnode:1;
/* the pending errno reported by kqueue */ /* the pending errno reported by kqueue */
int kq_errno; int kq_errno;
@ -139,9 +107,12 @@ struct ngx_event_s {
#if (HAVE_KQUEUE) || (HAVE_IOCP) #if (HAVE_KQUEUE) || (HAVE_IOCP)
int available; int available;
#else #else
unsigned short available:1; unsigned available:1;
#endif #endif
/* TODO rename to handler */
ngx_event_handler_pt event_handler;
#if (HAVE_AIO) #if (HAVE_AIO)
@ -153,11 +124,27 @@ struct ngx_event_s {
#endif #endif
u_int index;
ngx_log_t *log;
/* TODO: threads: padding to cache line */
/*
* STUB: The inline of "ngx_rbtree_t rbtree;"
*/
ngx_int_t rbtree_key;
void *rbtree_left;
void *rbtree_right;
void *rbtree_parent;
char rbtree_color;
unsigned closed:1;
#if (NGX_THREADS) #if (NGX_THREADS)
ngx_atomic_t *lock;
unsigned locked:1; unsigned locked:1;
unsigned posted_ready:1; unsigned posted_ready:1;
@ -175,8 +162,14 @@ struct ngx_event_s {
unsigned posted_available:1; unsigned posted_available:1;
#endif #endif
ngx_atomic_t *lock;
#endif #endif
/* the links of the posted queue */
ngx_event_t *next;
ngx_event_t **prev;
#if 0 #if 0

2
src/event/ngx_event_pipe.c
View File

@ -120,7 +120,7 @@ ngx_int_t ngx_event_pipe_read_upstream(ngx_event_pipe_t *p)
*/ */
if (p->upstream->read->available == 0 if (p->upstream->read->available == 0
&& (p->upstream->read->kq_eof || p->upstream->read->aio_eof)) && p->upstream->read->pending_eof)
{ {
p->upstream->read->ready = 0; p->upstream->read->ready = 0;
p->upstream->read->eof = 0; p->upstream->read->eof = 0;

51
src/event/ngx_event_posted.c
View File

@ -27,13 +27,17 @@ void ngx_event_process_posted(ngx_cycle_t *cycle)
return; return;
} }
ngx_posted_events = ev->next; ngx_delete_posted_event(ev);
#if 0
/* do not check instance ??? */
if (ev->accept) { if (ev->accept) {
continue; continue;
} }
#endif
if ((!ev->posted && !ev->active) if (ev->closed
|| (ev->use_instance && ev->instance != ev->returned_instance)) || (ev->use_instance && ev->instance != ev->returned_instance))
{ {
/* /*
@ -46,10 +50,6 @@ void ngx_event_process_posted(ngx_cycle_t *cycle)
continue; continue;
} }
if (ev->posted) {
ev->posted = 0;
}
ev->event_handler(ev); ev->event_handler(ev);
} }
} }
@ -59,12 +59,11 @@ void ngx_event_process_posted(ngx_cycle_t *cycle)
ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle) ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle)
{ {
ngx_event_t *ev, **ep; ngx_event_t *ev;
for ( ;; ) { for ( ;; ) {
ev = (ngx_event_t *) ngx_posted_events; ev = (ngx_event_t *) ngx_posted_events;
ep = (ngx_event_t **) &ngx_posted_events;
for ( ;; ) { for ( ;; ) {
@ -76,23 +75,22 @@ ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle)
return NGX_OK; return NGX_OK;
} }
ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"posted event lock:%d " PTR_FMT,
*(ev->lock), ev->lock);
if (ngx_trylock(ev->lock) == 0) { if (ngx_trylock(ev->lock) == 0) {
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"posted event " PTR_FMT " is busy", ev); "posted event " PTR_FMT " is busy", ev);
ep = &ev->next;
ev = ev->next; ev = ev->next;
continue; continue;
} }
*ep = ev->next; ngx_delete_posted_event(ev);
if ((!ev->posted && !ev->active) ngx_log_debug3(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
"event instance: c:%d i:%d r:%d",
ev->closed, ev->instance, ev->returned_instance);
if (ev->closed
|| (ev->use_instance && ev->instance != ev->returned_instance)) || (ev->use_instance && ev->instance != ev->returned_instance))
{ {
/* /*
@ -102,7 +100,7 @@ ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle)
*/ */
ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0, ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
"kevent: stale event " PTR_FMT, ev); "stale posted event " PTR_FMT, ev);
ngx_unlock(ev->lock); ngx_unlock(ev->lock);
@ -113,16 +111,21 @@ ngx_int_t ngx_event_thread_process_posted(ngx_cycle_t *cycle)
ev->locked = 1; ev->locked = 1;
if (ev->posted) { ev->ready |= ev->posted_ready;
ev->ready = ev->posted_ready; ev->timedout |= ev->posted_timedout;
ev->timedout = ev->posted_timedout; ev->available |= ev->posted_available;
ev->available = ev->posted_available; ev->pending_eof |= ev->posted_eof;
ev->kq_eof = ev->posted_eof;
#if (HAVE_KQUEUE) #if (HAVE_KQUEUE)
ev->kq_errno = ev->posted_errno; ev->kq_errno |= ev->posted_errno;
#endif
ev->posted_ready = 0;
ev->posted_timedout = 0;
ev->posted_available = 0;
ev->posted_eof = 0;
#if (HAVE_KQUEUE)
ev->posted_errno = 0;
#endif #endif
ev->posted = 0;
}
ngx_mutex_unlock(ngx_posted_events_mutex); ngx_mutex_unlock(ngx_posted_events_mutex);

32
src/event/ngx_event_posted.h
View File

@ -8,29 +8,21 @@
#define ngx_post_event(ev) \ #define ngx_post_event(ev) \
if (!ev->posted) { \ if (ev->prev == NULL) { \
ev->next = (ngx_event_t *) ngx_posted_events; \ ev->next = (ngx_event_t *) ngx_posted_events; \
ev->prev = (ngx_event_t **) &ngx_posted_events; \
ngx_posted_events = ev; \ ngx_posted_events = ev; \
ev->posted = 1; \ ngx_log_debug1(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, \
\ "post event " PTR_FMT, ev); \
ngx_log_debug3(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, \ }
"POST: %08X %08X %08X", ngx_posted_events, \
(ngx_posted_events ? ngx_posted_events->next: 0), \ #define ngx_delete_posted_event(ev) \
((ngx_posted_events && ngx_posted_events->next) ? \ *(ev->prev) = ev->next; \
ngx_posted_events->next->next: 0)); \ if (ev->next) { \
\ ev->next->prev = ev->prev; \
} } \
ev->prev = NULL;
/*
\
{ int i; ngx_event_t *e;\
e = (ngx_event_t *) ngx_posted_events; \
for (i = 0; e && i < 10; e = e->next, i++) { \
ngx_log_debug2(NGX_LOG_DEBUG_CORE, ngx_cycle->log, 0, \
"POST: %d %08X", i, e);\
}} \
\
*/
void ngx_event_process_posted(ngx_cycle_t *cycle); void ngx_event_process_posted(ngx_cycle_t *cycle);

18
src/event/ngx_event_timer.c
View File

@ -88,7 +88,17 @@ void ngx_event_expire_timers(ngx_msec_t timer)
((char *) node - offsetof(ngx_event_t, rbtree_key)); ((char *) node - offsetof(ngx_event_t, rbtree_key));
#if (NGX_THREADS) #if (NGX_THREADS)
if (ngx_trylock(ev->lock) == 0) {
if (ngx_threaded && ngx_trylock(ev->lock) == 0) {
/*
* We can not change the timer of the event that is been
* handling by another thread. And we can not easy walk
* the rbtree to find a next expired timer so we exit the loop.
* However it should be rare case when the event that is
* been handling has expired timer.
*/
break; break;
} }
#endif #endif
@ -111,17 +121,23 @@ void ngx_event_expire_timers(ngx_msec_t timer)
ev->timer_set = 0; ev->timer_set = 0;
#if (NGX_THREADS)
if (ngx_threaded) { if (ngx_threaded) {
if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) { if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_ERROR) {
return; return;
} }
ev->posted_timedout = 1; ev->posted_timedout = 1;
ev->returned_instance = ev->instance;
ngx_post_event(ev); ngx_post_event(ev);
ngx_mutex_unlock(ngx_posted_events_mutex); ngx_mutex_unlock(ngx_posted_events_mutex);
ngx_unlock(ev->lock);
continue; continue;
} }
#endif
ev->timedout = 1; ev->timedout = 1;

6
src/http/modules/proxy/ngx_http_proxy_handler.c
View File

@ -385,7 +385,7 @@ void ngx_http_proxy_check_broken_connection(ngx_event_t *ev)
if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) { if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) {
if (!ev->kq_eof) { if (!ev->pending_eof) {
return; return;
} }
@ -641,11 +641,11 @@ void ngx_http_proxy_close_connection(ngx_http_proxy_ctx_t *p)
ngx_del_conn(c, NGX_CLOSE_EVENT); ngx_del_conn(c, NGX_CLOSE_EVENT);
} else { } else {
if (c->read->active || c->read->posted) { if (c->read->active || c->read->disabled) {
ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT); ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
} }
if (c->write->active || c->read->posted) { if (c->write->active || c->read->disabled) {
ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT); ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);
} }
} }

2
src/http/modules/proxy/ngx_http_proxy_upstream.c
View File

@ -660,7 +660,7 @@ static void ngx_http_proxy_send_request(ngx_http_proxy_ctx_t *p)
if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT)
&& !p->request_sent && !p->request_sent
&& c->write->kq_eof) && c->write->pending_eof)
{ {
ngx_log_error(NGX_LOG_ERR, c->log, c->write->kq_errno, ngx_log_error(NGX_LOG_ERR, c->log, c->write->kq_errno,
"connect() failed"); "connect() failed");

43
src/http/ngx_http_request.c
View File

@ -1017,7 +1017,7 @@ void ngx_http_finalize_request(ngx_http_request_t *r, int rc)
ngx_del_timer(r->connection->write); ngx_del_timer(r->connection->write);
} }
if (r->connection->read->kq_eof) { if (r->connection->read->pending_eof) {
#if (NGX_KQUEUE) #if (NGX_KQUEUE)
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log,
r->connection->read->kq_errno, r->connection->read->kq_errno,
@ -1730,11 +1730,11 @@ void ngx_http_close_connection(ngx_connection_t *c)
ngx_del_conn(c, NGX_CLOSE_EVENT); ngx_del_conn(c, NGX_CLOSE_EVENT);
} else { } else {
if (c->read->active || c->read->posted || c->read->disabled) { if (c->read->active || c->read->disabled) {
ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT); ngx_del_event(c->read, NGX_READ_EVENT, NGX_CLOSE_EVENT);
} }
if (c->write->active || c->write->posted || c->write->disabled) { if (c->write->active || c->write->disabled) {
ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT); ngx_del_event(c->write, NGX_WRITE_EVENT, NGX_CLOSE_EVENT);
} }
} }
@ -1745,26 +1745,49 @@ void ngx_http_close_connection(ngx_connection_t *c)
* before we clean the connection * before we clean the connection
*/ */
fd = c->fd;
c->fd = (ngx_socket_t) -1;
c->data = NULL;
ngx_destroy_pool(c->pool);
#if (NGX_THREADS) #if (NGX_THREADS)
if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_OK) { if (ngx_mutex_lock(ngx_posted_events_mutex) == NGX_OK) {
ngx_unlock(&c->lock); ngx_unlock(&c->lock);
c->read->locked = 0; c->read->locked = 0;
c->write->locked = 0; c->write->locked = 0;
c->read->closed = 1;
c->write->closed = 1;
if (c->read->prev) {
ngx_delete_posted_event(c->read);
}
if (c->write->prev) {
ngx_delete_posted_event(c->write);
}
ngx_mutex_unlock(ngx_posted_events_mutex); ngx_mutex_unlock(ngx_posted_events_mutex);
} }
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, #else
"connection lock: %d " PTR_FMT, c->lock, &c->lock);
c->read->closed = 1;
c->write->closed = 1;
if (c->read->prev) {
ngx_delete_posted_event(c->read);
}
if (c->write->prev) {
ngx_delete_posted_event(c->write);
}
#endif #endif
fd = c->fd;
c->fd = (ngx_socket_t) -1;
c->data = NULL;
ngx_destroy_pool(c->pool);
if (ngx_close_socket(fd) == -1) { if (ngx_close_socket(fd) == -1) {
/* we use ngx_cycle->log because c->log was in c->pool */ /* we use ngx_cycle->log because c->log was in c->pool */

4
src/os/unix/ngx_aio_read_chain.c
View File

@ -13,7 +13,7 @@ ssize_t ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl)
ssize_t total; ssize_t total;
ngx_err_t err; ngx_err_t err;
if (c->read->aio_eof) { if (c->read->pending_eof) {
c->read->ready = 0; c->read->ready = 0;
return 0; return 0;
} }
@ -53,7 +53,7 @@ ssize_t ngx_aio_read_chain(ngx_connection_t *c, ngx_chain_t *cl)
} }
if (n == 0) { if (n == 0) {
c->read->aio_eof = 1; c->read->pending_eof = 1;
if (total) { if (total) {
c->read->eof = 0; c->read->eof = 0;
c->read->ready = 1; c->read->ready = 1;

8
src/os/unix/ngx_freebsd_rfork_thread.c
View File

@ -390,7 +390,7 @@ ngx_int_t ngx_mutex_dolock(ngx_mutex_t *m, ngx_int_t try)
op.sem_num = 0; op.sem_num = 0;
op.sem_op = -1; op.sem_op = -1;
op.sem_flg = SEM_UNDO; op.sem_flg = 0;
if (semop(m->semid, &op, 1) == -1) { if (semop(m->semid, &op, 1) == -1) {
ngx_log_error(NGX_LOG_ALERT, m->log, ngx_errno, ngx_log_error(NGX_LOG_ALERT, m->log, ngx_errno,
@ -514,7 +514,7 @@ ngx_int_t ngx_mutex_unlock(ngx_mutex_t *m)
op.sem_num = 0; op.sem_num = 0;
op.sem_op = 1; op.sem_op = 1;
op.sem_flg = SEM_UNDO; op.sem_flg = 0;
if (semop(m->semid, &op, 1) == -1) { if (semop(m->semid, &op, 1) == -1) {
ngx_log_error(NGX_LOG_ALERT, m->log, ngx_errno, ngx_log_error(NGX_LOG_ALERT, m->log, ngx_errno,
@ -590,7 +590,7 @@ ngx_int_t ngx_cond_wait(ngx_cond_t *cv, ngx_mutex_t *m)
op.sem_num = 0; op.sem_num = 0;
op.sem_op = -1; op.sem_op = -1;
op.sem_flg = SEM_UNDO; op.sem_flg = 0;
if (semop(cv->semid, &op, 1) == -1) { if (semop(cv->semid, &op, 1) == -1) {
ngx_log_error(NGX_LOG_ALERT, cv->log, ngx_errno, ngx_log_error(NGX_LOG_ALERT, cv->log, ngx_errno,
@ -618,7 +618,7 @@ ngx_int_t ngx_cond_signal(ngx_cond_t *cv)
op.sem_num = 0; op.sem_num = 0;
op.sem_op = 1; op.sem_op = 1;
op.sem_flg = SEM_UNDO; op.sem_flg = 0;
if (semop(cv->semid, &op, 1) == -1) { if (semop(cv->semid, &op, 1) == -1) {
ngx_log_error(NGX_LOG_ALERT, cv->log, ngx_errno, ngx_log_error(NGX_LOG_ALERT, cv->log, ngx_errno,

2
src/os/unix/ngx_freebsd_sendfile_chain.c
View File

@ -53,7 +53,7 @@ ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
#if (HAVE_KQUEUE) #if (HAVE_KQUEUE)
if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) && wev->kq_eof) { if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) && wev->pending_eof) {
ngx_log_error(NGX_LOG_INFO, c->log, wev->kq_errno, ngx_log_error(NGX_LOG_INFO, c->log, wev->kq_errno,
"kevent() reported about an closed connection"); "kevent() reported about an closed connection");

8
src/os/unix/ngx_process_cycle.c
View File

@ -760,10 +760,10 @@ int ngx_worker_thread_cycle(void *data)
sigset_t set; sigset_t set;
struct timeval tv; struct timeval tv;
sigfillset(&set); sigemptyset(&set);
sigdelset(&set, SIGALRM); sigaddset(&set, ngx_signal_value(NGX_RECONFIGURE_SIGNAL));
sigdelset(&set, ngx_signal_value(NGX_TERMINATE_SIGNAL)); sigaddset(&set, ngx_signal_value(NGX_REOPEN_SIGNAL));
sigdelset(&set, ngx_signal_value(NGX_SHUTDOWN_SIGNAL)); sigaddset(&set, ngx_signal_value(NGX_CHANGEBIN_SIGNAL));
err = ngx_thread_sigmask(SIG_BLOCK, &set, NULL); err = ngx_thread_sigmask(SIG_BLOCK, &set, NULL);
if (err) { if (err) {

6
src/os/unix/ngx_readv_chain.c
View File

@ -20,10 +20,10 @@ ssize_t ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain)
if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) { if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) {
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
"readv: eof:%d, avail:%d, err:%d", "readv: eof:%d, avail:%d, err:%d",
rev->kq_eof, rev->available, rev->kq_errno); rev->pending_eof, rev->available, rev->kq_errno);
if (rev->available == 0) { if (rev->available == 0) {
if (rev->kq_eof) { if (rev->pending_eof) {
rev->ready = 0; rev->ready = 0;
rev->eof = 1; rev->eof = 1;
@ -85,7 +85,7 @@ ssize_t ngx_readv_chain(ngx_connection_t *c, ngx_chain_t *chain)
*/ */
if (rev->available <= 0) { if (rev->available <= 0) {
if (!rev->kq_eof) { if (!rev->pending_eof) {
rev->ready = 0; rev->ready = 0;
} }

6
src/os/unix/ngx_recv.c
View File

@ -17,10 +17,10 @@ ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) { if (ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) {
ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0, ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
"recv: eof:%d, avail:%d, err:%d", "recv: eof:%d, avail:%d, err:%d",
rev->kq_eof, rev->available, rev->kq_errno); rev->pending_eof, rev->available, rev->kq_errno);
if (rev->available == 0) { if (rev->available == 0) {
if (rev->kq_eof) { if (rev->pending_eof) {
rev->ready = 0; rev->ready = 0;
rev->eof = 1; rev->eof = 1;
@ -64,7 +64,7 @@ ssize_t ngx_unix_recv(ngx_connection_t *c, u_char *buf, size_t size)
*/ */
if (rev->available <= 0) { if (rev->available <= 0) {
if (!rev->kq_eof) { if (!rev->pending_eof) {
rev->ready = 0; rev->ready = 0;
} }

2
src/os/unix/ngx_writev_chain.c
View File

@ -24,7 +24,7 @@ ngx_chain_t *ngx_writev_chain(ngx_connection_t *c, ngx_chain_t *in, off_t limit)
#if (HAVE_KQUEUE) #if (HAVE_KQUEUE)
if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) && wev->kq_eof) { if ((ngx_event_flags & NGX_HAVE_KQUEUE_EVENT) && wev->pending_eof) {
ngx_log_error(NGX_LOG_INFO, c->log, wev->kq_errno, ngx_log_error(NGX_LOG_INFO, c->log, wev->kq_errno,
"kevent() reported about an closed connection"); "kevent() reported about an closed connection");

3
src/os/win32/ngx_win32_config.h
View File

@ -40,9 +40,6 @@
/* conditional expression is constant */ /* conditional expression is constant */
#pragma warning(disable:4127) #pragma warning(disable:4127)
/* nonstandard extension used : bit field types other than int */
#pragma warning(disable:4214)
/* unreachable code */ /* unreachable code */
#pragma warning(disable:4702) #pragma warning(disable:4702)