Merge branch 'master' of git://git.lttng.org/lttng-tools

diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_size b/tests/regression/tools/tracefile-limits/test_tracefile_size
index 99301b59d4e624b5c01e8dd84401509c35559bbd..ed58e70a2f0c4169bb4d392d895bffd8b6abd1a5 100755 (executable)
--- a/tests/regression/tools/tracefile-limits/test_tracefile_size
+++ b/tests/regression/tools/tracefile-limits/test_tracefile_size
@@ -53,7 +53,7 @@ function enable_lttng_channel_size_limit ()
        test_name+="$tracefile_size_limit bytes tracefile limit"
 
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel \
-           -u $channel_name -s $sess_name \
+           -u $channel_name -s $sess_name --buffers-pid \
            -C $tracefile_size_limit >/dev/null 2>&1
 
        ok $? "$test_name"

diff --git a/tests/utils/babelstats.pl b/tests/utils/babelstats.pl
index d8d4dd08e04cafb92276549b9b279713858b61f9..64a243fc8a69f8b1428d8bf7c5a2231cc8756afd 100755 (executable)
--- a/tests/utils/babelstats.pl
+++ b/tests/utils/babelstats.pl
@@ -146,6 +146,7 @@ while (<>)
        my $elapsed     = '\((.*)\)';
        my $hostname    = '.*';
        my $pname       = '.*';
+       my $pinfo       = '.*';
        my $pid         = '\d+';
        my $tp_provider = '.*';
        my $tp_name     = '.*';
@@ -153,18 +154,21 @@ while (<>)
        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($pinfo)\s($tp_provider):($tp_name):\s$cpu_info,\s$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{'pinfo'}       = $3;
+
+#              my @split_pinfo = split(':', $3);
+#              $event_hash{'hostname'}    = $split_pinfo[0];
+#              $event_hash{'pname'}       = defined($split_pinfo[1]) ? $split_pinfo[1] : undef;
+#              $event_hash{'pid'}         = defined($split_pinfo[2]) ? $split_pinfo[2] : undef;
+
+               $event_hash{'tp_provider'} = $4;
+               $event_hash{'tp_name'}     = $5;
+               $event_hash{'cpu_id'}      = $6;
+               $event_hash{'fields'}      = parse_fields($7);
 
                push @events, \%event_hash;
        }