From patchwork Mon Jun 27 09:12:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 640877 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rdNXM2d8bz9t16 for ; Mon, 27 Jun 2016 19:13:39 +1000 (AEST) Received: from localhost ([::1]:57335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHSbp-0007hL-6l for incoming@patchwork.ozlabs.org; Mon, 27 Jun 2016 05:13:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHSak-0006pe-Rd for qemu-devel@nongnu.org; Mon, 27 Jun 2016 05:12:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHSaf-0007HW-QO for qemu-devel@nongnu.org; Mon, 27 Jun 2016 05:12:30 -0400 Received: from roura.ac.upc.es ([147.83.33.10]:59094) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHSaf-0007Gz-Cd for qemu-devel@nongnu.org; Mon, 27 Jun 2016 05:12:25 -0400 Received: from gw-3.ac.upc.es (gw-3.ac.upc.es [147.83.30.9]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id u5R9COK9025266; Mon, 27 Jun 2016 11:12:24 +0200 Received: from localhost (unknown [84.88.51.85]) by gw-3.ac.upc.es (Postfix) with ESMTPSA id 8B4B23DB; Mon, 27 Jun 2016 11:12:24 +0200 (CEST) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Mon, 27 Jun 2016 11:12:24 +0200 Message-Id: <146701874427.26946.7349928059418713247.stgit@fimbulvetr.bsc.es> X-Mailer: git-send-email 2.8.1 In-Reply-To: <146701872793.26946.11572417385271053432.stgit@fimbulvetr.bsc.es> References: <146701872793.26946.11572417385271053432.stgit@fimbulvetr.bsc.es> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id u5R9COK9025266 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 147.83.33.10 Subject: [Qemu-devel] [PATCH v7 3/7] [trivial] trace: Cosmetic changes on fast-path tracing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Eduardo Habkost , Stefan Hajnoczi Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Lluís Vilanova Reviewed-by: Stefan Hajnoczi --- trace/control-internal.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/trace/control-internal.h b/trace/control-internal.h index 5e0a5ab..c5f5f3d 100644 --- a/trace/control-internal.h +++ b/trace/control-internal.h @@ -62,14 +62,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); }