1
0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00

Merge branch 'PHP-8.5'

* PHP-8.5:
  ext/pcntl: fix pcntl_getcpuaffinity() for solaris.
This commit is contained in:
David Carlier
2025-12-24 16:11:16 +00:00

View File

@@ -94,7 +94,7 @@ typedef cpuset_t *cpu_set_t;
#elif defined(HAVE_PSET_BIND) #elif defined(HAVE_PSET_BIND)
#include <sys/pset.h> #include <sys/pset.h>
typedef psetid_t cpu_set_t; typedef psetid_t cpu_set_t;
#define sched_getaffinity(p, c, m) pset_bind(PS_QUERY, P_PID, (p <= 0 ? getpid() : p), &m) #define sched_getaffinity(p, c, m) pset_bind(PS_QUERY, P_PID, p, &m)
#define sched_setaffinity(p, c, m) pset_bind(m, P_PID, (p <= 0 ? getpid() : p), NULL) #define sched_setaffinity(p, c, m) pset_bind(m, P_PID, (p <= 0 ? getpid() : p), NULL)
#define PCNTL_CPUSET(mask) mask #define PCNTL_CPUSET(mask) mask
#define PCNTL_CPU_ISSET(i, mask) (pset_assign(PS_QUERY, (processorid_t)i, &query) == 0 && query == mask) #define PCNTL_CPU_ISSET(i, mask) (pset_assign(PS_QUERY, (processorid_t)i, &query) == 0 && query == mask)