pf->ipf= ipf;
pf->wd= inotify_add_watch(filemon_inotify_fd, ipf->path, IN_MODIFY);
- if (pf->wd < 0) sysdie("inotify_add_watch %s", ipf->path);
+ if (pf->wd < 0) sysdie("filemon inotify: inotify_add_watch %s", ipf->path);
LIST_ADDHEAD(filemon_inotify_watches, pf);
- dbg("filemon inotify startfile %p wd=%d pf=%p", ipf, wd, pf);
+ dbg("filemon inotify: startfile %p wd=%d pf=%p", ipf, pf->wd, pf);
}
static void filemon_method_stopfile(InputFile *ipf, Filemon_Perfile *pf) {
- dbg("filemon inotify stopfile %p wd=%d pf=%p", ipf, pf->wd, pf);
+ dbg("filemon inotify: stopfile %p wd=%d pf=%p", ipf, pf->wd, pf);
int r= inotify_rm_watch(filemon_inotify_fd, pf->wd);
- if (r) syscrash("inotify_rm_watch");
+ if (r) syscrash("filemon inotify: inotify_rm_watch");
LIST_REMOVE(filemon_inotify_watches, pf);
}
static void *filemon_inotify_readable(oop_source *lp, int fd,
oop_event e, void *u) {
struct inotify_event iev;
+ InputFile *ipf;
for (;;) {
int r= read(filemon_inotify_fd, &iev, sizeof(iev));
if (r==-1) {
if (isewouldblock(errno)) break;
- syscrash("read from inotify master");
+ syscrash("filemon inotify: read from inotify master");
} else if (r!=sizeof(iev)) {
- crash("inotify read %d bytes wanted struct of %d", r, (int)sizeof(iev));
+ crash("filemon inotify: read %d bytes when wanted struct of %d",
+ r, (int)sizeof(iev));
}
Filemon_Perfile *pf;
FOR_LIST_NODE(pf, filemon_inotify_watches)
if (pf->wd == iev.wd) goto found;
- crash("inotify read event on unknown wd=%p", iev.wd);
+ /* Linux seems to remember events and can produce them even after
+ * you've removed the watch. This means that we can't spot bugs
+ * where we lose track of our watches and have to just regard
+ * unexpected random watch events as normal. It's not a
+ * correctness problem as the watch is just a prod to read a file,
+ * which is harmless if it does not need to be read. */
+ dbg("filemon inotify: read event with unknown wd=%d", iev.wd);
+ continue;
+
found:
- InputFile *ipf= pf->ipf;
+ ipf= pf->ipf;
/*dbg("filemon inotify readable read %p wd=%d", ipf, iev.wd);*/
tailing_make_readable(ipf);
}
LIST_INIT(filemon_inotify_watches);
filemon_inotify_fd= inotify_init();
if (filemon_inotify_fd<0) {
- syswarn("filemon/inotify: inotify_init failed");
+ syswarn("filemon inotify: inotify_init failed");
return 0;
}
xsetnonblock(filemon_inotify_fd, 1);
loop->on_fd(loop, filemon_inotify_fd, OOP_READ, filemon_inotify_readable, 0);
- dbg("filemon inotify init filemon_inotify_fd=%d", filemon_inotify_fd);
+ dbg("filemon inotify: init filemon_inotify_fd=%d", filemon_inotify_fd);
return 1;
}
void filemon_method_dump_info(FILE *f) {
- int i;
fprintf(f,"inotify");
DUMPV("%d",,filemon_inotify_fd);
DUMPV("%d",filemon_inotify_watches.,count);
struct Filemon_Perfile { int dummy; };
int filemon_method_init(void) {
- warn("filemon/dummy: no filemon method compiled in");
+ warn("filemon dummy: no filemon method compiled in");
return 0;
}
static void filemon_method_startfile(InputFile *ipf, Filemon_Perfile *pf) { }