Further cancel time reduction of oltpxcrun --no-awr

Author: bengsig

bin/oltpcore

@@ -250,7 +250,7 @@ do
   echo -n " "`expr $procs - $procnumber`
   rwloadsim $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 $extra_args -i proccount:=$procs -R $prepfile $quiet $runfile &
+    -W -i xc_run_dedicated:=$xc_run_dedicated -i doawr:=$doawr $extra_args -i proccount:=$procs -R $prepfile $quiet $runfile &
   quiet='-q' # only messages from first
   procnumber=`expr $procnumber + 1`
   if test x$killfile != x

oltp/run.rwl

@@ -189,8 +189,12 @@ $if xc_enabled $then
       if xc_stopnow=1 or xc_stopnow=2 then break; end if;
     end loop;
     if xc_stopnow=1 or xc_stopnow=2 then
-      wait 2;
-      xc_kill();
+      if doawr then
+        wait 20; # Allow some time for flushing things
+      else
+        wait 1;
+      end if;
+      xc_kill("process " procnumber);
     end if;
 $endif
   end;

oltp/runsys.rwl

@@ -157,14 +157,16 @@ $if xc_enabled $then
       if xc_stopnow=1 or xc_stopnow=2 then break; end if;
     end loop;
     if xc_stopnow=1 or xc_stopnow=2 then
-      # Wait up to 30s before killing myself
-      # to give time to awr end snapshot
-      double killtime := runseconds + 30;
-      for wait 2 stop killtime loop
-        if awrend_done then break; end if;
-      end loop;
-      wait 2;
-      xc_kill();
+      if doawr then
+	# Wait up to 30s before killing myself
+	# to give time to awr end snapshot
+	double killtime := runseconds + 30;
+	for wait 2 stop killtime loop
+	  if awrend_done then break; end if;
+	end loop;
+      end if;
+      wait 1;
+      xc_kill("process runsys");
     end if;
   end threads;
 $endif
@@ -216,6 +218,7 @@ $endif
     end loop;
   end threads;
 
+$if !xc_enabled $then
   # save the buffer cache and shared pool sizes every pool_size_interval
   # and at end
   threads 1 at rwloadsim
@@ -225,6 +228,7 @@ $endif
     # gather end values as well
     savecaches();
   end threads;
+$endif
 
   # Create the SQL that will collact top ash data
   threads 1 

oltp/xc_implementation.rwl

@@ -191,6 +191,7 @@ $endif
   end if;
 end;
 
-procedure xc_kill() nostatistics
+procedure xc_kill(string killmsg) nostatistics
+  fprintf stderr, "Now terminating %s - ", killmsg;
   abort;
 end xc_kill;