From c2398198a6f824f675147f1fb7daa40f98d93f29 Mon Sep 17 00:00:00 2001
From: Renaud Demarneffe <renaud.demarneffe@i-pulses.be>
Date: Mon, 4 Nov 2019 18:24:55 +0100
Subject: [PATCH] Update vCPUS computation to support multiple platforms

---
 informix_calculate_onconfig.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/informix_calculate_onconfig.sh b/informix_calculate_onconfig.sh
index 95ace69..3c226d2 100644
--- a/informix_calculate_onconfig.sh
+++ b/informix_calculate_onconfig.sh
@@ -32,13 +32,15 @@ SUCCESS=0
 FAILURE=-1
 
 ## Resource Limit files.  
-CPUFILE="/sys/fs/cgroup/cpu/cpu.cfs_quota_us"
+CPUFILE_QUOTA="/sys/fs/cgroup/cpu/cpu.cfs_quota_us"
+CPUFILE_PERIOD="/sys/fs/cgroup/cpu/cpu.cfs_period_us"
 MEMFILE="/sys/fs/cgroup/memory/memory.limit_in_bytes"
 
 vSYSTEM_MEM_LIMIT_B=`cat $MEMFILE`
 vSYSTEM_MEM_LIMIT_MB=`echo "($vSYSTEM_MEM_LIMIT_B / 1024) / 1024" | bc`
 
-vCPUS_CONTAINER=`cat $CPUFILE`
+vCPUS_CONTAINER_QUOTA=`cat $CPUFILE_QUOTA`
+vCPUS_CONTAINER_PERIOD=`cat $CPUFILE_PERIOD`
 
 vMEM_HOST_MB=`free -m |grep Mem|awk '{print $2}'`
 vCPUS_HOST=`lscpu |grep "CPU(s):"|grep -v node|awk '{print $2}'`
@@ -50,7 +52,7 @@ if [[ $vCPUS_CONTAINER == "-1" ]]
 then
    vCPUS=$vCPUS_HOST
 else
-   vCPUS=`echo "$vCPUS_CONTAINER / 100000" | bc`
+   vCPUS=`echo "$vCPUS_CONTAINER_QUOTA / $vCPUS_CONTAINER_PERIOD" | bc`
 fi
 
 ###