All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tvrtko Ursulin <tursulin@ursulin.net>
To: igt-dev@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org,
	Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Subject: [igt-dev] [PATCH i-g-t 05/11] trace.pl: Fix HTML timestamp generation
Date: Mon,  9 Jul 2018 14:19:58 +0100	[thread overview]
Message-ID: <20180709132004.14468-6-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20180709132004.14468-1-tvrtko.ursulin@linux.intel.com>

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Now that we scale timestamps to get better timeline granularity, the hacky
hand rolled micro-second time to HTML date conversion does no longer cut
it.

Use perl built-in gmtime to handle things properly.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
---
 scripts/trace.pl | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/scripts/trace.pl b/scripts/trace.pl
index e2978e5382c2..aeaf2392162e 100755
--- a/scripts/trace.pl
+++ b/scripts/trace.pl
@@ -346,24 +346,17 @@ sub sanitize_ctx
 sub ts
 {
 	my ($us) = @_;
-	my ($d, $h, $m, $s);
+	my ($y, $mo, $d, $h, $m, $s);
 
 	$us *= 1000 unless $no_timeline_scaling;
 
 	$s = int($us / 1000000);
 	$us = $us % 1000000;
 
-	$m = int($s / 60);
-	$s = $s % 60;
+	($s, $m, $h, $d, $mo, $y) = gmtime($s);
 
-	$h = int($m / 60);
-	$m = $m % 60;
-
-	$d = 1 + int($h / 24);
-	$h = $h % 24;
-
-	return sprintf('2017-01-%02u %02u:%02u:%02u.%06u',
-		       int($d), int($h), int($m), int($s), int($us));
+	return sprintf('%04u-%02u-%02u %02u:%02u:%02u.%06u',
+		        1970 + $y, 1 + $mo, $d, $h, $m, $s, int($us));
 }
 
 # Main input loop - parse lines and build the internal representation of the
-- 
2.17.1

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

WARNING: multiple messages have this Message-ID (diff)
From: Tvrtko Ursulin <tursulin@ursulin.net>
To: igt-dev@lists.freedesktop.org
Cc: intel-gfx@lists.freedesktop.org
Subject: [PATCH i-g-t 05/11] trace.pl: Fix HTML timestamp generation
Date: Mon,  9 Jul 2018 14:19:58 +0100	[thread overview]
Message-ID: <20180709132004.14468-6-tvrtko.ursulin@linux.intel.com> (raw)
In-Reply-To: <20180709132004.14468-1-tvrtko.ursulin@linux.intel.com>

From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Now that we scale timestamps to get better timeline granularity, the hacky
hand rolled micro-second time to HTML date conversion does no longer cut
it.

Use perl built-in gmtime to handle things properly.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: John Harrison <John.C.Harrison@Intel.com>
---
 scripts/trace.pl | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/scripts/trace.pl b/scripts/trace.pl
index e2978e5382c2..aeaf2392162e 100755
--- a/scripts/trace.pl
+++ b/scripts/trace.pl
@@ -346,24 +346,17 @@ sub sanitize_ctx
 sub ts
 {
 	my ($us) = @_;
-	my ($d, $h, $m, $s);
+	my ($y, $mo, $d, $h, $m, $s);
 
 	$us *= 1000 unless $no_timeline_scaling;
 
 	$s = int($us / 1000000);
 	$us = $us % 1000000;
 
-	$m = int($s / 60);
-	$s = $s % 60;
+	($s, $m, $h, $d, $mo, $y) = gmtime($s);
 
-	$h = int($m / 60);
-	$m = $m % 60;
-
-	$d = 1 + int($h / 24);
-	$h = $h % 24;
-
-	return sprintf('2017-01-%02u %02u:%02u:%02u.%06u',
-		       int($d), int($h), int($m), int($s), int($us));
+	return sprintf('%04u-%02u-%02u %02u:%02u:%02u.%06u',
+		        1970 + $y, 1 + $mo, $d, $h, $m, $s, int($us));
 }
 
 # Main input loop - parse lines and build the internal representation of the
