X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fllanalyze;h=5aa8ffd6b5d8c55ac379c66f013592a1eb83e3ba;hb=6299d78713ef2b6f69f6dd046256aa91a85147a8;hp=40166a52f6552e91d904c8adf148d71b4c21c32e;hpb=5eab22aed5fc438a1b1f482c299f89f4050ae5d0;p=fs%2Flustre-release.git

diff --git a/lustre/utils/llanalyze b/lustre/utils/llanalyze
index 40166a5..5aa8ffd 100644
--- a/lustre/utils/llanalyze
+++ b/lustre/utils/llanalyze
@@ -7,7 +7,6 @@ GetOptions("pid=i" => \$pid,
            "trace!" => \$trace, 
            "silent!" => \$silent, 
            "rpctrace!" => \$rpctrace, 
-           "lmvtrace!" => \$lmvtrace, 
            "nodlm!" => \$nodlm,
            "dlm_ns=s" => \$dlm_ns,
            "noclass!" => \$noclass,
@@ -15,6 +14,8 @@ GetOptions("pid=i" => \$pid,
            "extract_start=s" => \$extract_start,
            "extract_end=s" => \$extract_end);
 
+
+
 $subsys->{UNDEFINED} = 1 << 0;
 $subsys->{MDC} = 1 << 1;
 $subsys->{MDS} = 1 << 2;
@@ -37,11 +38,7 @@ $subsys->{LOV} = 1 << 18;
 $subsys->{GMNAL} = 1 << 19;
 $subsys->{PTLROUTER} = 1 << 20;
 $subsys->{COBD} = 1 << 21;
-$subsys->{IBNAL} = 1 << 22;
-$subsys->{SM} = 1 << 23;
-$subsys->{ASOBD} = 1 << 24;
-$subsys->{LMV} = 1 << 25;
-$subsys->{CMOBD} = 1 << 26;
+$subsys->{OPENIBNAL} = 1 << 22;
 
 
 $masks->{TRACE} = 1 << 0; # /* ENTRY/EXIT markers */
@@ -64,13 +61,13 @@ $masks->{DLMTRACE} = 1 << 16; #
 $masks->{ERROR} = 1 << 17; # /* CERROR} = ...) == CDEBUG} = D_ERROR, ...) */
 $masks->{EMERG} = 1 << 18; # /* CEMERG} = ...) == CDEBUG} = D_EMERG, ...) */
 $masks->{HA} = 1 << 19; # /* recovery and failover */
-$masks->{RPCTRACE} = 1 << 20; # /* recovery and failover */
+$masks->{RPCTRACE} = 1 << 19; # /* recovery and failover */
 
 sub extractpid
 {
     $line = shift;
 #    print "$_\n";
-    if ($line =~ m/(\d+):(\d+):(\d+):(\d+\.\d+):(\d+):(\d+):.*$/) {
+    if ($line =~ /(\d+)\:(\d+)\:(\d+)\:(\d+\.\d+)\:(\d+)\:(\d+)\:.*/) {
 	return $6;
     }
 }
@@ -79,27 +76,10 @@ sub extracthostpid
 {
     $line = shift;
 #    print "$_\n";
-    if ($line =~ m/(\d+):(\d+):(\d+):(\d+\.\d+):(\d+):(\d+):(\d+):.*$/) {
+    if ($line =~ /(\d+)\:(\d+)\:(\d+)\:(\d+\.\d+)\:(\d+)\:(\d+)\:(\d+)\:.*/) {
 	return $7;
     }
 }
-sub extractsubsys
-{
-    $line = shift;
-#    print "$_\n";
-    if ($line =~ m/(\d+):(\d+):(\d+):(\d+\.\d+):(\d+):(\d+):(\d+):.*$/) {
-	return hex($1);
-    }
-}
-
-sub extractmask
-{
-    $line = shift;
-#    print "$_\n";
-    if ($line =~ m/(\d+):(\d+):(\d+):(\d+\.\d+):(\d+):(\d+):(\d+):.*$/) {
-	return hex($2);
-    }
-}
 
 sub entering_rpc
 {
@@ -286,28 +266,29 @@ if ($ARGV[1]) {
    $width = $ARGV[1];
 }
 
-print "nodlm $nodlm, nonet $nonet, trace $trace lmvtrace $lmvtrace\n";
+print "nodlm $nodlm, nonet $nonet, trace $trace\n";
 print "pid: $pid, dlm_ns: $dlm_ns\n";
 print "extract_start: $extract_start\n";
 print "extract_end:   $extract_end\n";
 while (<LOG>) {
-    if ($extract_start && $extract_start != LLANAYZE_FOUND) {
+    if ($extract_start && $extract_start ne "LLANAYZE_FOUND") {
         next if (index($_, $extract_start, 0) == -1);
-        $extract_start = LLANAYZE_FOUND;
+        $extract_start = "LLANAYZE_FOUND";
     }
 
     if ($extract_end) {
-        next if ($extract_end == LLANAYZE_FOUND);
+	next if ($extract_end eq "LLANAYZE_FOUND");
         if (index($_, $extract_end, 0) != -1) {
-             $extract_end = LLANAYZE_FOUND;
+             $extract_end = "LLANAYZE_FOUND";
         }
     }
 
     $linepid = extractpid($_);
-
     $linehpid = extracthostpid($_);
-    $linesubsys = extractsubsys($_);
-    $linemask = extractmask($_);
+    $linemask = getmask($_);
+    $linesubsys = getsubsys($_);
+
+#    printf "---> mask %x subsys %x\n", $linemask, $linesubsys;
 
     if (leaving($_)) {
         chop $prefix->{$linepid};
@@ -326,8 +307,6 @@ while (<LOG>) {
         next if ($trace && $linemask != $masks->{TRACE});
         next if ($nodlm && 
                  (  $linesubsys == $subsys->{LDLM}));
-        next if ($lmvtrace && 
-                 (  $linesubsys != $subsys->{LMV}));
         next if ($dlm_ns &&
                  (  $linesubsys != $subsys->{LDLM}));
         next if (($found_dlm_ns = index( $_, $dlm_ns, 0)) == -1);
@@ -339,7 +318,7 @@ while (<LOG>) {
                     $linesubsys == $subsys->{PORTALS} ||
                     $linesubsys == $subsys->{SOCKNAL} ||
                     $linesubsys == $subsys->{QSWNAL} ||
-                    $linesubsys == $subsys->{IBNAL} ||
+                    $linesubsys == $subsys->{OPENIBNAL} ||
                     $linesubsys == $subsys->{GMNAL}));
 	if(!$entering_rpc) {entering_rpc($_);}
 	if(!$leaving_rpc) {leaving_rpc($_);}