Skip to content

Remove non-async cluster methods & go full-async #366

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

Closed
gmarcosb wants to merge 9 commits into from
Closed

Remove non-async cluster methods & go full-async #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
367c090
Remove non-async cluster methods & go full-async
gmarcosb Jan 27, 2026
03c4533
Klippy
gmarcosb Jan 27, 2026
d87f232
Fix bloat-check
gmarcosb Jan 27, 2026
3bc8ec9
Fix onoff_light_bt
gmarcosb Jan 27, 2026
3f627ce
Apply Future<> changes to all usages to see if it helps improve size …
gmarcosb Jan 27, 2026
93e70a9
Try inline(always)
gmarcosb Jan 28, 2026
528fe92
Go back to having a SyncHandler which has sync methods, wrapped by an…
gmarcosb Jan 29, 2026
11ab6a1
(Failed) attempt at optimizing by using compile-time matching to opti…
gmarcosb Feb 4, 2026
c505ffd
Revert failed optimization attempt, as size report confirms this make…
gmarcosb Feb 4, 2026
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
10 changes: 5 additions & 5 deletions bloat-check/src/bin/bloat-check.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ use rs_matter::dm::networks::wireless::{
use rs_matter::dm::networks::NetChangeNotif;
use rs_matter::dm::subscriptions::{Subscriptions, DEFAULT_MAX_SUBSCRIPTIONS};
use rs_matter::dm::{endpoints, IMBuffer};
use rs_matter::dm::{Async, DataModel, Dataver, EmptyHandler, Endpoint, EpClMatcher, Node};
use rs_matter::dm::{DataModel, Dataver, EmptyHandler, Endpoint, EpClMatcher, Node};
use rs_matter::error::Error;
use rs_matter::pairing::qr::QrTextType;
use rs_matter::pairing::DiscoveryCapabilities;
Expand Down Expand Up @@ -197,8 +197,8 @@ type AppBtp<'a> =
Btp<&'a BtpContext<CriticalSectionRawMutex>, CriticalSectionRawMutex, FakeGattPeripheral>;
type AppTransport<'a> = ChainedNetwork<FakeUdp, &'a AppBtp<'a>, fn(&Address) -> bool>;
type AppHandler<'a> = handler_chain_type!(
EpClMatcher => on_off::HandlerAsyncAdaptor<on_off::OnOffHandler<'a, TestOnOffDeviceLogic, NoLevelControl>>,
EpClMatcher => Async<desc::HandlerAdaptor<DescHandler<'a>>>
EpClMatcher => on_off::HandlerAdaptor<on_off::OnOffHandler<'a, TestOnOffDeviceLogic, NoLevelControl>>,
EpClMatcher => desc::HandlerAdaptor<DescHandler<'a>>
| EmptyHandler
);
type AppDmHandler<'a> = WifiHandler<'a, &'a AppNetCtl<'a>, SysHandler<'a, AppHandler<'a>>>;
Expand Down Expand Up @@ -635,11 +635,11 @@ where
EmptyHandler
.chain(
EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
Async(desc::DescHandler::new(Dataver::new_rand(matter.rand())).adapt()),
desc::DescHandler::new(Dataver::new_rand(matter.rand())).adapt(),
)
.chain(
EpClMatcher::new(Some(1), Some(TestOnOffDeviceLogic::CLUSTER.id)),
on_off::HandlerAsyncAdaptor(on_off),
on_off::HandlerAdaptor(on_off),
),
),
)
Expand Down
23 changes: 11 additions & 12 deletions examples/src/bin/bridge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ use rs_matter::dm::endpoints;
use rs_matter::dm::networks::unix::UnixNetifs;
use rs_matter::dm::subscriptions::DefaultSubscriptions;
use rs_matter::dm::{
Async, AsyncHandler, AsyncMetadata, Cluster, DataModel, Dataver, EmptyHandler, Endpoint,
EpClMatcher, InvokeContext, Node, ReadContext,
AsyncHandler, AsyncMetadata, Cluster, DataModel, Dataver, EmptyHandler, Endpoint, EpClMatcher,
InvokeContext, Node, ReadContext,
};
use rs_matter::error::Error;
use rs_matter::pairing::qr::QrTextType;
Expand Down Expand Up @@ -220,10 +220,7 @@ fn dm_handler<'a, OH: OnOffHooks, LH: LevelControlHooks>(
// https://www.1home.io/docs/en/server/configure-devices#manage-rooms
.chain(
EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
Async(
desc::DescHandler::new_aggregator(Dataver::new_rand(matter.rand()))
.adapt(),
),
desc::DescHandler::new_aggregator(Dataver::new_rand(matter.rand())).adapt(),
)
// The following chains are the handlers for the bridged devices corresponding to ep 2 and ep3.
//
Expand All @@ -236,27 +233,27 @@ fn dm_handler<'a, OH: OnOffHooks, LH: LevelControlHooks>(
// the lamp, or to switch it on/off.
.chain(
EpClMatcher::new(Some(2), Some(desc::DescHandler::CLUSTER.id)),
Async(desc::DescHandler::new(Dataver::new_rand(matter.rand())).adapt()),
desc::DescHandler::new(Dataver::new_rand(matter.rand())).adapt(),
)
.chain(
EpClMatcher::new(Some(2), Some(TestOnOffDeviceLogic::CLUSTER.id)),
on_off::HandlerAsyncAdaptor(on_off_ep2),
on_off::HandlerAdaptor(on_off_ep2),
)
.chain(
EpClMatcher::new(Some(2), Some(BridgedHandler::CLUSTER.id)),
Async(BridgedHandler::new(Dataver::new_rand(matter.rand())).adapt()),
BridgedHandler::new(Dataver::new_rand(matter.rand())).adapt(),
)
.chain(
EpClMatcher::new(Some(3), Some(desc::DescHandler::CLUSTER.id)),
Async(desc::DescHandler::new(Dataver::new_rand(matter.rand())).adapt()),
desc::DescHandler::new(Dataver::new_rand(matter.rand())).adapt(),
)
.chain(
EpClMatcher::new(Some(3), Some(TestOnOffDeviceLogic::CLUSTER.id)),
on_off::HandlerAsyncAdaptor(on_off_ep3),
on_off::HandlerAdaptor(on_off_ep3),
)
.chain(
EpClMatcher::new(Some(3), Some(BridgedHandler::CLUSTER.id)),
Async(BridgedHandler::new(Dataver::new_rand(matter.rand())).adapt()),
BridgedHandler::new(Dataver::new_rand(matter.rand())).adapt(),
),
),
),
Expand Down Expand Up @@ -291,7 +288,9 @@ impl bridged_device_basic_information::ClusterHandler for BridgedHandler {
fn dataver_changed(&self) {
self.dataver.changed();
}
}

