[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [patch 04/11] qemu: introduce main_loop_break
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [patch 04/11] qemu: introduce main_loop_break |
Date: |
Thu, 02 Apr 2009 20:32:54 -0300 |
User-agent: |
quilt/0.46-1 |
Use a pipe to signal pending work for the iothread.
Signed-off-by: Marcelo Tosatti <address@hidden>
Index: trunk/qemu-common.h
===================================================================
--- trunk.orig/qemu-common.h
+++ trunk/qemu-common.h
@@ -186,6 +186,8 @@ int cpu_load(QEMUFile *f, void *opaque,
/* Force QEMU to stop what it's doing and service IO */
void qemu_service_io(void);
+void main_loop_break(void);
+
/* Force QEMU to process pending events */
void qemu_notify_event(void);
Index: trunk/vl.c
===================================================================
--- trunk.orig/vl.c
+++ trunk/vl.c
@@ -276,6 +276,8 @@ static QEMUTimer *nographic_timer;
uint8_t qemu_uuid[16];
+static int io_thread_fd = -1;
+
/***********************************************************/
/* x86 ISA bus support */
@@ -3632,6 +3634,55 @@ void qemu_notify_event(void)
}
}
+void main_loop_break(void)
+{
+ uint64_t value = 1;
+ char buffer[8];
+ size_t offset = 0;
+
+ if (io_thread_fd == -1)
+ return;
+
+ memcpy(buffer, &value, sizeof(value));
+
+ while (offset < 8) {
+ ssize_t len;
+
+ len = write(io_thread_fd, buffer + offset, 8 - offset);
+ if (len == -1 && errno == EINTR)
+ continue;
+
+ if (len <= 0)
+ break;
+
+ offset += len;
+ }
+
+ if (offset != 8)
+ fprintf(stderr, "failed to notify io thread\n");
+}
+
+/* Used to break IO thread out of select */
+static void io_thread_wakeup(void *opaque)
+{
+ int fd = (unsigned long)opaque;
+ char buffer[8];
+ size_t offset = 0;
+
+ while (offset < 8) {
+ ssize_t len;
+
+ len = read(fd, buffer + offset, 8 - offset);
+ if (len == -1 && errno == EINTR)
+ continue;
+
+ if (len <= 0)
+ break;
+
+ offset += len;
+ }
+}
+
#ifdef _WIN32
static void host_main_loop_wait(int *timeout)
{
@@ -3774,6 +3825,20 @@ void main_loop_wait(int timeout)
}
+static void setup_iothread_fd(void)
+{
+ int fds[2];
+
+ if (pipe(fds) == -1) {
+ fprintf(stderr, "failed to create iothread pipe");
+ exit(0);
+ }
+
+ qemu_set_fd_handler2(fds[0], NULL, io_thread_wakeup, NULL,
+ (void *)(unsigned long)fds[0]);
+ io_thread_fd = fds[1];
+}
+
static int main_loop(void)
{
int ret, timeout;
--
- [Qemu-devel] [patch 00/11] iothread v2, Marcelo Tosatti, 2009/04/02
- [Qemu-devel] [patch 03/11] qemu: per-arch cpu_has_work, Marcelo Tosatti, 2009/04/02
- [Qemu-devel] [patch 07/11] qemu: handle reset/poweroff/shutdown in iothread, Marcelo Tosatti, 2009/04/02
- [Qemu-devel] [patch 05/11] qemu: separate thread for io, Marcelo Tosatti, 2009/04/02
- [Qemu-devel] [patch 06/11] qemu: per-cpu thread information, Marcelo Tosatti, 2009/04/02
- [Qemu-devel] [patch 04/11] qemu: introduce main_loop_break,
Marcelo Tosatti <=
- [Qemu-devel] [patch 09/11] qemu: handle vmstop from cpu context, Marcelo Tosatti, 2009/04/02
- [Qemu-devel] [patch 08/11] qemu: pause and resume cpu threads, Marcelo Tosatti, 2009/04/02
- [Qemu-devel] [patch 11/11] qemu: basic kvm iothread support, Marcelo Tosatti, 2009/04/02
- [Qemu-devel] [patch 10/11] qemu: make iothread selectable at compile time, Marcelo Tosatti, 2009/04/02