comparison src/os/unix/ngx_posix_init.c @ 665:0b460e61bdcd default tip

Merge with nginx 1.0.0.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 25 Apr 2011 04:22:17 +0400
parents 428c6e58046a
children
comparison
equal deleted inserted replaced
572:06419a2298a9 665:0b460e61bdcd
42 ngx_init_setproctitle(log); 42 ngx_init_setproctitle(log);
43 43
44 ngx_pagesize = getpagesize(); 44 ngx_pagesize = getpagesize();
45 ngx_cacheline_size = NGX_CPU_CACHE_LINE; 45 ngx_cacheline_size = NGX_CPU_CACHE_LINE;
46 46
47 n = ngx_pagesize;
48
49 for (n = ngx_pagesize; n >>= 1; ngx_pagesize_shift++) { /* void */ } 47 for (n = ngx_pagesize; n >>= 1; ngx_pagesize_shift++) { /* void */ }
50 48
51 if (ngx_ncpu == 0) { 49 if (ngx_ncpu == 0) {
52 ngx_ncpu = 1; 50 ngx_ncpu = 1;
53 } 51 }
60 return NGX_ERROR; 58 return NGX_ERROR;
61 } 59 }
62 60
63 ngx_max_sockets = (ngx_int_t) rlmt.rlim_cur; 61 ngx_max_sockets = (ngx_int_t) rlmt.rlim_cur;
64 62
65 #if (NGX_HAVE_INHERITED_NONBLOCK) 63 #if (NGX_HAVE_INHERITED_NONBLOCK || NGX_HAVE_ACCEPT4)
66 ngx_inherited_nonblocking = 1; 64 ngx_inherited_nonblocking = 1;
67 #else 65 #else
68 ngx_inherited_nonblocking = 0; 66 ngx_inherited_nonblocking = 0;
69 #endif 67 #endif
70 68