comparison src/event/ngx_event.c @ 44:4989c3d25945 NGINX_0_1_22

nginx 0.1.22 *) Bugfix: the ngx_http_stub_status_module showed incorrect handled connections statistics if the proxying or FastCGI server were used. *) Bugfix: the installation paths were incorrectly quoted on Linux and Solaris; bug appeared in 0.1.21.
author Igor Sysoev <http://sysoev.ru>
date Tue, 22 Feb 2005 00:00:00 +0300
parents 41ccba1aba45
children 6cfc63e68377
comparison
equal deleted inserted replaced
43:95fe5f51bcdb 44:4989c3d25945
32 static void *ngx_event_create_conf(ngx_cycle_t *cycle); 32 static void *ngx_event_create_conf(ngx_cycle_t *cycle);
33 static char *ngx_event_init_conf(ngx_cycle_t *cycle, void *conf); 33 static char *ngx_event_init_conf(ngx_cycle_t *cycle, void *conf);
34 static char *ngx_accept_mutex_check(ngx_conf_t *cf, void *post, void *data); 34 static char *ngx_accept_mutex_check(ngx_conf_t *cf, void *post, void *data);
35 35
36 36
37 static ngx_uint_t ngx_event_max_module; 37 static ngx_uint_t ngx_event_max_module;
38 38
39 ngx_uint_t ngx_event_flags; 39 ngx_uint_t ngx_event_flags;
40 ngx_event_actions_t ngx_event_actions; 40 ngx_event_actions_t ngx_event_actions;
41 41
42 42
43 ngx_atomic_t connection_counter; 43 ngx_atomic_t connection_counter;
44 ngx_atomic_t *ngx_connection_counter = &connection_counter; 44 ngx_atomic_t *ngx_connection_counter = &connection_counter;
45 45
46 46
47 ngx_atomic_t *ngx_accept_mutex_ptr; 47 ngx_atomic_t *ngx_accept_mutex_ptr;
48 ngx_atomic_t *ngx_accept_mutex; 48 ngx_atomic_t *ngx_accept_mutex;
49 ngx_uint_t ngx_accept_mutex_held; 49 ngx_uint_t ngx_accept_mutex_held;
50 ngx_msec_t ngx_accept_mutex_delay; 50 ngx_msec_t ngx_accept_mutex_delay;
51 ngx_int_t ngx_accept_disabled; 51 ngx_int_t ngx_accept_disabled;
52 52
53 53
54 #if (NGX_STAT_STUB) 54 #if (NGX_STAT_STUB)
55 55
56 ngx_atomic_t ngx_stat_accepted0; 56 ngx_atomic_t ngx_stat_accepted0;
57 ngx_atomic_t *ngx_stat_accepted = &ngx_stat_accepted0; 57 ngx_atomic_t *ngx_stat_accepted = &ngx_stat_accepted0;
58 ngx_atomic_t ngx_stat_handled0;
59 ngx_atomic_t *ngx_stat_handled = &ngx_stat_handled0;
58 ngx_atomic_t ngx_stat_requests0; 60 ngx_atomic_t ngx_stat_requests0;
59 ngx_atomic_t *ngx_stat_requests = &ngx_stat_requests0; 61 ngx_atomic_t *ngx_stat_requests = &ngx_stat_requests0;
60 ngx_atomic_t ngx_stat_active0; 62 ngx_atomic_t ngx_stat_active0;
61 ngx_atomic_t *ngx_stat_active = &ngx_stat_active0; 63 ngx_atomic_t *ngx_stat_active = &ngx_stat_active0;
62 ngx_atomic_t ngx_stat_reading0; 64 ngx_atomic_t ngx_stat_reading0;
63 ngx_atomic_t *ngx_stat_reading = &ngx_stat_reading0; 65 ngx_atomic_t *ngx_stat_reading = &ngx_stat_reading0;
64 ngx_atomic_t ngx_stat_writing0; 66 ngx_atomic_t ngx_stat_writing0;
65 ngx_atomic_t *ngx_stat_writing = &ngx_stat_reading0; 67 ngx_atomic_t *ngx_stat_writing = &ngx_stat_writing0;
66 68
67 #endif 69 #endif
68 70
69 71
70 72
207 + 128; /* ngx_connection_counter */ 209 + 128; /* ngx_connection_counter */
208 210
209 #if (NGX_STAT_STUB) 211 #if (NGX_STAT_STUB)
210 212
211 size += 128 /* ngx_stat_accepted */ 213 size += 128 /* ngx_stat_accepted */
214 + 128 /* ngx_stat_handled */
212 + 128 /* ngx_stat_requests */ 215 + 128 /* ngx_stat_requests */
213 + 128 /* ngx_stat_active */ 216 + 128 /* ngx_stat_active */
214 + 128 /* ngx_stat_reading */ 217 + 128 /* ngx_stat_reading */
215 + 128; /* ngx_stat_writing */ 218 + 128; /* ngx_stat_writing */
216 219
224 ngx_connection_counter = (ngx_atomic_t *) (shared + 128); 227 ngx_connection_counter = (ngx_atomic_t *) (shared + 128);
225 228
226 #if (NGX_STAT_STUB) 229 #if (NGX_STAT_STUB)
227 230
228 ngx_stat_accepted = (ngx_atomic_t *) (shared + 2 * 128); 231 ngx_stat_accepted = (ngx_atomic_t *) (shared + 2 * 128);
229 ngx_stat_requests = (ngx_atomic_t *) (shared + 3 * 128); 232 ngx_stat_handled = (ngx_atomic_t *) (shared + 3 * 128);
230 ngx_stat_active = (ngx_atomic_t *) (shared + 4 * 128); 233 ngx_stat_requests = (ngx_atomic_t *) (shared + 4 * 128);
231 ngx_stat_reading = (ngx_atomic_t *) (shared + 5 * 128); 234 ngx_stat_active = (ngx_atomic_t *) (shared + 5 * 128);
232 ngx_stat_writing = (ngx_atomic_t *) (shared + 6 * 128); 235 ngx_stat_reading = (ngx_atomic_t *) (shared + 6 * 128);
236 ngx_stat_writing = (ngx_atomic_t *) (shared + 7 * 128);
233 237
234 #endif 238 #endif
235 239
236 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0, 240 ngx_log_debug2(NGX_LOG_DEBUG_EVENT, cycle->log, 0,
237 "counter: %p, %d", 241 "counter: %p, %d",