From 365fd466c293f9c2cdcdb8be2f654fe42b67080c Mon Sep 17 00:00:00 2001
From: midoks <midoks@163.com>
Date: Sun, 5 Feb 2023 16:21:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E5=BF=AB=E8=8E=B7=E5=8F=96cpu?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/op_waf/shell/cpu_usage_file.sh | 50 ++++++++++++++++++++++++++++++++++
 plugins/op_waf/tool_task.py            |  2 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 plugins/op_waf/shell/cpu_usage_file.sh

diff --git a/plugins/op_waf/shell/cpu_usage_file.sh b/plugins/op_waf/shell/cpu_usage_file.sh
new file mode 100644
index 000000000..bda27da2f
--- /dev/null
+++ b/plugins/op_waf/shell/cpu_usage_file.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+DST_DIR=/www/server/op_waf
+DIS_FILE=${DST_DIR}/cpu.info
+
+function GetCpuUsage(){
+	cpu_info=`cat /proc/stat | head -n 1`
+	user_cpu=`echo $cpu_info|awk '{print $2}'`
+	cpu_total_time=0
+	for ci in ${cpu_info[@]}; do
+		if [ "$ci" == "cpu" ];then
+			continue
+		else
+			#echo $ci
+			cpu_total_time=`expr $cpu_total_time + $ci`
+		fi
+	done
+	#echo "user_cpu:${user_cpu}"
+	#echo "cpu_total_time:${cpu_total_time}"
+
+	cpu_percet=$(awk "BEGIN{print (${user_cpu}/${cpu_total_time})*100}")
+	echo "${cpu_percet}"
+	return 0
+}
+
+# one value detal 
+getOne=`GetCpuUsage`
+
+CPU_USAGE=`echo $getOne | awk -F . '{print $1}'`
+echo "cpu usage:${CPU_USAGE}"
+echo $CPU_USAGE > $DIS_FILE
+echo "done success!"
+
+
+# two value compare 
+
+# getOne=`GetCpuUsage`
+# echo "getOne:$getOne"
+# sleep 1
+# getTwo=`GetCpuUsage`
+# echo "getTwo:$getTwo"
+
+# cpu_percet_calc=$(awk "BEGIN{print (${getOne}+${getTwo})/2}")
+# echo "cpu_percet_calc:${cpu_percet_calc}"
+
+# #echo '0.61212' | awk -F . '{print $1}'
+# CPU_USAGE=`echo $cpu_percet_calc | awk -F . '{print $1}'`
+# echo "cpu usage:${CPU_USAGE}"
+# echo $CPU_USAGE > $DIS_FILE
+# echo "done success!"
\ No newline at end of file
diff --git a/plugins/op_waf/tool_task.py b/plugins/op_waf/tool_task.py
index c8d8d228e..52d37e6e6 100644
--- a/plugins/op_waf/tool_task.py
+++ b/plugins/op_waf/tool_task.py
@@ -102,7 +102,7 @@ logs_file=$plugin_path/${rname}.log
         cmd += 'echo "cd $mw_dir && source bin/activate && python3 $script_path/tool_task.py run >> $logs_file 2>&1"' + "\n"
         cmd += 'cd $mw_dir && source bin/activate && python3 $script_path/tool_task.py run >> $logs_file 2>&1' + "\n"
     else:
-        cmd += 'echo "cd $mw_dir && source bin/activate && bash $script_path/shell/cpu_usage.sh >> $logs_file 2>&1"' + "\n"
+        cmd += 'echo "cd $mw_dir && source bin/activate && bash $script_path/shell/cpu_usage_file.sh >> $logs_file 2>&1"' + "\n"
         cmd += 'cd $mw_dir && source bin/activate && bash $script_path/shell/cpu_usage.sh >> $logs_file 2>&1' + "\n"
 
     cmd += 'echo "【`date +"%Y-%m-%d %H:%M:%S"`】 END★" >> $logs_file' + "\n"