# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1288693938 0
# Node ID e23a8d7ea8bb28899f2e9429deb32e9d93451b53
# Parent  8ee002ad9af5c740314b44a168c9cb0d3fe28762
Update filter_obyfile.pl to report the "minimal ROM" executables
Update bulk_marking.pl to handle lists of exes both with and without the -x option
Update summarise_kerneltrace.pl to deal with the interspersed "DTimer::Create" information, and update summary.txt

diff -r 8ee002ad9af5 -r e23a8d7ea8bb analysis/summary.txt
--- a/analysis/summary.txt	Mon Nov 01 15:06:10 2010 +0000
+++ b/analysis/summary.txt	Tue Nov 02 10:32:18 2010 +0000
@@ -767,7 +767,7 @@
 103505: Thread AknIconSrv.exe::ICLThread.00063456526852754375.00603158 SetRequiredPriority def 18 cleanup -1 nest 0
 103506: Thread AknIconSrv.exe::ICLThread.00063456526852754375.00603158 MState 2 SetActualPriority 18
 103507: Thread AknIconSrv.exe::!AknIconServer Logon to thread AknIconSrv.exe::ICLThread.00063456526852754375.00603158, status at 00404328 rdv=0
-103526: Thread AknIconSDTimer::Create thread EwSrv.exe::00d003608fc71fee
+103527: Thread AknIconSrv.exe::!AknIconServer Logon to thread AknIconSrv.exe::ICLThread.00063456526852754375.00603158, status at 006038d4 rdv=0
 103529: Thread AknIconSrv.exe::!AknIconServer Logon to thread AknIconSrv.exe::ICLThread.00063456526852754375.00603158, status at 00404478 rdv=0
 103531: Thread AknIconSrv.exe::!AknIconServer Logon to thread AknIconSrv.exe::ICLThread.00063456526852754375.00603158, status at 00404488 rdv=0
 103536: Thread AknIconSrv.exe::ICLThread.00063456526852754375.00603158 SetDefaultPriority 19
@@ -1256,7 +1256,7 @@
 259876: Process FLogSvr.exe Die: 0 0 Kill
 	FLogSvr.exe: #2, 1 threads, lifetime 258875-259876
 259888: Thread FLogSvr.exe::!FLogger server SvKill()
-259892: Thread FLogSvr.exe::!FLogger server ReleasDTimer::Create thread EwSrv.exe::00d003608fc71fee
+259893: Thread FLogSvr.exe::!FLogger server Release()
 260177: Thread weatherinfo::weatherinfo SetRequiredPriority def 12 cleanup 21 nest 1
 260178: Thread weatherinfo::weatherinfo MState 2 SetActualPriority 21
 260179: Thread weatherinfo::weatherinfo RevertPriority def 12 cleanup -1
@@ -1549,7 +1549,6 @@
 304156: Thread deform.exe::Main RevertPriority def 12 cleanup 0
 304340: Thread efile.exe::LoaderThread SetRequiredPriority def 21 cleanup 21 nest 1
 304341: Thread efile.exe::LoaderThread RevertPriority def 21 cleanup -1
-304631: DCodeSeg::Create c80b36b8 file Z:\sys\bin\xmlDTimer::Create thread EwSrv.exe::00d003608fc71fee
 305295: Thread Menu::Menu SetRequiredPriority def 12 cleanup 21 nest 1
 305296: Thread Menu::Menu MState 2 SetActualPriority 21
 305809: DLibrary Menu::xmlparserplugin.dll Close m=-1
@@ -1735,7 +1734,7 @@
  293487	weatherinfo          #3, 3 threads, lifetime 252792-293487, died 0 0 Kill
  312721	FLogSvr.exe          #4, 1 threads, lifetime 311759-312721, died 0 0 Kill
 
-Loaded executables (297)
+Loaded executables (299)
 101fe2aa.dll                  	akncapserver.exe
 102827CF.dll                  	EikSrvs.exe
 10283389.dll                  	akncapserver.exe
@@ -1877,6 +1876,7 @@
 cryptospisetup.exe            	cryptospisetup.exe
 ctsysystemstateplugin.dll     	c32exe.exe
 customcmds.dll                	sysstatemgr.exe
+deform.exe                    	deform.exe
 devencnotifplugin.dll         	EikSrvs.exe
 display0.ldd                  	NULL
 domainPolicy.dll              	domainSrv.exe
@@ -1921,6 +1921,7 @@
 javaipc.dll                   	matrixmenu.exe
 javaregistryclient.dll        	matrixmenu.exe
 javasecurity.dll              	matrixmenu.exe
+javasizehelperclient.dll      	matrixmenu.exe
 javastorage.dll               	matrixmenu.exe
 javautils.dll                 	matrixmenu.exe
 jpegcodec.dll                 	AknIconSrv.exe
diff -r 8ee002ad9af5 -r e23a8d7ea8bb tools/bulk_marking.pl
--- a/tools/bulk_marking.pl	Mon Nov 01 15:06:10 2010 +0000
+++ b/tools/bulk_marking.pl	Tue Nov 02 10:32:18 2010 +0000
@@ -46,9 +46,9 @@
 	my ($romfile,$hostfile,$ibyfile,$package,$cmd,@rest) = split /,/, $line;
 	if (!defined $cmd)
 		{
-		if ($other_exes && $line =~ /^(\S+)$/)
+		if ($line =~ /^(\S+)$/)
 			{
-			# guess that this is a preserved filename
+			# guess that this is a preserved executable
 			my $exe = "sys\\bin\\". lc $1;
 			$romfiles{$exe} = 1;
 			# print STDERR "Preserving $exe\n";
diff -r 8ee002ad9af5 -r e23a8d7ea8bb tools/filter_obyfile.pl
--- a/tools/filter_obyfile.pl	Mon Nov 01 15:06:10 2010 +0000
+++ b/tools/filter_obyfile.pl	Tue Nov 02 10:32:18 2010 +0000
@@ -571,6 +571,9 @@
 		
 	print FILE "\n====\n";
 	printf FILE "Minimum ROM now has %d exes\n", scalar keys %must_have_exes;
+	print FILE join("\n", sort keys %must_have_exes), "\n";
+	
+	print FILE "\n====\n";
 	foreach my $deletion_root (sort {$b <=> $a} @deletion_roots)
 		{
 		my ($count,$exe) = split /\s+/, $deletion_root;
diff -r 8ee002ad9af5 -r e23a8d7ea8bb tools/summarise_kerneltrace.pl
--- a/tools/summarise_kerneltrace.pl	Mon Nov 01 15:06:10 2010 +0000
+++ b/tools/summarise_kerneltrace.pl	Tue Nov 02 10:32:18 2010 +0000
@@ -23,8 +23,21 @@
 my %loaded_exes;
 
 my $line;
+my $partline = "";
 while ($line = <>)
 	{
+	# Clean up the effect of "DTimer::Create ..." traces in the middle of lines
+	if ($partline ne "")
+		{
+		$line = $partline . $line;
+		$partline = "";
+		}
+	elsif ($line =~ /^(.*)(DTimer::Create.*)$/o)
+		{
+		$line = $2;
+		$partline = $1;
+		}
+
 	# AddThread ekern.exe::NVMem-ecc10dce to ekern.exe
 	# Process FLogSvr.exe Die: 0 0 Kill
 	# DLibrary domainSrv.exe::domainpolicy2.dll Close m=-1