pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

module/mpd: don't detach refresh thread

Browse source 
Instead, abort and join previous thread (if any), just before creating
a new one.

Abort/join the last one when destroying the module.

Note: we may end up with a dangling (non-joined) thread for a
while (for example, when state goes from playing -> paused/stopped).

It will however be joined eventually; either when state goes to
'playing' again, or when the module is destroyed.
This commit is contained in:
Daniel Eklöf 2018-12-28 14:22:17 +01:00
parent cc59593f29
commit 97b279ff82
1 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
modules/mpd/mpd.c
View file

@ -43,6 +43,7 @@ struct private {
} elapsed; } elapsed;
uint64_t duration; uint64_t duration;
thrd_t refresh_thread_id;
int refresh_abort_fd; int refresh_abort_fd;
}; };
@ -50,9 +51,15 @@ static void
destroy(struct module *mod) destroy(struct module *mod)
{ {
struct private *m = mod->private; struct private *m = mod->private;
if (m->refresh_abort_fd != -1) if (m->refresh_thread_id != 0) {
assert(m->refresh_abort_fd != -1);
write(m->refresh_abort_fd, &(uint64_t){1}, sizeof(uint64_t)); write(m->refresh_abort_fd, &(uint64_t){1}, sizeof(uint64_t));
int res;
thrd_join(m->refresh_thread_id, &res);
close(m->refresh_abort_fd);
};
free(m->host); free(m->host);
free(m->album); free(m->album);
free(m->artist); free(m->artist);
@ -340,7 +347,6 @@ refresh_in_thread(void *arg)
{ {
struct refresh_context *ctx = arg; struct refresh_context *ctx = arg;
struct module *mod = ctx->mod; struct module *mod = ctx->mod;
struct private *m = mod->private;
/* Extract data from context so that we can free it */ /* Extract data from context so that we can free it */
int abort_fd = ctx->abort_fd; int abort_fd = ctx->abort_fd;
@ -353,17 +359,15 @@ refresh_in_thread(void *arg)
struct pollfd fds[] = {{.fd = abort_fd, .events = POLLIN}}; struct pollfd fds[] = {{.fd = abort_fd, .events = POLLIN}};
int r = poll(fds, 1, milli_seconds); int r = poll(fds, 1, milli_seconds);
/* Close abort eventfd */ if (r < 0) {
mtx_lock(&mod->lock); LOG_ERRNO("failed to poll() in refresh thread");
close(abort_fd); return 1;
if (m->refresh_abort_fd == abort_fd) }
m->refresh_abort_fd = -1;
mtx_unlock(&mod->lock);
/* Aborted? */ /* Aborted? */
if (r == 1) { if (r == 1) {
assert(fds[0].revents & POLLIN); assert(fds[0].revents & POLLIN);
LOG_DBG("aborted"); LOG_DBG("refresh thread aborted");
return 0; return 0;
} }
@ -379,15 +383,22 @@ refresh_in(struct module *mod, long milli_seconds)
struct private *m = mod->private; struct private *m = mod->private;
/* Abort currently running refresh thread */ /* Abort currently running refresh thread */
mtx_lock(&mod->lock); if (m->refresh_thread_id != 0) {
if (m->refresh_abort_fd != -1) {
LOG_DBG("aborting current refresh thread"); LOG_DBG("aborting current refresh thread");
/* Signal abort to thread */
assert(m->refresh_abort_fd != -1);
write(m->refresh_abort_fd, &(uint64_t){1}, sizeof(uint64_t)); write(m->refresh_abort_fd, &(uint64_t){1}, sizeof(uint64_t));
/* Closed by thread */ /* Wait for it to finish */
int res;
thrd_join(m->refresh_thread_id, &res);
/* Close and cleanup */
close(m->refresh_abort_fd);
m->refresh_abort_fd = -1; m->refresh_abort_fd = -1;
m->refresh_thread_id = 0;
} }
mtx_unlock(&mod->lock);
/* Create a new eventfd, to be able to signal abort to the thread */ /* Create a new eventfd, to be able to signal abort to the thread */
int abort_fd = eventfd(0, EFD_CLOEXEC); int abort_fd = eventfd(0, EFD_CLOEXEC);
@ -403,13 +414,18 @@ refresh_in(struct module *mod, long milli_seconds)
ctx->milli_seconds = milli_seconds; ctx->milli_seconds = milli_seconds;
/* Create thread */ /* Create thread */
thrd_t tid; int r = thrd_create(&m->refresh_thread_id, &refresh_in_thread, ctx);
int r = thrd_create(&tid, &refresh_in_thread, ctx);
if (r != 0) if (r != 0) {
LOG_ERR("failed to create refresh thread"); LOG_ERR("failed to create refresh thread");
close(m->refresh_abort_fd);
m->refresh_abort_fd = -1;
m->refresh_thread_id = 0;
free(ctx);
}
/* Detach - we don't want to have to thrd_join() it */ /* Detach - we don't want to have to thrd_join() it */
thrd_detach(tid); //thrd_detach(tid);
return r == 0; return r == 0;
} }
@ -428,6 +444,7 @@ module_mpd(const char *host, uint16_t port, struct particle *label)
priv->elapsed.value = 0; priv->elapsed.value = 0;
priv->elapsed.when.tv_sec = priv->elapsed.when.tv_nsec = 0; priv->elapsed.when.tv_sec = priv->elapsed.when.tv_nsec = 0;
priv->duration = 0; priv->duration = 0;
priv->refresh_thread_id = 0;
priv->refresh_abort_fd = -1; priv->refresh_abort_fd = -1;
struct module *mod = module_common_new(); struct module *mod = module_common_new();