multi-ranges support.

Author: devnexen

sapi/fpm/fpm/fpm_unix.c

@@ -359,6 +359,14 @@ static int fpm_unix_conf_wp(struct fpm_worker_pool_s *wp) /* {{{ */
 /* }}} */
 
 #if HAVE_FPM_CPUAFFINITY
+struct fpm_cpuaffinity_conf {
+#if defined(HAVE_SCHED_SETAFFINITY) || defined(HAVE_CPUSET_SETAFFINITY)
+	cpu_set_t cset;
+#endif
+	long min;
+	long max;
+};
+
 static long fpm_cpumax(void)
 {
 	static long cpuid = LONG_MIN;
@@ -369,53 +377,82 @@ static long fpm_cpumax(void)
 	return cpuid;
 }
 
-static int fpm_cpusrange(char *cpumask, int *min, int *max) {
-	char *cpumasksep;
-	long cpumax;
-	cpumax = fpm_cpumax();
-	if (0 >= cpumax) {
-		return -1;
-	}
-	*min = strtol(cpumask, &cpumasksep, 0);
-	if (errno || *min < 0 || *min >= cpumax) {
-		return -1;
-	}
-
-	*max = *min;
-	if (*cpumasksep == '-') {
-		if (strlen(cpumasksep) > 1) {
-			char *err;
-			*max = strtol(cpumasksep + 1, &err, 0);
-			if (errno || *err != '\0' || *max <= *min || *max >= cpumax) {
-				return -1;
-			}
-		} else {
-			return -1;
-		}
-	}
-	return 0;
+static void fpm_cpuaffinity_init(struct fpm_cpuaffinity_conf *c)
+{
+#if defined(HAVE_SCHED_SETAFFINITY) || defined(HAVE_CPUSET_SETAFFINITY)
+	CPU_ZERO(&c->cset);
+#endif
 }
 
-static int fpm_setcpuaffinity(int min, int max)
+static void fpm_cpuaffinity_add(struct fpm_cpuaffinity_conf *c)
 {
 #if defined(HAVE_SCHED_SETAFFINITY) || defined(HAVE_CPUSET_SETAFFINITY)
-	cpu_set_t cset;
 	int i;
 
-	CPU_ZERO(&cset);
-	for (i = min; i <= max; i ++) {
-		if (!CPU_ISSET(i, &cset)) {
-			CPU_SET(i, &cset);
+	for (i = c->min; i <= c->max; i ++) {
+		if (!CPU_ISSET(i, &c->cset)) {
+			CPU_SET(i, &c->cset);
 		}
 	}
+#endif
+}
 
+static int fpm_cpuaffinity_set(struct fpm_cpuaffinity_conf *c)
+{
 #if defined(HAVE_SCHED_SETAFFINITY)
-	return sched_setaffinity(0, sizeof(cset), &cset);
-#else
-	return cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cset), &cset);
-#endif
+	return sched_setaffinity(0, sizeof(c->cset), &c->cset);
+#elif defined(HAVE_CPUSET_SETAFFINITY)
+	return cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(c->cset), &c->cset);
 #endif
 }
+
+static void fpm_cpuaffinity_destroy(struct fpm_cpuaffinity_conf *c)
+{
+	// some platform/apis requires to allocates data on the heap
+}
+
+static int fpm_setcpuaffinity(char *cpumask)
+{
+	char *token, *buf;
+	struct fpm_cpuaffinity_conf fconf;
+	int r, cpumax;
+
+	r = -1;
+	cpumax = fpm_cpumax();
+
+	fpm_cpuaffinity_init(&fconf);
+	token = php_strtok_r(cpumask, ";", &buf);
+
+	while (token) {
+		char *cpumasksep;
+
+		fconf.min = strtol(token, &cpumasksep, 0);
+		if (errno || fconf.min > cpumax) {
+			goto fail;
+		}
+		fconf.max = fconf.min;
+		if (*cpumasksep == '-') {
+			if (strlen(cpumasksep) > 1) {
+				char *err;
+				fconf.max = strtol(cpumasksep + 1, &err, 0);
+				if (errno || *err != '\0' || fconf.max < fconf.min || fconf.max > cpumax) {
+					return -1;
+				}
+			} else {
+				return -1;
+			}
+		}
+
+		fpm_cpuaffinity_add(&fconf);
+
+		token = php_strtok_r(NULL, ";", &buf);
+	}
+
+fail:
+	r = fpm_cpuaffinity_set(&fconf);
+	fpm_cpuaffinity_destroy(&fconf);
+	return r;
+}
 #endif
 
 int fpm_unix_init_child(struct fpm_worker_pool_s *wp) /* {{{ */
@@ -443,14 +480,9 @@ int fpm_unix_init_child(struct fpm_worker_pool_s *wp) /* {{{ */
 		}
 	}
 #if HAVE_FPM_CPUAFFINITY
-	if (is_root && wp->config->process_cpumask) {
-		int fcpu, lcpu;
+	if (wp->config->process_cpumask) {
 
-		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)) {
+		if (0 > fpm_setcpuaffinity(wp->config->process_cpumask)) {
 			zlog(ZLOG_SYSERROR, "[pool %s] failed to fpm_setcpuaffinity(%s)", wp->config->name, wp->config->process_cpumask);
 			return -1;
 		}
@@ -704,19 +736,9 @@ int fpm_unix_init_main(void)
 
 #if HAVE_FPM_CPUAFFINITY
 	if (fpm_global_config.process_cpumask) {
-		if (is_root) {
-			int fcpu, lcpu;
-
-			if (0 > fpm_cpusrange(fpm_global_config.process_cpumask, &fcpu, &lcpu)) {
-				zlog(ZLOG_SYSERROR, "failed to fpm_cpusrange(%s)", fpm_global_config.process_cpumask);
-				return -1;
-			}
-			if (0 > fpm_setcpuaffinity(fcpu, lcpu)) {
-				zlog(ZLOG_SYSERROR, "failed to fpm_setcpuaffinity(%s)", fpm_global_config.process_cpumask);
-				return -1;
-			}
-		} else {
-			zlog(ZLOG_NOTICE, "'process.cpumask' directive is ignored when FPM is not running as root");
+		if (0 > fpm_setcpuaffinity(fpm_global_config.process_cpumask)) {
+			zlog(ZLOG_SYSERROR, "failed to fpm_setcpuaffinity(%s)", fpm_global_config.process_cpumask);
+			return -1;
 		}
 	}
 #endif

sapi/fpm/php-fpm.conf.in

@@ -129,7 +129,9 @@
 ; The value can be one cpu id or a range.
 ;
 ; Default Value: not set
-; process.cpumask = 0-3
+; process.cpumask = "4"
+; process.cpumask = "0-3"
+; process.cpumask = "1-4;8-16;32-48"
 
 ;;;;;;;;;;;;;;;;;;;;
 ; Pool Definitions ;

sapi/fpm/www.conf.in

@@ -78,7 +78,9 @@ listen = 127.0.0.1:9000
 ; The value can be one cpu id or a range.
 ;
 ; Default Value: inherits master's cpu affinity
-; process.cpumask = 4-7
+; process.cpumask = "8"
+; process.cpumask = "0-3"
+; process.cpumask = "4-7;10-12"
 
 ; Set the process dumpable flag (PR_SET_DUMPABLE prctl for Linux or
 ; PROC_TRACE_CTL procctl for FreeBSD) even if the process user