Merge branch 'bkedev' into 'jfkdev'

# Conflicts:
#   src/rwl.h

Author: bengsig

CHANGELOG.md

@@ -1,5 +1,10 @@
 # RWP\*Load Simulator Release Notes
 
+## 3.1.1
+
+* Bug fixes
+* Add parsefailure to oltp external control
+
 ## 3.1.0
 
 * Bug fixes

admin/rwl311.sql

@@ -0,0 +1,21 @@
+-- update the RWP*Load Simulator repository
+-- for version 3.1.1
+--
+-- Copyright (c) 2023 Oracle Corporation
+-- Licensed under the Universal Permissive License v 1.0
+-- as shown at https://oss.oracle.com/licenses/upl/
+--
+-- Changes
+-- 
+-- NAME     DATE         COMMENTS
+-- bengsig   3-oct-2023  Add parsefailure column to oltpxc
+-- bengsig  25-apr-2023  Creation
+--
+alter table oltpxc add
+( parsefailure number )
+/
+
+update oltpxc set parsefailure = 0
+/
+commit
+/

admin/rwloadsim.sql

@@ -181,6 +181,7 @@ create table oltpxc
 , affinity number
 , rowspins number
 , arraysize number
+, parsefailure number
 , constraint oltpxc_pk primary key(key, hostname)
 )
 /

bin/mtitcore

@@ -10,7 +10,8 @@
 
 # Changes
 #
-# bengsig  10-may-2023 Creation
+# bengsig   9-nov-2023 - support multiple application servers
+# bengsig  10-may-2023 - Creation
 
 # If stdin is not a tty 
 # show how we were called
@@ -156,7 +157,7 @@ fi
 eval `rwloadsim -q -i proccount:=$procs -i runperiod:=$runperiod parameters2shell.rwl`
 
 # verify that it compiles
-rwloadsim -u -v $extra_args -e -- '-x $mute:141' $runfile || exit $?
+rwloadsim -u -v $extra_args -e '-x $mute:141' $runfile || exit $?
 
 if test $mtitxc = yes
 then
@@ -189,7 +190,7 @@ then
   rwloadsim -u -v -c 15 -sss -P $prepfile -k $key -K "$komment" -q \
   --fulltitle="$komment" \
   -i runperiod:=$runperiod -i proccount:=$procs prepare.rwl
-  mute59='-x$mute:59'
+  mute59='--mute=59'
 else
   rwloadsim -u -v -c $rampup -sss -P $prepfile -k $key -K "$komment" -q \
   --fulltitle="$komment" \
@@ -227,7 +228,6 @@ then
   echo $! >> $killfile
 fi
 
-markerfile='string(1000)xc_marker_file:="'$resultsdir/$subdir/$runnumber/markers.txt'";'
 quiet=''
 
 # Start sys gather
@@ -239,17 +239,20 @@ then
   echo $awrpid >> $killfile
 fi
 
+prepvalue=`cat $prepfile`
 # show countdown to user
 echo -n '**** remaining:'
 # Start the real workers
 while test $procnumber -le $procs
 do
   sleep $script_ramp
   echo -n " "`expr $procs - $procnumber`
-  rwloadsim $mute59 -u -r -i procnumber:=$procnumber \
+  eval $(rwloadsim -q -i proccount:=$procs -i runperiod:=$runperiod rwlcall.rwl -i procnumber:=$procnumber)
+
+  $rwlcall $rwlcallargs $mute59 -u -r -i procnumber:=$procnumber \
     --flush-stop=$runperiod --flush-every=2 -v -i runperiod:=$runperiod \
-    --procno $procnumber \
-    -W -i doawr:=$doawr -x "$markerfile" $mtitsetxc $extra_args -i proccount:=$procs -R $prepfile $quiet $runfile &
+    --procno $procnumber --markerfile=$resultsdir/$subdir/$runnumber/markers.txt \
+    -W -i doawr:=$doawr $mtitsetxc $extra_args -i proccount:=$procs -M $prepvalue $quiet $runfile &
   quiet='-q' # only messages from first
   procnumber=`expr $procnumber + 1`
   if test x$killfile != x

bin/mtitplot

@@ -21,6 +21,7 @@ help=no
 markerfile=`mktemp`
 trap "rm -f $markerfile" 0 int
 xcolor=''
+runnumber=0
 
 while test $1 != '--'
 do

bin/oltpcore

@@ -11,6 +11,9 @@
 
 # Changes
 #
+# bengsig   9-nov-2023 - support multiple application servers
+# bengsig   2-nov-2023 - Add extra_args plots, etc
+# bengsig  17-oct-2023 - Add extra_args to prepare
 # bengsig  29-sep-2023 - No ash if no awr
 # bengsig   7-aug-2023 - Also mute59 in graphs
 # bengsig   1-aug-2023 - Add oltpxcset markers from oltpxcrun
