Check out the ' ."" - ."$total_warnings Build Warnings (updated $time_str). " + ."$total_unignored_warnings Build Warnings (updated $time_str). " .'-' .'slamm
\';'."\n"; $fh->close; move($warn_summary, "$tree/warn.pl"); - warn "$total_warnings warnings (updated $time_str)\n"; + warn "$total_unignored_warnings warnings ($total_ignored_count ignored)," + ." updated $time_str\n"; last; } @@ -198,7 +215,6 @@ sub gcc_parser { # Now only match lines with "warning:" next unless /warning:/; - next if /$ignore_pat/o; chomp; # Yum, yum @@ -223,26 +239,26 @@ sub gcc_parser { my $file = "$dir/$filename"; # Special case for "`foo' was hidden\nby `foo2'" - $warning_text = "...was hidden " . $warning_text - if $warning_text =~ /^by \`/; - + $warning_text = "...was hidden $warning_text" if $warning_text =~ /^by \`/; # Remember line of first occurrence in the build log $warnings{$file}{$line}->{first_seen_line} = $. unless defined $warnings{$file}{$line}; + my $ignore_it = /$ignore_pat/o; + if ($ignore_it) { + $warnings{$file}{$line}->{ignorecount}++; + $total_ignored_count++; + } + $warnings{$file}{$line}->{count}++; $total_warnings_count++; - # Do not re-add this warning if it has been seen before - for my $rec (@{ $warnings{$file}{$line}->{list} }) { - next PARSE_TOP if $rec->{warning_text} eq $warning_text; - } - # Remember where in the build log the warning occured push @{ $warnings{$file}{$line}->{list} }, { log_file => $log_file, warning_text => $warning_text, + ignore => $ignore_it, }; } warn "debug> $. lines read\n" if $debug; @@ -270,14 +286,14 @@ sub build_blame { my $rcs_filename = "$cvsroot/$file,v"; unless (-e $rcs_filename) { - warn "Unable to find $rcs_filename\n"; +# warn "Unable to find $rcs_filename\n"; $unblamed{$file} = 1; next; } my $revision = &parse_cvs_file($rcs_filename); @text = &extract_revision($revision); - LINE: while (my ($line, $warn_rec) = each %{$lines_hash}) { + LINE: while (my ($line, $line_rec) = each %{$lines_hash}) { my $line_rev = $revision_map[$line-1]; my $who = $revision_author{$line_rev}; my $source_text = join '', @text[$line-3..$line+1]; @@ -285,23 +301,30 @@ sub build_blame { $who = "$who%netscape.com" unless $who =~ /[%]/; - $warn_rec->{line_rev} = $line_rev; - $warn_rec->{source} = $source_text; + $line_rec->{line_rev} = $line_rev; + $line_rec->{source} = $source_text; - for $ignore_rec (@ignore_match_pat) { - next LINE if $warn_rec->{warning_text} =~ /$ignore_rec->{warning}/ - and $warn_rec->{source} =~ /$ignore_rec->{source}/; + for $ignore_rec (@ignore_match) { + for my $warn_rec (@{ $line_rec->{list}}) { + if ($warn_rec->{warning_text} =~ /$ignore_rec->{warning}/ + and $warn_rec->{source} =~ /$ignore_rec->{source}/ + and not $warn_rec->{ignore}) { + $warn_rec->{ignore} = 1; + $line_rec->{ignorecount}++; + warn "ignored $warn_rec->{warning_text}\n"; + next LINE; + } + } } - $warnings_by_who{$who}{$file}{$line} = $warn_rec; + $warnings_by_who{$who}{$file}{$line} = $line_rec; - $total_who_count++ unless exists $who_count{$who}; - $who_count{$who} += $warn_rec->{count}; + $who_count{$who} += $line_rec->{count} - $line_rec->{ignorecount}; } } } -sub print_warnings_as_html { +sub print_html_by_who { my ($fh, $br) = @_; my ($buildname, $buildtime) = ($br->{buildname}, $br->{buildtime}); @@ -310,6 +333,7 @@ sub print_warnings_as_html { # Change the default destination for print to $fh my $old_fh = select($fh); + my $total_unignored_count = $total_warnings_count - $total_ignored_count; print <<"__END_HEADER";
@@ -321,7 +345,7 @@ sub print_warnings_as_html {__END_HEADER @@ -343,6 +367,7 @@ __END_HEADER next if $index > $#who_list; my $name = $who_list[$index]; my $count = $who_count{$name}; + next if $count == 0; $name =~ s/%.*//; print " " x $jj; print "
+
+ +__END_HEADER # Print all the warnings # @@ -385,11 +483,12 @@ __END_HEADER my $count = 1; for $file (sort keys %{$warnings_by_who{$who}}) { for $linenum (sort keys %{$warnings_by_who{$who}{$file}}) { - my $warn_rec = $warnings_by_who{$who}{$file}{$linenum}; - print_count($count, $warn_rec->{count}); - print_warning($tree, $br, $file, $linenum, $warn_rec); - print_source_code($linenum, $warn_rec) unless $unblamed{$file}; - $count += $warn_rec->{count}; + my $line_rec = $warnings_by_who{$who}{$file}{$linenum}; + next if $line_rec->{ignorecount} == $line_rec->{count}; + print_count($count, $line_rec->{count}); + print_warning($tree, $br, $file, $linenum, $line_rec); + print_source_code($linenum, $line_rec) unless $unblamed{$file}; + $count += $line_rec->{count}; } } print "\n"; @@ -405,8 +504,6 @@ __END_FOOTER # Change default destination back. select($old_fh); - - return ($total_warnings_count, $time_str); } sub print_count { @@ -418,7 +515,7 @@ sub print_count { } sub print_warning { - my ($tree, $br, $file, $linenum, $warn_rec) = @_; + my ($tree, $br, $file, $linenum, $line_rec) = @_; print "
";
+ print "";
- my $source_text = trim_common_leading_whitespace($warn_rec->{source});
+ my $source_text = trim_common_leading_whitespace($line_rec->{source});
$source_text =~ s/&/&/gm;
$source_text =~ s//>/gm;
- $source_text =~ s|\b\Q$keyword\E\b|$keyword|gm unless $keyword eq '';
+ # Highlight the warning's keyword
+ for my $warn_rec (@{ $line_rec->{list}}) {
+ my $warning = $warn_rec->{warning_text};
+ my ($keyword) = $warning =~ /\`([^\']*)\'/;
+ next if $keyword eq '';
+ $source_text =~ s|\b\Q$keyword\E\b|$keyword|gm;
+ last;
+ }
my $line_index = $linenum - 2;
$source_text =~ s/^(.*)$/$line_index++." $1"/gme;
$source_text =~ s|^($linenum.*)$|\1|gm;
chomp $source_text;
print $source_text;
- print "";
#print "";
print "