MCL/sf/os/commsfw: comparison commsfwtools/commstools/svg/parselog.pl

equal deleted inserted replaced

-:9ddb1d67ebaf
+:9644881fedd0
 # 1	include client IPC requests
 # 2	include client IPC completions (async requests only)
 # 4	include ESOCK session creation
 # 8 display activity name along with each tuple line (e.g. "(IpCprNoBearer) (CoreNetStates::TSendBindTo, CoreNetStates::TAwaitingBindToComplete)")
 # 16 display AddClient/RemoveClient operations
+# -o <path>			Write HTML and SVG output files into directory <path>
 use strict;
 require 'getopts.pl';
-my $version = "2.1 (24/02/09)";
+my $version = "2.2 (16/04/10)";
 #
 # Internal Options
 #
 # BUG BEWARE: A timestamp or milestone displayed on lefthand side overwrites any fast count delta that would have been displayed there
 my $fastCount = 0;	# Add fast count delta on lefthand side.
 my $globalIndex = 1;
 my $lifeStage = 0;	# 0 = not running or shutting down, 1 = during boot, 2 = main phase
+my $outputPath = "";			# path to output directory specified by "-o"
-our($opt_p,$opt_s,$opt_x,$opt_X);
+our($opt_p,$opt_s,$opt_x,$opt_X, $opt_o);
-Getopts("ps:x:X:");
+Getopts("ps:x:X:o:");
+$outputPath = processPathArgument($opt_o);
 ### to get 1st line of latest log: type log.txt | perl -e "while(<>){if(/^#Logging started/){$a=$.;print $a.' '}};print $a"
 #
 # objectNameParse is an array of hashes used to shorten class names and specify left-to-right
 # Variables/constants concerned with Arguments file.
 #
 use constant ArgumentSignedDecimal => 0;
 use constant ArgumentNode => 1;
-my %argumentFormatToConstant = ( "node" => ArgumentNode );	# used to have several other options
+use constant ArgumentHex => 2;
+my %argumentFormatToConstant = ( "node" => ArgumentNode, "x" => ArgumentHex );	# used to have several other options
 my %arguments;
 # Support for AddClient/RemoveClient
 my %clients;
 my %clientTypeToDirection = ( "100" => "<", "200" => "^", "400" => "v", "800" => ">");
 				print "ad $session\n";
 				}
 			}
 		elsif (($opt_s & 2) &&
 			(/CWorkerSubSession\(.{8}\):\s*CompleteMessage\((.{8})\) with (.+), session .{8}/ ||
+			 /~CESockClientActivityBase..{8}.\s*RMessage2::Complete \((.{8})\) with ([-\d]+)\./ ||
+			 /RSafeMessage\(.{8}\)::Complete\((.{8})\) with ([-\d]+)/))
+			{
 #			 /ProcessMessageL, session=.{8}, RMessage2::Complete \((.{8})\) with ([-\d]+)\./ ||
-			 /~CESockClientActivityBase..{8}.\s*RMessage2::Complete \((.{8})\) with ([-\d]+)\./ ||
-			 /RSafeMessage\((.{8})\)::Complete\((\d+)\) - session .{8}/))
-			{
 			# W6: CPlayer:	ProcessMessageL, session=0be839a8, RMessage2::Complete (00de5538) with 0.
 			# W0: CWorkerSubSession(0c941bc4):	CompleteMessage(00de1a6c) with -3, session 0be839a8.
 			# W6: ~CESockClientActivityBase=0c941f8c, RMessage2::Complete (00de5538) with 0.
+			# RSafeMessage(00e01590)::Complete(cd21cb80) with -36
 			my $msgAddr = $1;
 			my $ret = $2;
 			my $exe = $msgAddrToExe{$msgAddr};
 			my $ipc = $msgAddrToIpc{$msgAddr};
 		} elsif ($value =~ m/^0x[0-9a-fA-F]+$/ || $value =~ m/^[\-\d]\d+$/) {
 			# hex or decimal number - convert to signed decimal
 			if ($value =~ m/^0x/) {
 				$value = hex($value);
 			}
-			$buf .= sprintf "%d", $value;
+			if ($format == ArgumentHex) {
+				$buf .= sprintf "0x%x", $value;
+			} else {
+				$buf .= sprintf "%d", $value;
+			}
 		} else {
 			$buf .= $value;
 		}
 	}
 	return $buf;
 sub truncateExeName($)
 	{
 	my ($exeName) = @_;
 	$exeName =~ s/\.exe$//;
 	$exeName =~ s/\.EXE$//;
+	$exeName =~ s/ /_/g;
 	return $exeName;
 	}
 sub outputSymbols()
 	{
-	open SYM, ">logsym.html" || die "Cannot open logsym.html for writing\n";
+	# Should have already created $outputPath directory, create html/ subdirectory.
+	my $path = $outputPath . "html";
+	if (! -d $path) {
+		mkdir $path;
+	}
+	$path .= "/logsym.html";
+	open SYM, ">$path" || die "Cannot open $path for writing\n";
 	print SYM "<html>\n<body><code>\n";
 	my @keys = sort keys %symtab;
 	for my $i (@keys) {
 		print SYM "$i\t$symtab{$i}<br>\n";
 		}
 	}
 	if (defined $activityName{$actAddr}) {
 		delete $activityName{$actAddr};
 	}
 }
+sub processPathArgument($)
+{
+	my $path = $_[0];
+	if ($path) {
+		# ensure "/" at the end
+		if ($path !~ /\/$/) {
+			$path .= "/";
+		}
+		mkdirp($path);
+		return $path;
+	} else {
+		return "";
+	}
+}
+sub mkdirp($)
+{
+my $dirName = @_[0];
+if ($dirName =~ m/^(.*)\//i) {
+if ($1 ne "") {
+mkdirp($1);
+}
+}
+	if (! -d $dirName) {
+		mkdir($dirName);
+	}
+}

branch	RCL_3
changeset 18	9644881fedd0
parent 1	21d2ab05f085
child 23	cbb19216b74d