-- 
2.17.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2018-07-09 13:20 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-09 13:19 [Intel-gfx] [PATCH i-g-t 00/11] trace.pl fixes and improvements Tvrtko Ursulin
2018-07-09 13:19 ` Tvrtko Ursulin
2018-07-09 13:19 ` [igt-dev] [PATCH i-g-t 01/11] trace.pl: Fix no context colouring mode Tvrtko Ursulin
2018-07-09 13:19   ` Tvrtko Ursulin
2018-07-11 17:49   ` [igt-dev] " John Harrison
2018-07-11 17:49     ` John Harrison
2018-07-09 13:19 ` [igt-dev] [PATCH i-g-t 02/11] trace.pl: Improve readability of graphical timeline representation Tvrtko Ursulin
2018-07-09 13:19   ` Tvrtko Ursulin
2018-07-11 22:07   ` [Intel-gfx] " John Harrison
2018-07-11 22:07     ` John Harrison
2018-07-09 13:19 ` [igt-dev] [PATCH i-g-t 03/11] trace.pl: Scale timeline for better precision Tvrtko Ursulin
2018-07-09 13:19   ` Tvrtko Ursulin
2018-07-09 13:26   ` [igt-dev] " Chris Wilson
2018-07-09 13:26     ` Chris Wilson
2018-07-09 13:40     ` [Intel-gfx] " Tvrtko Ursulin
2018-07-09 13:40       ` Tvrtko Ursulin
2018-07-11 17:52   ` John Harrison
2018-07-11 17:52     ` John Harrison
2018-07-09 13:19 ` [igt-dev] [PATCH i-g-t 04/11] trace.pl: Put single context at single vertical slot Tvrtko Ursulin
2018-07-09 13:19   ` Tvrtko Ursulin
2018-07-11 17:55   ` [igt-dev] " John Harrison
2018-07-11 17:55     ` John Harrison
2018-07-09 13:19 ` Tvrtko Ursulin [this message]
2018-07-09 13:19   ` [PATCH i-g-t 05/11] trace.pl: Fix HTML timestamp generation Tvrtko Ursulin
2018-07-11 18:01   ` [igt-dev] " John Harrison
2018-07-11 18:01     ` John Harrison
2018-07-09 13:19 ` [igt-dev] [PATCH i-g-t 06/11] trace.pl: Improve context colouring for large context id's Tvrtko Ursulin
2018-07-09 13:19   ` Tvrtko Ursulin
2018-07-11 22:16   ` [igt-dev] " John Harrison
2018-07-11 22:16     ` John Harrison
2018-07-09 13:20 ` [igt-dev] [PATCH i-g-t 07/11] trace.pl: Fix engine busy accounting in split mode Tvrtko Ursulin
2018-07-09 13:20   ` Tvrtko Ursulin
2018-07-12  6:38   ` [igt-dev] " John Harrison
2018-07-12  6:38     ` John Harrison
2018-07-09 13:20 ` [igt-dev] [PATCH i-g-t 08/11] trace.pl: Context save only applies to last request of a bunch Tvrtko Ursulin
2018-07-09 13:20   ` Tvrtko Ursulin
2018-07-09 13:20 ` [igt-dev] [PATCH i-g-t 09/11] trace.pl: Fix incomplete request handling Tvrtko Ursulin
2018-07-09 13:20   ` Tvrtko Ursulin
2018-07-09 13:20 ` [igt-dev] [PATCH i-g-t 10/11] trace.pl: Basic preemption support Tvrtko Ursulin
2018-07-09 13:20   ` Tvrtko Ursulin
2018-07-09 13:20 ` [igt-dev] [PATCH i-g-t 11/11] trace.pl: Fix request split mode Tvrtko Ursulin
2018-07-09 13:20   ` Tvrtko Ursulin
2018-07-09 14:53 ` [igt-dev] ✓ Fi.CI.BAT: success for trace.pl fixes and improvements Patchwork
2018-07-09 21:50 ` [igt-dev] ✗ Fi.CI.IGT: failure " Patchwork
2018-07-11 23:21 ` [igt-dev] ✗ Fi.CI.BAT: failure for trace.pl fixes and improvements (rev2) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180709132004.14468-6-tvrtko.ursulin@linux.intel.com \
    --to=tursulin@ursulin.net \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=tvrtko.ursulin@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.