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

Wrap struct event into struct watch. For now this is just code bloat. We might start monitoring files later. We also might want to create a tree/list of all watches if we ever need to search within them, like the inotify module does.

Browse Source
This commit is contained in:
Gleb Smirnoff 2017-12-29 11:18:44 -08:00 committed by Justin Maggard
parent 5e320f2798
commit dfdd81a09f
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
monitor_kqueue.c
View File

@ -17,9 +17,16 @@
#include "sql.h" #include "sql.h"
#include "utils.h" #include "utils.h"
struct watch {
struct event ev;
const char *path;
bool isdir;
};
static void static void
vnode_process(struct event *ev, u_int fflags) dir_vnode_process(struct event *ev, u_int fflags)
{ {
struct watch *wt;
const char *path; const char *path;
char *sql, **result, tmp_path[PATH_MAX], *esc_name; char *sql, **result, tmp_path[PATH_MAX], *esc_name;
int rows, result_path_len; int rows, result_path_len;
@ -27,12 +34,13 @@ vnode_process(struct event *ev, u_int fflags)
struct dirent *entry; struct dirent *entry;
bool found_flag; bool found_flag;
path = (const char *)ev->data; wt = (struct watch *)ev->data;
path = wt->path;
if (fflags & NOTE_DELETE) { if (fflags & NOTE_DELETE) {
DPRINTF(E_DEBUG, L_INOTIFY, "Path [%s] deleted.\n", path); DPRINTF(E_DEBUG, L_INOTIFY, "Path [%s] deleted.\n", path);
close(ev->fd); close(ev->fd);
free(ev); free(wt);
monitor_remove_directory(0, path); monitor_remove_directory(0, path);
return; return;
} else if ((fflags & (NOTE_WRITE | NOTE_LINK)) == } else if ((fflags & (NOTE_WRITE | NOTE_LINK)) ==
@ -181,6 +189,7 @@ err1:
int int
add_watch(int fd __unused, const char *path) add_watch(int fd __unused, const char *path)
{ {
struct watch *wt;
struct event *ev; struct event *ev;
int wd; int wd;
@ -191,20 +200,23 @@ add_watch(int fd __unused, const char *path)
return (errno); return (errno);
} }
if ((ev = malloc(sizeof(struct event))) == NULL) { if ((wt = malloc(sizeof(struct watch))) == NULL) {
DPRINTF(E_ERROR, L_INOTIFY, "malloc() error\n"); DPRINTF(E_ERROR, L_INOTIFY, "malloc() error\n");
close(wd); close(wd);
return (ENOMEM); return (ENOMEM);
} }
if ((ev->data = strdup(path)) == NULL) { if ((wt->path = strdup(path)) == NULL) {
DPRINTF(E_ERROR, L_INOTIFY, "strdup() error\n"); DPRINTF(E_ERROR, L_INOTIFY, "strdup() error\n");
close(wd); close(wd);
free(ev); free(wt);
return (ENOMEM); return (ENOMEM);
} }
wt->isdir = true;
ev = &wt->ev;
ev->data = wt;
ev->fd = wd; ev->fd = wd;
ev->rdwr = EVENT_VNODE; ev->rdwr = EVENT_VNODE;
ev->process_vnode = vnode_process; ev->process_vnode = dir_vnode_process;
DPRINTF(E_DEBUG, L_INOTIFY, "kqueue add_watch [%s]\n", path); DPRINTF(E_DEBUG, L_INOTIFY, "kqueue add_watch [%s]\n", path);
event_module.add(ev); event_module.add(ev);