@@ -161,6 +164,9 @@ rwloadsim -i simulatebatch:=$simulatebatch parameters.rwl || exit $?
 # show the contents of our parameters file as a reference
 rwloadsim -q $extra_args -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod -i proccount:=$procs -i show_changed_values:=1  -x 'string key_to_show := "'$key'";' parameters.rwl
 
+# Show size of aw_cols and skewness in access
+rwloadsim -q aw_sizeinfo.rwl
+
 # Check parameters.rwl is silent
 shouldbezero=`rwloadsim -q parameters.rwl | wc -c`
 if test "$shouldbezero" -ne 0
@@ -171,10 +177,10 @@ then
 fi
 
 # Set shell variables
-eval `rwloadsim -q -i proccount:=$procs -i runperiod:=$runperiod parameters2shell.rwl`
+eval `rwloadsim -q $extra_args -i proccount:=$procs -i runperiod:=$runperiod parameters2shell.rwl`
 
 # verify that it compiles
-rwloadsim -u -v $extra_args -e -- '-x $mute:141' $runfile || exit $?
+rwloadsim -q -u -v $extra_args -e '-x $mute:141' $runfile || exit $?
 
 if test $oltpxc = yes
 then
@@ -184,9 +190,6 @@ else
   oltpsetxc='';
 fi
 
-# Show size of aw_cols and skewness in access
-rwloadsim -q aw_sizeinfo.rwl
-
 # Truncate the artificial transaction tables
 # this is mostly a precaution, as it should have been done
 # after finishing last run
@@ -210,12 +213,12 @@ komment=`echo $RWLOLTP_NAME $rwl_title $extrakomment | sed 's/[\\"'"']//g"`
 # prepare the run; this will also create the $resultsdir/$subdir/$runnumber/env file
 if test $oltpxc = yes
 then
-  rwloadsim -u -v -c 15 -sss -P $prepfile -k $key -K "$komment" -q \
+  rwloadsim $extra_args -u -v -c 15 -sss -P $prepfile -k $key -K "$komment" -q \
   --fulltitle="$komment" \
   -i runperiod:=$runperiod -i proccount:=$procs prepare.rwl
-  mute59='-x$mute:59'
+  mute59='--mute=59'
 else
-  rwloadsim -u -v -c $rampup -sss -P $prepfile -k $key -K "$komment" -q \
+  rwloadsim $extra_args -u -v -c $rampup -sss -P $prepfile -k $key -K "$komment" -q \
   --fulltitle="$komment" \
   -i runperiod:=$runperiod -i proccount:=$procs prepare.rwl
   mute59=''
@@ -234,27 +237,29 @@ echo $runnumber > $runnumberfile
 
 echo "runperiod=$runperiod" >> $resultsdir/$subdir/$runnumber/env
 echo "komment='$komment'" >> $resultsdir/$subdir/$runnumber/env
+echo "showfail='$showfail'" >> $resultsdir/$subdir/$runnumber/env
 if test $pool_type = sessionpool -o $pool_type = connectionpool
 then
   echo "plotactive=yes" >> $resultsdir/$subdir/$runnumber/env
 else
   echo "plotactive=no" >> $resultsdir/$subdir/$runnumber/env
 fi
 rwloadsim $oltpsetxc -q $extra_args -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod -i proccount:=$procs -i show_changed_values:=1 -x 'string key_to_show := "'$key'";' parameters.rwl > $resultsdir/$subdir/$runnumber/parmatstart.txt
+# add size of aw_cols and skewness in access
+rwloadsim -q aw_sizeinfo.rwl >> $resultsdir/$subdir/$runnumber/parmatstart.txt
 
 # Start ping gather and also ask for event notification 
-rwloadsim $oltpsetxc $mute59 -u -E -q -R $prepfile -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod runping.rwl &
+rwloadsim $extra_args $oltpsetxc $mute59 -u -E -q -R $prepfile -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod runping.rwl &
 
 if test x$killfile != x
 then
   echo $! >> $killfile
 fi
 
-markerfile='string(1000)xc_marker_file:="'$resultsdir/$subdir/$runnumber/markers.txt'";'
 quiet=''
 
 # Start sys gather
-rwloadsim $mute59 $oltpsetxc -u -A 1 -r -q -i procnumber:=99999 -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod -i proccount:=$procs -R $prepfile -i doawr:=$doawr runsys.rwl $starttime &
+rwloadsim $extra_args $mute59 $oltpsetxc -u -A 1 -r -q -i procnumber:=99999 -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod -i proccount:=$procs -R $prepfile -i doawr:=$doawr runsys.rwl $starttime &
 awrpid=$!
 
 if test x$killfile != x
