Merge branch 'oramain' into 'obakhir'

# Conflicts:
#   src/rwlerror.h

Author: bengsig

.gitignore

@@ -14,6 +14,7 @@ lib/*.o
 lib/*.obj
 lib/*.lib
 dist-rwl-bin.sh
+dist-rwldev.sh
 push_to_remotes.sh
 make.generated.sh
 *.tgz

BUILDING.md

@@ -3,14 +3,14 @@
 ## Prerequisites
 
  * An Oracle client environment (release 19.9 or higher) used for building the tool; Instant Client including basiclite, sdk and sqlplus is fine.
- * Potentially client environments for other releases than the primary build release, these can similarly use full client or Instant Client; releases 11, 12, 18, 19, 21, 23 are supported.
+ * Potentially client environments for other releases than the primary build release, these can similarly use full client or Instant Client; releases 11, 12, 19, 21, 23 are supported.
  * For client release 19, you must have at least 19.9.
- * A database (release 19 or higher, release 21.3 preferred) that can be used to run test scripts.
+ * A database (release 19 or higher, release 21.9 preferred) that can be used to run test scripts.
  * An environment with the gcc compiler and tools like make.
  * Both bison (3.0.4 or newer) and flex must be installed.
  * Installing ctags and cscope is recommended if you want to work on the source.
  * The Bourne Again Shell, /bin/bash.
- * Installing gnuplot is highly recommended, although not required for compiling or running test suite. It is required for running the oltp workload.
+ * Installing gnuplot is highly recommended, although not required for compiling or running test suite. It is required for running the oltp workload and several standard utilities
  * On Solaris, you must have GNU utilities installed and they _must_ be before ordinary utilities in your PATH. Typically, this means your PATH should have /usr/gnu/bin among the first parts.
 
 ## Building rwloadsim
@@ -63,6 +63,15 @@ It contains a set of defines that must be provided for the new platform.
 At present, the following platforms are in _Beta_ state, which means they are not yet ready for production use.
 If you complete a port, please contact the rwloadsim developer.
 
+### Microsoft Windows
+
+For building on Microsoft Windows, you need the following:
+
+ * Microsoft Visual Studio 2017 or later
+ * nmake, cl, link (command line C compiler and linker)
+ * Oracle Instant client for Windows release 19.21 or newer
+ * For certain utilities (ashplot, ociping in concurrency mode), an installation of gnuplot is required
+
 ### Apple OS X
 
 For building on OS X, please be aware of the following:

CHANGELOG.md

@@ -6,6 +6,7 @@
 * Printf format for KiB, MiB, etc
 * Oltp workload can show connection storm effects
 * Oltp workload can optionally query gv$osstat to usr/sys on db server
+* The ashplot command can output a running graph
 * Added -= assignment
 * Various improvements to statistics gathering
 

admin/.vim/syntax/rwl.vim

@@ -4,7 +4,7 @@
 " Copyright (c) 2023 Oracle Corporation
 " Licensed under the Universal Permissive License v 1.0
 " as shown at https://oss.oracle.com/licenses/upl/
-" Latest Revision: 28 feb 2024
+" Latest Revision:  4 jun 2024
 
 if exists("b:current_syntax")
   finish
@@ -141,6 +141,8 @@ syn match rwlDirective '\$maxmesg:\d\+'
 syn match rwlDirective '\$readbuffer:\d\+'
 syn match rwlDirective '\$ora01013:stop'
 syn match rwlDirective '\$ora01013:continue'
+syn match rwlDirective '\$ora01013:break'
+syn match rwlDirective '\$ora01013:reset'
 syn match rwlDirective '\$oraerror:showoci'
 syn match rwlDirective '\$oraerror:noshowoci'
 syn match rwlDirective '\$oraerror:stop'

bin/mtitxcset

@@ -1,17 +1,18 @@
 #!/bin/bash
-# Copyright (c) 2023 Oracle Corporation
+# Copyright (c) 2024 Oracle Corporation
 # Licensed under the Universal Permissive License v 1.0
 # as shown at https://oss.oracle.com/licenses/upl/
 
 . oltp-setup-env
 
 # Changes
 #
-# bengsig  10-may-2023 Creation
+# bengsig  30-may-2024 - loadfactor used to mute threads
+# bengsig  10-may-2023 - Creation
 
 # External control 
 
-options="hHk: -l help,key:,hostname:,mtittype:,rowspins:,arraysize:,affinity:,no-stopnow,stopnow,finishnext,finishnow,proccount:,default,no-show"
+options="hHk: -l help,key:,hostname:,mtittype:,rowspins:,arraysize:,affinity:,no-stopnow,stopnow,finishnext,finishnow,proccount:,loadfactor:,default,no-show"
 usage="$commandname [-H] [--{parameter}=value]"
 
 help=no
@@ -23,6 +24,7 @@ rowspins=''
 arraysize=''
 affinity=''
 stopnow=''
+loadfactor=''
 proccount=''
 default=no
 
@@ -36,6 +38,8 @@ do
       ;;
     --hostname) hostname=$2; shift; shift;
       ;;
+    --loadfactor) loadfactor=$2; shift; shift;
+      ;;
     --mtittype) mtittype=$2; shift; shift;
       ;;
     --rowspins) rowspins=$2; shift; shift;
@@ -71,11 +75,12 @@ cat <<END
 -H -h --help           : show this help
 -k|--key key           : Change values for this key ($key)
 --hostname name        : Change values for hostname ($hostname)
---mtittype N           : Set the mtit type (0-7)
+--mtittype N           : Set the mtit type (0-7, 202)
 --rowspins N           : Set the number of rows per insert
 --arraysize            : Set the array size of the insert
---affinity D           : Set the affinity for relevant type in range [0..1]
+--affinity D           : Set the affinity for relevant type in range [0..4]
 --proccount N          : Set the process count for the next run
+--loadfactor D         : Set proportion of threads to be active [0..1]
 --stopnow              : Stop current run, start a new one
 --finishnow            : Stop current run and finish completely
 --finishnext           : Let current run complete, then finish
@@ -96,6 +101,11 @@ then
   rwloadsim -q xcchange.rwl --myhost=$hostname --mykey=$key --mtittype=$mtittype;
 fi
 
+if test x$loadfactor != x
+then
+  rwloadsim -q xcchange.rwl --myhost=$hostname --mykey=$key --loadfactor=$loadfactor;
+fi
+
 if test x$rowspins != x
 then
   rwloadsim -q xcchange.rwl --myhost=$hostname --mykey=$key --rowspins=$rowspins;

bin/oltpconnect

@@ -0,0 +1,161 @@
+#!/bin/bash
+# Copyright (c) 2021 Oracle Corporation
+# Licensed under the Universal Permissive License v 1.0
+# as shown at https://oss.oracle.com/licenses/upl/
+
+save_oracle_path="$ORACLE_PATH"
+
+. oltp-setup-env
+
+# This shell script will return the credentials for the specified connection
+#
+
+# History
+#
+#  4-jun-2024 bengsig  Created
+help=no
+side2=no
+username=''
+password=''
+usage="Usage: $commandname [-2] [-b|--batch] [-p|--pool] [-H|--help] [-C|--cruser] [-A|--awr] [-S|--system] [-R|--results] [-r|--run] [-a|--aw] [-o|--oe]"
+
+# Get directory names from parameters.rwl
+
+eval `rwloadsim -q parameters2shell.rwl`
+
+export ORACLE_PATH="$save_oracle_path"
+
+options='2pbhHASCRrao -l cruser,help,awr,system,results,run,aw,oe,batch,pool'
+
+if getopt -Q -o $options -- "$@" 
+then
+  : 
+else
+  # output something likely to cause proper errors in
+  # actual utility if $(oltpconnect) is given invalid options
+  tty -s <&1 || echo unknown/{password}@unknown
+  exit 1
+fi
+
+set -- `getopt -u -n $commandname -o $options -- "$@"`
+
+while test $1 != '--'
+do
+  case $1 in
+    --system|-S) 
+      username=$system_username
+      password=$system_password
+      connect=$system_connect
+      shift
+    ;;
+    --awr|-A) 
+      username=$sysawr_username
+      password=$sysawr_password
+      connect=$sysawr_connect
+      shift
+    ;;
+    --cruser|-C)
+      username=$cruser_username
+      password=$cruser_password
+      connect=$cruser_connect
+      shift
+    ;;
+    --oe|-o)
+      username=$rwl_oe_username
+      password=$rwl_oe_password
+      shift
+    ;;
+    --aw|-a)
+      username=$rwl_aw1_username
+      password=$rwl_aw1_password
+      shift
+    ;;
+    --run|-r)
+      username=$rwl_run1_username
+      password=$rwl_run1_password
+      shift
+    ;;
+    --results|-R)
+      username=$results_username
+      password=$results_password
+      connect=$results_connect
+      shift
+    ;;
+    -b|--batch)
+      if test -z "$connect" 
+      then
+        connect=$batch_connect
+      fi
+      shift
+    ;;
+    -p|--pool)
+      if test -z "$connect" 
+      then
+        connect=$pool_connect
+      fi
+      shift
+    ;;
+    -2) 
+      side2=yes;
+      shift;
+    ;;
+    --help|-H|-h) help=yes; shift;
+    ;;
+  esac
+done
+
+if test x$help = xyes
+then
+  echo "$usage"
+cat <<END
+-H           : Show this help
+-A --awr     : Return credentials for the user doing awr etc
+-S --system  : Return credentials for the user running v$ queries etc
+-C --cruser  : Return credentials for the user creating schemas
+-R --results : Return credentials for your repository user
+-r --run     : Return credentials for the normal runtime user
+-a --aw      : Return credentials for the user owning the artificial workload tables
+-o --oe      : Return credentials for the user owning the order entry tables
+-2           : Use side 2 as used by oltpforever2 for -r, or -a
+-p --pool    : Use the pool_connect connect string rather than normal_connect 
+               for -r, -o, -a
+-b --batch   : Use the batch_connect connect string rather than normal_connect
+               for -r, -o, -a
+END
+  exit
+fi
+
+if test -z "$username"
+then
+  # use --run as default
+  username=$rwl_run1_username
+  password=$rwl_run1_password
+fi
+
+# If no connect, it must be the normal
+if test -z "$connect" 
+then
+  connect=$normal_connect
+fi
+
+if test $side2 = yes 
+then
+  # Change the username/password
+  if test $username = $rwl_run1_username
+  then
+    username=$rwl_run2_username
+    password=$rwl_run2_password
+  fi
+  if test $username = $rwl_aw1_username
+  then
+    username=$rwl_aw2_username
+    password=$rwl_aw2_password
+  fi
+fi
+
+if tty -s <&1 
+then
+  echo $username/@$connect
+else
+  echo $username/$password@$connect
+fi

bin/rwloadsim

@@ -11,6 +11,7 @@
 #
 # History
 #
+# bengsig  13-jun-2023 - exec line wihtout full path
 # bengsig   4-jan-2023 - Add version 23
 # bengsig  23-dec-2020 - Desupport release 20 (see rwl.h)
 # bengsig  17-dec-2020 - Add release 21
@@ -68,13 +69,15 @@ then
   exit 1
 fi
 
-# Do our own search such that the full path is used
-# in the exec command line
+# Do our own search so that we can do our own error reporting
+# in case of missing rwloadsimNN in PATH
 for dir in `echo $PATH | sed 's/:/ /g'`
 do
   if test -x "$dir"/$rwloadsim
   then
-    exec "$dir"/$rwloadsim "$@"
+    # We used to have full path, but just name makes 
+    # e.g. ps and top nicer
+    exec $rwloadsim "$@"
   fi
 done
 

bin/sqlmonitor

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# RWP*Load Simulator
+#
+# Copyright (c) 2024 Oracle Corporation
+# Licensed under the Universal Permissive License v 1.0
+# as shown at https://oss.oracle.com/licenses/upl/
+#
+# call rwloadsim -u sqlmonitor.rwl
+
+# bengsig  13-jun-2024 - Created 
+
+exec rwloadsim --pretend-gen-banner='RWP*SQL Monitor' -u sqlmonitor.rwl "$@"

bin/sqlreport

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# RWP*Load Simulator
+#
+# Copyright (c) 2024 Oracle Corporation
+# Licensed under the Universal Permissive License v 1.0
+# as shown at https://oss.oracle.com/licenses/upl/
+#
+# call rwloadsim -u sqlreport.rwl
+
+# bengsig  13-jun-2024 - Created 
+
+exec rwloadsim --pretend-gen-banner='RWP*SQL Report' -u sqlreport.rwl "$@"

docs/ERRORLIST.md

@@ -1310,6 +1310,11 @@ error.
 ### RWL-321 warning: "nostatistics has no effect here"
 The nostatistics statement only has an effect inside a declared proedure.
 
+### RWL-322 error: "user requested break"
+The $ora01013:break directive is in effect and ctrl-c has caused a break.
+You need to also have a $ora01013:reset directive later in your rwl program
+to allow any clean up procedures to be called.
+
 ### RWL-600 internal error: '%s'
 An abnormal situation caused an internal error in rwloadsim.
 This is in most cases due to a programming error and it

docs/refman/Makefile.refman

@@ -21,7 +21,7 @@
 
 ALL1=atclause.html bengsig.html compoundstatement.html conditional.html controlloop.html database.html databasedeclaration.html databasestatement.html declaration.html directive.html double.html expression.html filestatement.html histogram.html identifier.html include.html integer.html lob.html lobdeclaration.html multiprocess.html oerstats.html percentiles.html persec.html proceduredeclaration.html randomproceduredeclaration.html randomstringdeclaration.html regex.html runres.html rwlcpu.html rwlman.html rwloadsim.html rwlprogram.html rwlrun.html simpledeclaration.html sqldeclaration.html sqlexecution.html sqlstatement.html statement.html statistics.html string.html sysres.html threadexecution.html useroption.html rwlerror.html random.html procedure.html printfstatement.html cqnthread.html clob.html concatenation.html constant.html cursor.html cursorloop.html directives.html executionblock.html file.html forloop.html fractiles.html function.html functiondeclaration.html histogram_a.html if.html ifstatement.html longoption.html loop.html persec_a.html printline.html readline.html readlob.html readloop.html regexextract.html regexsearch.html regexsubstitute.html run.html runres_a.html rwl.html rwlcpu_a.html scalardeclaration.html sql.html statementlist.html thread.html threads.html userswitch.html variable.html while.html writeline.html writelob.html userhelp.html
 
-ALL2=ashplot.html awrreport.html awreport.html awrdump.html connping.html nettest.html oltp.html oltpcheckkey.html oltpcore.html oltpcreate.html oltpday.html oltpping.html oltpdrop.html oltpfilloe.html oltpforever.html oltpparams.html oltpplot.html oltprun.html oltpscale.html oltpscalereport.html oltpverify.html ovid2.html sqlid2file.html sqlmonitor.html sqlmonitorawr.html ociping.html oltpsetup.html oltpawcols.html oltpplus.html utilities.html sqlreport.html netthroughput.html oltpxcset.html oltpxcrun.html oltpxc.html oltpdirectory.html oltpkomment.html ashdata.html rwlash.html filecommands.html
+ALL2=ashplot.html awrreport.html awreport.html awrdump.html connping.html nettest.html oltp.html oltpcheckkey.html oltpcore.html oltpcreate.html oltpday.html oltpping.html oltpdrop.html oltpfilloe.html oltpforever.html oltpparams.html oltpplot.html oltprun.html oltpscale.html oltpscalereport.html oltpverify.html ovid2.html sqlid2file.html sqlmonitor.html sqlmonitorawr.html ociping.html oltpsetup.html oltpawcols.html oltpplus.html oltpconnect.html utilities.html sqlreport.html netthroughput.html oltpxcset.html oltpxcrun.html oltpxc.html oltpdirectory.html oltpkomment.html ashdata.html rwlash.html filecommands.html
 
 all: $(ALL1) $(ALL2)
 
@@ -154,3 +154,5 @@ filecommands.html: ../../man/man2rwl/filecommands.2rwl
 oltpxc.html: ../../man/man2rwl/oltpxc.2rwl
 oltpxcset.html: ../../man/man2rwl/oltpxcset.2rwl
 oltpxcrun.html: ../../man/man2rwl/oltpxcrun.2rwl
+oltpplus.html: ../../man/man2rwl/oltpplus.2rwl
+oltpconnect.html: ../../man/man2rwl/oltpconnect.2rwl