diff options
author | Igor Sysoev <igor@sysoev.ru> | 2006-11-20 08:51:45 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2006-11-20 08:51:45 +0000 |
commit | 67cd336d88f8a920ea5921936785a1c1553062fb (patch) | |
tree | f76934379e98e22854638a4ddc44b022deefd265 /src/core/ngx_cycle.h | |
parent | cae66582d5e6137d3b53552fcb84520a042841ca (diff) | |
download | nginx-67cd336d88f8a920ea5921936785a1c1553062fb.tar.gz nginx-67cd336d88f8a920ea5921936785a1c1553062fb.zip |
slab allocator in shared memory
Diffstat (limited to 'src/core/ngx_cycle.h')
-rw-r--r-- | src/core/ngx_cycle.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h index ad92ff2df..e1a35eb75 100644 --- a/src/core/ngx_cycle.h +++ b/src/core/ngx_cycle.h @@ -21,6 +21,12 @@ #define NGX_DEBUG_POINTS_ABORT 2 +typedef struct { + ngx_shm_t shm; + ngx_str_t name; +} ngx_shm_zone_t; + + struct ngx_cycle_s { void ****conf_ctx; ngx_pool_t *pool; @@ -32,13 +38,10 @@ struct ngx_cycle_s { ngx_connection_t *free_connections; ngx_uint_t free_connection_n; - ngx_shm_t shm; - u_char *shm_last; - u_char *shm_end; - ngx_array_t listening; ngx_array_t pathes; ngx_list_t open_files; + ngx_list_t shared_memory; ngx_uint_t connection_n; ngx_uint_t files_n; @@ -51,6 +54,7 @@ struct ngx_cycle_s { ngx_str_t conf_file; ngx_str_t root; + ngx_str_t lock_file; }; |