From bac8599c09533749e8d246494b44babc8f060b3d Mon Sep 17 00:00:00 2001 From: alegrand Date: Mon, 29 Jan 2007 10:51:33 +0000 Subject: [PATCH] Keeping up with last trace modifications. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3083 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- tools/MSG_visualization/trace2fig.pl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/MSG_visualization/trace2fig.pl b/tools/MSG_visualization/trace2fig.pl index 6b07413fa1..bb381b5931 100755 --- a/tools/MSG_visualization/trace2fig.pl +++ b/tools/MSG_visualization/trace2fig.pl @@ -60,12 +60,12 @@ sub read_link { while (defined($line=)) { chomp $line; if($line =~ /^16\s/) { - my($event,$date,$type,$father,$channel,$src,$key) = split(/\s+/,$line); + my($event,$date,$type,$father,$channel,$src,$key) = split(/\t+/,$line); $link{$key}{src}=$src; $link{$key}{src_date}=$date; } if($line =~ /^17\s/) { - my($event,$date,$type,$father,$channel,$dst,$key) = split(/\s+/,$line); + my($event,$date,$type,$father,$channel,$dst,$key) = split(/\t+/,$line); $link{$key}{dst}=$dst; $link{$key}{dst_date}=$date; } @@ -143,7 +143,7 @@ sub draw_cat { next unless (defined($$Cat{$cat}{Y_min}) && defined($$Cat{$cat}{Y_max})); my($text) = new XFig ('text'); - $text->{'text'} = $$Cat{$cat}{name}; + $text->{'text'} = "$$Cat{$$Cat{$cat}{father}}{name}"."$$Cat{$cat}{name}"; $text->{'y'} = ($$Cat{$cat}{Y_min}+$$Cat{$cat}{Y_max})/2*$grid_Y_size+68; $fig->add ($text); } @@ -163,6 +163,7 @@ sub draw_cat { my($line) = new XFig ('polyline'); + $line->{'depth'} = 50; # line $line->{'subtype'} = 1; # line $line->{'points'} = [ [$old_date*$grid_X_size, $$Cat{$cat}{Y_min}*$grid_Y_size], [$new_date*$grid_X_size, $$Cat{$cat}{Y_min}*$grid_Y_size], @@ -191,6 +192,9 @@ sub draw_cat { my($dst)=$$Link{$link}{dst}; $line->{'subtype'} = 1; # line + print STDERR "$src -> $dst\n"; + + print STDERR "$$Cat{$src}{name} -> $$Cat{$dst}{name}\n"; $line->{'points'} = [ [$src_date*$grid_X_size, ($$Cat{$src}{Y_min}+$$Cat{$src}{Y_max})/2*$grid_Y_size], [$dst_date*$grid_X_size, -- 2.20.1