X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fllanalyze;h=bb78a6b3956649bba227c92033f7a53848205fda;hb=3b0094779b58c162e5dc553f6d7cdff1910d0c3b;hp=1a58b1661c64848d5b844a016d1d7351e40508f2;hpb=fcf40559c8a4edb83aef82ef584e5ba4de9ea045;p=fs%2Flustre-release.git

diff --git a/lustre/utils/llanalyze b/lustre/utils/llanalyze
index 1a58b16..bb78a6b 100644
--- a/lustre/utils/llanalyze
+++ b/lustre/utils/llanalyze
@@ -53,7 +53,7 @@ $subsys->{FLD} = 1 << 31;  #/* b_new_cmd */
 $masks->{TRACE} = 1 << 0; # /* ENTRY/EXIT markers */
 $masks->{INODE} = 1 << 1; #
 $masks->{SUPER} = 1 << 2; #
-$masks->{EXT2} = 1 << 3; # /* anything from ext2_debug */
+$masks->{TTY} = 1 << 3; # /* notification printed to TTY */
 $masks->{MALLOC} = 1 << 4; # /* print malloc, free information */
 $masks->{CACHE} = 1 << 5; # /* cache-related items */
 $masks->{INFO} = 1 << 6; # /* general information */
@@ -289,6 +289,7 @@ print "pid: $pid, dlm_ns: $dlm_ns\n";
 print "rpctrace: $rpctrace\n";
 print "extract_start: $extract_start\n";
 print "extract_end:   $extract_end\n";
+print "width: $width\n";
 while (<LOG>) {
     if ($extract_start && $extract_start ne "LLANAYZE_FOUND") {
         next if (index($_, $extract_start, 0) == -1);
@@ -322,7 +323,7 @@ while (<LOG>) {
     }
 
     if ( !$pid || $linepid == $pid || $linehpid == $pid) {
-        next if (!$entering_rpc && $rpctrace && $linemask != $masks->{RPCTRACE});
+        next if ($rpctrace && !$entering_rpc && $linemask != $masks->{RPCTRACE});
         next if ($trace && $linemask != $masks->{TRACE});
         next if ($nodlm && 
                  (  $linesubsys == $subsys->{LDLM}));
@@ -336,8 +337,8 @@ while (<LOG>) {
                     $linesubsys == $subsys->{NET} ||
                     $linesubsys == $subsys->{LNET} ||
                     $linesubsys == $subsys->{LND}));
-	if(!$entering_rpc) {entering_rpc($_);}
-	if(!$leaving_rpc) {leaving_rpc($_);}
+	if($rpctrace && !$entering_rpc) {entering_rpc($_);}
+	if($rpctrace && !$leaving_rpc) {leaving_rpc($_);}
 
 #        printf "sub/mask: %s - %s\n", getsubsys($_), getmask($_);
         if (!$silent) {