Merge branch 'bkemain' into 'oramain'

Bkemain

See merge request rwp/rwloadsim!33

Author: bengsig

CHANGELOG.md

@@ -1,6 +1,6 @@
 # RWP\*Load Simulator Release Notes
 
-## 3.1.4
+## 3.2.0
 
 * Bug fixes
 * -Dsrc will show source line of all debug messages
@@ -9,6 +9,8 @@
 * Bit set/clear assignments
 * session pool can set max usage count and max lifetime
 * dbsecounds() and ociseconds() functions
+* procedures can be called without ( ) just like in bash
+* Output from tests are based on database version 21.16
 
 ## 3.1.3
 

demo/massinsert.rwl

@@ -5,19 +5,19 @@ integer thrcount := 3;
 procedure massinsert()
   # just busy loop insorder()
   for count runcount loop
-    insorder();
+    insorder;
   end;
 end;
 
 run 
 
   threads thrcount # start 20 threads
   at demouser      # Using this database
-    massinsert();
-    showcounts();
+    massinsert;
+    showcounts;
   end;
 
 end;
 
-showcounts(); # to show total
+showcounts; # to show total
 

demo/runsimple.rwl

@@ -12,6 +12,6 @@ procedure someinserts()
   end;
 end;
 
-someinserts();
+someinserts;
 
 printline "inserted", totalrows;

demo/runsimple2.rwl

@@ -13,7 +13,7 @@ end;
 # background in the shell with a wait at then end
 run
   threads 10
-    someinserts();
+    someinserts;
   end;
 end;
 

demo/runsimple3.rwl

@@ -20,7 +20,7 @@ end;
 # a session from the pool
 run
   threads numthreads at rwlpool
-    someinserts();
+    someinserts;
   end;
 end;
 

demo/runsimulation.rwl

@@ -35,7 +35,7 @@ run
       every erlang2(0.05)  # simulate arrival rate of 20 per second
       stop totaltime   # this many times
     loop
-      doeither(); # executing this
+      doeither; # executing this
     end;
   end;
 
@@ -44,15 +44,15 @@ run
   at awruser
     # begin 5 seconds into run
     wait(5);
-    beginawr();
+    beginawr;
     # end 5 seconds before finish
-    wait(totaltime-runseconds-5);
-    makeawr();
+    wait(totaltime-runseconds()-5);
+    makeawr;
   end;
 end;
 
-showcounts(); # to show total
-qshowcounts(); # to show total
-cshowcounts(); # to show total
+showcounts; # to show total
+qshowcounts; # to show total
+cshowcounts; # to show total
 
 printline "runnumber:", runnumber;

demo/sample1.rwl

@@ -18,8 +18,8 @@ integer i; # declarations can come anywhere
 
 procedure runten()
   for i := 1 .. 10 loop # do something ten times
-    setab();
-    add(a,b);
+    setab;
+    add a,b;
   end;
 end;
 

demo/simpleinsert.rwl

@@ -31,4 +31,4 @@ procedure doinsert()
 end;
 
 # actually execute the procedure
-doinsert();
+doinsert;

demo/testquery.rwl

@@ -1,39 +1,39 @@
-selorder();
-qshowcounts();
+selorder;
+qshowcounts;
 
-qcomplex();
+qcomplex;
 
 procedure getorders()
   for wait 0.5 stop 5 loop
-    selorder();
+    selorder;
   end;
 end;
 
 procedure getqs()
   for every 1.0 stop 4 loop
-    qcomplex();
+    qcomplex;
   end;
 end;
 
 run
   threads 2
-    getorders();
-    qshowcounts();
+    getorders;
+    qshowcounts;
   end;
   threads 1
-    getqs();
-    cshowcounts();
+    getqs;
+    cshowcounts;
   end;
 end;
 
-qshowcounts();
-cshowcounts();
+qshowcounts;
+cshowcounts;
 
 procedure showrun()
   if runnumber is not null then
     printline "This was runnumber:", runnumber;
   end;
 end;
 
-showrun();
+showrun;
 

docs/ATCLAUSE.md

@@ -25,9 +25,9 @@ This mechanism applies in the following cases of the use of an at
 clause outside a declared procedure or function, i.e. directly at the 
 "top level" of your rwloadsim code:
 
- * procedurecall() at database;
+ * procedurecall at database;
  * sqlstatement at database;
- * execute at database; ... end;
+ * execute at database ... end;
 
 When any of these is found directly in your main program, a database 
 session will be acquired, the code will be executed and the session 
@@ -89,9 +89,9 @@ procedure copytodest()
   commit; # always against the effective database in use
 end;
 
-copytodest() at destdb;
+copytodest at destdb;
 ```
-When the procedure copytodest() is being called at the last line above, 
+When the procedure copytodest is being called at the last line above, 
 the named database (destdb) is being used during the call.
 Inside the procedure, a cursor loop is being executed selecting rows 
 from the named database (sourcedb), and for each row returned, the SQL