Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refine concurrency logic #5063

Merged
merged 8 commits into from
Feb 16, 2024
Merged

Refine concurrency logic #5063

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cda0149
Fix for unchecked concurrency
adamfarley Feb 5, 2024
61a56c4
Adjusting memory size math to compare bytes with bytes
adamfarley Feb 14, 2024
54baab1
Updating memory limit check to allow cgroup V2 compatability
adamfarley Feb 14, 2024
7b6dc17
Include docker check and cgroup version check
adamfarley Feb 14, 2024
65ec46d
Exporting debug message
adamfarley Feb 14, 2024
ef689c4
Switching back to file existance checks for simplicity
adamfarley Feb 15, 2024
2ec2b02
Correcting comment symbol. Typo.
adamfarley Feb 15, 2024
923e67e
Switching to curley braces to access variable value
adamfarley Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion openjdk/openjdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,37 @@ ARCH:=$(shell uname -m)

ifeq ($(OS),Linux)
NPROCS:=$(shell nproc)
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} / 1024`; if [ "$${KMEMMB}" -lt "$${CGMEMMB}" ]; then echo "$${KMEMMB}"; else echo "$${CGMEMMB}"; fi)
# This is the MEMORY_SIZE script below, with formatting for readability.
#
# // The number of megabytes of memory this machine has.
# KMEMMB=`awk '/^MemTotal:/{print int($$2/1024)}' /proc/meminfo`;
#
# // 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
# // Use this to identify memory maximum (bytes) for cgroup v2.
# CGMEM=`cat /sys/fs/cgroup/memory.max 2>1`;
# else
# // Else use this file for memory maximum (bytes) on cgroup v1.
# CGMEM=`cat /sys/fs/cgroup/memory/memory.limit_in_bytes 2>1`;
# fi;
#
# // 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
# CGMEM=`expr $${KMEMMB} \* 1024 \* 1024`;
# fi;
#
# CGMEMMB=`expr $${CGMEM} / 1024 / 1024`;
#
# // Between memory limits in the cgroup and memory on the machine,
# // use the lower limit. This protects us against situations
# // where the cgroup has a value which is much bigger/smaller than
# // the limits on the machine overall. We've seen both.
# 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)
endif
ifeq ($(OS),Darwin)
NPROCS:=$(shell sysctl -n hw.ncpu)
Expand Down