sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a built-in macro for fetching number of CPUs, affinity aware and all

Browse Source 
There's an increasing number of placing wanting to know the number of
CPU's for parallel processing, and increasingly these things are running
in containers and such where the total host CPU count is not meaningful.

Merged-by: Vitaly Chikunov <vt@altlinux.org>
This commit is contained in:
Panu Matilainen 2019-01-15 11:16:04 +02:00 committed by Vitaly Chikunov
parent 0263f6ebbd
commit e3bd69c7df
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -542,6 +542,7 @@ dnl XXX AC_CHECK_FUNCS(gethostname mkdir mkfifo rmdir select uname)
AC_CHECK_FUNCS(basename getcwd getwd inet_aton mtrace putenv realpath setenv)
AC_CHECK_FUNCS(stpcpy stpncpy strcspn)
AC_CHECK_FUNCS(strdup strerror strtol strtoul strspn strstr)
AC_CHECK_FUNCS(sched_getaffinity, [], [], [#include <sched.h>])
AC_CHECK_FUNCS(regcomp)

24
rpmio/macro.c
View File

@ -9,6 +9,9 @@
#include "system.h"
#include <stdarg.h>
#if HAVE_SCHED_GETAFFINITY
#include <sched.h>
#endif
#if !defined(isblank)
#define isblank(_c) ((_c) == ' ' || (_c) == '\t')
@ -542,6 +545,23 @@ doShellEscape(MacroBuf mb, const char * cmd, size_t clen)
return 0;
}
static unsigned int getncpus(void)
{
unsigned int ncpus = 0;
#if HAVE_SCHED_GETAFFINITY
cpu_set_t set;
if (sched_getaffinity (0, sizeof(set), &set) == 0)
ncpus = CPU_COUNT(&set);
#endif
/* Fallback to sysconf() if the above isn't supported or didn't work */
if (ncpus < 1)
ncpus = sysconf(_SC_NPROCESSORS_ONLN);
/* If all else fails, there's always the one we're running on... */
if (ncpus < 1)
ncpus = 1;
return ncpus;
}
/**
* Parse (and execute) new macro definition.
* @param mb macro expansion state
@ -1057,6 +1077,9 @@ doFoo(MacroBuf mb, int negate, const char * f, size_t fn,
break;
}
b = be;
} else if (STREQ("getncpus", f, fn)) {
sprintf(buf, "%u", getncpus());
b = buf;
} else if (STREQ("S", f, fn)) {
for (b = buf; (c = *b) && xisdigit(c);)
b++;
@ -1365,6 +1388,7 @@ expandMacro(MacroBuf mb)
STREQ("getenv", f, fn) ||
STREQ("_tmpdir", f, fn) ||
STREQ("homedir", f, fn) ||
STREQ("getncpus", f, fn) ||
STREQ("S", f, fn) ||
STREQ("P", f, fn) ||
STREQ("F", f, fn)) {