Changeset 26070 for trunk/ippTasks/pantasks.pro

Timestamp:

Nov 8, 2009, 11:56:57 AM (17 years ago)

Author:

eugene

Message:

updates from ipp generated during throughtput tests

File:

• trunk/ippTasks/pantasks.pro (modified) (4 diffs)

trunk/ippTasks/pantasks.pro

@@ -530 +530 @@
 
   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 +563 @@
   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    
@@ -568 +576 @@
     $skyhash = $skyhash + $myValue
   end
-  # strhash $skycellID $count -var skyhash
-
+  inthash $skyhash 46 -var skyhash
   sprintf skyname "sky%02d" $skyhash
 
@@ -576 +583 @@
 
   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