nginx-vendor-current: src/event/ngx

comparison src/event/ngx_event.c @ 92:45945fa8b8ba NGINX_0_2_0

nginx 0.2.0 *) The pid-file names used during online upgrade was changed and now is not required a manual rename operation. The old master process adds the ".oldbin" suffix to its pid-file and executes a new binary file. The new master process creates usual pid-file without the ".newbin" suffix. If the master process exits, then old master process renames back its pid-file with the ".oldbin" suffix to the pid-file without suffix. *) Change: the "worker_connections" directive, new name of the "connections" directive; now the directive specifies maximum number of connections, but not maximum socket descriptor number. *) Feature: SSL supports the session cache inside one worker process. *) Feature: the "satisfy_any" directive. *) Change: the ngx_http_access_module and ngx_http_auth_basic_module do not run for subrequests. *) Feature: the "worker_rlimit_nofile" and "worker_rlimit_sigpending" directives. *) Bugfix: if all backend using in load-balancing failed after one error, then nginx did not try do connect to them during 60 seconds. *) Bugfix: in IMAP/POP3 command argument parsing. Thanks to Rob Mueller. *) Bugfix: errors while using SSL in IMAP/POP3 proxy. *) Bugfix: errors while using SSI and gzipping. *) Bugfix: the "Expires" and "Cache-Control" header lines were omitted from the 304 responses. Thanks to Alexandr Kukushkin.

author	Igor Sysoev <http://sysoev.ru>
date	Fri, 23 Sep 2005 00:00:00 +0400
parents	71c46860eb55
children	dad2fe8ecf08

comparison

equal deleted inserted replaced

-:c3eee83ea942
+:45945fa8b8ba
 static ngx_conf_post_t  ngx_accept_mutex_post = { ngx_accept_mutex_check } ;
 static ngx_command_t  ngx_event_core_commands[] = {
+{ ngx_string("worker_connections"),
+NGX_EVENT_CONF|NGX_CONF_TAKE1,
+ngx_event_connections,
+0,
+0,
+NULL },
 { ngx_string("connections"),
 NGX_EVENT_CONF|NGX_CONF_TAKE1,
 ngx_event_connections,
 0,
 0,
 static ngx_int_t
 ngx_event_module_init(ngx_cycle_t *cycle)
 {
+void              ***cf;
+ngx_event_conf_t    *ecf;
 #if !(NGX_WIN32)
+char                *shared;
 size_t               size;
-void              ***cf;
+ngx_int_t            limit;
-char                *shared;
+struct rlimit        rlmt;
 ngx_core_conf_t     *ccf;
-ngx_event_conf_t    *ecf;
+#endif
 cf = ngx_get_conf(cycle->conf_ctx, ngx_events_module);
 if (cf == NULL) {
 ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
 ecf = (*cf)[ngx_event_core_module.ctx_index];
 ngx_log_error(NGX_LOG_INFO, cycle->log, 0,
 "using the \"%s\" event method", ecf->name);
+#if !(NGX_WIN32)
 ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
+if (getrlimit(RLIMIT_NOFILE, &rlmt) == -1) {
+ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+"getrlimit(RLIMIT_NOFILE) failed, ignored");
+} else {
+if (ecf->connections > (ngx_uint_t) rlmt.rlim_cur
+&& (ccf->rlimit_nofile == NGX_CONF_UNSET
+|| ecf->connections > (ngx_uint_t) ccf->rlimit_nofile))
+{
+limit = (ccf->rlimit_nofile == NGX_CONF_UNSET) ?
+(ngx_int_t) rlmt.rlim_cur : ccf->rlimit_nofile;
+ngx_log_error(NGX_LOG_WARN, cycle->log, 0,
+"%ui worker_connections are more than "
+"open file resource limit: %i",
+ecf->connections, limit);
+}
+}
 if (ccf->master == 0 || ngx_accept_mutex_ptr) {
 return NGX_OK;
 }
 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
 "counter: %p, %d",
 ngx_connection_counter, *ngx_connection_counter);
-#endif
+#endif /* !(NGX_WIN32) */
 return NGX_OK;
 }
 static ngx_int_t
 ngx_event_process_init(ngx_cycle_t *cycle)
 {
 ngx_uint_t           m, i;
-ngx_socket_t         fd;
 ngx_event_t         *rev, *wev;
-ngx_listening_t     *s;
+ngx_listening_t     *ls;
-ngx_connection_t    *c;
+ngx_connection_t    *c, *next, *old;
 ngx_core_conf_t     *ccf;
 ngx_event_conf_t    *ecf;
 ngx_event_module_t  *module;
 #if (NGX_WIN32)
 ngx_iocp_conf_t     *iocpcf;
+#else
+struct rlimit        rlmt;
 #endif
 ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
 ecf = ngx_event_get_conf(cycle->conf_ctx, ngx_event_core_module);
 }
 break;
 }
 }
-cycle->connections = ngx_alloc(sizeof(ngx_connection_t) * ecf->connections,
+#if !(NGX_WIN32)
+if (ngx_event_flags & NGX_USE_FD_EVENT) {
+if (getrlimit(RLIMIT_NOFILE, &rlmt) == -1) {
+ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
+"getrlimit(RLIMIT_NOFILE) failed");
+return NGX_ERROR;
+}
+cycle->files_n = (ngx_uint_t) rlmt.rlim_cur;
+cycle->files = ngx_calloc(sizeof(ngx_connection_t *) * cycle->files_n,
+cycle->log);
+if (cycle->files == NULL) {
+return NGX_ERROR;
+}
+}
+#endif
+cycle->connections0 = ngx_alloc(sizeof(ngx_connection_t) * ecf->connections,
 cycle->log);
