mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

thread-loop: improve thread name

Browse source 
The thread name can only be 16 chars. We don't need to strdup the
name but copy and trunc into a fixed buffer.
We can also set the thread name right after we created the thread.
Emit a warning when we can't set the thread name
This commit is contained in:
Wim Taymans 2021-06-28 12:17:15 +02:00
parent 82f02dc502
commit c90bd14ede
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pipewire/thread-loop.c
View file

@ -44,7 +44,7 @@
/** \cond */ /** \cond */
struct pw_thread_loop { struct pw_thread_loop {
struct pw_loop *loop; struct pw_loop *loop;
char *name; char name[16];
struct spa_hook_list listener_list; struct spa_hook_list listener_list;
@ -112,7 +112,7 @@ static struct pw_thread_loop *loop_new(struct pw_loop *loop,
if (this == NULL) if (this == NULL)
return NULL; return NULL;
pw_log_debug(NAME" %p: new", this); pw_log_debug(NAME" %p: new name:%s", this, name);
if (loop == NULL) { if (loop == NULL) {
loop = pw_loop_new(props); loop = pw_loop_new(props);
@ -123,7 +123,7 @@ static struct pw_thread_loop *loop_new(struct pw_loop *loop,
goto clean_this; goto clean_this;
} }
this->loop = loop; this->loop = loop;
this->name = name ? strdup(name) : NULL; snprintf(this->name, sizeof(this->name), "%s", name ? name : "pw-thread-loop");
spa_hook_list_init(&this->listener_list); spa_hook_list_init(&this->listener_list);
@ -155,7 +155,6 @@ clean_lock:
clean_this: clean_this:
if (this->created && this->loop) if (this->created && this->loop)
pw_loop_destroy(this->loop); pw_loop_destroy(this->loop);
free(this->name);
free(this); free(this);
errno = -res; errno = -res;
return NULL; return NULL;
@ -223,7 +222,6 @@ void pw_thread_loop_destroy(struct pw_thread_loop *loop)
pthread_cond_destroy(&loop->cond); pthread_cond_destroy(&loop->cond);
pthread_mutex_destroy(&loop->lock); pthread_mutex_destroy(&loop->lock);
free(loop->name);
free(loop); free(loop);
} }
@ -250,7 +248,6 @@ static void *do_loop(void *user_data)
pthread_mutex_lock(&this->lock); pthread_mutex_lock(&this->lock);
pw_log_debug(NAME" %p: enter thread", this); pw_log_debug(NAME" %p: enter thread", this);
pthread_setname_np(this->thread, this->name ? this->name : "pipewire-thread");
pw_loop_enter(this->loop); pw_loop_enter(this->loop);
while (this->running) { while (this->running) {
@ -287,6 +284,8 @@ int pw_thread_loop_start(struct pw_thread_loop *loop)
loop->running = false; loop->running = false;
return -err; return -err;
} }
if ((err = pthread_setname_np(loop->thread, loop->name)) != 0)
pw_log_warn(NAME" %p: error: %s", loop, strerror(err));
} }
return 0; return 0;
} }