From 43e4e23eebdc3c67269c1962d279a61bdba2c2b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= <pbos@webrtc.org>
Date: Fri, 11 Dec 2015 20:29:35 +0100
Subject: [PATCH] Remove thread-id wraparounds in event tracing.

Prints tid as a DWORD on Windows and an int on other systems.

BUG=
R=thakis@chromium.org, tommi@webrtc.org

Review URL: https://codereview.webrtc.org/1522483002 .

Cr-Commit-Position: refs/heads/master@{#10992}
---
 webrtc/base/event_tracer.cc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/webrtc/base/event_tracer.cc b/webrtc/base/event_tracer.cc
index f16bd6f757..4f3df82a59 100644
--- a/webrtc/base/event_tracer.cc
+++ b/webrtc/base/event_tracer.cc
@@ -119,9 +119,14 @@ class EventLogger final {
                 ", \"ph\": \"%c\""
                 ", \"ts\": %" PRIu64
                 ", \"pid\": %d"
-                ", \"tid\": %d}\n",
+#if defined(WEBRTC_WIN)
+                ", \"tid\": %lu"
+#else
+                ", \"tid\": %d"
+#endif  // defined(WEBRTC_WIN)
+                "}\n",
                 has_logged_event ? "," : " ", e.name, e.category_enabled,
-                e.phase, e.timestamp, e.pid, static_cast<int>(e.tid));
+                e.phase, e.timestamp, e.pid, e.tid);
         has_logged_event = true;
       }
       if (shutting_down)