iothread: Set the GSource "name" field

Having a name in the source helps with debugging core dumps when one
might not have access to TLS data to cross-reference AioContexts with
their addresses.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20230905180359.14083-1-farosas@suse.de
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Fabiano Rosas 2023-09-05 15:03:59 -03:00 committed by Stefan Hajnoczi
parent 03a3a62fbd
commit 1f14c9147c

View File

@ -138,12 +138,14 @@ static void iothread_instance_finalize(Object *obj)
qemu_sem_destroy(&iothread->init_done_sem); qemu_sem_destroy(&iothread->init_done_sem);
} }
static void iothread_init_gcontext(IOThread *iothread) static void iothread_init_gcontext(IOThread *iothread, const char *thread_name)
{ {
GSource *source; GSource *source;
g_autofree char *name = g_strdup_printf("%s aio-context", thread_name);
iothread->worker_context = g_main_context_new(); iothread->worker_context = g_main_context_new();
source = aio_get_g_source(iothread_get_aio_context(iothread)); source = aio_get_g_source(iothread_get_aio_context(iothread));
g_source_set_name(source, name);
g_source_attach(source, iothread->worker_context); g_source_attach(source, iothread->worker_context);
g_source_unref(source); g_source_unref(source);
iothread->main_loop = g_main_loop_new(iothread->worker_context, TRUE); iothread->main_loop = g_main_loop_new(iothread->worker_context, TRUE);
@ -180,7 +182,7 @@ static void iothread_init(EventLoopBase *base, Error **errp)
{ {
Error *local_error = NULL; Error *local_error = NULL;
IOThread *iothread = IOTHREAD(base); IOThread *iothread = IOTHREAD(base);
char *thread_name; g_autofree char *thread_name = NULL;
iothread->stopping = false; iothread->stopping = false;
iothread->running = true; iothread->running = true;
@ -189,11 +191,14 @@ static void iothread_init(EventLoopBase *base, Error **errp)
return; return;
} }
thread_name = g_strdup_printf("IO %s",
object_get_canonical_path_component(OBJECT(base)));
/* /*
* Init one GMainContext for the iothread unconditionally, even if * Init one GMainContext for the iothread unconditionally, even if
* it's not used * it's not used
*/ */
iothread_init_gcontext(iothread); iothread_init_gcontext(iothread, thread_name);
iothread_set_aio_context_params(base, &local_error); iothread_set_aio_context_params(base, &local_error);
if (local_error) { if (local_error) {
@ -206,11 +211,8 @@ static void iothread_init(EventLoopBase *base, Error **errp)
/* This assumes we are called from a thread with useful CPU affinity for us /* This assumes we are called from a thread with useful CPU affinity for us
* to inherit. * to inherit.
*/ */
thread_name = g_strdup_printf("IO %s",
object_get_canonical_path_component(OBJECT(base)));
qemu_thread_create(&iothread->thread, thread_name, iothread_run, qemu_thread_create(&iothread->thread, thread_name, iothread_run,
iothread, QEMU_THREAD_JOINABLE); iothread, QEMU_THREAD_JOINABLE);
g_free(thread_name);
/* Wait for initialization to complete */ /* Wait for initialization to complete */
while (iothread->thread_id == -1) { while (iothread->thread_id == -1) {