nginx-0.0.1-2003-01-09-08:36:00 import
diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index cef4aec..9a5b730 100644
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -84,8 +84,9 @@
/* STUB */
int max_connections = 512;
- if (ngx_init_events(max_connections, log) == NGX_ERROR)
+ if (ngx_init_events(max_connections, log) == NGX_ERROR) {
exit(1);
+ }
ngx_connections = ngx_alloc(sizeof(ngx_connection_t)
* max_connections, log);
@@ -101,43 +102,44 @@
c = &ngx_connections[fd];
ev = &ngx_read_events[fd];
- ngx_memzero(&ngx_connections[fd], sizeof(ngx_connection_t));
- ngx_memzero(&ngx_read_events[fd], sizeof(ngx_event_t));
+ ngx_memzero(c, sizeof(ngx_connection_t));
+ ngx_memzero(ev, sizeof(ngx_event_t));
- ngx_connections[fd].fd = fd;
- ngx_connections[fd].family = s[i].family;
- ngx_connections[fd].socklen = s[i].socklen;
- ngx_connections[fd].sockaddr = ngx_palloc(pool, s[i].socklen);
- ngx_connections[fd].addr = s[i].addr;
- ngx_connections[fd].addr_text = s[i].addr_text;
- ngx_connections[fd].post_accept_timeout = s[i].post_accept_timeout;
+ c->fd = fd;
+ c->family = s[i].family;
+ c->socklen = s[i].socklen;
+ c->sockaddr = ngx_palloc(pool, s[i].socklen);
+ c->addr = s[i].addr;
+ c->addr_text = s[i].addr_text;
+ c->addr_text_max_len = s[i].addr_text_max_len;
+ c->post_accept_timeout = s[i].post_accept_timeout;
- ngx_connections[fd].server = s[i].server;
- ngx_connections[fd].handler = s[i].handler;
- ngx_connections[fd].log = s[i].log;
+ c->handler = s[i].handler;
+ c->ctx = s[i].ctx;
+ c->servers = s[i].servers;
+ c->log = s[i].log;
- ngx_test_null(ngx_read_events[fd].log,
+ ngx_test_null(ev->log,
ngx_palloc(pool, sizeof(ngx_log_t)), /* void */ ; );
- ngx_memcpy(ngx_read_events[fd].log, ngx_connections[fd].log,
- sizeof(ngx_log_t));
+ ngx_memcpy(ev->log, c->log, sizeof(ngx_log_t));
c->read = ev;
- ngx_read_events[fd].data = &ngx_connections[fd];
- ngx_read_events[fd].event_handler = &ngx_event_accept;
- ngx_read_events[fd].listening = 1;
+ ev->data = c;
+ ev->event_handler = &ngx_event_accept;
+ ev->listening = 1;
ev->index = NGX_INVALID_INDEX;
- ngx_read_events[fd].available = 0;
+ ev->available = 0;
#if (HAVE_DEFERRED_ACCEPT)
- ngx_read_events[fd].deferred_accept = s[i].deferred_accept;
+ ev->deferred_accept = s[i].deferred_accept;
#endif
- ngx_add_event(&ngx_read_events[fd], NGX_READ_EVENT, 0);
+ ngx_add_event(ev, NGX_READ_EVENT, 0);
}
}
void ngx_worker(ngx_log_t *log)
{
- while (1) {
+ for ( ;; ) {
ngx_log_debug(log, "ngx_worker cycle");
ngx_process_events(log);
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 7437ad7..c8365f1 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -98,12 +98,14 @@
/*
NGX_LEVEL_EVENT (default) select, poll, /dev/poll, kqueue
requires to read whole data
-NGX_ONESHOT_EVENT select, poll, kqueue
-NGX_CLEAR_EVENT kqueue
+NGX_ONESHOT_EVENT select, poll, /dev/poll(*), kqueue, epoll(*)
+ (*) - additional syscall
+NGX_CLEAR_EVENT kqueue, epoll
NGX_AIO_EVENT overlapped, aio_read, aioread
no need to add or delete events
NGX_CLOSE_EVENT kqueue: kqueue deletes events for file that closed
+ /dev/poll: need to flush events before closing
*/
#define NGX_CLOSE_EVENT 1
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 1d355cd..73d83e6 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -59,7 +59,7 @@
c->family = ac->family;
c->socklen = ac->socklen;
c->addr = ac->addr;
- c->addr_text.len = ac->addr_text.len;
+ c->addr_text_max_len = ac->addr_text_max_len;
c->post_accept_timeout = ac->post_accept_timeout;
rev->index = wev->index = NGX_INVALID_INDEX;
@@ -77,7 +77,7 @@
wev->timer_handler = rev->timer_handler = ngx_event_close_connection;
wev->close_handler = rev->close_handler = ngx_event_close_connection;
- c->server = ac->server;
+ c->ctx = ac->ctx;
c->servers = ac->servers;
c->log = rev->log = wev->log = ev->log;
diff --git a/src/event/ngx_event_write.c b/src/event/ngx_event_write.c
index 5de80d3..35949ec 100644
--- a/src/event/ngx_event_write.c
+++ b/src/event/ngx_event_write.c
@@ -102,7 +102,9 @@
sent = rc > 0 ? rc: 0;
+#if (NGX_DEBUG_EVENT_WRITE)
ngx_log_debug(c->log, "sendv: " QD_FMT _ sent);
+#endif
}
#if (HAVE_MAX_SENDFILE_IOVEC)
}
@@ -115,17 +117,21 @@
for (ch = in; ch; ch = ch->next) {
- ngx_log_debug(c->log, "ch event write: %x %qx %qd" _
+#if (NGX_DEBUG_EVENT_WRITE)
+ ngx_log_debug(c->log, "event write: %x " QX_FMT " " QD_FMT _
ch->hunk->type _
ch->hunk->pos.file _
ch->hunk->last.file - ch->hunk->pos.file);
+#endif
if (sent >= ch->hunk->last.file - ch->hunk->pos.file) {
sent -= ch->hunk->last.file - ch->hunk->pos.file;
ch->hunk->pos.file = ch->hunk->last.file;
+#if (NGX_DEBUG_EVENT_WRITE)
ngx_log_debug(c->log, "event write: " QX_FMT " 0 " QD_FMT _
ch->hunk->pos.file _ sent);
+#endif
/*
if (ch->hunk->type & NGX_HUNK_LAST)
@@ -137,9 +143,11 @@
ch->hunk->pos.file += sent;
- ngx_log_debug(c->log, "event write: %qx %qd" _
+#if (NGX_DEBUG_EVENT_WRITE)
+ ngx_log_debug(c->log, "event write: " QX_FMT " " QD_FMT _
ch->hunk->pos.file _
ch->hunk->last.file - ch->hunk->pos.file);
+#endif
break;
}
