From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:33592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHHw4-0004RB-DJ for qemu-devel@nongnu.org; Fri, 21 Oct 2011 12:27:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RHHw1-0007SF-Vi for qemu-devel@nongnu.org; Fri, 21 Oct 2011 12:27:08 -0400 Received: from mail-ww0-f53.google.com ([74.125.82.53]:38994) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RHHw1-0007Ox-Hd for qemu-devel@nongnu.org; Fri, 21 Oct 2011 12:27:05 -0400 Received: by mail-ww0-f53.google.com with SMTP id 36so5506865wwi.10 for ; Fri, 21 Oct 2011 09:27:05 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 21 Oct 2011 18:26:44 +0200 Message-Id: <1319214405-20388-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1319214405-20388-1-git-send-email-pbonzini@redhat.com> References: <1319214405-20388-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3 12/13] Revert to a hand-made select loop List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This reverts commit c82dc29a9112f34e0a51cad9a412cf6d9d05dfb2 and 4d88a2ac8643265108ef1fb47ceee5d7b28e19f2. Signed-off-by: Paolo Bonzini --- iohandler.c | 54 +----------------------------------------------------- 1 files changed, 1 insertions(+), 53 deletions(-) diff --git a/iohandler.c b/iohandler.c index 687dc56..5640d49 100644 --- a/iohandler.c +++ b/iohandler.c @@ -81,64 +81,12 @@ int qemu_set_fd_handler2(int fd, return 0; } -typedef struct IOTrampoline -{ - GIOChannel *chan; - IOHandler *fd_read; - IOHandler *fd_write; - void *opaque; - guint tag; -} IOTrampoline; - -static gboolean fd_trampoline(GIOChannel *chan, GIOCondition cond, gpointer opaque) -{ - IOTrampoline *tramp = opaque; - - if ((cond & G_IO_IN) && tramp->fd_read) { - tramp->fd_read(tramp->opaque); - } - - if ((cond & G_IO_OUT) && tramp->fd_write) { - tramp->fd_write(tramp->opaque); - } - - return TRUE; -} - int qemu_set_fd_handler(int fd, IOHandler *fd_read, IOHandler *fd_write, void *opaque) { - static IOTrampoline fd_trampolines[FD_SETSIZE]; - IOTrampoline *tramp = &fd_trampolines[fd]; - - if (tramp->tag != 0) { - g_io_channel_unref(tramp->chan); - g_source_remove(tramp->tag); - tramp->tag = 0; - } - - if (fd_read || fd_write || opaque) { - GIOCondition cond = 0; - - tramp->fd_read = fd_read; - tramp->fd_write = fd_write; - tramp->opaque = opaque; - - if (fd_read) { - cond |= G_IO_IN | G_IO_ERR; - } - - if (fd_write) { - cond |= G_IO_OUT | G_IO_ERR; - } - - tramp->chan = g_io_channel_unix_new(fd); - tramp->tag = g_io_add_watch(tramp->chan, cond, fd_trampoline, tramp); - } - - return 0; + return qemu_set_fd_handler2(fd, NULL, fd_read, fd_write, opaque); } void qemu_iohandler_fill(int *pnfds, fd_set *readfds, fd_set *writefds, fd_set *xfds) -- 1.7.6