mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 23:40:10 +00:00
8dc6133eff
posix/sched_cpucount.c assumes that size of __cpu_mask == size of long, which is incorrect for x32. This patch uses __builtin_popcount, which is availabe in GCC 4.9, in posix/sched_cpucount.c. Tested on i686, x86-64 and x32 with multi-arch disabled. [BZ #21696] * posix/sched_cpucount.c: Don't include <limits.h>. (__sched_cpucount): Use __builtin_popcount.
53 lines
1.5 KiB
C
53 lines
1.5 KiB
C
/* Copyright (C) 2007-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <sched.h>
|
|
|
|
|
|
int
|
|
__sched_cpucount (size_t setsize, const cpu_set_t *setp)
|
|
{
|
|
int s = 0;
|
|
const __cpu_mask *p = setp->__bits;
|
|
const __cpu_mask *end = &setp->__bits[setsize / sizeof (__cpu_mask)];
|
|
|
|
while (p < end)
|
|
{
|
|
__cpu_mask l = *p++;
|
|
|
|
#ifdef POPCNT
|
|
s += POPCNT (l);
|
|
#else
|
|
if (l == 0)
|
|
continue;
|
|
|
|
_Static_assert (sizeof (l) == sizeof (unsigned int)
|
|
|| sizeof (l) == sizeof (unsigned long)
|
|
|| sizeof (l) == sizeof (unsigned long long),
|
|
"sizeof (__cpu_mask");
|
|
if (sizeof (__cpu_mask) == sizeof (unsigned int))
|
|
s += __builtin_popcount (l);
|
|
else if (sizeof (__cpu_mask) == sizeof (unsigned long))
|
|
s += __builtin_popcountl (l);
|
|
else
|
|
s += __builtin_popcountll (l);
|
|
#endif
|
|
}
|
|
|
|
return s;
|
|
}
|