ifacestate/udevmonitor: added callback to signal end of enumeration #6072
Conversation
Codecov Report
@@ Coverage Diff @@
## master #6072 +/- ##
==========================================
+ Coverage 78.97% 78.98% +<.01%
==========================================
Files 546 546
Lines 42782 42792 +10
==========================================
+ Hits 33789 33798 +9
- Misses 6248 6249 +1
Partials 2745 2745
Continue to review full report at Codecov.
|
| @@ -38,13 +38,15 @@ type Interface interface { | |||
|
|
|||
| type DeviceAddedFunc func(device *hotplug.HotplugDeviceInfo) | |||
| type DeviceRemovedFunc func(device *hotplug.HotplugDeviceInfo) | |||
| type EnumerationDoneFunc func() | |||
|
|
|||
| // Monitor monitors kernel uevents making it possible to find USB devices. | |||
There was a problem hiding this comment.
BTW. this should probably say hotpluggable devices, there are more interfaces supporting hotplug than just USB.
| m.monitorStop = m.netlinkConn.Monitor(m.netlinkEvents, m.netlinkErrors, nil) | ||
| var filter netlink.Matcher | ||
| // TODO: extend with other criteria based on the hotplug interfaces | ||
| filter = &netlink.RuleDefinitions{ |
There was a problem hiding this comment.
Shouldn't this be a part of a separate PR?
| // TODO: consider passing a device filter to reduce noise from irrelevant devices. | ||
| m.monitorStop = m.netlinkConn.Monitor(m.netlinkEvents, m.netlinkErrors, nil) | ||
| var filter netlink.Matcher | ||
| // TODO: extend with other criteria based on the hotplug interfaces |
There was a problem hiding this comment.
This is slightly unrelated to this PR it seem(?). Its ok but I couldn't help noticing. I guess because this goes directly to netlinkConn.Monitor() we cannot add a test that the subsystem matching does really work(?).
There was a problem hiding this comment.
Indeed, this should be part of another PR, removed.
| @@ -60,6 +61,15 @@ func (s *udevMonitorSuite) TestDiscovery(c *C) { | |||
| remInfo = inf | |||
| callbackChannel <- struct{}{} | |||
| } | |||
| done := func() { | |||
There was a problem hiding this comment.
(nitpick) would be nice to call this "enumerateDone" - when I looked at this I though we could change the code here to only look at done but this test also simulates hotplugs after the enumeration was done. So a slightly different name would probably have given me the extra context :)
This PR adds a callback to signal the end of initial enumeration of devices (via udevadm) to interface manager. This is required to know when to compute the "delta" between currently present devices and the past (not in this PR).
Also made the two existing ifacemgr hotplug callbacks private as they don't need to be exported.