8217896: Make better use of LCPUs when building on AIX

Reviewed-by: ihse
This commit is contained in:
Andrew Leonard 2019-02-01 12:44:30 +01:00 committed by Magnus Ihse Bursie
parent 6d4de736d8
commit 31c8b22dc1

View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -42,8 +42,11 @@ AC_DEFUN([BPERF_CHECK_CORES],
NUM_CORES=`/usr/sbin/sysctl -n hw.ncpu` NUM_CORES=`/usr/sbin/sysctl -n hw.ncpu`
FOUND_CORES=yes FOUND_CORES=yes
elif test "x$OPENJDK_BUILD_OS" = xaix ; then elif test "x$OPENJDK_BUILD_OS" = xaix ; then
NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'` NUM_LCPU=`lparstat -m 2> /dev/null | $GREP -o "lcpu=[[0-9]]*" | $CUT -d "=" -f 2`
FOUND_CORES=yes if test -n "$NUM_LCPU"; then
NUM_CORES=$NUM_LCPU
FOUND_CORES=yes
fi
elif test -n "$NUMBER_OF_PROCESSORS"; then elif test -n "$NUMBER_OF_PROCESSORS"; then
# On windows, look in the env # On windows, look in the env
NUM_CORES=$NUMBER_OF_PROCESSORS NUM_CORES=$NUMBER_OF_PROCESSORS