X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=trace%2Fcontrol-internal.h;h=8b2b50a7cf39bac3d0d61bb719bfd5a76858c720;hb=30e702abf6fa8a7f1e6ad11a75d6f3ab6fcb2155;hp=b3f587ed93b0c32a7a9b7f501a563060e7b1cb8c;hpb=2f23e9ae2cc37788ae1211803a7f8545ae14df91;p=mirror_qemu.git

diff --git a/trace/control-internal.h b/trace/control-internal.h
index b3f587ed93..8b2b50a7cf 100644
--- a/trace/control-internal.h
+++ b/trace/control-internal.h
@@ -1,7 +1,7 @@
 /*
  * Interface for configuring and controlling the state of tracing events.
  *
- * Copyright (C) 2011-2012 Lluís Vilanova <vilanova@ac.upc.edu>
+ * Copyright (C) 2011-2016 Lluís Vilanova <vilanova@ac.upc.edu>
  *
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
@@ -10,33 +10,29 @@
 #ifndef TRACE__CONTROL_INTERNAL_H
 #define TRACE__CONTROL_INTERNAL_H
 
-#include <string.h>
+extern int trace_events_enabled_count;
 
 
-extern TraceEvent trace_events[];
-
-
-static inline TraceEventID trace_event_count(void)
+static inline bool trace_event_is_pattern(const char *str)
 {
-    return TRACE_EVENT_COUNT;
+    assert(str != NULL);
+    return strchr(str, '*') != NULL;
 }
 
-static inline TraceEvent *trace_event_id(TraceEventID id)
+static inline uint32_t trace_event_get_id(TraceEvent *ev)
 {
-    assert(id < trace_event_count());
-    return &trace_events[id];
+    assert(ev != NULL);
+    return ev->id;
 }
 
-static inline bool trace_event_is_pattern(const char *str)
+static inline uint32_t trace_event_get_vcpu_id(TraceEvent *ev)
 {
-    assert(str != NULL);
-    return strchr(str, '*') != NULL;
+    return ev->vcpu_id;
 }
 
-static inline TraceEventID trace_event_get_id(TraceEvent *ev)
+static inline bool trace_event_is_vcpu(TraceEvent *ev)
 {
-    assert(ev != NULL);
-    return ev->id;
+    return ev->vcpu_id != TRACE_VCPU_EVENT_NONE;
 }
 
 static inline const char * trace_event_get_name(TraceEvent *ev)
@@ -51,17 +47,15 @@ static inline bool trace_event_get_state_static(TraceEvent *ev)
     return ev->sstate;
 }
 
+/* it's on fast path, avoid consistency checks (asserts) */
+#define trace_event_get_state_dynamic_by_id(id) \
+    (unlikely(trace_events_enabled_count) && _ ## id ## _DSTATE)
+
 static inline bool trace_event_get_state_dynamic(TraceEvent *ev)
 {
-    assert(ev != NULL);
-    return ev->dstate;
+    return unlikely(trace_events_enabled_count) && *ev->dstate;
 }
 
-static inline void trace_event_set_state_dynamic(TraceEvent *ev, bool state)
-{
-    assert(ev != NULL);
-    assert(trace_event_get_state_static(ev));
-    return trace_event_set_state_dynamic_backend(ev, state);
-}
+void trace_event_register_group(TraceEvent **events);
 
-#endif  /* TRACE__CONTROL_INTERNAL_H */
+#endif /* TRACE__CONTROL_INTERNAL_H */