Changeset 161 for trunk

Timestamp:

08/19/09 12:21:32 (15 years ago)

Author:

sdipsl

Message:

• Move the "ksh time" detection on SX hosts because it generates a false positive with vargas detection

File:

• trunk/libIGCM/libIGCM_sys/IGCM_add_out.awk (modified) (3 diffs)

trunk/libIGCM/libIGCM_sys/IGCM_add_out.awk

@@ -1 @@
-#!/usr/bin/awk -f
+#!/usr/bin/gawk -f
 # IGCM_add_out - filter of output of the job :
 # command :
@@ -210 +210 @@
 
   }
+
+# csh time
+  else if (match($0, "[0-9.]+u [0-9.]+s .+"))
+  {
+    myprint( "csh" )
+    counter=counter+1
+
+    UserTime=(substr($1,1,match($1, "u")-1))
+    SysTime=(substr($2,1,match($2, "s")-1))
+    RealTime=(substr($3,1,match($3, ":")-1)*60. + substr($3,match($3, ":")+1))
+
+  }
+# linux system time
+  else if (match($0, ".*user .*system .*elapsed .*CPU .*"))
+  {
+    myprint( "linux" )
+    counter=counter+1
+
+    UserTime=(substr($1,1,match($1, "user")-1))
+    SysTime=(substr($2,1,match($2, "system")-1))
+    RealTime=(substr($3,1,match($3, ":")-1)*60.+substr($3, match($3, ":")+1, match($3, "elapsed")))
+
+  }
+# AIX vargas system time
+  else if (match($0, "real   [0-9]*"))
+  {
+    myprint( "vargas" )
+    vargas_found=1  
+    counter=counter+1
+
+    RealTime=substr($0,8)
+    next
+  }
+  else if (vargas_found=1 )
+  {
+    if (match($0, "user   [0-9]*"))
+      {
+        UserTime=substr($0,8)
+        next
+      }
+    if (match($0, "sys    [0-9]*"))
+      {
+        SysTime=substr($0,7)
+        next
+      }
+  }
 # Get information with time output on SX hosts
 # ksh time
@@ -267 +313 @@
         SysTime=(substr($2,1,match($2, ":")-1))
     }
-  }
-# csh time
-  else if (match($0, "[0-9.]+u [0-9.]+s .+"))
-  {
-    myprint( "csh" )
-    counter=counter+1
-
-    UserTime=(substr($1,1,match($1, "u")-1))
-    SysTime=(substr($2,1,match($2, "s")-1))
-    RealTime=(substr($3,1,match($3, ":")-1)*60. + substr($3,match($3, ":")+1))
-
-  }
-# linux system time
-  else if (match($0, ".*user .*system .*elapsed .*CPU .*"))
-  {
-    myprint( "linux" )
-    counter=counter+1
-
-    UserTime=(substr($1,1,match($1, "user")-1))
-    SysTime=(substr($2,1,match($2, "system")-1))
-    RealTime=(substr($3,1,match($3, ":")-1)*60.+substr($3, match($3, ":")+1, match($3, "elapsed")))
-
-  }
-# AIX vargas system time
-  else if (match($0, "real\ \ \ [0-9]*"))
-  {
-    myprint( "vargas" )
-    vargas_found=1  
-    counter=counter+1
-
-    RealTime=substr($0,8)
-    next
-  }
-  else if (vargas_found=1 )
-  {
-    if (match($0, "user\ \ \ [0-9]*"))
-      {
-        UserTime=substr($0,8)
-        next
-      }
-    if (match($0, "sys\ \ \ \ [0-9]*"))
-      {
-        SysTime=substr($0,7)
-        next
-      }
   }