-if (cycle->connections == NULL) {
+if (cycle->connections0 == NULL) {
 return NGX_ERROR;
 }
-c = cycle->connections;
+c = cycle->connections0;
-for (i = 0; i < cycle->connection_n; i++) {
-c[i].fd = (ngx_socket_t) -1;
+cycle->read_events0 = ngx_alloc(sizeof(ngx_event_t) * ecf->connections,
-c[i].data = NULL;
-#if (NGX_THREADS)
-c[i].lock = 0;
-#endif
-}
-cycle->read_events = ngx_alloc(sizeof(ngx_event_t) * ecf->connections,
 cycle->log);
-if (cycle->read_events == NULL) {
+if (cycle->read_events0 == NULL) {
 return NGX_ERROR;
 }
-rev = cycle->read_events;
+rev = cycle->read_events0;
 for (i = 0; i < cycle->connection_n; i++) {
 rev[i].closed = 1;
 rev[i].instance = 1;
 #if (NGX_THREADS)
 rev[i].lock = &c[i].lock;
 rev[i].own_lock = &c[i].lock;
 #endif
 }
-cycle->write_events = ngx_alloc(sizeof(ngx_event_t) * ecf->connections,
+cycle->write_events0 = ngx_alloc(sizeof(ngx_event_t) * ecf->connections,
 cycle->log);
-if (cycle->write_events == NULL) {
+if (cycle->write_events0 == NULL) {
 return NGX_ERROR;
 }
-wev = cycle->write_events;
+wev = cycle->write_events0;
 for (i = 0; i < cycle->connection_n; i++) {
 wev[i].closed = 1;
 #if (NGX_THREADS)
 wev[i].lock = &c[i].lock;
 wev[i].own_lock = &c[i].lock;
 #endif
 }
+i = cycle->connection_n;
+next = NULL;
+do {
+i--;
+c[i].data = next;
+c[i].read = &cycle->read_events0[i];
+c[i].write = &cycle->write_events0[i];
+c[i].fd = (ngx_socket_t) -1;
+next = &c[i];
+#if (NGX_THREADS)
+c[i].lock = 0;
+#endif
+} while (i);
+cycle->free_connections = next;
+cycle->free_connection_n = ecf->connections;
 /* for each listening socket */
-s = cycle->listening.elts;
+ls = cycle->listening.elts;
 for (i = 0; i < cycle->listening.nelts; i++) {
-fd = s[i].fd;
+c = ngx_get_connection(ls[i].fd, cycle->log);
-#if (NGX_WIN32)
+if (c == NULL) {
-/*
+return NGX_ERROR;
-* Winsock assignes a socket number divisible by 4
+}
-* so to find a connection we divide a socket number by 4.
-*/
+rev = c->read;
+wev = c->write;
-fd /= 4;
-#endif
-c = &cycle->connections[fd];
-rev = &cycle->read_events[fd];
-wev = &cycle->write_events[fd];
 ngx_memzero(c, sizeof(ngx_connection_t));
+c->read = rev;
+c->write = wev;
+c->fd = ls[i].fd;
+c->log = &ls[i].log;
+c->listening = &ls[i];
+ls[i].connection = c;
+c->ctx = ls[i].ctx;
+c->servers = ls[i].servers;
 ngx_memzero(rev, sizeof(ngx_event_t));
 ngx_memzero(wev, sizeof(ngx_event_t));
-c->fd = s[i].fd;
-c->listening = &s[i];
-c->ctx = s[i].ctx;
-c->servers = s[i].servers;
-c->log = s[i].log;
-c->read = rev;
-/* required by iocp in "c->write->active = 1" */
-c->write = wev;
 /* required by poll */
 wev->index = NGX_INVALID_INDEX;
 rev->log = c->log;
 rev->available = 0;
 rev->accept = 1;
 #if (NGX_HAVE_DEFERRED_ACCEPT)
-rev->deferred_accept = s[i].deferred_accept;
+rev->deferred_accept = ls[i].deferred_accept;
 #endif
 if (!(ngx_event_flags & NGX_USE_IOCP_EVENT)) {
-if (s[i].remain) {
+if (ls[i].previous) {
 /*
 * delete the old accept events that were bound to
 * the old cycle read events array
 */
-if (ngx_del_event(&cycle->old_cycle->read_events[fd],
+old = ls[i].previous->connection;
-NGX_READ_EVENT, NGX_CLOSE_EVENT) == NGX_ERROR)
+if (ngx_del_event(old->read, NGX_READ_EVENT, NGX_CLOSE_EVENT)
+== NGX_ERROR)
 {
 return NGX_ERROR;
 }
-cycle->old_cycle->connections[fd].fd = (ngx_socket_t) -1;
+old->fd = (ngx_socket_t) -1;
 }
 }
 #if (NGX_WIN32)
 if (ngx_add_event(rev, 0, NGX_IOCP_ACCEPT) == NGX_ERROR) {
 return NGX_ERROR;
 }
+ls[i].log.handler = ngx_acceptex_log_error;
 iocpcf = ngx_event_get_conf(cycle->conf_ctx, ngx_iocp_module);
-if (ngx_event_post_acceptex(&s[i], iocpcf->post_acceptex)
+if (ngx_event_post_acceptex(&ls[i], iocpcf->post_acceptex)
 == NGX_ERROR)
 {
 return NGX_ERROR;
 }
 } else {
 return NGX_ERROR;
 }
 }
 #endif
 }
 return NGX_OK;
 }

Mercurial > hg > nginx-vendor-current

comparison src/event/ngx_event.c @ 92:45945fa8b8ba NGINX_0_2_0