@@ -268,16 +273,21 @@ then
   rwloadsim -u -q -i simulatebatch:=$simulatebatch -i runperiod:=$runperiod -R $prepfile runtrunc.rwl &
 fi
 
+prepvalue=`cat $prepfile`
+
 # show countdown to user
 echo -n '**** remaining:'
 # Start the real workers
 while test $procnumber -le $procs
 do
   sleep $script_ramp
   echo -n " "`expr $procs - $procnumber`
-  rwloadsim $mute59 -u -r -i simulatebatch:=$simulatebatch -i procnumber:=$procnumber \
+  # get the actual call to execute in background
+  eval $(rwloadsim -q -i proccount:=$procs -i runperiod:=$runperiod rwlcall.rwl -i procnumber:=$procnumber)
+  # by default, rwlcall=rwloadsim and rwlcallargs is empty
+  $rwlcall $rwlcallargs $mute59 -u -r -i simulatebatch:=$simulatebatch -i procnumber:=$procnumber \
     --flush-stop=$runperiod --flush-every=2 -v -i runperiod:=$runperiod \
-    -W -i xc_run_dedicated:=$xc_run_dedicated -i doawr:=$doawr -x $markerfile $oltpsetxc $extra_args -i proccount:=$procs -R $prepfile $quiet $runfile &
+    -W -i xc_run_dedicated:=$xc_run_dedicated -i doawr:=$doawr --markerfile=$resultsdir/$subdir/$runnumber/markers.txt $oltpsetxc $extra_args -i proccount:=$procs -M $prepvalue $quiet $runfile &
   quiet='-q' # only messages from first
   procnumber=`expr $procnumber + 1`
   if test x$killfile != x
@@ -291,13 +301,13 @@ echo '****' started all background jobs at `date`
 
 sleep 3
 # show running graph of dbcpu and dbtime
-test $graphs != no && rwloadsim $mute59 $oltpsetxc -u -q -R $prepfile plotfigures.rwl -i runperiod:=$runperiod ';' $runnumber | gnuplot $RWLOLTP_GNUPLOT1 &
+test $graphs != no && rwloadsim $extra_args $mute59 $oltpsetxc -u -q -R $prepfile plotfigures.rwl -i runperiod:=$runperiod ';' $runnumber | gnuplot $RWLOLTP_GNUPLOT1 &
 
 # show running graph of throughput
-test $graphs = yes && rwloadsim $mute59 $oltpsetxc -u -q -R $prepfile plotruntp.rwl -i runperiod:=$runperiod ';' $runnumber | gnuplot $RWLOLTP_GNUPLOT2 &
+test $graphs = yes && rwloadsim $extra_args $mute59 $oltpsetxc -u -q -R $prepfile plotruntp.rwl -i runperiod:=$runperiod ';' $runnumber | gnuplot $RWLOLTP_GNUPLOT2 &
 
 # show running graph of queue/exec time
-test $graphs = qe && rwloadsim $mute59 $oltpsetxc -u -q -R $prepfile plotrunwetim.rwl -i runperiod:=$runperiod ';' $runnumber | gnuplot $RWLOLTP_GNUPLOT2 &
+test $graphs = qe && rwloadsim $extra_args $mute59 $oltpsetxc -u -q -R $prepfile plotrunwetim.rwl -i runperiod:=$runperiod ';' $runnumber | gnuplot $RWLOLTP_GNUPLOT2 &
 
 # with external control, we simply wait
 if test $oltpxc = no

bin/oltpdirectory

@@ -20,9 +20,11 @@ help=no
 awr=no
 scalekey=''
 runnumber=''
+mykey="$RWLOLTP_NAME"
+wantlatest=no
 
-usage="Usage: $commandname [-a|--awrdirectory] [-h|-H|--help] [-s|--scalekey key] [-r|--runnumber N] [-l|--latest]"
-options='aAhHs:r:l -l latest,awrdirectory,help,scalekey:,runnumber:'
+usage="Usage: $commandname [-a|--awrdirectory] [-h|-H|--help] [-s|--scalekey key] [-k|--key key] [-r|--runnumber N] [-l|--latest]"
+options='aAhHs:r:lk: -l key:,latest,awrdirectory,help,scalekey:,runnumber:'
 
 # Get directory names from parameters.rwl
 
@@ -34,19 +36,26 @@ set -- `getopt -u -n $commandname -o $options -- "$@"`
 while test $1 != '--'
 do
   case $1 in
-    -l|--latest) runnumber=`rwloadsim latest.rwl`; shift;
-    ;;
     -r|--runnumber) runnumber=`expr 0 + $2`; shift; shift;
     ;;
+    -k|--key) mykey=$2; shift; shift;
+    ;;
     -s|--scalekey) scalekey=$2; shift; shift;
     ;;
