Mercurial > hg > nginx-vendor-current

comparison src/os/unix/ngx_process_cycle.c @ 668:9fbf3ad94cbf NGINX_1_1_18

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.1.18 *) Change: keepalive connections are no longer disabled for Safari by default. *) Feature: the $connection_requests variable. *) Feature: $tcpinfo_rtt, $tcpinfo_rttvar, $tcpinfo_snd_cwnd and $tcpinfo_rcv_space variables. *) Feature: the "worker_cpu_affinity" directive now works on FreeBSD. *) Feature: the "xslt_param" and "xslt_string_param" directives. Thanks to Samuel Behan. *) Bugfix: in configure tests. Thanks to Piotr Sikora. *) Bugfix: in the ngx_http_xslt_filter_module. *) Bugfix: nginx could not be built on Debian GNU/Hurd.
author Igor Sysoev <http://sysoev.ru>
date Wed, 28 Mar 2012 00:00:00 +0400
parents f5b859b2f097
children 981b4c44593b
comparison
equal deleted inserted replaced
667:e0eabdb2bad1 668:9fbf3ad94cbf
60 volatile ngx_thread_t ngx_threads[NGX_MAX_THREADS]; 60 volatile ngx_thread_t ngx_threads[NGX_MAX_THREADS];
61 ngx_int_t ngx_threads_n; 61 ngx_int_t ngx_threads_n;
62 #endif 62 #endif
63 63
64 64
65 u_long cpu_affinity; 65 uint64_t cpu_affinity;
66 static u_char master_process[] = "master process"; 66 static u_char master_process[] = "master process";
67 67
68 68
69 static ngx_cache_manager_ctx_t ngx_cache_manager_ctx = { 69 static ngx_cache_manager_ctx_t ngx_cache_manager_ctx = {
70 ngx_cache_manager_process_handler, "cache manager process", 0 70 ngx_cache_manager_process_handler, "cache manager process", 0
911 /* fatal */ 911 /* fatal */
912 exit(2); 912 exit(2);
913 } 913 }
914 } 914 }
915 915
916 #if (NGX_HAVE_SCHED_SETAFFINITY)
917
918 if (cpu_affinity) { 916 if (cpu_affinity) {
919 ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, 917 ngx_setaffinity(cpu_affinity, cycle->log);
920 "sched_setaffinity(0x%08Xl)", cpu_affinity); 918 }
921
922 if (sched_setaffinity(0, sizeof(cpu_affinity),
923 (cpu_set_t *) &cpu_affinity)
924 == -1)
925 {
926 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
927 "sched_setaffinity(0x%08Xl) failed", cpu_affinity);
928 }
929 }
930
931 #endif
932 919
933 #if (NGX_HAVE_PR_SET_DUMPABLE) 920 #if (NGX_HAVE_PR_SET_DUMPABLE)
934 921
935 /* allow coredump after setuid() in Linux 2.4.x */ 922 /* allow coredump after setuid() in Linux 2.4.x */
936 923