nginx-0.0.1-2003-07-02-18:41:17 import

diff --git a/src/core/nginx.c b/src/core/nginx.c
index b011df390430a2763b71de92948b75f2aff3bc04..1c54a8c1f0988ef822380360c4c9a0c1f959f607 100644 (file)
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -5,8 +5,8 @@
 #include <nginx.h>
 
 
-
-static int ngx_open_listening_sockets(ngx_log_t *log);
+static ngx_cycle_t *ngx_init_cycle(ngx_cycle_t *old_cycle, ngx_log_t *log);
+static int ngx_open_listening_sockets(ngx_cycle_t *cycle, ngx_log_t *log);
 
 
 void  ****ngx_conf_ctx;
@@ -16,21 +16,25 @@ ngx_os_io_t  ngx_io;
 
 
 int     ngx_max_module;
+#if 0
 void   *ctx_conf;
+#endif
 
 int ngx_connection_counter;
 
+#if 0
 ngx_array_t  ngx_listening_sockets;
+#endif
 
 
-#if 0
+#if 1
 
 int main(int argc, char *const *argv)
 {
-    ngx_str_t     conf_file;
+    int           i;
     ngx_log_t    *log;
     ngx_conf_t    conf;
-    ngx_cycle_t  *cycle;
+    ngx_cycle_t  *cycle, *new_cycle;
 
     /* TODO */ ngx_max_sockets = -1;
 
@@ -64,10 +68,10 @@ int main(int argc, char *const *argv)
 
         for ( ;; ) {
 
-            worker(cycle->log);
+            ngx_worker(cycle);
 
             new_cycle = ngx_init_cycle(cycle, cycle->log);
-            if (new_cycle) == NULL) {
+            if (new_cycle == NULL) {
                 continue;
             }
 
@@ -80,9 +84,10 @@ int main(int argc, char *const *argv)
 }
 
 
-static int ngx_init_cycle(ngx_cycle_t *old_cycle, ngx_log_t *log)
+static ngx_cycle_t *ngx_init_cycle(ngx_cycle_t *old_cycle, ngx_log_t *log)
 {
-    int               i, n;
+    int               i, n, failed;
+    ngx_str_t         conf_file;
     ngx_conf_t        conf;
     ngx_pool_t       *pool;
     ngx_cycle_t      *cycle;
@@ -102,6 +107,12 @@ static int ngx_init_cycle(ngx_cycle_t *old_cycle, ngx_log_t *log)
     }
     cycle->pool = pool;
 
+    cycle->log = ngx_log_create_errlog(cycle);
+    if (cycle->log == NULL) {
+        ngx_destroy_pool(pool);
+        return NULL;
+    }
+
     n = old_cycle ? old_cycle->open_files.nelts : 20;
     cycle->open_files.elts = ngx_pcalloc(pool, n * sizeof(ngx_open_file_t));
     if (cycle->open_files.elts == NULL) {
@@ -153,6 +164,8 @@ static int ngx_init_cycle(ngx_cycle_t *old_cycle, ngx_log_t *log)
         return NULL;
     }
 
+    failed = 0;
+
     for (i = 0; ngx_modules[i]; i++) {
         if (ngx_modules[i]->init_module) {
             if (ngx_modules[i]->init_module(cycle, log) == NGX_ERROR)
@@ -166,7 +179,7 @@ static int ngx_init_cycle(ngx_cycle_t *old_cycle, ngx_log_t *log)
     if (!failed) {
         file = cycle->open_files.elts;
         for (i = 0; i < cycle->open_files.nelts; i++) {
-            if (file->name.data = NULL) {
+            if (file->name.data == NULL) {
                 continue;
             }
 
@@ -209,7 +222,7 @@ static int ngx_init_cycle(ngx_cycle_t *old_cycle, ngx_log_t *log)
             }
         }
 
-        if (ngx_open_listening_sockets(new_cycle) == NGX_ERROR) {
+        if (ngx_open_listening_sockets(cycle, log) == NGX_ERROR) {
             failed = 1;
         }
     }
@@ -220,7 +233,7 @@ static int ngx_init_cycle(ngx_cycle_t *old_cycle, ngx_log_t *log)
 
         for (i = 0; ngx_modules[i]; i++) {
             if (ngx_modules[i]->rollback_module) {
-                ngx_modules[i]->rollback_module(cycle);
+                ngx_modules[i]->rollback_module(cycle, log);
             }
         }
 
@@ -230,20 +243,20 @@ static int ngx_init_cycle(ngx_cycle_t *old_cycle, ngx_log_t *log)
                 continue;
             }
 
-            if (ngx_close_file(file.fd) == NGX_FILE_ERROR) {
+            if (ngx_close_file(file->fd) == NGX_FILE_ERROR) {
                 ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
                               ngx_close_file_n " \"%s\" failed",
                               file->name.data);
             }
         }
 
-        ls[i] = cycle->listening.elts;
+        ls = cycle->listening.elts;
         for (i = 0; i < cycle->listening.nelts; i++) {
             if (ls[i].new && ls[i].fd == -1) {
                 continue;
             }
 
-            if (ngx_close_socket(ls[i].fd) == -1)
+            if (ngx_close_socket(ls[i].fd) == -1) {
                 ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
                               ngx_close_socket_n " %s failed",
                               ls[i].addr_text.data);
@@ -252,15 +265,13 @@ static int ngx_init_cycle(ngx_cycle_t *old_cycle, ngx_log_t *log)
 
         ngx_destroy_pool(pool);
         return NULL;
+    }
 
-    } else {
-
-        /* commit the new cycle configuration */
+    /* commit the new cycle configuration */
 
-        for (i = 0; ngx_modules[i]; i++) {
-            if (ngx_modules[i]->commit_module) {
-                ngx_modules[i]->commit_module(cycle);
-            }
+    for (i = 0; ngx_modules[i]; i++) {
+        if (ngx_modules[i]->commit_module) {
+            ngx_modules[i]->commit_module(cycle, log);
         }
     }
 
@@ -270,7 +281,7 @@ static int ngx_init_cycle(ngx_cycle_t *old_cycle, ngx_log_t *log)
             continue;
         }
 
-        if (ngx_close_socket(ls[i].fd) == -1)
+        if (ngx_close_socket(ls[i].fd) == -1) {
             ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
                           ngx_close_socket_n " %s failed",
                           ls[i].addr_text.data);
@@ -278,20 +289,19 @@ static int ngx_init_cycle(ngx_cycle_t *old_cycle, ngx_log_t *log)
     }
 
     file = old_cycle->open_files.elts;
-    for (i = 0; i < cycle->old_open_files.nelts; i++) {
+    for (i = 0; i < old_cycle->open_files.nelts; i++) {
         if (file->fd == NGX_INVALID_FILE) {
             continue;
         }
 
-        if (ngx_close_file(file.fd) == NGX_FILE_ERROR) {
+        if (ngx_close_file(file->fd) == NGX_FILE_ERROR) {
             ngx_log_error(NGX_LOG_EMERG, log, ngx_errno,
                           ngx_close_file_n " \"%s\" failed",
                           file->name.data);
         }
     }
 
-    new_cycle->log = ???;
-    pool->log = ???;
+    pool->log = cycle->log;
 
     ngx_destroy_pool(old_cycle->pool);
 
@@ -397,7 +407,7 @@ int main(int argc, char *const *argv)
 #endif
 
 
-static int ngx_open_listening_sockets(ngx_log_t *log)
+static int ngx_open_listening_sockets(ngx_cycle_t *cycle, ngx_log_t *log)
 {
     int              times, failed, reuseaddr, i;
     ngx_err_t        err;
@@ -406,16 +416,19 @@ static int ngx_open_listening_sockets(ngx_log_t *log)
 
     reuseaddr = 1;
 
+    /* TODO: times configurable */
+
     for (times = 10; times; times--) {
          failed = 0;
 
         /* for each listening socket */
 
-        ls = ngx_listening_sockets.elts;
-        for (i = 0; i < ngx_listening_sockets.nelts; i++) {
+        ls = cycle->listening.elts;
+        for (i = 0; i < cycle->listening.nelts; i++) {
 
-            if (ls[i].bound)
+            if (ls[i].fd != -1) {
                 continue;
+            }
 
             if (ls[i].inherited) {
 
@@ -423,12 +436,12 @@ static int ngx_open_listening_sockets(ngx_log_t *log)
                 /* TODO: nonblocking */
                 /* TODO: deferred accept */
 
-                ls[i].bound = 1;
                 continue;
             }
 
             s = ngx_socket(ls[i].family, ls[i].type, ls[i].protocol,
                            ls[i].flags);
+
             if (s == -1) {
                 ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno,
                               ngx_socket_n " %s falied", ls[i].addr_text.data);
@@ -493,22 +506,20 @@ static int ngx_open_listening_sockets(ngx_log_t *log)
             /* TODO: deferred accept */
 
             ls[i].fd = s;
-            ls[i].bound = 1;
         }
 
         if (!failed)
             break;
 
+        /* TODO: delay configurable */
+
         ngx_log_error(NGX_LOG_NOTICE, log, 0,
                       "try again to bind() after 500ms");
         ngx_msleep(500);
     }
 
     if (failed) {
-
-        /* TODO: configurable */
-
-        ngx_log_error(NGX_LOG_EMERG, log, 0, "can not bind(), exiting");
+        ngx_log_error(NGX_LOG_EMERG, log, 0, "still can not bind()");
         return NGX_ERROR;
     }
 

diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index e841374720ea6bdef0e1e3b7e2671c7ee0fdb352..932f5bf934300a2bad30212ab9f9fa872bb66335 100644 (file)
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -56,13 +56,32 @@ struct ngx_command_s {
 #define ngx_null_command   {ngx_null_string, 0, NULL, 0, 0, NULL}
 
 
+struct ngx_open_file_s {
+    ngx_fd_t   fd;
+    ngx_str_t  name;
+};
+
+
+struct ngx_cycle_s {
+    void         ****conf_ctx;
+    ngx_pool_t      *pool;
+    ngx_log_t       *log;
+    ngx_array_t      listening;
+    ngx_array_t      open_files;
+
+    unsigned         one_process:1;
+};
+
+
 struct ngx_module_s {
     int             ctx_index;
     int             index;
     void           *ctx;
     ngx_command_t  *commands;
     int             type;
-    int           (*init_module)(ngx_pool_t *p);
+    int           (*init_module)(ngx_cycle_t *cycle, ngx_log_t *log);
+    int           (*commit_module)(ngx_cycle_t *cycle, ngx_log_t *log);
+    int           (*rollback_module)(ngx_cycle_t *cycle, ngx_log_t *log);
 };
 
 
@@ -73,22 +92,6 @@ typedef struct {
 } ngx_conf_file_t;
 
 
-struct ngx_open_file_s {
-    ngx_fd_t   fd;
-    ngx_str_t  name;
-};
-
-
-typedef struct {
-    ngx_pool_t   *pool;
-    ngx_log_t    *log;
-    ngx_array_t   listening;
-    ngx_array_t   open_files;
-
-    unsigned      one_process:1;
-} ngx_cycle_t;
-
-
 typedef char *(*ngx_conf_handler_pt)(ngx_conf_t *cf,
                                      ngx_command_t *dummy, void *conf);
 

diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 1bd97f2bb0be14ae7a72b30f1b596d2486291216..6211c5f5c14ddd2d848dd0185efc9160bf10bf45 100644 (file)
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -34,6 +34,9 @@ typedef struct {
     time_t            post_accept_timeout;     /* should be here because
                                                   of the deferred accept */
 
+    unsigned          new:1;
+    unsigned          remain:1;
+
     unsigned          bound:1;       /* already bound */
     unsigned          inherited:1;   /* inherited from previous process */
     unsigned          nonblocking_accept:1;

diff --git a/src/core/ngx_core.h b/src/core/ngx_core.h
index a1a7c06f0d870ddee44345f185093bf991437561..52ba59b57caa364fb0a6b6ed2c5afd6b42f985ba 100644 (file)
--- a/src/core/ngx_core.h
+++ b/src/core/ngx_core.h
@@ -10,7 +10,8 @@
 
 typedef struct ngx_module_s      ngx_module_t;
 typedef struct ngx_conf_s        ngx_conf_t;
-typedef struct ngx_open_file_s   ngx_open_file_t;;
+typedef struct ngx_cycle_s       ngx_cycle_t;
+typedef struct ngx_open_file_s   ngx_open_file_t;
 typedef struct ngx_command_s     ngx_command_t;
 
 typedef struct ngx_file_s        ngx_file_t;

diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
index d4f3df3578aad3a31d28d2db4ae57e79670f5409..51bae3d1accf6054ac187adbf5856fa03a23e355 100644 (file)
--- a/src/core/ngx_log.c
+++ b/src/core/ngx_log.c
@@ -246,6 +246,17 @@ ngx_log_t *ngx_log_init_errlog()
 }
 
 
+ngx_log_t *ngx_log_create_errlog(ngx_cycle_t *cycle)
+{
+    ngx_log_t  *log;
+
+    ngx_test_null(log, ngx_pcalloc(cycle->pool, sizeof(ngx_log_t)), NULL);
+    ngx_test_null(log->file, ngx_push_array(&cycle->open_files), NULL);
+
+    return log;
+}
+
+
 char *ngx_log_set_errlog(ngx_conf_t *cf, ngx_command_t *cmd, ngx_log_t *log)
 {
     int         len;

diff --git a/src/core/ngx_log.h b/src/core/ngx_log.h
index d8aca8afab655d30b3d3428acc0641f63dc0a286..0de8c3edd315febe0220325578ad021d51d0cd6b 100644 (file)
--- a/src/core/ngx_log.h
+++ b/src/core/ngx_log.h
@@ -168,6 +168,8 @@ void ngx_assert_core(ngx_log_t *log, const char *fmt, ...);
 #define ngx_log_copy_log(new, old)    ngx_memcpy(new, old, sizeof(ngx_log_t))
 
 ngx_log_t *ngx_log_init_errlog();
+ngx_log_t *ngx_log_create_errlog(ngx_cycle_t *cycle);
+
 char *ngx_log_set_errlog(ngx_conf_t *cf, ngx_command_t *cmd, ngx_log_t *log);
 
 

diff --git a/src/event/modules/ngx_devpoll_module.c b/src/event/modules/ngx_devpoll_module.c
index 27396fcde5bce7d1998a26ad77834b88419bd41e..766d4032850a6b1d6d5decbbc1e02a528ca4cc1f 100644 (file)
--- a/src/event/modules/ngx_devpoll_module.c
+++ b/src/event/modules/ngx_devpoll_module.c
@@ -190,10 +190,10 @@ static int ngx_devpoll_add_event(ngx_event_t *ev, int event, u_int flags)
 
 static int ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags)
 {
-    ngx_event_t  *e;
+    ngx_event_t       *e;
+    ngx_connection_t  *c;
 
 #if (NGX_DEBUG_EVENT)
-    ngx_connection_t *c = ev->data;
     ngx_log_debug(c->log, "del event: %d, %d" _ c->fd _ event);
 #endif
 
@@ -209,6 +209,8 @@ static int ngx_devpoll_del_event(ngx_event_t *ev, int event, u_int flags)
 
     /* we need to restore second event if it exists */
 
+    c = ev->data;
+
     if (event == NGX_READ_EVENT) {
         e = c->write;
         event = POLLOUT;

diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
index 263d88e3634d1e7a506f1a3f842f51fe7319aaa7..7438fc168bbbdb0d774afe4b31369be0ef8f308f 100644 (file)
--- a/src/event/ngx_event.c
+++ b/src/event/ngx_event.c
@@ -235,12 +235,12 @@ ngx_log_debug(log, "TYPE: %d" _ ecf->use);
 }
 
 
-void ngx_worker(ngx_log_t *log)
+void ngx_worker(ngx_cycle_t *cycle)
 {
     for ( ;; ) {
-        ngx_log_debug(log, "ngx_worker cycle");
+        ngx_log_debug(cycle->log, "ngx_worker cycle");
 
-        ngx_process_events(log);
+        ngx_process_events(cycle->log);
     }
 }
 

diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 8ae2b5385af9fa1e03727fc0f0ceda474f8be4e6..393699f0af3e39ef96161a8ab141a8ca42ee4bb9 100644 (file)
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -371,7 +371,7 @@ int ngx_event_close_connection(ngx_event_t *ev);
 
 
 int  ngx_pre_thread(ngx_array_t *ls, ngx_pool_t *pool, ngx_log_t *log);
-void ngx_worker(ngx_log_t *log);
+void ngx_worker(ngx_cycle_t *cycle);
 
 
 /* ***************************** */

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index c1024e25c59f355197d5e32a323a648a68d6663e..4cc4388f2c4314ec997e782b2e6b1eb76922dde5 100644 (file)
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -20,7 +20,7 @@ static void *ngx_http_core_create_loc_conf(ngx_pool_t *pool);
 static char *ngx_http_core_merge_loc_conf(ngx_pool_t *pool,
                                           void *parent, void *child);
 
-static int ngx_http_core_init(ngx_pool_t *pool);
+static int ngx_http_core_init(ngx_cycle_t *cycle, ngx_log_t *log);
 static char *ngx_server_block(ngx_conf_t *cf, ngx_command_t *cmd, void *dummy);
 static int ngx_cmp_locations(const void *first, const void *second);
 static char *ngx_location_block(ngx_conf_t *cf, ngx_command_t *cmd,
@@ -186,17 +186,20 @@ ngx_module_t  ngx_http_core_module = {
     &ngx_http_core_module_ctx,             /* module context */
     ngx_http_core_commands,                /* module directives */
     NGX_HTTP_MODULE,                       /* module type */
-    ngx_http_core_init                     /* init module */
+    ngx_http_core_init,                    /* init module */
+    NULL,                                  /* commit module */
+    NULL                                   /* rollback module */
 };
 
 
 void ngx_http_handler(ngx_http_request_t *r)
 {
-    int                        rc, i;
-    ngx_http_log_ctx_t        *lcx;
-    ngx_http_handler_pt       *h;
-    ngx_http_core_loc_conf_t  *clcf, **clcfp;
-    ngx_http_core_srv_conf_t  *cscf;
+    int                         rc, i;
+    ngx_http_log_ctx_t         *lcx;
+    ngx_http_handler_pt        *h;
+    ngx_http_core_loc_conf_t   *clcf, **clcfp;
+    ngx_http_core_srv_conf_t   *cscf;
+    ngx_http_core_main_conf_t  *cmcf;
 
     r->connection->unexpected_eof = 0;
 
@@ -248,10 +251,12 @@ ngx_log_debug(r->connection->log, "rc: %d" _ rc);
         r->filter = NGX_HTTP_FILTER_NEED_IN_MEMORY;
     }
 
+    cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+
     /* run translation phase */
 
-    h = ngx_http_translate_handlers.elts;
-    for (i = ngx_http_translate_handlers.nelts - 1; i >= 0; i--) {
+    h = cmcf->translate_handlers.elts;
+    for (i = cmcf->translate_handlers.nelts - 1; i >= 0; i--) {
 
         rc = h[i](r);
 
@@ -521,7 +526,7 @@ int ngx_http_internal_redirect(ngx_http_request_t *r,
 }
 
 
-static int ngx_http_core_init(ngx_pool_t *pool)
+static int ngx_http_core_init(ngx_cycle_t *cycle, ngx_log_t *log)
 {
     ngx_http_handler_pt  *h;
 

diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index df9bcca023e074c0c737758a828c4c5ebd319a26..8acf4feb1af8132dba7e24dbe9897ffcbaa9ea9d 100644 (file)
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -18,7 +18,8 @@ typedef struct {
 
 
 typedef struct {
-    ngx_array_t  servers;      /* array of ngx_http_core_srv_conf_t */
+    ngx_array_t  servers;              /* array of ngx_http_core_srv_conf_t */
+    ngx_array_t  translate_handlers;
 } ngx_http_core_main_conf_t;