impl bridged_device_basic_information::ClusterSyncHandler for BridgedHandler {
fn reachable(&self, _ctx: impl ReadContext) -> Result<bool, Error> {
// This is the only mandatory attribute.
//
Expand Down
19 changes: 8 additions & 11 deletions examples/src/bin/chip_tool_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ use rs_matter::dm::endpoints;
use rs_matter::dm::networks::unix::UnixNetifs;
use rs_matter::dm::subscriptions::DefaultSubscriptions;
use rs_matter::dm::{
Async, AsyncHandler, AsyncMetadata, DataModel, Dataver, EmptyHandler, Endpoint, EpClMatcher,
Node,
AsyncHandler, AsyncMetadata, DataModel, Dataver, EmptyHandler, Endpoint, EpClMatcher, Node,
};
use rs_matter::error::Error;
use rs_matter::pairing::qr::QrTextType;
Expand Down Expand Up @@ -276,21 +275,19 @@ fn dm_handler<'a, OH: OnOffHooks, LH: LevelControlHooks>(
EmptyHandler
.chain(
EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
Async(desc::DescHandler::new(Dataver::new_rand(matter.rand())).adapt()),
desc::DescHandler::new(Dataver::new_rand(matter.rand())).adapt(),
)
.chain(
EpClMatcher::new(Some(1), Some(TestOnOffDeviceLogic::CLUSTER.id)),
on_off::HandlerAsyncAdaptor(on_off),
on_off::HandlerAdaptor(on_off),
)
.chain(
EpClMatcher::new(Some(1), Some(UnitTestingHandler::CLUSTER.id)),
Async(
UnitTestingHandler::new(
Dataver::new_rand(matter.rand()),
unit_testing_data,
)
.adapt(),
),
UnitTestingHandler::new(
Dataver::new_rand(matter.rand()),
unit_testing_data,
)
.adapt(),
),
),
),
Expand Down
10 changes: 5 additions & 5 deletions examples/src/bin/dimmable_light.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ use rs_matter::dm::networks::unix::UnixNetifs;
use rs_matter::dm::subscriptions::DefaultSubscriptions;
use rs_matter::dm::IMBuffer;
use rs_matter::dm::{
Async, AsyncHandler, AsyncMetadata, Cluster, DataModel, Dataver, EmptyHandler, Endpoint,
EpClMatcher, Node,
AsyncHandler, AsyncMetadata, Cluster, DataModel, Dataver, EmptyHandler, Endpoint, EpClMatcher,
Node,
};
use rs_matter::error::{Error, ErrorCode};
use rs_matter::pairing::qr::QrTextType;
Expand Down Expand Up @@ -282,15 +282,15 @@ fn dm_handler<'a, LH: LevelControlHooks, OH: OnOffHooks>(
EmptyHandler
.chain(
EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
Async(desc::DescHandler::new(Dataver::new_rand(matter.rand())).adapt()),
desc::DescHandler::new(Dataver::new_rand(matter.rand())).adapt(),
)
.chain(
EpClMatcher::new(Some(1), Some(OnOffDeviceLogic::CLUSTER.id)),
on_off::HandlerAsyncAdaptor(on_off),
on_off::HandlerAdaptor(on_off),
)
.chain(
EpClMatcher::new(Some(1), Some(LevelControlDeviceLogic::CLUSTER.id)),
level_control::HandlerAsyncAdaptor(level_control),
level_control::HandlerAdaptor(level_control),
),
),
),
Expand Down
Loading