oltpplot --gnuplot-extra option

Author: bengsig

bin/oltpplot

@@ -5,6 +5,7 @@
 
 # Changes:
 #
+# 22-nov-2023 bengsig  Add --gnuplot-extra
 # 23-sep-2023 bengsig  Add timestamps to res.plot and ping.plot
 #  9-aug-2023 bengsig  Add --ses-yrange, --ses-y2range
 #  1-aug-2023 bengsig  Add oltpxcset markers from oltpxcrun
@@ -24,8 +25,8 @@
 
 . oltp-setup-env
 
-options="-o lhHX:x:c:r:k: -l key:,xfile:,Xfile:,latest,help,xmarker:,xline:,xcolor:,ses-y2range:,ses-yrange:,ash-yrange:,res-yrange:,res-y2range:"
-usage="$commandname [-x|-X|--xmarker|--xline 'time text'] [--xcolor=rgbname] [-l|--latest|[-r] runnumber] [-k|--key key] [{gnuplot range settings}]"
+options="-o lhHX:x:c:r:k: -l no-awr-interval,key:,xfile:,Xfile:,latest,help,xmarker:,xline:,xcolor:,ses-y2range:,ses-yrange:,ash-yrange:,res-yrange:,res-y2range:,gnuplot-extra:"
+usage="$commandname [-x|-X|--xmarker|--xline 'time text'] [--xcolor=rgbname] [-l|--latest|[-r] runnumber] [-k|--key key] [{gnuplot range/extra settings}]"
 
 getopt -Q $options -- "$@" || exit 1
 options=$(getopt -n $commandname $options -- "$@")
@@ -42,12 +43,23 @@ sesy2range=''
 resyrange=''
 ashyrange=''
 resy2range=''
+gnuplotextra=''
+noawrinterval=''
 mykey="$RWLOLTP_NAME"
 wantlatest=no
 
 while test $1 != '--'
 do
   case $1 in 
+    --gnuplot-extra) 
+          if test -r $2
+	  then
+	    gnuplotextra=$2
+	  else
+	    echo "oltpplot: Cannot read $2 - --gnuplot-extra will be ignored" 2>&1
+	  fi
+	  shift; shift;
+	;;
     --ses-y2range) sesy2range="$2"; shift; shift;
 	;;
     --ses-yrange) sesyrange="$2"; shift; shift;
@@ -62,6 +74,8 @@ do
 	;;
     -k|--key) mykey=$2; shift; shift;
 	;;
+    --no-awr-interval) noawrinterval='--no-awr-interval'; shift;
+	;;
     -l|--latest) wantlatest=yes; shift;
 	;;
     --xfile) cat $2 | while read x; do echo m $x; done >> $markerfile; shift; shift;
@@ -86,6 +100,7 @@ shift
 if test $wantlatest = yes
 then
     runnumber=`rwloadsim --mykey=$mykey latest.rwl`
+    echo oltpplot: latest runnumber for $mykey is $runnumber
 fi
 
 if test $help = yes
@@ -100,6 +115,8 @@ Usage: $usage
 --ses-yrange '[ .. ]'    : Set gnuplot yrange for database open/active counts
 --ses-y2range '[ .. ]'   : Set gnuplot y2range for instance distribution
 --ash-yrange '[ .. ]'    : Set gnuplot yrange for sessions in ash plot
+--gnuplot-extra file     : Add the contents of file to all graphs
+--no-awr-interval        : Do not indicate the intervals for awr snapshot generation
 -h|-H|--help             : Print this help
 time for -x|-X is either YYYY.MM.DD"T"HH24:MI:SS or a number of seconds
 HELP
@@ -162,10 +179,10 @@ then
   cp $markerfile $resultsdir$subdir$runnumber/csvmarkers.input
   rwloadsim -q -i runperiod:=$runperiod -i runno:=$runnumber \
   $xcolor --markerfile=$markerfile --starttime=$starttime \
