From 055ecd1fdfbe39c62df071c81bd210cd74559993 Mon Sep 17 00:00:00 2001 From: tommi Date: Mon, 27 Feb 2017 05:09:06 -0800 Subject: [PATCH] Fix race in INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO BUG=webrtc:7251 Review-Url: https://codereview.webrtc.org/2716343002 Cr-Commit-Position: refs/heads/master@{#16862} --- webrtc/base/trace_event.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/webrtc/base/trace_event.h b/webrtc/base/trace_event.h index 3916af4fb6..3789886a1c 100644 --- a/webrtc/base/trace_event.h +++ b/webrtc/base/trace_event.h @@ -577,11 +577,8 @@ // Implementation detail: internal macro to create static category. #define INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category) \ - static const unsigned char* INTERNAL_TRACE_EVENT_UID(catstatic) = 0; \ - if (!INTERNAL_TRACE_EVENT_UID(catstatic)) { \ - INTERNAL_TRACE_EVENT_UID(catstatic) = \ - TRACE_EVENT_API_GET_CATEGORY_ENABLED(category); \ - } + static const unsigned char* INTERNAL_TRACE_EVENT_UID(catstatic) = \ + TRACE_EVENT_API_GET_CATEGORY_ENABLED(category); // Implementation detail: internal macro to create static category and add // event if the category is enabled.