update

[l4.git] / l4 / pkg / valgrind / src / valgrind-3.6.0-svn / callgrind / callgrind_annotate.in

diff --git a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/callgrind/callgrind_annotate.in b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/callgrind/callgrind_annotate.in
index afa9e04bff4e7401886a0bfef532afe1e9474d17..e2e2f5f2ebfd22506b0b70453349968d7e54becb 100644 (file)
--- a/l4/pkg/valgrind/src/valgrind-3.6.0-svn/callgrind/callgrind_annotate.in
+++ b/l4/pkg/valgrind/src/valgrind-3.6.0-svn/callgrind/callgrind_annotate.in
@@ -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;
 
@@ -611,7 +607,7 @@ sub read_input_file()
                 if (defined $curr_file);
 
             $curr_file = uncompressed_name("fl",$1);
-           $curr_file =~ s/^$pwd//;
+            $curr_file =~ s/^\Q$pwd\E//;
             $curr_file_ind_CCs = $all_ind_CCs{$curr_file};
             $curr_file_ind_CCs = {} unless (defined $curr_file_ind_CCs);
 
@@ -621,7 +617,7 @@ sub read_input_file()
             $all_ind_CCs{$curr_file} = $curr_file_ind_CCs;
 
             $curr_file = uncompressed_name("fl",$2);
-           $curr_file =~ s/^$pwd//;
+            $curr_file =~ s/^\Q$pwd\E//;
             $curr_name = "$curr_file:$curr_fn";
             $curr_file_ind_CCs = $all_ind_CCs{$curr_file};
             $curr_file_ind_CCs = {} unless (defined $curr_file_ind_CCs);