Changeset 34041 for branches/meh_branches/ppstack_test/ippTasks/pstamp.pro

Timestamp:

Jun 19, 2012, 5:24:19 PM (14 years ago)

Author:

mhuber

Message:

merging latest r34040 trunk changes to branch

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ippTasks/pstamp.pro (modified) (7 diffs)

branches/meh_branches/ppstack_test/ippTasks/pstamp.pro

@@ -13 +13 @@
 $pstampFin_DB = 0
 $pstampRev_DB = 0
+$pstampRevReq_DB = 0
 $pstampDep_DB = 0
 $pstampRevDep_DB = 0
@@ -117 +118 @@
 
 macro pstamp.revert.on
+    task pstamp.request.revert
+        active true
+    end
     task pstamp.job.revert
         active true
@@ -128 +132 @@
 end
 macro pstamp.revert.off
+    task pstamp.request.revert
+        active false
+    end
     task pstamp.job.revert
         active false
@@ -200 +207 @@
     end
 end
+
+echo DEFINING PLABEL stuff
+# keep a separate list of labels for request parsing
+if ($?PLABEL:n == 0)      set PLABEL:n = 0
+set PLABEL:n = 0
+
+macro add.parse.label
+  if ($0 != 2)
+    echo "USAGE: add.parse.label (label)"
+    break
+  end
+  if ($?PLABEL:n == 0)
+    list PLABEL -add $1
+    return
+  end
+
+  local found
+  $found = 0
+  for i 0 $PLABEL:n
+    if ($PLABEL:$i == $1) 
+      $found = 1
+      echo "$PLABEL:$i set"
+      last
+    end
+  end
+  
+  if ($found == 0)
+    list PLABEL -add $1
+  end
+end
+
+
+macro del.parse.label
+  if ($0 != 2)
+    echo "USAGE: del.parse.label (label)"
+    break
+  end
+  if ($?PLABEL:n == 0)
+    return
+  end
+
+  list PLABEL -del $1
+end
+
+macro show.parse.labels
+  if ($0 != 1)
+    echo "USAGE: show.parse.labels"
+    break
+  end
+  if ($?PLABEL:n == 0)
+    echo "no labels defined"
+  end
+  if ($PLABEL:n == 0)
+    echo "no labels defined"
+  end
+
+  local i
+  for i 0 $PLABEL:n
+    echo $PLABEL:$i
+  end
+end
+
+macro add_parse_labels
+    if ($0 != 2)
+        echo "Must pass in the command of interest, and this function will supplement"
+        stop
+    end
+
+    local command i
+
+    $command = $$1
+
+    # Only process the data with the specified label.
+    for i 0 $PLABEL:n
+      $command = $command -label $PLABEL:$i
+    end
+
+    $$1 = $command
+end
+
+echo DONE defineing plabel stuf
 
 task pstamp.request.find
@@ -261 +349 @@
         end
         add_poll_args run
-        add_poll_labels run
+        # add_poll_labels run
+        add_parse_labels run
         # limit number of requests in the queue to avoid blocking everything
         # when jobs take an infinite amount of time to parse
@@ -580 +669 @@
 end
 
+task pstamp.request.revert
+    host        local
+
+    periods     -poll $LOADPOLL
+    periods     -exec 1200
+    periods     -timeout 20
+    npending    1
+
+    task.exec
+        stdout NULL
+        stderr $LOGSUBDIR/pstamp.request.revert.log
+        $run = pstamptool -revertreq
+        if ($DB:n == 0)
+            option DEFAULT
+        else 
+            $run = $run $PS_DBSERVER -dbname $DB:$pstampRevReq_DB
+            $pstampRevReq_DB ++
+            if ($pstampRevReq_DB >= $DB:n) set pstampRevReq_DB = 0
+        end
+        add_poll_args run
+        add_poll_labels run
+        command $run
+    end
+
+    task.exit $EXIT_SUCCESS
+        # nothing to do
+    end
+
+    task.exit   default
+        showcommand failure
+    end
+
+    task.exit   crash
+        showcommand crash
+    end
+
+    task.exit   timeout
+        showcommand timeout
+    end
+end
 task pstamp.job.revert
     host        local
@@ -961 +1090 @@
 
     periods     -poll $LOADPOLL
-    periods     -exec 90
-    periods     -timeout 20
+    periods     -exec 60
+    periods     -timeout 120
     npending    1