Changeset 31490

Timestamp:

May 6, 2011, 6:32:50 PM (15 years ago)

Author:

watersc1

Message:

fix race condition between load/run tasks

File:

• tags/ipp-20110505/ippTasks/lap.pro (modified) (15 diffs)

tags/ipp-20110505/ippTasks/lap.pro

@@ -172 +172 @@
     ipptool2book stdout lapNewRuns -uniq -key lap_id -setword dbname $options:0 -setword pantaskState INIT
 
+    process_cleanup lapNewRuns
+
     if ($VERBOSE > 2)
       book listbook lapNewRuns
@@ -207 +209 @@
 
 
-    book getpage lapNewRuns $lap_NewPage -var lapNewPageName 
+    book getpage lapNewRuns -var lapNewPageName -key pantaskState INIT
 
     $lap_NewPage ++
     if ($lap_NewPage >= $N) set lap_NewPage = 0
-
 
     if ("$lapNewPageName" == "NULL") break
@@ -220 +221 @@
 
     option $LAP_ID
-    book delpage lapNewRuns $LAP_ID
 
     $run = lap_science.pl --chip_mode --dbname $DBNAME --lap_id $LAP_ID
@@ -230 +230 @@
   # success
   task.exit  0
+    process_exit lapNewRuns $options:0 0
     if ($VERBOSE > 2)
       book listbook lapNewRuns
@@ -236 +237 @@
   # locked list
   task.exit    default
-    showcommand failure
-  end
-  task.exit    crash
-    showcommand crash
-  end
-  #operation times out?
-  task.exit    timeout
+    process_exit lapNewRuns $options:0 0
+    showcommand failure
+  end
+  task.exit    crash
+    process_exit lapNewRuns $options:0 0
+    showcommand crash
+  end
+  #operation times out?
+  task.exit    timeout
+    process_exit lapNewRuns $options:0 0
     showcommand timeout
   end
@@ -286 +290 @@
   task.exit  0
     ipptool2book stdout lapRunRuns -uniq -key lap_id -setword dbname $options:0 -setword pantaskState INIT
+    
+    process_cleanup lapRunRuns
 
     if ($VERBOSE > 2)
@@ -323 +329 @@
 
 
-    book getpage lapRunRuns $lap_RunPage -var lapRunPageName
+    book getpage lapRunRuns -var lapRunPageName -key pantaskState INIT
 
     $lap_RunPage ++
@@ -335 +341 @@
 
     option $LAP_ID
-    book delpage lapRunRuns $LAP_ID
 
     $run = lap_science.pl --monitor_mode --dbname $DBNAME --lap_id $LAP_ID
@@ -345 +350 @@
   # success
   task.exit  0
-    if ($VERBOSE > 2)
+    process_exit lapRunRuns $options:0 0
+    if ($VERBOSE > 2)
+
       book listbook lapRunRuns
     end
@@ -351 +358 @@
   # locked list
   task.exit    default
-    showcommand failure
-  end
-  task.exit    crash
-    showcommand crash
-  end
-  #operation times out?
-  task.exit    timeout
+    process_exit lapRunRuns $options:0 0
+    showcommand failure
+  end
+  task.exit    crash
+    process_exit lapRunRuns $options:0 0
+    showcommand crash
+  end
+  #operation times out?
+  task.exit    timeout
+    process_exit lapRunRuns $options:0 0
     showcommand timeout
   end
@@ -402 +412 @@
     ipptool2book stdout lapDoneRuns -uniq -key lap_id  -setword dbname $options:0 -setword pantaskState INIT
 
+    process_cleanup lapDoneRuns
     if ($VERBOSE > 2)
       book listbook lapRuns
@@ -437 +448 @@
 
 
-    book getpage lapDoneRuns $lap_DonePage -var lapDonePageName 
+    book getpage lapDoneRuns -var lapDonePageName -key pantaskState INIT
 
     $lap_DonePage ++
@@ -448 +459 @@
     book getword lapDoneRuns $lapDonePageName dbname -var DBNAME
 
-    book delpage lapDoneRuns $LAP_ID
-
+    option $LAP_ID
     $run = lap_science.pl --cleanup_mode --dbname $DBNAME --lap_id $LAP_ID
 
@@ -458 +468 @@
   # success
   task.exit  0
-
+    process_exit lapDoneRuns $options:0 0
     if ($VERBOSE > 2)
       book listbook lapDoneRuns
@@ -465 +475 @@
   # locked list
   task.exit    default
-    showcommand failure
-  end
-  task.exit    crash
-    showcommand crash
-  end
-  #operation times out?
-  task.exit    timeout
-    showcommand timeout
-  end
-end
+    process_exit lapDoneRuns $options:0 0
+    showcommand failure
+  end
+  task.exit    crash
+    process_exit lapDoneRuns $options:0 0
+    showcommand crash
+  end
+  #operation times out?
+  task.exit    timeout
+    process_exit lapDoneRuns $options:0 0
+    showcommand timeout
+  end
+end