]> git.ipfire.org Git - thirdparty/valgrind.git/commitdiff
Merge from trunk, r11497 (fix perl bug in callgrind_annotate.in)
authorJulian Seward <jseward@acm.org>
Mon, 14 Feb 2011 09:50:31 +0000 (09:50 +0000)
committerJulian Seward <jseward@acm.org>
Mon, 14 Feb 2011 09:50:31 +0000 (09:50 +0000)
git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_6_BRANCH@11543

callgrind/callgrind_annotate.in

index afa9e04bff4e7401886a0bfef532afe1e9474d17..9d711e2ec9c944c315cca570ffc2d2c4d8ae2a69 100644 (file)
@@ -541,14 +541,12 @@ sub read_input_file()
            if ($curr_call_counter>0) {
 #            print "Read ($curr_name => $curr_cname) $curr_call_counter\n";
 
-             if (defined $call_CCs{$curr_name,$curr_cname}) {
-               add_array_a_to_b($CC, $call_CCs{$curr_name,$curr_cname});
-               $call_counter{$curr_name,$curr_cname} += $curr_call_counter;
-             }
-             else {
-               $call_CCs{$curr_name,$curr_cname} = $CC;
-               $call_counter{$curr_name,$curr_cname} = $curr_call_counter;
+             if (!defined $call_CCs{$curr_name,$curr_cname}) {
+               $call_CCs{$curr_name,$curr_cname} = [];
+               $call_counter{$curr_name,$curr_cname} = 0;
              }
+             add_array_a_to_b($CC, $call_CCs{$curr_name,$curr_cname});
+             $call_counter{$curr_name,$curr_cname} += $curr_call_counter;
 
              my $tmp = $called_from_line->{$curr_file,$curr_line_num};
              if (!defined $tmp) {
@@ -557,14 +555,12 @@ sub read_input_file()
              $tmp = {} unless defined $tmp;
              $$tmp{$curr_cname} = 1;
              $called_from_line->{$curr_file,$curr_line_num} = $tmp;
-             if(defined $call_CCs{$curr_name,$curr_cname,$curr_line_num}) {
-               add_array_a_to_b($CC, $call_CCs{$curr_name,$curr_cname,$curr_line_num});
-               $call_counter{$curr_name,$curr_cname,$curr_line_num} += $curr_call_counter;
-              }
-              else {
-               $call_CCs{$curr_name,$curr_cname,$curr_line_num} = $CC;
-               $call_counter{$curr_name,$curr_cname,$curr_line_num} = $curr_call_counter;
-              }
+             if (!defined $call_CCs{$curr_name,$curr_cname,$curr_line_num}) {
+               $call_CCs{$curr_name,$curr_cname,$curr_line_num} = [];
+               $call_counter{$curr_name,$curr_cname,$curr_line_num} = 0;
+             }
+             add_array_a_to_b($CC, $call_CCs{$curr_name,$curr_cname,$curr_line_num});
+             $call_counter{$curr_name,$curr_cname,$curr_line_num} += $curr_call_counter;
 
              $curr_call_counter = 0;