X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Fbabelstats.pl;h=16766baabd2810412bb27253f5fd5ab9aaaaddb9;hp=d8d4dd08e04cafb92276549b9b279713858b61f9;hb=bcf66e7d327496653738061614900f9828553432;hpb=9d806fbf7a6806b79cfddba58ced01441c1bf188

diff --git a/tests/utils/babelstats.pl b/tests/utils/babelstats.pl
index d8d4dd08e..16766baab 100755
--- a/tests/utils/babelstats.pl
+++ b/tests/utils/babelstats.pl
@@ -92,9 +92,8 @@ sub merge_fields
 	my %merged;
 
 	foreach my $event (@{$events_ref}) {
-		my $tp_provider = $event->{'tp_provider'};
-		my $tp_name     = $event->{'tp_name'};
-		my $tracepoint  = "$tp_provider:$tp_name";
+		my $tp_event     = $event->{'tp_event'};
+		my $tracepoint  = "${tp_event}";
 
 		foreach my $key (keys %{$event->{'fields'}}) {
 			my $val = $event->{'fields'}->{$key};
@@ -118,7 +117,7 @@ sub print_fields_stats
 
 	foreach my $field (keys %{$merged_ref->{$tracepoint}}) {
 		my @sorted;
-		my @val = keys ($merged_ref->{$tracepoint}->{$field});
+		my @val = keys %{$merged_ref->{$tracepoint}->{$field}};
 
 		if ($val[0] =~ /^\d+$/) {
 			# Sort numerically
@@ -142,29 +141,18 @@ my @events;
 
 while (<>)
 {
-	my $timestamp   = '\[(.*)\]';
-	my $elapsed     = '\((.*)\)';
-	my $hostname    = '.*';
-	my $pname       = '.*';
-	my $pid         = '\d+';
-	my $tp_provider = '.*';
-	my $tp_name     = '.*';
-	my $cpu_info    = '{\scpu_id\s=\s(\d+)\s\}';
-	my $fields      = '{(.*)}';
+	my $timestamp   = '\[(?:.*)\]';
+	my $elapsed     = '\((?:.*)\)';
+	my $hostname    = '(?:.*)';
+	my $tp_event    = '(.*)';
+	my $pkt_context = '(?:\{[^}]*\},\s)*';
+	my $fields      = '\{(.*)\}$';
 
 	# Parse babeltrace text output format
-	if (/$timestamp\s$elapsed\s($hostname):($pname):($pid)\s($tp_provider):($tp_name):\s$cpu_info,\s$fields/) {
+	if (/$timestamp\s$elapsed\s$hostname\s$tp_event:\s$pkt_context$fields/) {
 		my %event_hash;
-
-		$event_hash{'timestamp'}   = $1;
-		$event_hash{'elapsed'}     = $2;
-		$event_hash{'hostname'}    = $3;
-		$event_hash{'pname'}       = $4;
-		$event_hash{'pid'}         = $5;
-		$event_hash{'tp_provider'} = $6;
-		$event_hash{'tp_name'}     = $7;
-		$event_hash{'cpu_id'}      = $8;
-		$event_hash{'fields'}      = parse_fields($9);
+		$event_hash{'tp_event'}    = $1;
+		$event_hash{'fields'}      = parse_fields($2);
 
 		push @events, \%event_hash;
 	}