Skip to content

reimplementing SANE-USER-FLAGS and other things #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
m-g-r wants to merge 6 commits into
base: master
Choose a base branch
from
Open

reimplementing SANE-USER-FLAGS and other things #7

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cd8e640
change order: replace-p is supposed to replace the current mask not t…
Mar 10, 2022
13379a6
existing flags are actually at third position of the hash not cdr
Mar 10, 2022
91b4dff
reimplement SANE-USER-FLAGS: if we use UNION already we do not need I…
Mar 10, 2022
3fe6d42
use inotify-event-wd instead of slot-value
Mar 11, 2022
2944f73
Merge remote-tracking branch 'origin/master' into past
Mar 11, 2022
9f492e1
Merge branch 'master' into past
Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions src/inotify.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ closed with CLOSE-INOTIFY."
being watched by INOTIFY, else NIL. The match is exact."
(cdr (gethash pathname (inotify-pathnames inotify))))

(defun event-pathname/flags (inotify event &optional (handle (slot-value event 'wd)))
(defun event-pathname/flags (inotify event &optional (handle (inotify-event-wd event)))
"Returns two values PATHNAME and FLAGS for an EVENT which were used during
registration. If HANDLE is specified EVENT is ignored."
(let ((list (gethash handle (inotify-handles inotify))))
Expand All @@ -316,14 +316,16 @@ registration. If HANDLE is specified EVENT is ignored."
(check-type flags watch-flag-list)
;; now, :mask-add can't be member of flags
;; merge the flags
(let* ((flags (ensure-list flags))
(rep-flags (if replace-p
(cons :mask-add flags)
flags)))
(let ((it (gethash pathname (inotify-pathnames inotify))))
(if it
(union (third it) rep-flags :test #'eq)
rep-flags))))
;; 20220310 mgr:
;; - if we UNION already we don't need :mask-add
;; - :mask-add is actually just ignored here and not necessary
;; - storing :mask-add in the inotify-pathnames hash is also strange
(let* ((flags (ensure-list flags)))
(if replace-p
flags
(union (third (gethash pathname (inotify-pathnames inotify)))
flags
:test #'eq))))

(defun watch (inotify pathname flags &key (replace-p T))
"Adds PATHNAME (either pathname or string) to be watched and records the
Expand All @@ -332,6 +334,7 @@ inotify(7) for detailed information). Returns a handle which can be used
with UNWATCH and EVENT-PATHNAME/FLAGS. If REPLACE-P is set to T (default),
the flags mask is replaced rather than OR-ed to the current mask (if it
exists). The :MASK-ADD flag is therefore removed from the FLAGS argument."
;; :mask-add is actually nowhere removed (20220310 mgr)
(let* ((flags (sane-user-flags inotify pathname flags :replace-p replace-p))
(handle (watch-raw inotify pathname flags))
(list (list pathname handle flags)))
Expand All @@ -345,7 +348,7 @@ may be one from a given EVENT) or PATHNAME."
(unless (or pathname event handle)
(error "either PATHNAME, EVENT or HANDLE have to be specified"))
(when event
(setf handle (slot-value event 'wd)))
(setf handle (inotify-event-wd event)))
(let ((handle (or handle
(car (pathname-handle/flags inotify pathname))
(error "PATHNAME ~S isn't being watched" pathname)))
Expand Down