comparison src/core/ngx_cycle.h @ 635:e67b227c8dbb default tip

Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:07:55 +0400
parents b9763778e212
children
comparison
equal deleted inserted replaced
578:f3a9e57d2e17 635:e67b227c8dbb
42 42
43 ngx_connection_t **files; 43 ngx_connection_t **files;
44 ngx_connection_t *free_connections; 44 ngx_connection_t *free_connections;
45 ngx_uint_t free_connection_n; 45 ngx_uint_t free_connection_n;
46 46
47 ngx_queue_t reusable_connections_queue;
48
47 ngx_array_t listening; 49 ngx_array_t listening;
48 ngx_array_t pathes; 50 ngx_array_t pathes;
49 ngx_list_t open_files; 51 ngx_list_t open_files;
50 ngx_list_t shared_memory; 52 ngx_list_t shared_memory;
51 53
76 ngx_int_t worker_processes; 78 ngx_int_t worker_processes;
77 ngx_int_t debug_points; 79 ngx_int_t debug_points;
78 80
79 ngx_int_t rlimit_nofile; 81 ngx_int_t rlimit_nofile;
80 ngx_int_t rlimit_sigpending; 82 ngx_int_t rlimit_sigpending;
81 size_t rlimit_core; 83 off_t rlimit_core;
82 84
83 int priority; 85 int priority;
84 86
85 ngx_uint_t cpu_affinity_n; 87 ngx_uint_t cpu_affinity_n;
86 u_long *cpu_affinity; 88 u_long *cpu_affinity;
128 130
129 extern volatile ngx_cycle_t *ngx_cycle; 131 extern volatile ngx_cycle_t *ngx_cycle;
130 extern ngx_array_t ngx_old_cycles; 132 extern ngx_array_t ngx_old_cycles;
131 extern ngx_module_t ngx_core_module; 133 extern ngx_module_t ngx_core_module;
132 extern ngx_uint_t ngx_test_config; 134 extern ngx_uint_t ngx_test_config;
135 extern ngx_uint_t ngx_quiet_mode;
133 #if (NGX_THREADS) 136 #if (NGX_THREADS)
134 extern ngx_tls_key_t ngx_core_tls_key; 137 extern ngx_tls_key_t ngx_core_tls_key;
135 #endif 138 #endif
136 139
137 140