dan/liminix
1
0
Fork 5
Code

devout: support sysfs attributes for (grand*)parent device

Browse Source
This commit is contained in:
Daniel Barlow 2024-06-01 21:46:56 +01:00
parent 19aba0d873
commit 53f57c1a8c
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/devout/devout.fnl
View File

@ -31,13 +31,18 @@
name value (pairs expected)] name value (pairs expected)]
(and match? (= value (event:attr name))))) (and match? (= value (event:attr name)))))
(fn ancestor-attrs-match? [event expected]
(accumulate [match? true
name value (pairs expected)]
(and match? (= value (event:ancestor-attr name)))))
(fn event-matches? [e terms] (fn event-matches? [e terms]
(accumulate [match? true (accumulate [match? true
name value (pairs terms)] name value (pairs terms)]
(and match? (and match?
(case name (case name
:attr (attrs-match? e value) :attr (attrs-match? e value)
:attrs true :attrs (ancestor-attrs-match? e value)
other (= value (. e.properties name)))))) other (= value (. e.properties name))))))
(fn read-if-exists [pathname] (fn read-if-exists [pathname]
@ -48,6 +53,16 @@
s1) s1)
nil nil)) nil nil))
(fn event-ancestor-attr [event name]
(fn walk-up [sys-path path name]
(when path
(or (read-if-exists (.. sys-path "/" path "/" name))
(walk-up sys-path (dirname path) name))))
(walk-up event.sys-path event.path name))
(fn event-attr [event name]
(read-if-exists (.. event.sys-path "/" event.path "/" name)))
(fn parse-event [s] (fn parse-event [s]
(let [at (string.find s "@" 1 true) (let [at (string.find s "@" 1 true)
(nl nxt) (string.find s "\0" 1 true) (nl nxt) (string.find s "\0" 1 true)
@ -61,8 +76,8 @@
:action (string.sub s 1 (- at 1)) :action (string.sub s 1 (- at 1))
:format format-event :format format-event
:matches? event-matches? :matches? event-matches?
:attr (fn [self name] :attr event-attr
(read-if-exists (.. self.sys-path "/" self.path "/" name))) :ancestor-attr event-ancestor-attr
})) }))
(fn find-in-database [db terms] (fn find-in-database [db terms]

23
pkgs/devout/test.fnl
View File

@ -133,6 +133,29 @@ MINOR=17")
(expect (not m))) (expect (not m)))
)) ))
(example
"I can find a device matching ancestor sysfs attributes"
(let [db (database {:sys-path "./fixtures/sys"})
path "/devices/pci0000:00/0000:00:14.0/usb1/1-8/1-8:1.1"
e (.. "add@" path "\0ACTION=add\n"
(with-open [f (io.open (.. "fixtures/sys" path "/uevent"))]
(f:read "*a")))]
(db:add e)
(let [[m & more] (db:find {:devtype "usb_interface"
:driver "uvcvideo"
:attrs {:idVendor "13d3"
:manufacturer "Azurewave"
}})]
(expect= m.properties.driver "uvcvideo")
(expect= m.properties.interface "14/2/0")
(expect= more []))
(let [[m & more] (db:find {:devtype "usb_interface"
:driver "uvcvideo"
:attrs {:idVendor "23d3"
:manufacturer "Azurewave"
}})]
(expect (not m)))))
;;; tests for indices ;;; tests for indices