Hello community, here is the log from the commit of package memory-constraints for openSUSE:Factory checked in at 2019-06-22 11:22:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/memory-constraints (Old) and /work/SRC/openSUSE:Factory/.memory-constraints.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "memory-constraints" Sat Jun 22 11:22:29 2019 rev:2 rq:710310 version:20180406 Changes: -------- --- /work/SRC/openSUSE:Factory/memory-constraints/memory-constraints.changes 2018-04-11 13:56:41.702291605 +0200 +++ /work/SRC/openSUSE:Factory/.memory-constraints.new.4615/memory-constraints.changes 2019-06-22 11:22:31.633279379 +0200 @@ -1,0 +2,6 @@ +Sat Jun 15 14:34:00 UTC 2019 - Stefan Brüns <[email protected]> + +- Take SwapTotal into account, MemTotal only reflects physical memory. Some + workers have a considerable amount of swap. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ memory-constraints.macros ++++++ --- /var/tmp/diff_new_pack.4sumHz/_old 2019-06-22 11:22:33.445281305 +0200 +++ /var/tmp/diff_new_pack.4sumHz/_new 2019-06-22 11:22:33.461281322 +0200 @@ -16,10 +16,11 @@ echo "System jobs: $_threads" \ if test "$_threads" -gt 1 ; then \ mem_per_process="$_core_memory" \ - max_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) \ - max_jobs="$(($max_mem / ($mem_per_process * 1000)))" \ + max_physmem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo) \ + max_swapmem=$(awk '/SwapTotal/ { print $2 }' /proc/meminfo) \ + max_jobs="$((($max_physmem + $max_swapmem) / ($mem_per_process * 1000)))" \ test "$_threads" -gt "$max_jobs" && _threads="$max_jobs" && echo "Warning: Reducing number of jobs to $max_jobs because of memory limits" \ - test "$_threads" -le 0 && $_threads=1 && echo "Warning: Do not use the parallel build at all because of memory limits" \ + test "$_threads" -le 0 && _threads=1 && echo "Warning: Do not use the parallel build at all because of memory limits" \ fi \ %global jobs $([[ -n $_threads ]] && echo $_threads || echo "`/usr/bin/getconf _NPROCESSORS_ONLN`") \ %global _smp_mflags $([[ -n $_threads ]] && echo "-j$_threads" || echo "-j`/usr/bin/getconf _NPROCESSORS_ONLN`") \
