Update example network-manager-app and integrate it with ubus #33968
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
ksperling-apple
commented
Jun 18, 2024
ksperling-apple
commented
- Add the ability for EventLoopHandlers to participate in the event loop
- Update network-manager-app with correct device type and integrate ubus
|
PR #33968: Size comparison from 8ba371a to 4f5e46f Full report (52 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, mbed, nrfconnect, nxp, psoc6, stm32, tizen)
|
ksperling-apple
force-pushed
the
netman-ubus
branch
2 times, most recently
from
72ed829 to
c6f4692
Compare
|
PR #33968: Size comparison from 4cdce52 to c6f4692 Full report (46 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, linux, mbed, nxp, psoc6, qpg, stm32, tizen)
|
Add ubus integration Fix device type id Prefix binary name with "matter-"
ksperling-apple
force-pushed
the
netman-ubus
branch
from
c6f4692 to
92ee347
Compare
|
PR #33968: Size comparison from 4cdce52 to 92ee347 Full report (85 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, mbed, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
pullapprove
bot
requested review from
andyg-apple,
anush-apple,
arkq,
bauerschwan,
bzbarsky-apple,
carol-apple,
cecille,
chrisdecenzo,
chshu,
chulspro,
cliffamzn,
Damian-Nordic,
dhrishi,
fessehaeve,
harimau-qirex,
harsha-rajendran and
hawk248
Could we split this into separate PRs? Support for event loop handlers seem reasonably independent from the network manager changes. Can we add some unit tests that validates that EventLoopHandlers work as expected? |
bzbarsky-apple
approved these changes
Jun 18, 2024
| @@ -685,16 +695,21 @@ void LayerImplSelect::HandleEvents() | |||
|
|
|||
| for (auto & w : mSocketWatchPool) | |||
| { | |||
| if (w.mFD != kInvalidFd) | |||
| if (w.mFD != kInvalidFd && w.mCallback != nullptr) | |||
There was a problem hiding this comment.
Hmm. Wouldn't we want to drain the events even if there is no callback?
There was a problem hiding this comment.
SocketEventsFromFDs doesn't drain anything, it just sets a bit mask based on which of the socket sets the given FD appears in. So this just avoids a bit of unnecessary work.
| @@ -15,7 +15,11 @@ | |||
| import("//build_overrides/build.gni") | |||
| import("//build_overrides/chip.gni") | |||
|
|
|||
| executable("network-manager-app") { | |||
| declare_args() { | |||
| matter_enable_ubus = false | |||
There was a problem hiding this comment.
Please document what this arg means.
| UloopHandler::Register(); | ||
|
|
||
| int status; | ||
| if ((status = ubus_connect_ctx(&mContext, nullptr))) |
There was a problem hiding this comment.
My knowledge of ubus is nonexistent, so I am just rubber-stamping the ubus bits. If you need me to actually go read up on these APIs and do a proper review, please let me know.
|
PR #33968: Size comparison from a39c62e to d751d2c Full report (85 builds for bl602, bl702, bl702l, cc13x4_26x4, cc32xx, cyw30739, efr32, esp32, linux, mbed, nrfconnect, nxp, psoc6, qpg, stm32, telink, tizen)
|
I will split it out into a separate PR |
andy31415
approved these changes
Jun 24, 2024
|
@ksperling-apple this is quite an old PR and has approvals, but also merge conflicts. Could you review if it is appropriate to update or if it should be closed if not applicable anymore? |
woody-apple
requested review from
Copilot
and removed request for
tobiasgraf,
mhazley,
harsha-rajendran,
carol-apple,
kpschoedel,
wiba-nordic and
younghak-hwang
There was a problem hiding this comment.
Pull Request Overview
This PR updates the network-manager-app example to integrate ubus support and enhances the SystemLayer event loop by allowing EventLoopHandlers to participate. Key changes include:
- Adding Add/RemoveLoopHandler methods and integrating loop handler callbacks in SystemLayerImplSelect.
- Updating the network-manager-app to correctly define the device type and integrate ubus functionality via UbusManager and UloopHandler.
- Adjusting utility headers (e.g., IntrusiveList.h) and configuration settings to support the ubus integration.
Reviewed Changes
Copilot reviewed 12 out of 14 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| src/system/SystemLayerImplSelect.h and .cpp | Integrated new loop handler methods and updated event handling. |
| src/system/SystemLayer.h | Added interface definitions for loop handler registration. |
| src/lib/support/IntrusiveList.h | Updated constructors to use constexpr for improved compile-time checks. |
| examples/network-manager-app/linux/main.cpp | Revised app initialization to integrate ubus via a custom main loop. |
| examples/network-manager-app/linux/include/CHIPProjectAppConfig.h | Updated device type and added MATTER_ENABLE_UBUS flag. |
| examples/network-manager-app/linux/UloopHandler* | Added uloop integration support with corresponding registration API. |
| examples/network-manager-app/linux/UbusSchema* & UbusManager* | Introduced ubus schema and management classes for integration. |
Files not reviewed (2)
- examples/network-manager-app/linux/BUILD.gn: Language not supported
- examples/network-manager-app/linux/args.gni: Language not supported
Comments suppressed due to low confidence (3)
examples/network-manager-app/linux/include/CHIPProjectAppConfig.h:21
- [nitpick] Consider using a hexadecimal literal (e.g., 0x90) for CHIP_DEVICE_CONFIG_DEVICE_TYPE to maintain consistency with typical device type representations and the inline comment.
#define CHIP_DEVICE_CONFIG_DEVICE_TYPE 144 // 0x0090 Network Infrastructure Manager
src/system/SystemLayerImplSelect.cpp:698
- Confirm that filtering out socket watch entries with a null callback at this stage is intentional, as it changes the decision logic compared to checking for a non-null callback only after event detection.
if (w.mFD != kInvalidFd && w.mCallback != nullptr)
examples/network-manager-app/linux/UloopHandler.cpp:120
- Ensure that the StopWatchingSocket API correctly removes socket watch entries and that its error handling aligns with the intended behavior of the event loop management.
SuccessOrExit(err = system.StopWatchingSocket(&watch));
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.