storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Listen for SIGCHLD while scanning, so we can immediately add inotify watches after a scan.

Browse Source
This commit is contained in:
Justin Maggard 2012-05-17 07:49:24 +00:00
parent a41c137e1f
commit 110300b44e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
minidlna.c
View File

@ -53,6 +53,7 @@
#include <ctype.h> #include <ctype.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/wait.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/param.h> #include <sys/param.h>
@ -158,6 +159,14 @@ sigterm(int sig)
/*errno = save_errno;*/ /*errno = save_errno;*/
} }
static void
sigchld(int sig)
{
if (!scanning)
signal(SIGCHLD, SIG_IGN);
waitpid(-1, NULL, WNOHANG);
}
/* record the startup time */ /* record the startup time */
static void static void
set_startup_time(void) set_startup_time(void)
@ -971,7 +980,7 @@ main(int argc, char * * argv)
start_scanner(); start_scanner();
#endif #endif
} }
signal(SIGCHLD, SIG_IGN); signal(SIGCHLD, &sigchld);
#ifdef HAVE_INOTIFY #ifdef HAVE_INOTIFY
if( sqlite3_threadsafe() && sqlite3_libversion_number() >= 3005001 && if( sqlite3_threadsafe() && sqlite3_libversion_number() >= 3005001 &&
GETFLAG(INOTIFY_MASK) && pthread_create(&inotify_thread, NULL, start_inotify, NULL) ) GETFLAG(INOTIFY_MASK) && pthread_create(&inotify_thread, NULL, start_inotify, NULL) )
@ -1149,6 +1158,7 @@ main(int argc, char * * argv)
if(select(max_fd+1, &readset, &writeset, 0, &timeout) < 0) if(select(max_fd+1, &readset, &writeset, 0, &timeout) < 0)
{ {
if(quitting) goto shutdown; if(quitting) goto shutdown;
if(errno == EINTR) continue;
DPRINTF(E_ERROR, L_GENERAL, "select(all): %s\n", strerror(errno)); DPRINTF(E_ERROR, L_GENERAL, "select(all): %s\n", strerror(errno));
DPRINTF(E_FATAL, L_GENERAL, "Failed to select open sockets. EXITING\n"); DPRINTF(E_FATAL, L_GENERAL, "Failed to select open sockets. EXITING\n");
} }