[Libreoffice-commits] online.git: 2 commits - scripts/perftrace.pl
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Apr 2 19:45:16 UTC 2019
scripts/perftrace.pl | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
New commits:
commit 5ea3f328573723e6c83434196cbb70855930f1a6
Author: Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Apr 2 20:43:56 2019 +0100
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Apr 2 20:43:56 2019 +0100
perftrace: add thread identifiers, and spoof a duration for all lines.
Change-Id: I13d929ebb2f06969cccc1b89f6e2c9b022b107e3
diff --git a/scripts/perftrace.pl b/scripts/perftrace.pl
index b6a800dd4..f7c6e6fa3 100755
--- a/scripts/perftrace.pl
+++ b/scripts/perftrace.pl
@@ -16,6 +16,8 @@ my $log_start_date;
my $log_start_time;
my @log_start;
my @events;
+
+# Google Chrome Trace Event Format if set
my $json = 1;
sub escape($)
@@ -78,10 +80,11 @@ my @pairs = (
}
);
my %pair_starts;
+my %proc_names;
-sub consume($$$$$$$)
+sub consume($$$$$$$$)
{
- my ($pid, $tid, $time, $emitter, $type, $message, $line) = @_;
+ my ($proc, $pid, $tid, $time, $emitter, $type, $message, $line) = @_;
# print STDERR "$emitter, $type, $time, $message, $line\n";
@@ -90,6 +93,15 @@ sub consume($$$$$$$)
# accumulate all threads / processes
if (!defined $emitters{$emitter}) {
$emitters{$emitter} = (scalar keys %emitters) + 1;
+ if ($json) {
+ push @events, "{\"name\": \"thread_name\", \"ph\": \"M\", \"pid\": $pid, \"tid\": $tid, \"args\": { \"name\" : \"$emitter.\" } }";
+ }
+ }
+ if (!defined $proc_names{$proc}) {
+ $proc_names{$proc} = (scalar keys %proc_names) + 1;
+ if ($json) {
+ push @events, "{\"name\": \"process_name\", \"ph\": \"M\", \"pid\": $pid, \"args\": { \"name\" : \"$proc.\" } }";
+ }
}
my $handled = 0;
@@ -131,9 +143,10 @@ sub consume($$$$$$$)
}
my $content_e = escape($message. " " . $line);
+ # Hack give all events a 10ms duration - better to use the gap to the next event though.
if ($json)
{
- push @events, "{\"pid\":$pid, \"tid\":$tid, \"ts\":$time, \"ph\":\"i\", \"s\":\"p\", \"name\":\"$content_e\" }";
+ push @events, "{\"pid\":$pid, \"tid\":$tid, \"ts\":$time, \"dur\":10000, \"ph\":\"X\", \"s\":\"p\", \"name\":\"$content_e\" }";
}
else
{
@@ -233,11 +246,11 @@ while (my $line = shift @input) {
$line =~ s/\r*\n*//g;
# wsd-26974-26974 2019-03-27 03:45:46.735736 [ loolwsd ] INF Initializing wsd. Local time: Wed 2019-03-27 03:45:46+0000. Log level is [8].| common/Log.cpp:191
- if ($line =~ m/^\w+-(\d+)-(\d+)\s+\S+\s+(\S+)\s+\[\s+(\S+)\s+\]\s+(\S+)\s+(.+)\|\s+(\S+)$/) {
- consume($1, $2, $3, $4, $5, $6, $7);
+ if ($line =~ m/^(\w+)-(\d+)-(\d+)\s+\S+\s+(\S+)\s+\[\s+(\S+)\s+\]\s+(\S+)\s+(.+)\|\s+(\S+)$/) {
+ consume($1, $2, $3, $4, $5, $6, $7, $8);
- } elsif ($line =~ m/^\w+-(\d+)-(\d+)\s+\S+\s+(\S+)\s+\[\s+(\S+)\s+\]\s+(\S+)\s+(.+)$/) { # split lines ...
- my ($pid, $tid, $time, $emitter, $type, $message, $line) = ($1, $2, $3, $4, $5, $6);
+ } elsif ($line =~ m/^(\w+)-(\d+)-(\d+)\s+\S+\s+(\S+)\s+\[\s+(\S+)\s+\]\s+(\S+)\s+(.+)$/) { # split lines ...
+ my ($proc, $pid, $tid, $time, $emitter, $type, $message, $line) = ($1, $2, $3, $4, $5, $6, $7);
while (my $next = shift @input) {
# ... | kit/Kit.cpp:1272
if ($next =~ m/^(.*)\|\s+(\S+)$/)
@@ -249,7 +262,7 @@ while (my $line = shift @input) {
$message = $message . $next;
}
}
- consume($pid, $tid, $time, $emitter, $type, $message, $line);
+ consume($proc, $pid, $tid, $time, $emitter, $type, $message, $line);
} else {
die "Poorly formed line - is logging.file.flush set to true ? '$line'\n";
}
commit 4744755ede241b67b83db77ad0db8a76cae24f8c
Author: Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Tue Apr 2 20:27:45 2019 +0100
Commit: Michael Meeks <michael.meeks at collabora.com>
CommitDate: Tue Apr 2 20:27:45 2019 +0100
perftrace: map pids.
Change-Id: Ibb884bf212453decd146131e52478bdfe4283879
diff --git a/scripts/perftrace.pl b/scripts/perftrace.pl
index efb795dbe..b6a800dd4 100755
--- a/scripts/perftrace.pl
+++ b/scripts/perftrace.pl
@@ -79,9 +79,9 @@ my @pairs = (
);
my %pair_starts;
-sub consume($$$$$)
+sub consume($$$$$$$)
{
- my ($time, $emitter, $type, $message, $line) = @_;
+ my ($pid, $tid, $time, $emitter, $type, $message, $line) = @_;
# print STDERR "$emitter, $type, $time, $message, $line\n";
@@ -116,7 +116,7 @@ sub consume($$$$$)
{
my $dur = $end_time - $start_time;
my $ms = int ($dur / 1000.0);
- push @events, "{\"pid\":$emitters{$emitter}, \"tid\":1, \"ts\":$start_time, \"dur\":$dur, \"ph\":\"X\", \"name\":\"$title_e\", \"args\":{ \"ms\":$ms } }";
+ push @events, "{\"pid\":$pid, \"tid\":$tid, \"ts\":$start_time, \"dur\":$dur, \"ph\":\"X\", \"name\":\"$title_e\", \"args\":{ \"ms\":$ms } }";
}
else
{
@@ -133,7 +133,7 @@ sub consume($$$$$)
my $content_e = escape($message. " " . $line);
if ($json)
{
- push @events, "{\"pid\":$emitters{$emitter}, \"tid\":1, \"ts\":$time, \"ph\":\"i\", \"s\":\"p\", \"name\":\"$content_e\" }";
+ push @events, "{\"pid\":$pid, \"tid\":$tid, \"ts\":$time, \"ph\":\"i\", \"s\":\"p\", \"name\":\"$content_e\" }";
}
else
{
@@ -233,11 +233,11 @@ while (my $line = shift @input) {
$line =~ s/\r*\n*//g;
# wsd-26974-26974 2019-03-27 03:45:46.735736 [ loolwsd ] INF Initializing wsd. Local time: Wed 2019-03-27 03:45:46+0000. Log level is [8].| common/Log.cpp:191
- if ($line =~ m/^\S+\s+\S+\s+(\S+)\s+\[\s+(\S+)\s+\]\s+(\S+)\s+(.+)\|\s+(\S+)$/) {
- consume($1, $2, $3, $4, $5);
+ if ($line =~ m/^\w+-(\d+)-(\d+)\s+\S+\s+(\S+)\s+\[\s+(\S+)\s+\]\s+(\S+)\s+(.+)\|\s+(\S+)$/) {
+ consume($1, $2, $3, $4, $5, $6, $7);
- } elsif ($line =~ m/^\S+\s+\S+\s+(\S+)\s+\[\s+(\S+)\s+\]\s+(\S+)\s+(.+)$/) { # split lines ...
- my ($time, $emitter, $type, $message, $line) = ($1, $2, $3, $4);
+ } elsif ($line =~ m/^\w+-(\d+)-(\d+)\s+\S+\s+(\S+)\s+\[\s+(\S+)\s+\]\s+(\S+)\s+(.+)$/) { # split lines ...
+ my ($pid, $tid, $time, $emitter, $type, $message, $line) = ($1, $2, $3, $4, $5, $6);
while (my $next = shift @input) {
# ... | kit/Kit.cpp:1272
if ($next =~ m/^(.*)\|\s+(\S+)$/)
@@ -249,7 +249,7 @@ while (my $line = shift @input) {
$message = $message . $next;
}
}
- consume($time, $emitter, $type, $message, $line);
+ consume($pid, $tid, $time, $emitter, $type, $message, $line);
} else {
die "Poorly formed line - is logging.file.flush set to true ? '$line'\n";
}
More information about the Libreoffice-commits
mailing list