read channel until EAGAIN
This commit is contained in:
parent
875f90f6d2
commit
889d7a8301
1 changed files with 58 additions and 54 deletions
|
@ -1054,70 +1054,74 @@ ngx_channel_handler(ngx_event_t *ev)
|
||||||
|
|
||||||
ngx_log_debug0(NGX_LOG_DEBUG_CORE, ev->log, 0, "channel handler");
|
ngx_log_debug0(NGX_LOG_DEBUG_CORE, ev->log, 0, "channel handler");
|
||||||
|
|
||||||
n = ngx_read_channel(c->fd, &ch, sizeof(ngx_channel_t), ev->log);
|
for ( ;; ) {
|
||||||
|
|
||||||
ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0, "channel: %i", n);
|
n = ngx_read_channel(c->fd, &ch, sizeof(ngx_channel_t), ev->log);
|
||||||
|
|
||||||
if (n == NGX_ERROR) {
|
ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0, "channel: %i", n);
|
||||||
|
|
||||||
if (ngx_event_flags & NGX_USE_EPOLL_EVENT) {
|
if (n == NGX_ERROR) {
|
||||||
ngx_del_conn(c, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
ngx_close_connection(c);
|
if (ngx_event_flags & NGX_USE_EPOLL_EVENT) {
|
||||||
return;
|
ngx_del_conn(c, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ngx_event_flags & NGX_USE_EVENTPORT_EVENT) {
|
ngx_close_connection(c);
|
||||||
if (ngx_add_event(ev, NGX_READ_EVENT, 0) == NGX_ERROR) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (n == NGX_AGAIN) {
|
if (ngx_event_flags & NGX_USE_EVENTPORT_EVENT) {
|
||||||
return;
|
if (ngx_add_event(ev, NGX_READ_EVENT, 0) == NGX_ERROR) {
|
||||||
}
|
return;
|
||||||
|
}
|
||||||
ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0,
|
|
||||||
"channel command: %d", ch.command);
|
|
||||||
|
|
||||||
switch (ch.command) {
|
|
||||||
|
|
||||||
case NGX_CMD_QUIT:
|
|
||||||
ngx_quit = 1;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NGX_CMD_TERMINATE:
|
|
||||||
ngx_terminate = 1;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NGX_CMD_REOPEN:
|
|
||||||
ngx_reopen = 1;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NGX_CMD_OPEN_CHANNEL:
|
|
||||||
|
|
||||||
ngx_log_debug3(NGX_LOG_DEBUG_CORE, ev->log, 0,
|
|
||||||
"get channel s:%i pid:%P fd:%d", ch.slot, ch.pid, ch.fd);
|
|
||||||
|
|
||||||
ngx_processes[ch.slot].pid = ch.pid;
|
|
||||||
ngx_processes[ch.slot].channel[0] = ch.fd;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case NGX_CMD_CLOSE_CHANNEL:
|
|
||||||
|
|
||||||
ngx_log_debug4(NGX_LOG_DEBUG_CORE, ev->log, 0,
|
|
||||||
"close channel s:%i pid:%P our:%P fd:%d",
|
|
||||||
ch.slot, ch.pid, ngx_processes[ch.slot].pid,
|
|
||||||
ngx_processes[ch.slot].channel[0]);
|
|
||||||
|
|
||||||
if (close(ngx_processes[ch.slot].channel[0]) == -1) {
|
|
||||||
ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
|
|
||||||
"close() channel failed");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ngx_processes[ch.slot].channel[0] = -1;
|
if (n == NGX_AGAIN) {
|
||||||
break;
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
ngx_log_debug1(NGX_LOG_DEBUG_CORE, ev->log, 0,
|
||||||
|
"channel command: %d", ch.command);
|
||||||
|
|
||||||
|
switch (ch.command) {
|
||||||
|
|
||||||
|
case NGX_CMD_QUIT:
|
||||||
|
ngx_quit = 1;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case NGX_CMD_TERMINATE:
|
||||||
|
ngx_terminate = 1;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case NGX_CMD_REOPEN:
|
||||||
|
ngx_reopen = 1;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case NGX_CMD_OPEN_CHANNEL:
|
||||||
|
|
||||||
|
ngx_log_debug3(NGX_LOG_DEBUG_CORE, ev->log, 0,
|
||||||
|
"get channel s:%i pid:%P fd:%d",
|
||||||
|
ch.slot, ch.pid, ch.fd);
|
||||||
|
|
||||||
|
ngx_processes[ch.slot].pid = ch.pid;
|
||||||
|
ngx_processes[ch.slot].channel[0] = ch.fd;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case NGX_CMD_CLOSE_CHANNEL:
|
||||||
|
|
||||||
|
ngx_log_debug4(NGX_LOG_DEBUG_CORE, ev->log, 0,
|
||||||
|
"close channel s:%i pid:%P our:%P fd:%d",
|
||||||
|
ch.slot, ch.pid, ngx_processes[ch.slot].pid,
|
||||||
|
ngx_processes[ch.slot].channel[0]);
|
||||||
|
|
||||||
|
if (close(ngx_processes[ch.slot].channel[0]) == -1) {
|
||||||
|
ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_errno,
|
||||||
|
"close() channel failed");
|
||||||
|
}
|
||||||
|
|
||||||
|
ngx_processes[ch.slot].channel[0] = -1;
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue