search for: g_source_remove

** NOT WORKING ** This patch shows how to integrate libnbd and the glib main loop. Posted mainly as a point of discussion as it doesn't quite work yet. Rich.

...elem->in_num, 0, &res, sizeof(res)); > + iov_from_buf(elem->in_sg, elem->in_num, sizeof(res), info, sizeof(*info)); > + > + len += offset; > + virtqueue_push(vps->rvq, elem, len); > + virtio_notify(VIRTIO_DEVICE(vps), vps->rvq); > + > + return G_SOURCE_REMOVE; G_SOURCE_REMOVE was added in glib 2.32, but QEMU only permits stuff that is present in 2.22. Just use "FALSE" instead. > +static ssize_t virtio_pstore_do_read(VirtIOPstore *s, VirtQueueElement *elem) > +{ > + char *filename = NULL; > + int fd, idx; > + struct st...

...elem->in_num, 0, &res, sizeof(res)); > + iov_from_buf(elem->in_sg, elem->in_num, sizeof(res), info, sizeof(*info)); > + > + len += offset; > + virtqueue_push(vps->rvq, elem, len); > + virtio_notify(VIRTIO_DEVICE(vps), vps->rvq); > + > + return G_SOURCE_REMOVE; G_SOURCE_REMOVE was added in glib 2.32, but QEMU only permits stuff that is present in 2.22. Just use "FALSE" instead. > +static ssize_t virtio_pstore_do_read(VirtIOPstore *s, VirtQueueElement *elem) > +{ > + char *filename = NULL; > + int fd, idx; > + struct st...

...!= 0) > + nbd_aio_notify_write (source->nbd); No error checking? > + > + return TRUE; https://developer.gnome.org/glib/stable/glib-The-Main-Event-Loop.html#GSourceFuncs says dispatch() should return G_SOURCE_CONTINUE (which I assume is an alias of TRUE?). Should this ever return G_SOURCE_REMOVE (perhaps when we detect that the connection has moved to CLOSED)? > +} > + > +static void > +finalize (GSource *sp) > +{ > + struct NBDSource *source = (struct NBDSource *) sp; > + > + DEBUG (source, "finalize"); > + > + nbd_close (source->nbd); > +...

..._) +{ + struct NBDSource *source = (struct NBDSource *) sp; + int new_fd; + int events; + + /* The poll file descriptor can change or become invalid at any + * time. + */ + new_fd = nbd_aio_get_fd (source->nbd); + if (source->fd != new_fd) { + if (source->tag != NULL) { + g_source_remove_unix_fd ((GSource *) source, source->tag); + source->fd = -1; + source->tag = NULL; + } + if (new_fd >= 0) { + source->fd = new_fd; + source->tag = g_source_add_unix_fd ((GSource *) source, new_fd, 0); + } + } + + if (!source->tag) + return FAL...

...of(res)); > > + iov_from_buf(elem->in_sg, elem->in_num, sizeof(res), info, sizeof(*info)); > > + > > + len += offset; > > + virtqueue_push(vps->rvq, elem, len); > > + virtio_notify(VIRTIO_DEVICE(vps), vps->rvq); > > + > > + return G_SOURCE_REMOVE; > > G_SOURCE_REMOVE was added in glib 2.32, but QEMU only permits > stuff that is present in 2.22. Just use "FALSE" instead. Didn't know that, will change. > > > +static ssize_t virtio_pstore_do_read(VirtIOPstore *s, VirtQueueElement *elem) > > +{ > &gt...

This is working now, and incorporates all of the changes in Eric's review, *except* that it still doesn't retire commands (although this seems to make no obvious difference, except possibly a performance and memory impact). Rich.

...rting reader"); + g_idle_add (read_data, NULL); + reader_paused = false; + } + + /* If the reader has finished and there are no more buffers then we + * have done. + */ + if (finished && nr_buffers == 0) { + DEBUG (gsdest, "finished_write: all finished"); + g_source_remove (g_source_get_id ((GSource *) gssrc)); + g_source_unref ((GSource *) gssrc); + gssrc = NULL; + g_source_remove (g_source_get_id ((GSource *) gsdest)); + g_source_unref ((GSource *) gsdest); + gsdest = NULL; + g_main_loop_quit (loop); + } + + return 0; +} -- 2.22.0

