From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQzeq-0000mo-29 for qemu-devel@nongnu.org; Wed, 03 Feb 2016 10:47:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQzeo-0002Qe-OX for qemu-devel@nongnu.org; Wed, 03 Feb 2016 10:47:51 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55619) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQzeo-0002QY-Ht for qemu-devel@nongnu.org; Wed, 03 Feb 2016 10:47:50 -0500 From: Stefan Hajnoczi Date: Wed, 3 Feb 2016 15:47:33 +0000 Message-Id: <1454514465-11856-2-git-send-email-stefanha@redhat.com> In-Reply-To: <1454514465-11856-1-git-send-email-stefanha@redhat.com> References: <1454514465-11856-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 01/13] trace: count number of enabled events List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Stefan Hajnoczi , Paolo Bonzini From: Paolo Bonzini This lets trace_event_get_state_dynamic quickly return false. Right now there is hardly any benefit because there are also many assertions and indirections, but the next patch will streamline all of this. Signed-off-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- trace/control-internal.h | 4 +++- trace/control.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/trace/control-internal.h b/trace/control-internal.h index 5a8df28..271bddb 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -14,6 +14,7 @@ extern TraceEvent trace_events[]; +extern int trace_events_enabled_count; static inline TraceEventID trace_event_count(void) @@ -54,13 +55,14 @@ static inline bool trace_event_get_state_static(TraceEvent *ev) 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)); + trace_events_enabled_count += state - ev->dstate; ev->dstate = state; } diff --git a/trace/control.c b/trace/control.c index 995beb3..95fbc07 100644 --- a/trace/control.c +++ b/trace/control.c @@ -16,6 +16,8 @@ #endif #include "qemu/error-report.h" +int trace_events_enabled_count; + TraceEvent *trace_event_name(const char *name) { assert(name != NULL); -- 2.5.0