+    -l|--latest) wantlatest=yes; shift;
+    ;;
     -a|-A|--awrdirectory) awr=yes; shift;
     ;;
     --help|-h|-H) help=yes; shift;
     ;;
   esac
 done
 
+if test $wantlatest = yes
+then
+    runnumber=`rwloadsim --mykey=$mykey latest.rwl`
+fi
+
 shift # removes --
 
 if test $# -ge 1 -o x$help = xyes

bin/oltpforever

@@ -3,27 +3,37 @@
 # Licensed under the Universal Permissive License v 1.0
 # as shown at https://oss.oracle.com/licenses/upl/
 
+# History
+# 
+# bengsig  10-oct-2023 - Smarter run file
+# bengsig   4-oct-2023 - Longoptions, --sleep
+# bengsig         2019 - Creation
+
 . oltp-setup-env
 
-options="Ggk:HaR:WK:"
-usage="$commandname [-H] [-g|-G] [-a] [-k key] [-R file] [-W] [-K nn] [komment text ...]"
+options="Ggk:HaR:WK:s: -l sleep:,help,graphs,qegraphs,preallocate,key:,runfile:,awrwait,awrkill:"
+usage="$commandname [-H|--help] [-g|-G] [-a] [-k key] [-R file] [-W] [-K nn] [komment text ...]"
 
 copyargs=''
 help=no
+sleeptime=0
 key=$RWLOLTP_NAME
 
+getopt -Q -o $options -- "$@" || exit 1
 set -- `getopt -u -n $commandname -o $options -- "$@"`
 
 while test $1 != '--'
 do
   case $1 in 
-    -K|-R) copyargs="$copyargs $1 $2"; shift; shift;
+    --awrkill|-K|-R) copyargs="$copyargs $1 $2"; shift; shift;
+        ;;
+    --sleep|-s) sleeptime=$2; shift; shift;
         ;;
-    -k) key=$2; shift; shift;
+    --key|-k) key=$2; shift; shift;
         ;;
-    -W|-a|-g|-G) copyargs="$copyargs $1"; shift;
+    --awrwait|--graphs|--qegraphs|--preallocate|-W|-a|-g|-G) copyargs="$copyargs $1"; shift;
         ;;
-    -H ) help=yes; shift;
+    --help|-H ) help=yes; shift;
         ;;
     esac;
 done
@@ -34,12 +44,13 @@ if test x$help = xyes
 then
 echo "$usage"
 cat <<END
--H      : show this help
--k key  : set the value of the key to be used in repository, default $RWLOLTP_NAME
--g      : show running graphs - requires X windows
--G      : show alternative running graphs - requires X windows
--a      : pre allocate partitions - use with great care
--R fil  : Set non-default file to execute, default run.rwl
+-H --help        : show this help
+-k --key key     : set the value of the key to be used in repository, default $RWLOLTP_NAME
+-g --graphs      : show running graphs - requires X windows
+-G --qegraphs    : show alternative running graphs - requires X windows
+-a --preallocate : pre allocate partitions - use with great care
+-R --runfile fil : Set non-default file to execute, default run.rwl
+-s --sleep sec   : sleep this many seconds after each run
 END
 exit 0
 fi
@@ -59,19 +70,24 @@ then
 fi
 
 
-echo Workload started on `date` from `tty` on `hostname` > $runfile
+echo '# Workload started on' `date` from `tty` on `hostname` > $runfile
 
 # this is the normal runtime settings
 runtime=3590 # just under 1h
-separation=1700 # delay in starting forever2.sh
+# delay in starting forever2.sh
+separation=`expr 1700 + $sleeptime / 2`
 
 # for debug use these:
 #runtime=295
-#separation=150
+#separation=`expr 150 + $sleeptime / 2`
 
 trap "rm -f $runfile $side2time $side2args; exit 1" sigint
-echo Remove this file to stop workload after at most $runtime seconds. >> $runfile
-echo The process id of ./forever.sh starting this workload is $$ >> $runfile
+echo '# Remove this file to stop workload after at most' $runtime seconds. >> $runfile
+echo '# The process id of oltpforever starting this workload is' $$ >> $runfile
+echo '# You may want to execute one of these commands:' >> $runfile
+echo 'echo OLTPFOREVER IS RUNNING HERE >' `tty` >> $runfile
+echo 'ps -fp'$$ -wwww >> $runfile
+
 
 # run until the file is removed
 while test -f $runfile
@@ -91,6 +107,11 @@ do
   echo "-k $key $extrascript $copyargs -r $runtime -n $forever_proccount $komment" > $side2args
 
   oltprun -k $key $extrascript $copyargs -r $runtime -n $forever_proccount $komment
+  if test $sleeptime -gt 0 
+  then
+    echo sleeping for $sleeptime seconds
+    sleep $sleeptime
+  fi
 
 done
 rm -f $runfile $side2time $side2args