set affinity earlier for children

Author: devnexen

sapi/fpm/fpm/fpm_unix.c

@@ -433,6 +433,20 @@ int fpm_unix_init_child(struct fpm_worker_pool_s *wp) /* {{{ */
 			zlog(ZLOG_SYSERROR, "[pool %s] failed to set rlimit_core for this pool. Please check your system limits or decrease rlimit_core. setrlimit(RLIMIT_CORE, %d)", wp->config->name, wp->config->rlimit_core);
 		}
 	}
+#if HAVE_FPM_CPUAFFINITY
+	if (is_root && wp->config->process_cpumask) {
+		int fcpu, lcpu;
+
+		if (0 > fpm_cpusrange(wp->config->process_cpumask, &fcpu, &lcpu)) {
+			zlog(ZLOG_SYSERROR, "[pool %s] failed to fpm_cpusrange(%s)", wp->config->name, wp->config->process_cpumask);
+			return -1;
+		}
+		if (0 > fpm_setcpuaffinity(fcpu, lcpu)) {
+			zlog(ZLOG_SYSERROR, "[pool %s] failed to fpm_setcpuaffinity(%s)", wp->config->name, wp->config->process_cpumask);
+			return -1;
+		}
+	}
+#endif
 
 	if (is_root && wp->config->chroot && *wp->config->chroot) {
 		if (0 > chroot(wp->config->chroot)) {
@@ -462,20 +476,6 @@ int fpm_unix_init_child(struct fpm_worker_pool_s *wp) /* {{{ */
 			}
 		}
 
-#if HAVE_FPM_CPUAFFINITY
-		if (wp->config->process_cpumask) {
-			int fcpu, lcpu;
-
-			if (0 > fpm_cpusrange(wp->config->process_cpumask, &fcpu, &lcpu)) {
-				zlog(ZLOG_SYSERROR, "[pool %s] failed to fpm_cpusrange(%s)", wp->config->name, wp->config->process_cpumask);
-				return -1;
-			}
-			if (0 > fpm_setcpuaffinity(fcpu, lcpu)) {
-				zlog(ZLOG_SYSERROR, "[pool %s] failed to fpm_setcpuaffinity(%s)", wp->config->name, wp->config->process_cpumask);
-				return -1;
-			}
-		}
-#endif
 		if (wp->set_gid) {
 			if (0 > setgid(wp->set_gid)) {
 				zlog(ZLOG_SYSERROR, "[pool %s] failed to setgid(%d)", wp->config->name, wp->set_gid);
@@ -699,7 +699,7 @@ int fpm_unix_init_main(void)
 			int fcpu, lcpu;
 
 			if (0 > fpm_cpusrange(fpm_global_config.process_cpumask, &fcpu, &lcpu)) {
-				zlog(ZLOG_SYSERROR, "failed to fpm_cpurange(%s)", fpm_global_config.process_cpumask);
+				zlog(ZLOG_SYSERROR, "failed to fpm_cpusrange(%s)", fpm_global_config.process_cpumask);
 				return -1;
 			}
 			if (0 > fpm_setcpuaffinity(fcpu, lcpu)) {