Changeset 27838 for branches/tap_branches/ippTasks/pantasks.pro

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• ippTasks/pantasks.pro (modified) (11 diffs)

branches/tap_branches/ippTasks/pantasks.pro

@@ -4 +4 @@
 if ($?NEBULOUS == 0)      set NEBULOUS = 0
 if ($?NETWORK == 0)       set NETWORK = 1
+if ($?BURNTOOLING == 0)   set BURNTOOLING = 0
 if ($?PARALLEL == 0)      set PARALLEL = 1
 if ($?VERBOSE == 0)       set VERBOSE = 1
 if ($?LABEL:n == 0)       set LABEL:n = 0
-if ($?POLLLIMIT == 0)     set POLLLIMIT = 32
+if ($?POLL_LIMIT == 0)    set POLL_LIMIT = 32
 if ($?KEEP_FAILURES == 0) set KEEP_FAILURES = 0
 
@@ -21 +22 @@
 
 $RUNPOLL  = 0.5
-$RUNEXEC  = 1.0
+$RUNEXEC  = 2.5
 
 $EXIT_SUCCESS     = 0
@@ -310 +311 @@
       $command = $command $taskarg:$n
     end
+    date -var exitdate
     if ($0 == 2)
       echo ""
@@ -316 +318 @@
       echo "job host: $JOB_HOSTNAME"
       echo "job dtime: $JOB_DTIME"
+      echo "job exit date: $exitdate"
     else
       echo "command: $command"
@@ -330 +333 @@
 
     local command i
-    $command = $$1 -limit $POLLLIMIT
+    $command = $$1 -limit $POLL_LIMIT
 
     $$1 = $command
@@ -484 +487 @@
   end
  
-  $POLLLIMIT = $1
+  $POLL_LIMIT = $1
 end
 
 macro get.poll
-  echo "poll limit: $POLLLIMIT"
+  echo "poll limit: $POLL_LIMIT"
 end
 
@@ -530 +533 @@
 
   if ("$host" == "NULL")
-    strsub $template @HOST@ $default -var $varname
+    # we are modifying something like /data/@HOST@/foo/bar, 
+    # but some implementations have multiple entries for the same host,
+    # like /data/@HOST@.0/foo/bar.  
+    # try a couple of these first:
+    strsub $template @HOST@.0 $default -var $varname
+    strsub $$varname @HOST@.1 $default -var $varname
+    strsub $$varname @HOST@   $default -var $varname
   else
     strsub $template @HOST@ $host -var $varname
@@ -557 +566 @@
   book getword ipphosts skycell count -var count
   if ("$count" == "NULL")
-    strsub $template @HOST@ $default -var $varname
+    strsub $template @HOST@.0 $default -var $varname
+    strsub $$varname @HOST@.1 $default -var $varname
+    strsub $$varname @HOST@   $default -var $varname
     return
   end    
 
-  strhash $skycellID $count -var skyhash
+  local j myValue skyhash
+  list word -splitbychar . $skycellID
+  $skyhash = 0
+  for j 0 $word:n
+    inthash $word:$j $count -var myValue
+    $skyhash = $skyhash + $myValue
+  end
+  inthash $skyhash $count -var skyhash
   sprintf skyname "sky%02d" $skyhash
 
@@ -568 +586 @@
 
   if ("$host" == "NULL")
-    strsub $template @HOST@ $default -var $varname
+    strsub $template @HOST@.0 $default -var $varname
+    strsub $$varname @HOST@.1 $default -var $varname
+    strsub $$varname @HOST@   $default -var $varname
   else
     strsub $template @HOST@ $host -var $varname
@@ -613 +633 @@
   end    
 
-  strhash $skycellID $count -var skyhash
+  local j myValue skyhash
+  list word -splitbychar . $skycellID
+  $skyhash = 0
+  for j 0 $word:n
+    inthash $word:$j $count -var myValue
+    $skyhash = $skyhash + $myValue
+  end
+  inthash $skyhash $count -var skyhash
   sprintf skyname "sky%02d" $skyhash
 
@@ -669 +696 @@
   end
 end
+
+macro show.book
+  if ($0 != 2)
+   echo "USAGE: show.book (book)"
+   break
+  end
+
+  book npages $1 -var npages
+  for i 0 $npages
+    book getpage $1 $i -var pagename
+    book listpage $1 $pagename
+  end
+
+  echo "npages: $npages"
+end
+
+macro del.page.from.book
+  if ($0 != 3)
+   echo "USAGE: del.page.from.book (book) (page)"
+   break
+  end
+
+  book delpage $1 $2
+end
+