comparison src/core/nginx.c @ 930:45df22906c12

allocate aligned ngx_crc32_table_short globally
author Igor Sysoev <igor@sysoev.ru>
date Fri, 15 Dec 2006 21:31:03 +0000
parents 201d017ea470
children 3a126fca07fc
comparison
equal deleted inserted replaced
929:1adfc55bb6dc 930:45df22906c12
250 250
251 if (ngx_os_init(log) != NGX_OK) { 251 if (ngx_os_init(log) != NGX_OK) {
252 return 1; 252 return 1;
253 } 253 }
254 254
255 /* ngx_crc32_init() requires ngx_cacheline_size set in ngx_os_init() */
256
257 if (ngx_crc32_init() != NGX_OK) {
258 return 1;
259 }
260
255 if (ngx_add_inherited_sockets(&init_cycle) != NGX_OK) { 261 if (ngx_add_inherited_sockets(&init_cycle) != NGX_OK) {
256 return 1; 262 return 1;
257 } 263 }
258 264
259 environ = &ngx_null_environ; 265 environ = &ngx_null_environ;
280 cycle->conf_file.data); 286 cycle->conf_file.data);
281 return 0; 287 return 0;
282 } 288 }
283 289
284 ngx_os_status(cycle->log); 290 ngx_os_status(cycle->log);
285
286 if (ngx_crc32_init(cycle->pool) != NGX_OK) {
287 return 1;
288 }
289 291
290 ngx_cycle = cycle; 292 ngx_cycle = cycle;
291 293
292 ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); 294 ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
293 295