Alternate method for detecing CPUs (Needs more tweaking)

Signed-off-by: Stewart X Addison <sxa@redhat.com>

openjdk/openjdk.mk

@@ -18,7 +18,7 @@ MEMORY_SIZE:=1024
 OS:=$(shell uname -s)
 
 ifeq ($(OS),Linux)
-	NPROCS:=$(shell KPROCS=`grep -c ^processor /proc/cpuinfo`; CGPROCS=`if [ -r /sys/fs/cgroup/cpu,cpuacct/cgroup.procs ]; then wc -l < /sys/fs/cgroup/cpu,cpuacct/cgroup.procs; else echo "$$KPROCS"; fi`; if [ "$${KPROCS}" -lt "$${CGPROCS}" ]; then echo "$${KPROCS}"; else echo "$${CGPROCS}"; fi)
+	NPROCS:=$(shell KPROCS=`grep -c ^processor /proc/cpuinfo`; CGPROCS=`if [ -r /sys/fs/cgroup/cpu/cpu.cfs_quota_us ]; then cat /sys/fs/cgroup/cpu/cpu.cfs_quota_us | sed 's/......$$//g'; else echo "$$KPROCS"; fi`; if [ "$${KPROCS}" -lt "$${CGPROCS}" ]; then echo "$${KPROCS}"; else echo "$${CGPROCS}"; fi)
 	MEMORY_SIZE:=$(shell KMEMMB=`awk '/^MemTotal:/{print int($$2/1024)}' /proc/meminfo`; if [ -r /sys/fs/cgroup/memory/memory.limit_in_bytes]; then CGMEM=`cat /sys/fs/cgroup/memory/memory.limit_in_bytes`; else CGMEM=`expr $${KMEMMB} \* 1024`; fi; CGMEMMB=`expr $${CGMEM} / 1048576`; if [ "$${KMEMMB}" -lt "$${CGMEMMB}" ]; then echo "$${KMEMMB}"; else echo "$${CGMEMMB}"; fi)
 endif
 ifeq ($(OS),Darwin)