[Swift-commit] r6167 - trunk/libexec/log-processing

[lgadelha at ci.uchicago.edu]

Author: lgadelha
Date: 2013-01-28 07:03:17 -0600 (Mon, 28 Jan 2013)
New Revision: 6167

Modified:
   trunk/libexec/log-processing/create-everylog-vs-versions-data
Log:
Added version of CoG to output


Modified: trunk/libexec/log-processing/create-everylog-vs-versions-data
===================================================================
--- trunk/libexec/log-processing/create-everylog-vs-versions-data	2013-01-24 22:13:05 UTC (rev 6166)
+++ trunk/libexec/log-processing/create-everylog-vs-versions-data	2013-01-28 13:03:17 UTC (rev 6167)
@@ -6,21 +6,19 @@
 
 
 for logfile in `find $1 -name \*.log -and -not -name cluster-\* -and -not -name swift.log $EXTRALOGRESTRICTION`; do
-  VERSION=$(grep -m 1 -E 'Swift v[^ ]* r[0-9]*' $logfile | sed 's/.*Swift v[^ ]* r\([0-9]*\).*/\1/')
-  if [ "X$VERSION" == "X" ]; then
-# try newer format version info
-#2008-05-06 09:30:42,365-0500 INFO  unknown Swift svn swift-r1800 cog-r1963 (CoG modified locally)
-    VERSION=$(grep -m 1 -E 'Swift .* swift-r[0-9]*' $logfile | sed 's/.*Swift .* swift-r\([0-9]*\).*/\1/')
-  fi
-  START=$(head -n1 < $logfile | iso-to-secs | cut -f 1 -d ' ')
-  if [ "X$VERSION" == "X" ]; then
-    VERSION=1262
-  fi
-  if [ "X$START" != "X" ]; then
-    echo $START $VERSION $logfile >> everylog-vs-versions.data
-  fi
-#  echo $START $VERSION $logfile 
-
+    SWIFT_VERSION=$(grep -m 1 -E 'Swift .* swift-r[0-9]*' $logfile | sed 's/.*Swift .* swift-r\([0-9]*\).*/\1/')
+    COG_VERSION=$(grep -m 1 -E 'Swift .* swift-r[0-9]*' $logfile | sed 's/.*Swift .* cog-r\([0-9]*\).*/\1/')
+    START=$(head -n1 < $logfile | iso-to-secs | cut -f 1 -d ' ')
+    if [ "X$SWIFT_VERSION" == "X" ]; then
+	SWIFT_VERSION=na
+	COG_VERSION=na
+    fi
+    if [ "X$START" != "X" ]; then
+	echo $START $SWIFT_VERSION $logfile $COG_VERSION >> everylog-vs-versions.data
+    fi
 done
 
 echo Finished creating log/version data file
+
+
+