Attachment 155448 Details for Bug 241303 – Fix handling of file descriptors on VNC client disconnect

[patch] Fix handling of file descriptors on VNC client disconnect

vnc-delete.patch (text/plain), 2.56 KB, created by Daniel Berrangé on 2007-05-25 13:01:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Berrangé

Created: 2007-05-25 13:01:34 UTC

Size: 2.56 KB

patch

obsolete

>Index: vl.c
>===================================================================
>RCS file: /sources/qemu/qemu/vl.c,v
>retrieving revision 1.259
>retrieving revision 1.260
>diff -u -p -r1.259 -r1.260
>--- vl.c	22 Feb 2007 01:48:01 -0000	1.259
>+++ vl.c	28 Feb 2007 21:59:44 -0000	1.260
>@@ -4462,6 +4462,7 @@ typedef struct IOHandlerRecord {
>     IOCanRWHandler *fd_read_poll;
>     IOHandler *fd_read;
>     IOHandler *fd_write;
>+    int deleted;
>     void *opaque;
>     /* temporary data */
>     struct pollfd *ufd;
>@@ -4487,8 +4488,7 @@ int qemu_set_fd_handler2(int fd, 
>             if (ioh == NULL)
>                 break;
>             if (ioh->fd == fd) {
>-                *pioh = ioh->next;
>-                qemu_free(ioh);
>+                ioh->deleted = 1;
>                 break;
>             }
>             pioh = &ioh->next;
>@@ -4509,6 +4509,7 @@ int qemu_set_fd_handler2(int fd, 
>         ioh->fd_read = fd_read;
>         ioh->fd_write = fd_write;
>         ioh->opaque = opaque;
>+        ioh->deleted = 0;
>     }
>     return 0;
> }
>@@ -6157,7 +6158,7 @@ void qemu_system_powerdown_request(void)
> 
> void main_loop_wait(int timeout)
> {
>-    IOHandlerRecord *ioh, *ioh_next;
>+    IOHandlerRecord *ioh;
>     fd_set rfds, wfds, xfds;
>     int ret, nfds;
>     struct timeval tv;
>@@ -6192,6 +6193,8 @@ void main_loop_wait(int timeout)
>     FD_ZERO(&wfds);
>     FD_ZERO(&xfds);
>     for(ioh = first_io_handler; ioh != NULL; ioh = ioh->next) {
>+        if (ioh->deleted)
>+            continue;
>         if (ioh->fd_read &&
>             (!ioh->fd_read_poll ||
>              ioh->fd_read_poll(ioh->opaque) != 0)) {
>@@ -6219,9 +6222,11 @@ void main_loop_wait(int timeout)
> #endif
>     ret = select(nfds + 1, &rfds, &wfds, &xfds, &tv);
>     if (ret > 0) {
>-        /* XXX: better handling of removal */
>-        for(ioh = first_io_handler; ioh != NULL; ioh = ioh_next) {
>-            ioh_next = ioh->next;
>+        IOHandlerRecord **pioh;
>+
>+        for(ioh = first_io_handler; ioh != NULL; ioh = ioh->next) {
>+            if (ioh->deleted)
>+                continue;
>             if (FD_ISSET(ioh->fd, &rfds)) {
>                 ioh->fd_read(ioh->opaque);
>             }
>@@ -6229,6 +6234,17 @@ void main_loop_wait(int timeout)
>                 ioh->fd_write(ioh->opaque);
>             }
>         }
>+
>+	/* remove deleted IO handlers */
>+	pioh = &first_io_handler;
>+	while (*pioh) {
>+            ioh = *pioh;
>+            if (ioh->deleted) {
>+                *pioh = ioh->next;
>+                qemu_free(ioh);
>+            } else 
>+                pioh = &ioh->next;
>+        }
>     }
> #if defined(CONFIG_SLIRP)
>     if (slirp_inited) {

Actions: View | Diff

Attachments on bug 241303: 155448