From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZcbkG-0007xH-AG for qemu-devel@nongnu.org; Thu, 17 Sep 2015 12:09:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZcbkA-00052j-3U for qemu-devel@nongnu.org; Thu, 17 Sep 2015 12:09:12 -0400 Received: from mail-qk0-x22f.google.com ([2607:f8b0:400d:c09::22f]:35756) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zcbk9-00052c-UW for qemu-devel@nongnu.org; Thu, 17 Sep 2015 12:09:06 -0400 Received: by qkap81 with SMTP id p81so8454083qka.2 for ; Thu, 17 Sep 2015 09:09:05 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Thu, 17 Sep 2015 18:08:48 +0200 Message-Id: <1442506130-15219-4-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1442506130-15219-1-git-send-email-marcandre.lureau@redhat.com> References: <1442506130-15219-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2 3/5] monitor: rename QDict *data->qdict List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, amit.shah@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , lersek@redhat.com From: Marc-André Lureau As suggested by Markus Armbruster, this is a bit more specific for the event qdict than 'data'. Signed-off-by: Marc-André Lureau --- monitor.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/monitor.c b/monitor.c index e78ecc2..2f8af5b 100644 --- a/monitor.c +++ b/monitor.c @@ -178,13 +178,13 @@ typedef struct { QAPIEvent event; /* Event being tracked */ int64_t last; /* QEMU_CLOCK_REALTIME value at last emission */ QEMUTimer *timer; /* Timer for handling delayed events */ - QObject *data; /* Event pending delayed dispatch */ + QObject *qdict; /* Event pending delayed dispatch */ } MonitorQAPIEventPending; typedef struct MonitorQAPIEventState MonitorQAPIEventState; typedef bool (*MonitorQAPIEventDelay)(MonitorQAPIEventState *evstate, - QDict *data); + QDict *qdict); /* * To prevent flooding clients, events can be throttled. The * throttling is calculated globally, rather than per-Monitor @@ -472,14 +472,14 @@ static void monitor_qapi_event_emit(QAPIEvent event, QObject *data) * Return 'false' if the event is not delayed and can be emitted now. */ static bool -monitor_qapi_event_delay(MonitorQAPIEventState *evstate, QDict *data) +monitor_qapi_event_delay(MonitorQAPIEventState *evstate, QDict *qdict) { int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); MonitorQAPIEventPending *p = evstate->delay_data; int64_t delta = now - p->last; trace_monitor_protocol_event_delay(p->event, - data, + qdict, evstate->rate, p->last, now); @@ -490,19 +490,19 @@ monitor_qapi_event_delay(MonitorQAPIEventState *evstate, QDict *data) return false; } - if (p->data || delta < evstate->rate) { + if (p->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 (p->data) { - qobject_decref(p->data); + if (p->qdict) { + qobject_decref(p->qdict); } else { int64_t then = p->last + evstate->rate; timer_mod_ns(p->timer, then); } - p->data = QOBJECT(data); - qobject_incref(p->data); + p->qdict = QOBJECT(qdict); + qobject_incref(p->qdict); return true; } @@ -515,19 +515,19 @@ monitor_qapi_event_delay(MonitorQAPIEventState *evstate, QDict *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); evstate = &monitor_qapi_event_state[event]; - trace_monitor_protocol_event_queue(event, data); + trace_monitor_protocol_event_queue(event, qdict); qemu_mutex_lock(&monitor_lock); if (!evstate->delay || - !evstate->delay(evstate, data)) { - monitor_qapi_event_emit(event, QOBJECT(data)); + !evstate->delay(evstate, qdict)) { + monitor_qapi_event_emit(event, QOBJECT(qdict)); } qemu_mutex_unlock(&monitor_lock); @@ -543,14 +543,14 @@ static void monitor_qapi_event_handler(void *opaque) int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); trace_monitor_protocol_event_handler(p->event, - p->data, + p->qdict, p->last, now); qemu_mutex_lock(&monitor_lock); - if (p->data) { - monitor_qapi_event_emit(p->event, p->data); - qobject_decref(p->data); - p->data = NULL; + if (p->qdict) { + monitor_qapi_event_emit(p->event, p->qdict); + qobject_decref(p->qdict); + p->qdict = NULL; } p->last = now; qemu_mutex_unlock(&monitor_lock); -- 2.4.3