From 12685b315428a572721d697d75bbaaca32b3da2e Mon Sep 17 00:00:00 2001 From: deajan Date: Wed, 26 Apr 2017 13:51:15 +0200 Subject: [PATCH] Added more params to performance profiler --- dev/ofunctions.sh | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh index 422a039..e612e64 100644 --- a/dev/ofunctions.sh +++ b/dev/ofunctions.sh @@ -3,7 +3,7 @@ #### OFUNCTIONS MINI SUBSET #### _OFUNCTIONS_VERSION=2.1.2 -_OFUNCTIONS_BUILD=2017052602 +_OFUNCTIONS_BUILD=2017052603 #### _OFUNCTIONS_BOOTSTRAP SUBSET #### _OFUNCTIONS_BOOTSTRAP=true #### _OFUNCTIONS_BOOTSTRAP SUBSET END #### @@ -637,21 +637,21 @@ function Spinner { fi } -function _PerfProfiler { #__WITH_PARANOIA_DEBUG - local perfString #__WITH_PARANOIA_DEBUG - #__WITH_PARANOIA_DEBUG - perfString=$(ps -p $$ -o %cpu,%mem,cmd,time) #__WITH_PARANOIA_DEBUG - #__WITH_PARANOIA_DEBUG - for i in $(pgrep -P $$); do #__WITH_PARANOIA_DEBUG - perfString="$perfString\n"$(ps -p $i -o %cpu,%mem,cmd,time | tail -1) #__WITH_PARANOIA_DEBUG - done #__WITH_PARANOIA_DEBUG - #__WITH_PARANOIA_DEBUG - if type iostat > /dev/null 2>&1; then #__WITH_PARANOIA_DEBUG - perfString="$perfString\n"$(iostat) #__WITH_PARANOIA_DEBUG - fi #__WITH_PARANOIA_DEBUG - #__WITH_PARANOIA_DEBUG - Logger "PerfProfiler: $perfString" "PARANOIA_DEBUG" #__WITH_PARANOIA_DEBUG -} #__WITH_PARANOIA_DEBUG +function _PerfProfiler { #__WITH_PARANOIA_DEBUG + local perfString #__WITH_PARANOIA_DEBUG + #__WITH_PARANOIA_DEBUG + perfString=$(ps -p $$ -o command,args,pid,ppid,%cpu,%mem,time,etime,state) #__WITH_PARANOIA_DEBUG + #__WITH_PARANOIA_DEBUG + for i in $(pgrep -P $$); do #__WITH_PARANOIA_DEBUG + perfString="$perfString\n"$(ps -p $i -o command,args,pid,ppid,%cpu,%mem,time,etime,state | tail -1) #__WITH_PARANOIA_DEBUG + done #__WITH_PARANOIA_DEBUG + #__WITH_PARANOIA_DEBUG + if type iostat > /dev/null 2>&1; then #__WITH_PARANOIA_DEBUG + perfString="$perfString\n"$(iostat) #__WITH_PARANOIA_DEBUG + fi #__WITH_PARANOIA_DEBUG + #__WITH_PARANOIA_DEBUG + Logger "PerfProfiler: $perfString" "PARANOIA_DEBUG" #__WITH_PARANOIA_DEBUG +} #__WITH_PARANOIA_DEBUG # Time control function for background processes, suitable for multiple synchronous processes