diff options
Diffstat (limited to 'src/ev_kqueue.c')
| -rw-r--r-- | src/ev_kqueue.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c index a9921c6..680fb42 100644 --- a/src/ev_kqueue.c +++ b/src/ev_kqueue.c @@ -60,7 +60,7 @@ sysev_init() } int -sysev_filemask(struct dirwatcher *dp) +sysev_filemask(struct watchpoint *dp) { struct handler *h; handler_iterator_t itr; @@ -73,9 +73,9 @@ sysev_filemask(struct dirwatcher *dp) } int -sysev_add_watch(struct dirwatcher *dwp, event_mask mask) +sysev_add_watch(struct watchpoint *wpt, event_mask mask) { - int wd = open(dwp->dirname, O_RDONLY); + int wd = open(wpt->dirname, O_RDONLY); if (wd >= 0) { struct stat st; int sysmask; @@ -84,26 +84,26 @@ sysev_add_watch(struct dirwatcher *dwp, event_mask mask) close(wd); return -1; } - dwp->file_mode = st.st_mode; - dwp->file_ctime = st.st_ctime; + wpt->file_mode = st.st_mode; + wpt->file_ctime = st.st_ctime; sysmask = mask.sys_mask; if (S_ISDIR(st.st_mode) && mask.gen_mask & GENEV_CREATE) sysmask |= NOTE_WRITE; EV_SET(chtab + chcnt, wd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR, sysmask, - 0, dwp); + 0, wpt); wd = chcnt++; } return wd; } void -sysev_rm_watch(struct dirwatcher *dwp) +sysev_rm_watch(struct watchpoint *wpt) { - close(chtab[dwp->wd].ident); - chtab[dwp->wd].ident = -1; - if (chclosed == -1 || chclosed > dwp->wd) - chclosed = dwp->wd; + close(chtab[wpt->wd].ident); + chtab[wpt->wd].ident = -1; + if (chclosed == -1 || chclosed > wpt->wd) + chclosed = wpt->wd; } static void @@ -116,11 +116,11 @@ chclosed_elim() for (i = chclosed, j = chclosed + 1; j < chcnt; j++) if (chtab[j].ident != -1) { - struct dirwatcher *dwp; + struct watchpoint *wpt; chtab[i] = chtab[j]; - dwp = chtab[i].udata; - dwp->wd = i; + wpt = chtab[i].udata; + wpt->wd = i; i++; } chcnt = i; @@ -128,7 +128,7 @@ chclosed_elim() } static void -check_created(struct dirwatcher *dp) +check_created(struct watchpoint *dp) { DIR *dir; struct dirent *ent; @@ -150,7 +150,7 @@ check_created(struct dirwatcher *dp) (ent->d_name[1] == '.' && ent->d_name[2] == 0))) continue; - if (dirwatcher_pattern_match(dp, ent->d_name)) + if (watchpoint_pattern_match(dp, ent->d_name)) continue; pathname = mkfilename(dp->dirname, ent->d_name); @@ -171,7 +171,7 @@ check_created(struct dirwatcher *dp) know about that file. If the file is new, register a watcher for it. */ } else if (st.st_ctime > dp->file_ctime || - !dirwatcher_lookup(pathname)) { + !watchpoint_lookup(pathname)) { deliver_ev_create(dp, ent->d_name); subwatcher_create(dp, pathname, S_ISDIR(st.st_mode), 1); @@ -185,7 +185,7 @@ check_created(struct dirwatcher *dp) static void process_event(struct kevent *ep) { - struct dirwatcher *dp = ep->udata; + struct watchpoint *dp = ep->udata; struct handler *h; handler_iterator_t itr; event_mask m; @@ -217,7 +217,7 @@ process_event(struct kevent *ep) if (ep->fflags & (NOTE_DELETE|NOTE_RENAME)) { debug(1, ("%s deleted", dp->dirname)); - dirwatcher_suspend(dp); + watchpoint_suspend(dp); return; } } |