-  csvdata.rwl || exit 1
+  $noawrinterval csvdata.rwl || exit 1
 else
   rwloadsim -q -i runperiod:=$runperiod -i runno:=$runnumber \
-  --starttime=$starttime csvdata.rwl || exit 1
+  --starttime=$starttime $noawrinterval csvdata.rwl || exit 1
 fi
 
 # re-read env file as csvdata may have added a new runperiod value
@@ -196,6 +213,11 @@ cat >> $resultsdir$subdir$runnumber/header.plot << END
   set rmargin at screen 0.9
 END
 
+if test ! -z "$gnuplotextra"
+then
+  cat $gnuplotextra >> $resultsdir$subdir$runnumber/header.plot
+fi
+
 cat $resultsdir$subdir$runnumber/header.plot >> $resultsdir$subdir$runnumber/res.plot
 
 cp $resultsdir$subdir$runnumber/header.plot $resultsdir$subdir${runnumber}/instdist.plot

man/man2rwl/oltpplot.2rwl

@@ -2,7 +2,7 @@
 .SH NAME
 oltpplot \- Create html and graphics for a single run
 .SH SYNOPSIS
-\fBoltpplot [--xfile|--Xfile filename] [-x|-X|--xmarker|--xline 'time text'] [-c|--xcolor rgbname] [--ses-y{2}range '[ .. ]' [--res-y{2}range '[ .. ]' --ash-yrange '[ .. ]' [-k|--key key] [-l|--latest|[-r] runnumber]\fR
+\fBoltpplot [--xfile|--Xfile filename] [-x|-X|--xmarker|--xline 'time text'] [-c|--xcolor rgbname] [--ses-y{2}range '[ .. ]'] [--res-y{2}range '[ .. ]'] [--ash-yrange '[ .. ]'] [--gnuplot-extra file] [--no-awr-interval] [-k|--key key] [-l|--latest|[-r] runnumber]\fR
 .P
 Recreate the report that was created using
 .B oltprun
@@ -78,6 +78,21 @@ By default, these markers and lines are printed by gnuplot using the rgb name of
 you can use this option to choose any other valid rgb name.
 .RE
 .P
+.B --gnuplot-extra file
+.RS 4
+The contents of the named file will be added as extra contents to all gnuplot input files.
+It can contain any valid gnuplot commands and can be used to add any extra decoration
+to the generated graphics.
+.RE
+.P
+.B --no-awr-interval
+.RS 4
+By default, all generated graphics will indicate the time taken to do the initial and finishing
+awr snapshots.
+This option turns that graphics off.
+.RE
+.P
+.P
 .B -l|--latest
 .RS 4
 You can provide this option as an alternative to an actual runnumber, which causes the latest

oltp/csvdata.rwl

@@ -2,6 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0
 # as shown at https://oss.oracle.com/licenses/upl/
 
+# bengsig  22-nov-2023 - Add --no-awr-interval
 # bengsig  26-sep-2023 - Add timestamps to cli.csv
 # bengsig   1-aug-2023 - Add oltpxcset markers from oltpxcrun
 # bengsig  31-jul-2023 - Add experimental 24h simulation
@@ -31,6 +32,7 @@ string(1000) oerreverse;
 string(1000) markerfile; $useroption:markerfile
 private string starttime; $useroption:starttime
 private string xcolor := "blue"; $useroption:xcolor
+private integer no_awr_interval := 0; $userswitch:no-awr-interval
 
 # This function takes a string that must be either
 # in DDDD.MM.YYYY"T"HH24:MI:SS format or must be 
@@ -182,7 +184,7 @@ execute at rwloadsim
     if oraerror != 1403 then
       writeline stderr, "csvdata.rwl: getting awr markers: " oraerrortext;
     end;
-  else
+  elseif !no_awr_interval then
     writeline plotfile, "# awr markers:";
     writeline plotfile,
       "set arrow from " bb ", graph -0.01 to " be ", graph -0.01 lc rgb 'dark-red' heads size graph 0.005,90";