From patchwork Wed Oct 28 08:15:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 537247 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 475081401AD for ; Wed, 28 Oct 2015 19:23:40 +1100 (AEDT) Received: from localhost ([::1]:36179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrM1C-0006iF-37 for incoming@patchwork.ozlabs.org; Wed, 28 Oct 2015 04:23:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrLtz-0002FV-I5 for qemu-devel@nongnu.org; Wed, 28 Oct 2015 04:16:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrLtv-0008IO-7c for qemu-devel@nongnu.org; Wed, 28 Oct 2015 04:16:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38289) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrLtv-0008I0-02 for qemu-devel@nongnu.org; Wed, 28 Oct 2015 04:16:07 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id 8D6A091E86 for ; Wed, 28 Oct 2015 08:16:06 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-38.ams2.redhat.com [10.36.116.38]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9S8G4Tb030642 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 28 Oct 2015 04:16:05 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2CB1A30052EA; Wed, 28 Oct 2015 09:16:02 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 28 Oct 2015 09:15:54 +0100 Message-Id: <1446020161-21758-8-git-send-email-armbru@redhat.com> In-Reply-To: <1446020161-21758-1-git-send-email-armbru@redhat.com> References: <1446020161-21758-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v2 07/14] monitor: Reduce casting of QAPI event QDict X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Make the variables holding the event QDict instead of QObject. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <1444921716-9511-2-git-send-email-armbru@redhat.com> --- monitor.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/monitor.c b/monitor.c index 301a143..f90a42f 100644 --- a/monitor.c +++ b/monitor.c @@ -185,7 +185,7 @@ typedef struct MonitorQAPIEventState { int64_t rate; /* Minimum time (in ns) between two events */ int64_t last; /* QEMU_CLOCK_REALTIME value at last emission */ QEMUTimer *timer; /* Timer for handling delayed events */ - QObject *data; /* Event pending delayed dispatch */ + QDict *qdict; /* Delayed event (if any) */ } MonitorQAPIEventState; struct Monitor { @@ -444,14 +444,14 @@ static MonitorQAPIEventState monitor_qapi_event_state[QAPI_EVENT_MAX]; * Emits the event to every monitor instance, @event is only used for trace * Called with monitor_lock held. */ -static void monitor_qapi_event_emit(QAPIEvent event, QObject *data) +static void monitor_qapi_event_emit(QAPIEvent event, QDict *qdict) { Monitor *mon; - trace_monitor_protocol_event_emit(event, data); + trace_monitor_protocol_event_emit(event, qdict); QLIST_FOREACH(mon, &mon_list, entry) { if (monitor_is_qmp(mon) && mon->qmp.in_command_mode) { - monitor_json_emitter(mon, data); + monitor_json_emitter(mon, QOBJECT(qdict)); } } } @@ -461,7 +461,7 @@ static void monitor_qapi_event_emit(QAPIEvent event, QObject *data) * applying any rate limiting if required. */ static void -monitor_qapi_event_queue(QAPIEvent event, QDict *data, Error **errp) +monitor_qapi_event_queue(QAPIEvent event, QDict *qdict, Error **errp) { MonitorQAPIEventState *evstate; assert(event < QAPI_EVENT_MAX); @@ -469,7 +469,7 @@ monitor_qapi_event_queue(QAPIEvent event, QDict *data, Error **errp) evstate = &(monitor_qapi_event_state[event]); trace_monitor_protocol_event_queue(event, - data, + qdict, evstate->rate, evstate->last, now); @@ -477,26 +477,26 @@ monitor_qapi_event_queue(QAPIEvent event, QDict *data, Error **errp) /* Rate limit of 0 indicates no throttling */ qemu_mutex_lock(&monitor_lock); if (!evstate->rate) { - monitor_qapi_event_emit(event, QOBJECT(data)); + monitor_qapi_event_emit(event, qdict); evstate->last = now; } else { int64_t delta = now - evstate->last; - if (evstate->data || + if (evstate->qdict || delta < evstate->rate) { /* If there's an existing event pending, replace * it with the new event, otherwise schedule a * timer for delayed emission */ - if (evstate->data) { - qobject_decref(evstate->data); + if (evstate->qdict) { + QDECREF(evstate->qdict); } else { int64_t then = evstate->last + evstate->rate; timer_mod_ns(evstate->timer, then); } - evstate->data = QOBJECT(data); - qobject_incref(evstate->data); + evstate->qdict = qdict; + QINCREF(evstate->qdict); } else { - monitor_qapi_event_emit(event, QOBJECT(data)); + monitor_qapi_event_emit(event, qdict); evstate->last = now; } } @@ -513,14 +513,14 @@ static void monitor_qapi_event_handler(void *opaque) int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); trace_monitor_protocol_event_handler(evstate->event, - evstate->data, + evstate->qdict, evstate->last, now); qemu_mutex_lock(&monitor_lock); - if (evstate->data) { - monitor_qapi_event_emit(evstate->event, evstate->data); - qobject_decref(evstate->data); - evstate->data = NULL; + if (evstate->qdict) { + monitor_qapi_event_emit(evstate->event, evstate->qdict); + QDECREF(evstate->qdict); + evstate->qdict = NULL; } evstate->last = now; qemu_mutex_unlock(&monitor_lock); @@ -547,7 +547,7 @@ monitor_qapi_event_throttle(QAPIEvent event, int64_t rate) assert(rate * SCALE_MS <= INT64_MAX); evstate->rate = rate * SCALE_MS; evstate->last = 0; - evstate->data = NULL; + evstate->qdict = NULL; evstate->timer = timer_new(QEMU_CLOCK_REALTIME, SCALE_MS, monitor_qapi_event_handler,