[nginx] svn commit: r4900 - in branches/stable-1.2: . src/os/unix

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-11-12 17:54:49 +0000 (Mon, 12 Nov 2012)
New Revision: 4900
URL: http://trac.nginx.org/nginx/changeset/4900/nginx

Log:
Merge of r4865: clearing of cpu_affinity after process spawn.

This fixes unwanted/incorrect cpu_affinity use on dead worker processes
respawn.  While this is not ideal, it's expected to be better when previous
situation where multiple processes were spawn with identical CPU affinity
set.

Reported by Charles Chen.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/os/unix/ngx_process_cycle.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-11-12 17:03:38 UTC (rev 4899)
+++ branches/stable-1.2	2012-11-12 17:54:49 UTC (rev 4900)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865
\ No newline at end of property
Modified: branches/stable-1.2/src/os/unix/ngx_process_cycle.c
===================================================================
--- branches/stable-1.2/src/os/unix/ngx_process_cycle.c	2012-11-12 17:03:38 UTC (rev 4899)
+++ branches/stable-1.2/src/os/unix/ngx_process_cycle.c	2012-11-12 17:54:49 UTC (rev 4900)
@@ -371,6 +371,8 @@
 
         ngx_pass_open_channel(cycle, &ch);
     }
+
+    cpu_affinity = 0;
 }