mirror of
https://github.com/owntone/owntone-server.git
synced 2024-12-24 22:25:56 -05:00
Include listener thread in the threads waited for on shutdown
This commit is contained in:
parent
74238741d1
commit
5bb7712b5b
@ -265,12 +265,28 @@ void *ws_mainthread(void *arg) {
|
||||
pthread_t tid;
|
||||
char hostname[MAX_HOSTNAME];
|
||||
|
||||
if(pthread_mutex_lock(&pwsp->exit_mutex))
|
||||
log_err(1,"Cannot lock condition mutex\n");
|
||||
|
||||
pwsp->dispatch_threads++;
|
||||
|
||||
pthread_mutex_unlock(&pwsp->exit_mutex);
|
||||
|
||||
while(1) {
|
||||
pwsc=(WS_CONNINFO*)malloc(sizeof(WS_CONNINFO));
|
||||
if(!pwsc) {
|
||||
/* can't very well service any more threads! */
|
||||
DPRINTF(ERR_FATAL,"Error: %s\n",strerror(errno));
|
||||
pwsp->running=0;
|
||||
|
||||
|
||||
/* decrement the number of dispatch threads */
|
||||
if(pthread_mutex_lock(&pwsp->exit_mutex))
|
||||
log_err(1,"Cannot lock condition mutex\n");
|
||||
|
||||
pwsp->dispatch_threads--;
|
||||
pthread_cond_signal(&pwsp->exit_cond);
|
||||
pthread_mutex_unlock(&pwsp->exit_mutex);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -280,6 +296,14 @@ void *ws_mainthread(void *arg) {
|
||||
r_close(pwsp->server_fd);
|
||||
pwsp->running=0;
|
||||
free(pwsc);
|
||||
|
||||
/* decrement dispatch threads */
|
||||
if(pthread_mutex_lock(&pwsp->exit_mutex))
|
||||
log_err(1,"Cannot lock condition mutex\n");
|
||||
|
||||
pwsp->dispatch_threads--;
|
||||
pthread_cond_signal(&pwsp->exit_cond);
|
||||
pthread_mutex_unlock(&pwsp->exit_mutex);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user