[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - scripts/perftrace.pl

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Apr 24 23:53:52 UTC 2019


 scripts/perftrace.pl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d01b400afc02a9f145ab5f6c9589e065044f17d3
Author:     Michael Meeks <michael.meeks at collabora.com>
AuthorDate: Wed Apr 17 22:14:16 2019 +0100
Commit:     Ashod Nakashian <ashnakash at gmail.com>
CommitDate: Thu Apr 25 01:53:34 2019 +0200

    perftrace: fix time parsing issue.
    
    Change-Id: If0987454e3aa747aa476fa4e0ec8070a95e92867
    Reviewed-on: https://gerrit.libreoffice.org/71203
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/scripts/perftrace.pl b/scripts/perftrace.pl
index c779b95b5..0b1677382 100755
--- a/scripts/perftrace.pl
+++ b/scripts/perftrace.pl
@@ -168,7 +168,7 @@ sub consume($$$$$$$$$)
             $time = $time - $dur_us;
             push @events, "{\"pid\":$pid, \"tid\":$tid, \"ts\":$time, \"dur\":$dur_us, \"ph\":\"X\", \"name\":\"$msg\", \"args\":{ \"ms\":$dur_ms } }";
         } else {
-            die "Unknown prof message: '$message'";
+            die "Unknown prof message: '$message' at line $lineno";
         }
         return;
     }
@@ -261,7 +261,7 @@ sub parseProfileFrames($$$$$)
             #       print STDERR "Profile frame '$line'\n";
             # FIXME: silly to complicate and then re-parse this I guess ...
             my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = gmtime($secs);
-            my $time = sprintf("%.2d:%.2d:%02.6f", $hour, $min, "$sec.$fractsecs");
+            my $time = sprintf("%.2d:%.2d:%09.6f", $hour, $min, "$sec.$fractsecs");
 #           print STDERR "time '$time' from '$secs' - " . time() . "\n";
             consume($lineno, $proc, $pid, $tid, $time, $emitter, 'PROF', $realmsg, '');
         }


More information about the Libreoffice-commits mailing list