...; + } +} + +static void swfdec_slow_loader_dispose (GObject *object) { SwfdecSlowLoader *slow = SWFDEC_SLOW_LOADER (object); + g_signal_handlers_disconnect_by_func (slow->loader, swfdec_slow_loader_notify_cb, slow); g_object_unref (slow->loader); if (slow->timeout_id) { g_source_remove (slow->timeout_id); @@ -96,7 +105,11 @@ swfdec_slow_loader_tick (gpointer data) return TRUE; } - if (slow->loader->eof) { + if (slow->loader->error) { + swfdec_loader_error (SWFDEC_LOADER (slow), slow->loader->error); + slow->timeout_id = 0; + return F...

.../ + iov_from_buf(elem->in_sg, elem->in_num, 0, &res, sizeof(res)); + iov_from_buf(elem->in_sg, elem->in_num, sizeof(res), info, sizeof(*info)); + + len += offset; + virtqueue_push(vps->rvq, elem, len); + virtio_notify(VIRTIO_DEVICE(vps), vps->rvq); + + return G_SOURCE_REMOVE; +} + +static void free_rarg_fn(gpointer data) +{ + struct pstore_read_arg *rarg = data; + + qio_channel_close(rarg->ioc, NULL); + + g_free(rarg->elem); + g_free(rarg); +} + +static ssize_t virtio_pstore_do_read(VirtIOPstore *s, VirtQueueElement *elem) +{ + char *filename = NUL...

...rom_buf(elem->in_sg, elem->in_num, sizeof(res), info, sizeof(*info)); > > > + > > > + len += offset; > > > + virtqueue_push(vps->rvq, elem, len); > > > + virtio_notify(VIRTIO_DEVICE(vps), vps->rvq); > > > + > > > + return G_SOURCE_REMOVE; > > > +} > > > + > > > +static void free_rarg_fn(gpointer data) > > > +{ > > > + struct pstore_read_arg *rarg = data; > > > + > > > + qio_channel_close(rarg->ioc, NULL); > > > + > > > + g_free(rarg->ele...

Hello, This is another iteration of the virtio-pstore work. In this patchset I addressed most of feedbacks from previous version and drooped the support for PSTORE_TYPE_CONSOLE for simplicity. It'll be added once the basic implementation * changes in v3) - use QIOChannel API (Stefan, Daniel) - add bound check for malcious guests (Daniel) - drop support PSTORE_TYPE_CONSOLE for now

Hello, This is another iteration of the virtio-pstore work. In this patchset I addressed most of feedbacks from previous version and drooped the support for PSTORE_TYPE_CONSOLE for simplicity. It'll be added once the basic implementation * changes in v3) - use QIOChannel API (Stefan, Daniel) - add bound check for malcious guests (Daniel) - drop support PSTORE_TYPE_CONSOLE for now

...dle_add_full (-100, vivi_application_step_forward, app, NULL); } break; default: @@ -391,6 +399,12 @@ vivi_application_quit (ViviApplication * return; app->playback_state = VIVI_APPLICATION_EXITING; app->playback_count = 1; + if (app->step_source) { + if (!g_source_remove (app->step_source)) { + g_assert_not_reached (); + } + app->step_source = 0; + } g_object_notify (G_OBJECT (app), "quit"); vivi_application_check (app); } diff --git a/vivified/core/vivi_application.h b/vivified/core/vivi_application.h index 33694bf..1a8c68a 1006...

...dle_add_full (-100, vivi_application_step_forward, app, NULL); } break; default: @@ -391,6 +399,12 @@ vivi_application_quit (ViviApplication * return; app->playback_state = VIVI_APPLICATION_EXITING; app->playback_count = 1; + if (app->step_source) { + if (!g_source_remove (app->step_source)) { + g_assert_not_reached (); + } + app->step_source = 0; + } g_object_notify (G_OBJECT (app), "quit"); vivi_application_check (app); } diff --git a/vivified/core/vivi_application.h b/vivified/core/vivi_application.h index 33694bf..1a8c68a 1006...

...; - } -} - -static void -swfdec_slow_loader_dispose (GObject *object) -{ - SwfdecSlowLoader *slow = SWFDEC_SLOW_LOADER (object); - - g_signal_handlers_disconnect_by_func (slow->loader, swfdec_slow_loader_notify_cb, slow); - g_object_unref (slow->loader); - if (slow->timeout_id) { - g_source_remove (slow->timeout_id); - slow->timeout_id = 0; - } - - G_OBJECT_CLASS (swfdec_slow_loader_parent_class)->dispose (object); -} - -static gboolean -swfdec_slow_loader_tick (gpointer data) -{ - SwfdecSlowLoader *slow = data; - SwfdecBuffer *buffer; - guint total, amount; - - amount = sw...