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

Add monitoring support via kqueue(2). Based on patch from FreeBSD ports, authored by wg@FreeBSD.org and se@FreeBSD.org. However, this version doesn't create any thread, it uses main event dispatcher.

Browse Source 
Some effort was made to unify monitoring via kqueue and via inotify
APIs. Now both provide their implementation of add_watch() function.

I guess there are some logical bugs in vnode_process(). With this commit
it would be better provide code as is, and resolve bugs separately.
This commit is contained in:
Gleb Smirnoff
2017-12-29 02:05:46 -08:00
committed by Justin Maggard
parent 184607cb56
commit 5e320f2798
7 changed files with 300 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
minidlna.c
View File

@ -408,7 +408,6 @@ rescan:
if (ret || GETFLAG(RESCAN_MASK))
{
#if USE_FORK
SETFLAG(SCANNING_MASK);
sqlite3_close(db);
*scanner_pid = fork();
open_db(&db);
@ -425,6 +424,8 @@ rescan:
{
start_scanner();
}
else
SETFLAG(SCANNING_MASK);
#else
start_scanner();
#endif
@ -1153,7 +1154,13 @@ main(int argc, char **argv)
else if (pthread_create(&inotify_thread, NULL, start_inotify, NULL) != 0)
DPRINTF(E_FATAL, L_GENERAL, "ERROR: pthread_create() failed for start_inotify. EXITING\n");
}
#endif
#endif /* HAVE_INOTIFY */
#ifdef HAVE_KQUEUE
if (!GETFLAG(SCANNING_MASK))
kqueue_monitor_start();
#endif /* HAVE_KQUEUE */
smonitor = OpenAndConfMonitorSocket();
if (smonitor > 0)
{
@ -1270,14 +1277,13 @@ main(int argc, char **argv)
}
#endif
if (GETFLAG(SCANNING_MASK))
{
if (!scanner_pid || kill(scanner_pid, 0) != 0)
{
CLEARFLAG(SCANNING_MASK);
if (_get_dbtime() != lastdbtime)
updateID++;
}
if (GETFLAG(SCANNING_MASK) && kill(scanner_pid, 0) != 0) {
CLEARFLAG(SCANNING_MASK);
if (_get_dbtime() != lastdbtime)
updateID++;
#ifdef HAVE_KQUEUE
kqueue_monitor_start();
#endif /* HAVE_KQUEUE */
}
event_module.process(timeout);