diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2012-03-21 13:58:51 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2012-03-21 13:58:51 +0000 |
| commit | fbd32d4d19cf7996e1d54b548744639b93f94459 (patch) | |
| tree | d8ea2879887aa37e39587d2d377d8b18c88cdd55 /src/os/unix/ngx_process_cycle.c | |
| parent | d4b1e5f58b999ad9c36d150ceb4493662f0188dc (diff) | |
| download | nginx-fbd32d4d19cf7996e1d54b548744639b93f94459.tar.gz nginx-fbd32d4d19cf7996e1d54b548744639b93f94459.zip | |
worker_cpu_affinity: cleaned up Linux implementation, added FreeBSD support.
Diffstat (limited to 'src/os/unix/ngx_process_cycle.c')
| -rw-r--r-- | src/os/unix/ngx_process_cycle.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 2b6f4c72a..82cf8e6ca 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -62,7 +62,7 @@ ngx_int_t ngx_threads_n; #endif -u_long cpu_affinity; +uint64_t cpu_affinity; static u_char master_process[] = "master process"; @@ -913,23 +913,10 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_uint_t priority) } } -#if (NGX_HAVE_SCHED_SETAFFINITY) - if (cpu_affinity) { - ngx_log_error(NGX_LOG_NOTICE, cycle->log, 0, - "sched_setaffinity(0x%08Xl)", cpu_affinity); - - if (sched_setaffinity(0, sizeof(cpu_affinity), - (cpu_set_t *) &cpu_affinity) - == -1) - { - ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, - "sched_setaffinity(0x%08Xl) failed", cpu_affinity); - } + ngx_setaffinity(cpu_affinity, cycle->log); } -#endif - #if (NGX_HAVE_PR_SET_DUMPABLE) /* allow coredump after setuid() in Linux 2.4.x */ |