Browse Source

util: expose qemu_thread_set_name

The ability to set the thread name needs to be used in a number
of places, so expose the current impls as public methods.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dave@treblig.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
master
Daniel P. Berrangé 7 months ago
parent
commit
46255cc2be
  1. 1
      include/qemu/thread.h
  2. 26
      util/qemu-thread-posix.c
  3. 6
      util/qemu-thread-win32.c

1
include/qemu/thread.h

@ -215,6 +215,7 @@ void *qemu_thread_join(QemuThread *thread);
void qemu_thread_get_self(QemuThread *thread);
bool qemu_thread_is_self(QemuThread *thread);
G_NORETURN void qemu_thread_exit(void *retval);
void qemu_thread_set_name(const char *name);
struct Notifier;
/**

26
util/qemu-thread-posix.c

@ -329,6 +329,21 @@ static void qemu_thread_atexit_notify(void *arg)
notifier_list_notify(&thread_exit, NULL);
}
void qemu_thread_set_name(const char *name)
{
/*
* Attempt to set the thread name; note that this is for debug, so
* we're not going to fail if we can't set it.
*/
# if defined(CONFIG_PTHREAD_SETNAME_NP_W_TID)
pthread_setname_np(pthread_self(), name);
# elif defined(CONFIG_PTHREAD_SETNAME_NP_WO_TID)
pthread_setname_np(name);
# elif defined(CONFIG_PTHREAD_SET_NAME_NP)
pthread_set_name_np(pthread_self(), name);
# endif
}
typedef struct {
void *(*start_routine)(void *);
void *arg;
@ -342,17 +357,8 @@ static void *qemu_thread_start(void *args)
void *arg = qemu_thread_args->arg;
void *r;
/* Attempt to set the threads name; note that this is for debug, so
* we're not going to fail if we can't set it.
*/
if (qemu_thread_args->name) {
# if defined(CONFIG_PTHREAD_SETNAME_NP_W_TID)
pthread_setname_np(pthread_self(), qemu_thread_args->name);
# elif defined(CONFIG_PTHREAD_SETNAME_NP_WO_TID)
pthread_setname_np(qemu_thread_args->name);
# elif defined(CONFIG_PTHREAD_SET_NAME_NP)
pthread_set_name_np(pthread_self(), qemu_thread_args->name);
# endif
qemu_thread_set_name(qemu_thread_args->name);
}
QEMU_TSAN_ANNOTATE_THREAD_NAME(qemu_thread_args->name);
g_free(qemu_thread_args->name);

6
util/qemu-thread-win32.c

@ -22,8 +22,6 @@ typedef HRESULT (WINAPI *pSetThreadDescription) (HANDLE hThread,
static pSetThreadDescription SetThreadDescriptionFunc;
static HMODULE kernel32_module;
static void set_thread_description(const char *name);
static bool load_set_thread_description(void)
{
static gsize _init_once = 0;
@ -270,7 +268,7 @@ static unsigned __stdcall win32_start_routine(void *arg)
void *thread_arg = data->arg;
if (data->name) {
set_thread_description(data->name);
qemu_thread_set_name(data->name);
g_clear_pointer(&data->name, g_free);
}
qemu_thread_data = data;
@ -323,7 +321,7 @@ void *qemu_thread_join(QemuThread *thread)
return ret;
}
static void set_thread_description(const char *name)
void qemu_thread_set_name(const char *name)
{
g_autofree wchar_t *namew = NULL;

Loading…
Cancel
Save