Changeset 33695

Timestamp:

Apr 4, 2012, 9:58:58 AM (14 years ago)

Author:

bills

Message:

checking in some changes that have been running for awhile

Location:

tags/ipp-20120216/ippTasks

Files:

• pstamp.pro (modified) (3 diffs)
• science.cleanup.pro (modified) (1 diff)

tags/ipp-20120216/ippTasks/pstamp.pro

@@ -201 +201 @@
 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
     host        local
@@ -261 +342 @@
         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
@@ -961 +1043 @@
 
     periods     -poll $LOADPOLL
-    periods     -exec 90
-    periods     -timeout 20
+    periods     -exec 60
+    periods     -timeout 120
     npending    1
 

tags/ipp-20120216/ippTasks/science.cleanup.pro

@@ -114 +114 @@
 
   task.exec
-    periods -exec $RUNEXEC
 
     book npages chipPendingCleanup -var N
-    if ($N == 0) break
+    if ($N == 0)
+        periods -exec $RUNEXEC
+        break
+    end
     if ($NETWORK == 0) break