Merge pull request #4 from MikaelMollberg/add-verbose-flag

Add verbose flag

Author: GiantPanda0090

README.md

@@ -12,7 +12,7 @@ apt-get install gnuplot
 ## Usage
 Start measurment and input measurment time period. The diagram will generated afterwards in the graphs folder per process after the data collection
 ```
-sh plot.sh <Time Duration>
+sh plot.sh [--verbose|-v] <Time Duration>
 ```
 
 
@@ -102,4 +102,3 @@ writing, software distributed under the License is distributed on an "AS
 IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
 or implied.
 ```
-

collect.sh

@@ -2,16 +2,31 @@
 
 NS=1000000000
 
-rm -rf data/$1
-mkdir data/$1
+PROCESS=$1
+DURATION=$2
+VERBOSE=${3:-0}
+
+if [ -z "$PROCESS" ] || [ -z "$DURATION" ]; then
+  echo "Usage: $0 <process_name> <duration> [verbose_flag]"
+  exit 1
+fi
+
+log_verbose() {
+  if [ $VERBOSE -eq 1 ]; then
+    echo "$1"
+  fi
+}
+
+rm -rf data/$PROCESS
+mkdir data/$PROCESS
 
 PY_CHECK=0
 
-case "$1" in
-     "python3") 
+case "$PROCESS" in
+     "python3")
         PY_CHECK=1
         ;;
-     "python") 
+     "python")
         PY_CHECK=1
         ;;
      *)
@@ -20,7 +35,7 @@ case "$1" in
     esac
 
 NCS_CHECK=0
-case "$1" in
+case "$PROCESS" in
      "ncs.smp")
         NCS_CHECK=1
         ;;
@@ -30,11 +45,11 @@ case "$1" in
     esac
 
 
-for (( i=0;i<=$2;i++ ))
+for (( i=0;i<=$DURATION;i++ ))
 do
   START_TIME=$(date +%s%N)
   #echo $i" second is collected"
-  PID=$(pgrep -f $1)
+  PID=$(pgrep -f $PROCESS)
   #PYfiles=$(ls data/python3)
   #UPDATEfiles=$(ps -o command -p $data | awk -F' ' '{print $9}')
   #Diff=$(comm <(echo $PYfiles) <(echo $UPDATEfiles))
@@ -59,14 +74,14 @@ do
       name=$(ps -p $pid -o command | awk -F' ' '{print $9}')
       com=name
     else
-      name=$1
+      name=$PROCESS
       com=$(ps -p $pid -o command | awk -F' ' '{print $5}')
       #echo $pid" "$name "  " $com " "$(ps -p $pid -o command)
     fi
     if [ ! -z "${name}" ] && [ ! -z "${com}" ]  ; then
       name=$(echo $name)
-      echo "Monitoring PID: "$pid $name
-      ALO_PID=$(pmap -d $pid | grep "writeable/private" | awk -F' ' '{print $4}' | egrep -o '[0-9.]+'  ) 
+      log_verbose "Monitoring PID: $pid $name"
+      ALO_PID=$(pmap -d $pid | grep "writeable/private" | awk -F' ' '{print $4}' | egrep -o '[0-9.]+'  )
       PHY=$(cat /proc/$pid/status | grep VmRSS | awk -F' ' '{print $2}')
 
       if [ $PY_CHECK -eq 1 ] ||  [ $NCS_CHECK -eq 1 ] ; then
@@ -80,23 +95,23 @@ do
      if [ $counter -gt 1 ] ; then
         if [ ! -z "${name}" ]  && [ ! -z "${com}" ]   ; then
           if  [ $NCS_CHECK -eq 1 ] ; then
-            echo $TIME" "$SUM_PHY" "$SUM_ALO_PID" "$ALO_TOTAL" "$Limit  >> "data/"$1"/mem_"$name".log"
-            echo $i" second is collected towards data/"$1"/mem_"$name".log"
+            echo $TIME" "$SUM_PHY" "$SUM_ALO_PID" "$ALO_TOTAL" "$Limit  >> "data/"$PROCESS"/mem_"$name".log"
+            log_verbose "$i second is collected towards data/$PROCESS/mem_$name.log"
           else
-            echo $TIME" "$PHY" "$ALO_PID" "$ALO_TOTAL" "$Limit  >> "data/"$1"/mem_"$name".log"
-            echo $i" second is collected towards data/"$1"/mem_"$name".log"
+            echo $TIME" "$PHY" "$ALO_PID" "$ALO_TOTAL" "$Limit  >> "data/"$PROCESS"/mem_"$name".log"
+            log_verbose "$i second is collected towards data/$PROCESS/mem_$name.log"
           fi
         fi
      else
         if [ ! -z "${name}" ]  ; then
-          echo $TIME" "$PHY" "$ALO_PID" "$ALO_TOTAL" "$Limit  >> "data/"$1"/mem_"$name".log"
-          echo $i" second is collected towards data/"$1"/mem_"$name".log"
+          echo $TIME" "$PHY" "$ALO_PID" "$ALO_TOTAL" "$Limit  >> "data/"$PROCESS"/mem_"$name".log"
+          log_verbose "$i second is collected towards data/$PROCESS/mem_$name.log"
         fi
      fi
-   done   
+   done
 
   if [ $PY_CHECK -eq 1 ]; then
-    echo $TIME" "$SUM_PHY" "$SUM_ALO_PID" "$ALO_TOTAL" "$Limit  >> "data/"$1"/mem_total.log"  
+    echo $TIME" "$SUM_PHY" "$SUM_ALO_PID" "$ALO_TOTAL" "$Limit  >> "data/"$PROCESS"/mem_total.log"
   fi
 
   #echo $TIME" 0 0 0 0"  >> "data/ref.log"
@@ -111,4 +126,4 @@ do
   fi
 done
 
-echo "Collection for "$1" done"
+echo "Collection for $PROCESS done"

compare_mem_alloc.plt

@@ -1,17 +1,35 @@
 if (GPVAL_VERSION >= 5.0) set for [i=1:8] linetype i dashtype i
 if (GPVAL_VERSION < 5.0) set termoption dashed
 
-print "Statistical Data for Memory Allocation on JavaVM "
-stats 'data/NcsJVMLauncher/mem_NcsJVMLauncher.log' using 3
-
-print "Statistical Data for Memory Allocation on PythonVM(Total)"
-stats 'data/python3/mem_total.log' using 3
-
-print "Statistical Data for Memory Allocation on ncs.smp"
-stats 'data/ncs.smp/mem_ncs.smp.log' using 3
-
-print "Statistical Data for Commited_AS"
-stats 'data/python3/mem_total.log' using 4
+if (!exists("verbose")) verbose = 0
+
+if (verbose == 1) {
+    print "Statistical Data for Memory Allocation on JavaVM "
+    stats 'data/NcsJVMLauncher/mem_NcsJVMLauncher.log' using 3
+} else {
+    stats 'data/NcsJVMLauncher/mem_NcsJVMLauncher.log' using 3 nooutput
+}
+
+if (verbose == 1) {
+    print "Statistical Data for Memory Allocation on PythonVM(Total)"
+    stats 'data/python3/mem_total.log' using 3
+} else {
+    stats 'data/python3/mem_total.log' using 3 nooutput
+}
+
+if (verbose == 1) {
+    print "Statistical Data for Memory Allocation on ncs.smp"
+    stats 'data/ncs.smp/mem_ncs.smp.log' using 3
+} else {
+    stats 'data/ncs.smp/mem_ncs.smp.log' using 3 nooutput
+}
+
+if (verbose == 1) {
+    print "Statistical Data for Commited_AS"
+    stats 'data/python3/mem_total.log' using 4
+} else {
+    stats 'data/python3/mem_total.log' using 4 nooutput
+}
 print "Recommended CommitLimit: ",STATS_max
 print "Please add some buffer range based on the Recommended CommitLimit"
 

compare_mem_rss.plt

@@ -1,17 +1,35 @@
 if (GPVAL_VERSION >= 5.0) set for [i=1:8] linetype i dashtype i
 if (GPVAL_VERSION < 5.0) set termoption dashed
 
-print "Statistical Data for Memory Consumption on JavaVM Used"
-stats 'data/NcsJVMLauncher/mem_NcsJVMLauncher.log' using 2
-
-print "Statistical Data for Memory Consumption on PythonVM(Total) Used"
-stats 'data/python3/mem_total.log' using 2
-
-print "Statistical Data for Physical Memory Consumption on ncs.smp Used"
-stats 'data/ncs.smp/mem_ncs.smp.log' using 2
-
-print "Statistical Data for Commited_AS"
-stats 'data/python3/mem_total.log' using 4
+if (!exists("verbose")) verbose = 0
+
+if (verbose == 1) {
+    print "Statistical Data for Memory Consumption on JavaVM Used"
+    stats 'data/NcsJVMLauncher/mem_NcsJVMLauncher.log' using 2
+} else {
+    stats 'data/NcsJVMLauncher/mem_NcsJVMLauncher.log' using 2 nooutput
+}
+
+if (verbose == 1) {
+    print "Statistical Data for Memory Consumption on PythonVM(Total) Used"
+    stats 'data/python3/mem_total.log' using 2
+} else {
+    stats 'data/python3/mem_total.log' using 2 nooutput
+}
+
+if (verbose == 1) {
+    print "Statistical Data for Physical Memory Consumption on ncs.smp Used"
+    stats 'data/ncs.smp/mem_ncs.smp.log' using 2
+} else {
+    stats 'data/ncs.smp/mem_ncs.smp.log' using 2 nooutput
+}
+
+if (verbose == 1) {
+    print "Statistical Data for Commited_AS"
+    stats 'data/python3/mem_total.log' using 4
+} else {
+    stats 'data/python3/mem_total.log' using 4 nooutput
+}
 print "Recommended CommitLimit: ",STATS_max
 print "Please add some buffer range based on the Recommended CommitLimit"
 

graphs.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+VERBOSE=${2:-0}
 
 
 
@@ -37,9 +38,9 @@ for filename in data/$1/*.log; do
     echo "generated graph for pid "$name
     ln -s $PWD/data/$1/mem_$name.log $PWD/data/mem.log
     if [ $PY_CHECK -eq 1 ]; then
-       gnuplot show_mem_2.plt
+       gnuplot -e "verbose=$VERBOSE" show_mem_2.plt
     else
-       gnuplot show_mem.plt
+       gnuplot -e "verbose=$VERBOSE" show_mem.plt
     fi
 
     cp mem-graph.png graphs/$1/mem_$name.png
@@ -52,7 +53,7 @@ if [ $PY_CHECK -eq 1 ]; then
   echo "generated graph for total "$name
   rm -f data/mem.log
   ln -s $PWD/data/$1/mem_$name.log $PWD/data/mem.log
-  gnuplot show_mem.plt
+  gnuplot -e "verbose=$VERBOSE" show_mem.plt
   cp mem-graph.png graphs/$1/mem_$name.png
 fi
 

graphs_compare.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
+VERBOSE=${1:-0}
 
 rm -rf graphs/compare
 mkdir graphs/compare
 
 
-gnuplot compare_mem_alloc.plt
-gnuplot compare_mem_rss.plt
-
+gnuplot -e "verbose=$VERBOSE" compare_mem_alloc.plt
+gnuplot -e "verbose=$VERBOSE" compare_mem_rss.plt

plot.sh

@@ -1,24 +1,48 @@
 #!/bin/bash
 
+VERBOSE=0
+DURATION=""
+
+# Parse arguments
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -v|--verbose)
+      VERBOSE=1
+      shift
+      ;;
+    *)
+      DURATION="$1"
+      shift
+      ;;
+  esac
+done
+
+if [ -z "$DURATION" ]; then
+  echo "Usage: $0 [--verbose|-v] <duration>"
+  echo "  duration: Collection duration in seconds"
+  echo "  --verbose: Enable verbose logging"
+  exit 1
+fi
+
 echo "====================================== Collection for for all process ====================================================="
-bash collect.sh ncs.smp $1 &
-bash collect.sh NcsJVMLauncher $1 &
-bash collect.sh python3 $1 &
+bash collect.sh ncs.smp $DURATION $VERBOSE &
+bash collect.sh NcsJVMLauncher $DURATION $VERBOSE &
+bash collect.sh python3 $DURATION $VERBOSE &
 wait
-echo "===================================== Collection for for all process done  =================================================\n\n"
+echo -e "===================================== Collection for for all process done  =================================================\n\n"
 
 
 echo "====================================== Ploting graph to all process ========================================================"
 echo "====================================== Ploting graph for ncs.smp process ========================================================"
-bash graphs.sh ncs.smp
-echo "===================================== Ploting graph for ncs.smp process done  =================================================\n"
+bash graphs.sh ncs.smp $VERBOSE
+echo -e "===================================== Ploting graph for ncs.smp process done  =================================================\n"
 echo "====================================== Ploting graph for NcsJVMLauncher process ========================================================"
-bash graphs.sh NcsJVMLauncher
-echo "===================================== Ploting graph for NcsJVMLauncher process done  =================================================\n"
+bash graphs.sh NcsJVMLauncher $VERBOSE
+echo -e "===================================== Ploting graph for NcsJVMLauncher process done  =================================================\n"
 echo "====================================== Ploting graph for python3 process ========================================================"
-bash graphs.sh python3
-echo "===================================== Ploting graph for python3 process done  =================================================\n"
+bash graphs.sh python3 $VERBOSE
+echo -e "===================================== Ploting graph for python3 process done  =================================================\n"
 echo "====================================== Ploting graph to compare between process ========================================================"
-bash graphs_compare.sh
-echo "====================================== Ploting graph to compare between process done ========================================================\n"
+bash graphs_compare.sh $VERBOSE
+echo -e "====================================== Ploting graph to compare between process done ========================================================\n"
 echo "===================================== Ploting graph to all process done  ================================================="

show_mem.plt

@@ -1,16 +1,30 @@
 if (GPVAL_VERSION >= 5.0) set for [i=1:8] linetype i dashtype i
 if (GPVAL_VERSION < 5.0) set termoption dashed
 
-print "Statistical Data for Commited_AS"
-stats 'data/mem.log' using 4
+if (!exists("verbose")) verbose = 0
+
+if (verbose == 1) {
+    print "Statistical Data for Commited_AS"
+    stats 'data/mem.log' using 4
+} else {
+    stats 'data/mem.log' using 4 nooutput
+}
 print "Recommended CommitLimit: ",STATS_max
 print "Please add some buffer range based on the Recommended CommitLimit"
 
-print "Statistical Data for RSS"
-stats 'data/mem.log' using 2
-
-print "Statistical Data for Allocated"
-stats 'data/mem.log' using 3
+if (verbose == 1) {
+    print "Statistical Data for RSS"
+    stats 'data/mem.log' using 2
+} else {
+    stats 'data/mem.log' using 2 nooutput
+}
+
+if (verbose == 1) {
+    print "Statistical Data for Allocated"
+    stats 'data/mem.log' using 3
+} else {
+    stats 'data/mem.log' using 3 nooutput
+}
 
 
 

show_mem_2.plt

@@ -1,12 +1,21 @@
 if (GPVAL_VERSION >= 5.0) set for [i=1:8] linetype i dashtype i
 if (GPVAL_VERSION < 5.0) set termoption dashed
 
-
-print "Statistical Data for RSS"
-stats 'data/mem.log' using 2
-
-print "Statistical Data for Allocated"
-stats 'data/mem.log' using 3
+if (!exists("verbose")) verbose = 0
+
+if (verbose == 1) {
+    print "Statistical Data for RSS"
+    stats 'data/mem.log' using 2
+} else {
+    stats 'data/mem.log' using 2 nooutput
+}
+
+if (verbose == 1) {
+    print "Statistical Data for Allocated"
+    stats 'data/mem.log' using 3
+} else {
+    stats 'data/mem.log' using 3 nooutput
+}
 
 
 set term png small size 800,600