Merge pull request #4513 from ChipKerchner/fixNumCoresAIX
Fix get_num_cores for AIX.
This commit is contained in:
commit
9d6eeea867
10
getarch.c
10
getarch.c
|
@ -90,7 +90,9 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#include <sys/sysinfo.h>
|
#include <sys/sysinfo.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#endif
|
#endif
|
||||||
#if defined(AIX)
|
#if defined(_AIX)
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <sys/systemcfg.h>
|
||||||
#include <sys/sysinfo.h>
|
#include <sys/sysinfo.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -1870,11 +1872,13 @@ static int get_num_cores(void) {
|
||||||
|
|
||||||
return count;
|
return count;
|
||||||
|
|
||||||
#elif defined(AIX)
|
#elif defined(_AIX)
|
||||||
//returns the number of processors which are currently online
|
//returns the number of processors which are currently online
|
||||||
count = sysconf(_SC_NPROCESSORS_ONLN);
|
count = sysconf(_SC_NPROCESSORS_ONLN);
|
||||||
if (count <= 0) count = 2;
|
if (count <= 0) count = 2;
|
||||||
|
|
||||||
|
return count;
|
||||||
|
|
||||||
#else
|
#else
|
||||||
return 2;
|
return 2;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue