Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This patch:

Browse Source 
* Changes MOZ_TRACE_MALLOC ifdefs to NS_TRACE_MALLOC ifdefs
* Links against the trace-malloc utils against libxpcom instead of just xpcomds
* Builds NSPR in debug mode on win32 if trace-malloc is enabled
* Adds a few "defined()" checks to diffbloatdump.pl so that it will work for
perl 5.6.1
* Adds a couple of checks for \r so that diffbloatdump.pl works on win32.

Bug #126915 r=bryner/dbaron a=asa


git-svn-id: svn://10.0.0.236/trunk@115364 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
seawood%netscape.com
2002-02-26 09:26:10 +00:00
parent d884ad6b15
commit c046046c39
5 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mozilla/tools/trace-malloc/diffbloatdump.pl
View File

@@ -85,7 +85,7 @@ sub add_file($$) {
my @stack;
# read the data at the memory location
while ( ($line = <$infile>) && substr($line,0,1) eq "\t" ) {
while ( defined($infile) && ($line = <$infile>) && substr($line,0,1) eq "\t" ) {
# do nothing
}
@@ -97,7 +97,7 @@ sub add_file($$) {
$line = $1;
}
$stack[$#stack+1] = $line;
} while ( ($line = <$infile>) && $line ne "\n" );
} while ( defined($infile) && ($line = <$infile>) && $line ne "\n" && $line ne "\r\n" );
return \@stack;
}
@@ -131,8 +131,8 @@ sub add_file($$) {
while ( ! eof(INFILE) ) {
# read the type and address
my $line = <INFILE>;
unless ($line =~ /.*\((\d*)\)\n/) {
die "badly formed allocation header";
unless ($line =~ /.*\((\d*)\)[\r|\n]/) {
die "badly formed allocation header in $infile";
}
my $size;
if ($::opt_allocation_count) {
@@ -146,6 +146,8 @@ sub add_file($$) {
close INFILE;
}
sub print_node_indent($$$);
sub print_calltree() {
sub print_indent($) {
my ($i) = @_;