ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'luiz/queue/qmp' into staging 

* luiz/queue/qmp:
  monitor: eliminate monitor_event_state_lock

Message-id: 1382121003-5211-1-git-send-email-lcapitulino@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
This commit is contained in:
Anthony Liguori 2013-10-31 17:00:07 +01:00
parent a9c78bb82e c20b7fa4b2
commit 3fa4270a65
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
monitor.c
View File

@ -511,7 +511,6 @@ static const char *monitor_event_names[] = {
QEMU_BUILD_BUG_ON(ARRAY_SIZE(monitor_event_names) != QEVENT_MAX) QEMU_BUILD_BUG_ON(ARRAY_SIZE(monitor_event_names) != QEVENT_MAX)
MonitorEventState monitor_event_state[QEVENT_MAX]; MonitorEventState monitor_event_state[QEVENT_MAX];
QemuMutex monitor_event_state_lock;
/* /*
* Emits the event to every monitor instance * Emits the event to every monitor instance
@ -543,7 +542,6 @@ monitor_protocol_event_queue(MonitorEvent event,
int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
assert(event < QEVENT_MAX); assert(event < QEVENT_MAX);
qemu_mutex_lock(&monitor_event_state_lock);
evstate = &(monitor_event_state[event]); evstate = &(monitor_event_state[event]);
trace_monitor_protocol_event_queue(event, trace_monitor_protocol_event_queue(event,
data, data,
@ -576,7 +574,6 @@ monitor_protocol_event_queue(MonitorEvent event,
evstate->last = now; evstate->last = now;
} }
} }
qemu_mutex_unlock(&monitor_event_state_lock);
} }
@ -589,7 +586,6 @@ static void monitor_protocol_event_handler(void *opaque)
MonitorEventState *evstate = opaque; MonitorEventState *evstate = opaque;
int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
qemu_mutex_lock(&monitor_event_state_lock);
trace_monitor_protocol_event_handler(evstate->event, trace_monitor_protocol_event_handler(evstate->event,
evstate->data, evstate->data,
@ -601,7 +597,6 @@ static void monitor_protocol_event_handler(void *opaque)
evstate->data = NULL; evstate->data = NULL;
} }
evstate->last = now; evstate->last = now;
qemu_mutex_unlock(&monitor_event_state_lock);
} }
@ -638,7 +633,6 @@ monitor_protocol_event_throttle(MonitorEvent event,
* and initialize state */ * and initialize state */
static void monitor_protocol_event_init(void) static void monitor_protocol_event_init(void)
{ {
qemu_mutex_init(&monitor_event_state_lock);
/* Limit RTC & BALLOON events to 1 per second */ /* Limit RTC & BALLOON events to 1 per second */
monitor_protocol_event_throttle(QEVENT_RTC_CHANGE, 1000); monitor_protocol_event_throttle(QEVENT_RTC_CHANGE, 1000);
monitor_protocol_event_throttle(QEVENT_BALLOON_CHANGE, 1000); monitor_protocol_event_throttle(QEVENT_BALLOON_CHANGE, 1000);