Changeset 10673

Timestamp:

Dec 12, 2006, 4:17:47 PM (19 years ago)

Author:

eugene

Message:

cleanups

Location:

trunk/ippTasks

Files:

• p0tool.sh (modified) (1 diff)
• pantasks.pro (modified) (2 diffs)
• phase0.pro (modified) (4 diffs)
• testscript.pro (added)

trunk/ippTasks/p0tool.sh

@@ -1 @@
-#!/usr/bin/sh
-p0tool -pendingimfile -simple | head -n 20
+#!/bin/csh -f
+if ($#argv != 1) then
+  echo "USAGE: p0tool.sh (Nselect)"
+  exit 2
+endif
+
+p0tool -pendingimfile -simple | head -n $1

trunk/ippTasks/pantasks.pro

@@ -5 +5 @@
 $WORKDIR = `ipp_datapath.pl path://ESSENCE/`
 $loadpoll = 1
-$loadexec = 10
+$loadexec = 5
 $runpoll = 0.5
 $runexec = 1
@@ -16 +16 @@
     controller host add sn4
     controller host add sn5
-    controller host add sn6
+#    controller host add sn6
     # sn7 serves the disk
   end

trunk/ippTasks/phase0.pro

@@ -15 +15 @@
 end
 
-macro test.p0
-    list testlist -x "p0tool -pendingimfile -simple"
-    echo $testlist:n
-    for i 0 $testlist:n
-      queuepush stdout "$testlist:$i"
-    end
-    echo Done pushing.
-    queuesize stdout -var Nqueue
-    for i 0 $Nqueue
-      queuepop stdout -var line
-      list word -split $line
-      $EXP_TAG  = $word:0
-      $CLASS    = $word:1
-      $CLASS_ID = $word:2
-      $URI      = $word:3
-      queuepush Phase0Imfiles -uniq -key 1 "NEW $EXP_TAG $CLASS $CLASS_ID $URI"
-    end
-end
+$Phase0ImfileFail = 0
 
 # select images ready for phase0 analysis
@@ -39 +22 @@
 task           phase0.imfile.load
 #  command      p0tool -pendingimfile -simple
-  command      /home/price/ipp/ippTasks/p0tool.sh
   host         local
 
   periods      -poll $loadpoll
-  periods      -exec 30
+  periods      -exec $loadexec
   periods      -timeout 30
 
   stdout phase0.imfile.log
   stderr phase0.imfile.log
+
+  task.exec
+    command      p0tool.sh {$Phase0ImfileFail + 20}
+  end
 
   # success
@@ -76 +62 @@
   task.exit    default
     echo "phase0 pending imfiles: failure"
+    $Phase0ImfileFail ++
   end
 
@@ -138 +125 @@
     echo "failure for phase0imfile.pl: $options:0"
     queuepush Phase0Imfiles -replace -key 1 "FAIL $options:0"
+    $Phase0ImfileFail ++
   end