summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorschodet2008-01-28 13:36:09 +0000
committerschodet2008-01-28 13:36:09 +0000
commita27da22d829cfd9bf7bdd36f9e7a1039e3fd9232 (patch)
treeb980ece341caacce73d641f7110ffd17545d33f1 /common
parent6618601dc5694a3c266be852caceae336a671bb0 (diff)
* lib/trace:
- new lighter trace declaration syntax. - new TIMESTAMP option. git-svn-id: svn+ssh://pessac/svn/cesar/trunk@1339 017c9cb6-072f-447c-8318-d5b54f68fe89
Diffstat (limited to 'common')
-rwxr-xr-xcommon/tools/vcd-trace24
1 files changed, 12 insertions, 12 deletions
diff --git a/common/tools/vcd-trace b/common/tools/vcd-trace
index d00de3a305..12b2559f23 100755
--- a/common/tools/vcd-trace
+++ b/common/tools/vcd-trace
@@ -54,15 +54,15 @@ while (<>)
{
chomp;
s/\r$//;
- if (/^rx param mode=(.+)$/) {
+ if (/^\[.\] rx param mode=(.+)$/) {
$rx_fc_mode = $1;
- } elsif (/^ prp([01]) (.+)$/) {
- date ($2);
- print "sPRP$1 !\n";
- } elsif (/^ slot (.+) count=(.+)$/ && $2 > 1) {
+ } elsif (/^\[(.+)\] prp([01])$/) {
+ date ($1);
+ print "sPRP$2 !\n";
+ } elsif (/^\[(.+)\] slot count=(.+)$/ && $2 > 1) {
date ($1);
print "sCW$2 !\n";
- } elsif (/^ pre detect (.+)$/) {
+ } elsif (/^\[(.+)\] pre detect$/) {
date ($1, -$pre_detect_delay_tck);
print "sRX !\n";
my $t = -$pre_detect_delay_tck;
@@ -73,9 +73,9 @@ while (<>)
date ($1, $t);
}
@fc_end_date = ($1, $t);
- } elsif (/^rx prepare short=true.*/) {
+ } elsif (/^\[\.\] rx prepare short=true.*/) {
print "sIDLE <\nsIDLE !\n";
- } elsif (/^rx prepare short=false.*mod=(.+?) .* gil=(.+?) .*symb_nb=(.+)$/) {
+ } elsif (/^\[\.\] rx prepare short=false.*mod=(.+?) .* gil=(.+?) .*symb_nb=(.+)$/) {
my $t = $fc_end_date[1];
my $gil = exists $gilpmod{$1} ? $gilpmod{$1} : $2;
for my $d (1 .. $3)
@@ -85,11 +85,11 @@ while (<>)
date ($fc_end_date[0], $t);
}
print "sIDLE <\nsIDLE !\n";
- } elsif (/^tx param mode=(.+?) short=(.+?) mod=(.+?) .*gil=(.+?)/) {
+ } elsif (/^\[\.\] tx param mode=(.+?) short=(.+?) mod=(.+?) .*gil=(.+?)/) {
%tx_param = (fc_mode => $1, short => $2, mod => $3, gil => $4);
- } elsif (/^ tx symb_nb=(.*?)$/) {
+ } elsif (/^\[\.\] tx symb_nb=(.*?)$/) {
$tx_symb_nb = $1;
- } elsif (/^ tx frame (.+)$/) {
+ } elsif (/^\[(.+)\] tx frame$/) {
date ($1);
print "sTX !\n";
my $t = 0;
@@ -101,7 +101,7 @@ while (<>)
}
@fc_end_date = ($1, $t);
print "sIDLE >\nsIDLE !\n" if $tx_param{short} eq 'true';
- } elsif (/^ tx mpdu/) {
+ } elsif (/^\[.*\] tx mpdu/) {
my $t = $fc_end_date[1];
my $gil = exists $gilpmod{$tx_param{mod}}
? $gilpmod{$tx_param{mod}} : $tx_param{gil};