From: Lluís Vilanova <vilanova@ac.upc.edu>
Date: Mon, 11 Jul 2016 10:53:35 +0000 (+0200)
Subject: trace: Cosmetic changes on fast-path tracing
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e1d6e0a4c0e23b30501b887211f1fa6e0eb799a3;p=qemu.git

trace: Cosmetic changes on fast-path tracing

Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---

diff --git a/trace/control-internal.h b/trace/control-internal.h
index 59bcbb4427..b326d88d72 100644
--- a/trace/control-internal.h
+++ b/trace/control-internal.h
@@ -60,14 +60,17 @@ static inline bool trace_event_get_state_static(TraceEvent *ev)
     return ev->sstate;
 }
 
-static inline bool trace_event_get_state_dynamic_by_id(int id)
+static inline bool trace_event_get_state_dynamic_by_id(TraceEventID id)
 {
+    /* it's on fast path, avoid consistency checks (asserts) */
     return unlikely(trace_events_enabled_count) && trace_events_dstate[id];
 }
 
 static inline bool trace_event_get_state_dynamic(TraceEvent *ev)
 {
-    int id = trace_event_get_id(ev);
+    TraceEventID id;
+    assert(trace_event_get_state_static(ev));
+    id = trace_event_get_id(ev);
     return trace_event_get_state_dynamic_by_id(id);
 }