stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tvhlog: cleanup tvhlog_queue on shutdown

Browse source
This commit is contained in:
Jaroslav Kysela 2014-10-03 16:21:37 +02:00
parent 3d3d24aa3e
commit b2913639c4
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/tvhlog.c
View file

@ -270,7 +270,7 @@ void tvhlogv ( const char *file, int line,
pthread_mutex_lock(&tvhlog_mutex);
/* Check for full */
if (tvhlog_queue_full || !tvhlog_run) {
if (tvhlog_queue_full) {
pthread_mutex_unlock(&tvhlog_mutex);
return;
}
@ -428,11 +428,22 @@ tvhlog_start ( void )
void
tvhlog_end ( void )
{
FILE *fp = NULL;
tvhlog_msg_t *msg;
pthread_mutex_lock(&tvhlog_mutex);
tvhlog_run = 0;
pthread_cond_signal(&tvhlog_cond);
pthread_mutex_unlock(&tvhlog_mutex);
pthread_join(tvhlog_tid, NULL);
pthread_mutex_lock(&tvhlog_mutex);
while (!(msg = TAILQ_FIRST(&tvhlog_queue))) {
TAILQ_REMOVE(&tvhlog_queue, msg, link);
tvhlog_process(msg, tvhlog_options, &fp, tvhlog_path);
}
tvhlog_queue_full = 1;
pthread_mutex_unlock(&tvhlog_mutex);
if (fp)
fclose(fp);
free(tvhlog_path);
htsmsg_destroy(tvhlog_debug);
htsmsg_destroy(tvhlog_trace);