Changeset 19089 for trunk/ippTasks/diff.pro

Timestamp:

Aug 16, 2008, 1:06:59 PM (18 years ago)

Author:

eugene

Message:

adding cleanup stages; tidy logfile names

File:

• trunk/ippTasks/diff.pro (modified) (7 diffs)

trunk/ippTasks/diff.pro

@@ -8 +8 @@
 check.globals
 
-$LOGSUBDIR = $LOGDIR/diff
-exec mkdir -p $LOGSUBDIR
-
 ### Initialise the books containing the tasks to do
 book init diffSkyfile
+book init diffCleanup
 
 ### Database lists
 $diffSkycell_DB = 0
+$diffCleanup_DB = 0
 
 ### Check status of diffing tasks
 macro diff.status
   book listbook diffSkyfile
+  book listbook diffCleanup
 end
 
@@ -25 +25 @@
 macro diff.reset
   book init diffSkyfile
+  book init diffCleanup
 end
 
@@ -35 +36 @@
     active true
   end
+  task diff.cleanup.load
+    active true
+  end
+  task diff.cleanup.run
+    active true
+  end
 end
 
@@ -43 +50 @@
   end
   task diff.skycell.run
+    active false
+  end
+  task diff.cleanup.load
+    active false
+  end
+  task diff.cleanup.run
     active false
   end
@@ -59 +72 @@
 
   stdout NULL
-  stderr $LOGSUBDIR/diff.skycell.log
+  stderr $LOGDIR/diff.skycell.log
 
   task.exec
@@ -122 +135 @@
 
     ### XXX Instead of setting these by camera, need to set by skycell_id
+    ### XXX change these to use the --redirect scheme
 #    set.host.for.camera $CAMERA $DIFF_ID
 #    set.workdir.by.camera $CAMERA $DIFF_ID $WORKDIR_TEMPLATE $default_host WORKDIR
@@ -167 +181 @@
 end
 
+# select images ready for diff analysis
+# new entries are added to diffPendingImfile
+# skip already-present entries
+task           diff.cleanup.load
+  host         local
+
+  periods      -poll $LOADPOLL
+  periods      -exec $LOADEXEC
+  periods      -timeout 30
+  npending     1
+  active       true
+
+  stdout NULL
+  stderr $LOGDIR/diff.cleanup.log
+
+  task.exec
+    if ($DB:n == 0)
+      option DEFAULT
+      command difftool -pendingcleanuprun -limit 20
+    else
+      # save the DB name for the exit tasks
+      option $DB:$diffCleanup_DB
+      command difftool -pendingcleanuprun -limit 20 -dbname $DB:$diffCleanup_DB
+      $diffCleanup_DB ++
+      if ($diffCleanup_DB >= $DB:n) set diffCleanup_DB = 0
+    end
+  end
+
+  # success
+  task.exit    0
+    # convert 'stdout' to book format
+    ipptool2book stdout diffCleanup -key diff_id -uniq -setword dbname $options:0 -setword pantaskState INIT
+    if ($VERBOSE > 2)
+      book listbook diffCleanup
+    end
+
+    # delete existing entries in the appropriate pantaskStates
+    process_cleanup diffCleanup
+  end
+
+  # locked list
+  task.exit    default
+    showcommand failure
+  end
+
+  # operation times out?
+  task.exit    timeout
+    showcommand timeout
+  end
+end
+
+# run the ipp_cleanup.pl script on pending images
+task           diff.cleanup.run
+  periods      -poll $RUNPOLL
+  periods      -exec $RUNEXEC
+  periods      -timeout 60
+  active       true
+
+  task.exec
+    book npages diffCleanup -var N
+    if ($N == 0) break
+    if ($NETWORK == 0) break
+    
+    # look for new images in diffCleanup (pantaskState == INIT)
+    book getpage diffCleanup 0 -var pageName -key pantaskState INIT
+    if ("$pageName" == "NULL") break
+
+    book setword diffCleanup $pageName pantaskState RUN
+    book getword diffCleanup $pageName camera -var CAMERA
+    book getword diffCleanup $pageName state -var CLEANUP_MODE
+    book getword diffCleanup $pageName diff_id -var DIFF_ID
+    book getword diffCleanup $pageName dbname -var DBNAME
+
+    # specify choice of local or remote host based on camera and diff (class_id)
+    set.host.for.camera $CAMERA FPA
+
+    stdout $LOGDIR/diff.cleanup.log
+    stderr $LOGDIR/diff.cleanup.log
+
+    # XXX is everything listed here needed?
+    $run = ipp_cleanup.pl --stage diff --stage_id $DIFF_ID --camera $CAMERA --mode $CLEANUP_MODE
+    add_standard_args run
+
+    # save the pageName for future reference below
+    options $pageName
+
+    # create the command line
+    if ($VERBOSE > 1)
+      echo command $run
+    end
+    command $run
+  end
+
+  # default exit status
+  task.exit    default
+    process_exit diffCleanup $options:0 $JOB_STATUS
+  end
+
+  # operation timed out?
+  task.exit    timeout
+    showcommand timeout
+    book setword diffCleanup $options:0 pantaskState TIMEOUT
+  end
+end