From patchwork Tue Oct 27 09:21:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Armbruster X-Patchwork-Id: 536505 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 2233A1412F9 for ; Tue, 27 Oct 2015 20:24:46 +1100 (AEDT) Received: from localhost ([::1]:58367 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zr0Um-0007zU-3Z for incoming@patchwork.ozlabs.org; Tue, 27 Oct 2015 05:24:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zr0S3-0003Of-7q for qemu-devel@nongnu.org; Tue, 27 Oct 2015 05:21:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zr0S1-0003hp-Mf for qemu-devel@nongnu.org; Tue, 27 Oct 2015 05:21:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zr0S1-0003hU-FU for qemu-devel@nongnu.org; Tue, 27 Oct 2015 05:21:53 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id 177B28EA35 for ; Tue, 27 Oct 2015 09:21:53 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t9R9Lodr001077 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 27 Oct 2015 05:21:52 -0400 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 5319A30052EC; Tue, 27 Oct 2015 10:21:48 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 27 Oct 2015 10:21:44 +0100 Message-Id: <1445937707-22768-11-git-send-email-armbru@redhat.com> In-Reply-To: <1445937707-22768-1-git-send-email-armbru@redhat.com> References: <1445937707-22768-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 10/13] monitor: Split MonitorQAPIEventConf off MonitorQAPIEventState 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 In preparation of turning monitor_qapi_event_state[] into a hash table for finer grained throttling. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <1444921716-9511-5-git-send-email-armbru@redhat.com> --- monitor.c | 80 ++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 38 insertions(+), 42 deletions(-) diff --git a/monitor.c b/monitor.c index c2aedbe..07a0f76 100644 --- a/monitor.c +++ b/monitor.c @@ -182,11 +182,14 @@ typedef struct { */ typedef struct MonitorQAPIEventState { QAPIEvent event; /* Event being tracked */ - int64_t rate; /* Minimum time (in ns) between two events */ QEMUTimer *timer; /* Timer for handling delayed events */ QDict *qdict; /* Delayed event (if any) */ } MonitorQAPIEventState; +typedef struct { + int64_t rate; /* Minimum time (in ns) between two events */ +} MonitorQAPIEventConf; + struct Monitor { CharDriverState *chr; int reset_seen; @@ -437,6 +440,16 @@ static void monitor_protocol_emitter(Monitor *mon, QObject *data, } +static MonitorQAPIEventConf monitor_qapi_event_conf[QAPI_EVENT_MAX] = { + /* Limit guest-triggerable events to 1 per second */ + [QAPI_EVENT_RTC_CHANGE] = { 1000 * SCALE_MS }, + [QAPI_EVENT_WATCHDOG] = { 1000 * SCALE_MS }, + [QAPI_EVENT_BALLOON_CHANGE] = { 1000 * SCALE_MS }, + [QAPI_EVENT_QUORUM_REPORT_BAD] = { 1000 * SCALE_MS }, + [QAPI_EVENT_QUORUM_FAILURE] = { 1000 * SCALE_MS }, + [QAPI_EVENT_VSERPORT_CHANGE] = { 1000 * SCALE_MS }, +}; + static MonitorQAPIEventState monitor_qapi_event_state[QAPI_EVENT_MAX]; /* @@ -462,21 +475,23 @@ static void monitor_qapi_event_emit(QAPIEvent event, QDict *qdict) static void monitor_qapi_event_queue(QAPIEvent event, QDict *qdict, Error **errp) { + MonitorQAPIEventConf *evconf; MonitorQAPIEventState *evstate; assert(event < QAPI_EVENT_MAX); + evconf = &monitor_qapi_event_conf[event]; evstate = &monitor_qapi_event_state[event]; - trace_monitor_protocol_event_queue(event, qdict, evstate->rate); + trace_monitor_protocol_event_queue(event, qdict, evconf->rate); qemu_mutex_lock(&monitor_lock); - if (!evstate->rate) { + if (!evconf->rate) { /* Unthrottled event */ monitor_qapi_event_emit(event, qdict); } else { if (timer_pending(evstate->timer)) { /* - * Timer is pending for (at least) evstate->rate ns after + * Timer is pending for (at least) evconf->rate ns after * last send. Store event for sending when timer fires, * replacing a prior stored event if any. */ @@ -485,15 +500,15 @@ monitor_qapi_event_queue(QAPIEvent event, QDict *qdict, Error **errp) QINCREF(evstate->qdict); } else { /* - * Last send was (at least) evstate->rate ns ago. + * Last send was (at least) evconf->rate ns ago. * Send immediately, and arm the timer to call - * monitor_qapi_event_handler() in evstate->rate ns. Any + * monitor_qapi_event_handler() in evconf->rate ns. Any * events arriving before then will be delayed until then. */ int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); monitor_qapi_event_emit(event, qdict); - timer_mod_ns(evstate->timer, now + evstate->rate); + timer_mod_ns(evstate->timer, now + evconf->rate); } } @@ -501,13 +516,14 @@ monitor_qapi_event_queue(QAPIEvent event, QDict *qdict, Error **errp) } /* - * This function runs evstate->rate ns after sending a throttled + * This function runs evconf->rate ns after sending a throttled * event. * If another event has since been stored, send it. */ static void monitor_qapi_event_handler(void *opaque) { MonitorQAPIEventState *evstate = opaque; + MonitorQAPIEventConf *evconf = &monitor_qapi_event_conf[evstate->event]; trace_monitor_protocol_event_handler(evstate->event, evstate->qdict); qemu_mutex_lock(&monitor_lock); @@ -518,47 +534,27 @@ static void monitor_qapi_event_handler(void *opaque) monitor_qapi_event_emit(evstate->event, evstate->qdict); QDECREF(evstate->qdict); evstate->qdict = NULL; - timer_mod_ns(evstate->timer, now + evstate->rate); + timer_mod_ns(evstate->timer, now + evconf->rate); } qemu_mutex_unlock(&monitor_lock); } -/* - * @event: the event ID to be limited - * @rate: the rate limit in milliseconds - * - * Sets a rate limit on a particular event, so no - * more than 1 event will be emitted within @rate - * milliseconds - */ -static void -monitor_qapi_event_throttle(QAPIEvent event, int64_t rate) -{ - MonitorQAPIEventState *evstate; - assert(event < QAPI_EVENT_MAX); - - evstate = &(monitor_qapi_event_state[event]); - - trace_monitor_protocol_event_throttle(event, rate); - evstate->event = event; - assert(rate * SCALE_MS <= INT64_MAX); - evstate->rate = rate * SCALE_MS; - evstate->qdict = NULL; - evstate->timer = timer_new_ns(QEMU_CLOCK_REALTIME, - monitor_qapi_event_handler, - evstate); -} - static void monitor_qapi_event_init(void) { - /* Limit guest-triggerable events to 1 per second */ - monitor_qapi_event_throttle(QAPI_EVENT_RTC_CHANGE, 1000); - monitor_qapi_event_throttle(QAPI_EVENT_WATCHDOG, 1000); - monitor_qapi_event_throttle(QAPI_EVENT_BALLOON_CHANGE, 1000); - monitor_qapi_event_throttle(QAPI_EVENT_QUORUM_REPORT_BAD, 1000); - monitor_qapi_event_throttle(QAPI_EVENT_QUORUM_FAILURE, 1000); - monitor_qapi_event_throttle(QAPI_EVENT_VSERPORT_CHANGE, 1000); + int i; + MonitorQAPIEventState *evstate; + + for (i = 0; i < QAPI_EVENT_MAX; i++) { + if (monitor_qapi_event_conf[i].rate) { + evstate = &monitor_qapi_event_state[i]; + evstate->event = i; + evstate->qdict = NULL; + evstate->timer = timer_new_ns(QEMU_CLOCK_REALTIME, + monitor_qapi_event_handler, + evstate); + } + } qmp_event_set_func_emit(monitor_qapi_event_queue); }