SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chardev: let g_idle_add() be with chardev gcontext

Browse Source 
The idle task will be attached to main gcontext even if the chardev
backend is running in another gcontext.  Fix the only caller by
extending the g_idle_add() logic into the more powerful
g_source_attach().  It's basically g_idle_add_full() implementation, but
with the chardev's gcontext passed in.

Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20180104141835.17987-3-peterx@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Xu 2018-01-04 22:18:34 +08:00 committed by Paolo Bonzini
parent 91e14fb8e9
commit 938eb9e9c8
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
chardev/char-pty.c
View File

@ -43,7 +43,7 @@ typedef struct {
/* Protected by the Chardev chr_write_lock. */ /* Protected by the Chardev chr_write_lock. */
int connected; int connected;
guint timer_tag; guint timer_tag;
guint open_tag; GSource *open_source;
} PtyChardev; } PtyChardev;
#define PTY_CHARDEV(obj) OBJECT_CHECK(PtyChardev, (obj), TYPE_CHARDEV_PTY) #define PTY_CHARDEV(obj) OBJECT_CHECK(PtyChardev, (obj), TYPE_CHARDEV_PTY)
@ -58,7 +58,7 @@ static gboolean pty_chr_timer(gpointer opaque)
qemu_mutex_lock(&chr->chr_write_lock); qemu_mutex_lock(&chr->chr_write_lock);
s->timer_tag = 0; s->timer_tag = 0;
s->open_tag = 0; s->open_source = NULL;
if (!s->connected) { if (!s->connected) {
/* Next poll ... */ /* Next poll ... */
pty_chr_update_read_handler_locked(chr); pty_chr_update_read_handler_locked(chr);
@ -183,7 +183,7 @@ static gboolean qemu_chr_be_generic_open_func(gpointer opaque)
Chardev *chr = CHARDEV(opaque); Chardev *chr = CHARDEV(opaque);
PtyChardev *s = PTY_CHARDEV(opaque); PtyChardev *s = PTY_CHARDEV(opaque);
s->open_tag = 0; s->open_source = NULL;
qemu_chr_be_event(chr, CHR_EVENT_OPENED); qemu_chr_be_event(chr, CHR_EVENT_OPENED);
return FALSE; return FALSE;
} }
@ -194,9 +194,10 @@ static void pty_chr_state(Chardev *chr, int connected)
PtyChardev *s = PTY_CHARDEV(chr); PtyChardev *s = PTY_CHARDEV(chr);
if (!connected) { if (!connected) {
if (s->open_tag) { if (s->open_source) {
g_source_remove(s->open_tag); g_source_destroy(s->open_source);
s->open_tag = 0; g_source_unref(s->open_source);
s->open_source = NULL;
} }
remove_fd_in_watch(chr); remove_fd_in_watch(chr);
s->connected = 0; s->connected = 0;
@ -210,9 +211,13 @@ static void pty_chr_state(Chardev *chr, int connected)
s->timer_tag = 0; s->timer_tag = 0;
} }
if (!s->connected) { if (!s->connected) {
g_assert(s->open_tag == 0); g_assert(s->open_source == NULL);
s->open_source = g_idle_source_new();
s->connected = 1; s->connected = 1;
s->open_tag = g_idle_add(qemu_chr_be_generic_open_func, chr); g_source_set_callback(s->open_source,
qemu_chr_be_generic_open_func,
chr, NULL);
g_source_attach(s->open_source, chr->gcontext);
} }
if (!chr->gsource) { if (!chr->gsource) {
chr->gsource = io_add_watch_poll(chr, s->ioc, chr->gsource = io_add_watch_poll(chr, s->ioc,