Skip to content

Commit

Permalink
openjdk.mk: make MEMORY_SIZE computation portable
Browse files Browse the repository at this point in the history
  • Loading branch information
zzambers committed May 28, 2024
1 parent 0fe6d74 commit 23afe01
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions openjdk/openjdk.mk
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ifeq ($(OS),Linux)
#
# // If this machine/container uses cgroups to limit the amount of
# // memory available to us, we should use that as out memory size.
# if [[ -r /sys/fs/cgroup/memory.max ]]; then
# if [ -r /sys/fs/cgroup/memory.max ]; then
# // Use this to identify memory maximum (bytes) for cgroup v2.
# CGMEM=`cat /sys/fs/cgroup/memory.max 2>1`;
# else
Expand All @@ -37,7 +37,7 @@ ifeq ($(OS),Linux)
#
# // If those files were empty, or didn't exist, or had non-numbers
# // in them, then use /proc/meminfo (converted to bytes).
# if [[ ! $$(CGMEM) =~ ^[0-9]+$$ ]]; then
# if echo "$${CGMEM}" | grep -Eqv '^[0-9]+$$' ; then
# CGMEM=`expr $${KMEMMB} \* 1024 \* 1024`;
# fi;
#
Expand All @@ -50,7 +50,7 @@ ifeq ($(OS),Linux)
# if [ "$${KMEMMB}" -lt "$${CGMEMMB}" ]; then
# echo "$${KMEMMB}"; else echo "$${CGMEMMB}";
# fi
MEMORY_SIZE:=$(shell KMEMMB=`awk '/^MemTotal:/{print int($$2/1024)}' /proc/meminfo`; if [[ -r /sys/fs/cgroup/memory.max ]]; then CGMEM=`cat /sys/fs/cgroup/memory.max 2>1`; else CGMEM=`cat /sys/fs/cgroup/memory/memory.limit_in_bytes 2>1`; fi; if [[ ! $${CGMEM} =~ ^[0-9]+$$ ]]; then CGMEM=`expr $${KMEMMB} \* 1024 \* 1024`; fi; CGMEMMB=`expr $${CGMEM} / 1024 / 1024`; if [ "$${KMEMMB}" -lt "$${CGMEMMB}" ]; then echo "$${KMEMMB}"; else echo "$${CGMEMMB}"; fi)
MEMORY_SIZE:=$(shell KMEMMB=`awk '/^MemTotal:/{print int($$2/1024)}' /proc/meminfo`; if [ -r /sys/fs/cgroup/memory.max ]; then CGMEM=`cat /sys/fs/cgroup/memory.max 2>1`; else CGMEM=`cat /sys/fs/cgroup/memory/memory.limit_in_bytes 2>1`; fi; if echo "$${CGMEM}" | grep -Eqv '^[0-9]+$$' ; then CGMEM=`expr $${KMEMMB} \* 1024 \* 1024`; fi; CGMEMMB=`expr $${CGMEM} / 1024 / 1024`; if [ "$${KMEMMB}" -lt "$${CGMEMMB}" ]; then echo "$${KMEMMB}"; else echo "$${CGMEMMB}"; fi)
endif
ifeq ($(OS),Darwin)
NPROCS:=$(shell sysctl -n hw.ncpu)
Expand Down

0 comments on commit 23afe01

Please sign in to comment.