Skip to content

Rework the notion of Epoch #449

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

Merged
ivmarkov merged 14 commits into from
May 22, 2026
Merged

Rework the notion of Epoch #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3c77289
Software Diagnostics cluster
ivmarkov May 16, 2026
d11acbe
TimeSync cluster handler
ivmarkov May 16, 2026
957a180
Rearrange the handlers chain (less Async wraps) in an effort to reduc…
ivmarkov May 16, 2026
3b429ac
Add hooks to the time sync and sw diag handlers
ivmarkov May 17, 2026
62ed328
Make the Software Diagnostics handler feature complete
ivmarkov May 17, 2026
6a948b5
Make the TimeSync cluster handler feature complete
ivmarkov May 17, 2026
c98d93e
Move away from the with_ terminology now that the user handler is not…
ivmarkov May 18, 2026
7934ffe
Builders for the sys handlers
ivmarkov May 18, 2026
32f4c7e
Get rid of the Epoch type alias and use a regular time-since-boot whe…
ivmarkov May 18, 2026
ceb98ab
Enable more tests
ivmarkov May 19, 2026
d611cd4
TimeSync, TrustedTimeSource client
ivmarkov May 20, 2026
f7acce4
Fix TC_IDM_1_2 flakiness but not holding the TX buffer in our mDNS fo…
ivmarkov May 20, 2026
5396a16
Fix CI by properly configuring for the TC_DGSW_ tests
ivmarkov May 21, 2026
4d1b3a2
Retire delayed_ready - that is ok in handlers specifically - to try t…
ivmarkov May 22, 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
66 changes: 27 additions & 39 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 @@ -57,12 +57,12 @@ use esp_rtos::embassy::Executor;

use rs_matter::crypto::backend::rustcrypto::RustCrypto;
use rs_matter::crypto::{Crypto, RngCore, WeakTestOnlyRand};
use rs_matter::dm::clusters::app::on_off::NoLevelControl;
use rs_matter::dm::clusters::app::on_off::{self, test::TestOnOffDeviceLogic, OnOffHooks};
use rs_matter::dm::clusters::desc::{self, ClusterHandler as _, DescHandler};
use rs_matter::dm::clusters::net_comm::{
NetCtl, NetCtlError, NetCtlStatus, NetworkScanInfo, NetworkType, SharedNetworks, WirelessCreds,
NetCtl, NetCtlError, NetworkScanInfo, NetworkType, SharedNetworks, WirelessCreds,
};
use rs_matter::dm::clusters::app::on_off::NoLevelControl;
use rs_matter::dm::clusters::app::on_off::{self, test::TestOnOffDeviceLogic, OnOffHooks};
use rs_matter::dm::clusters::wifi_diag::{
SecurityTypeEnum, WiFiVersionEnum, WifiDiag, WirelessDiag,
};
Expand All @@ -76,7 +76,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::{Async, DataModel, Dataver, Endpoint, EpClMatcher, Node};
use rs_matter::error::Error;
use rs_matter::pairing::qr::QrTextType;
use rs_matter::pairing::DiscoveryCapabilities;
Expand All @@ -89,7 +89,6 @@ use rs_matter::transport::network::mdns::builtin::{BuiltinMdnsResponder, Host};
use rs_matter::transport::network::{
Address, ChainedNetwork, Ipv4Addr, Ipv6Addr, NetworkReceive, NetworkSend, NoNetwork,
};
use rs_matter::utils::epoch::dummy_epoch;
use rs_matter::utils::init::{init, Init, InitMaybeUninit};
use rs_matter::utils::storage::pooled::PooledBuffers;
use rs_matter::utils::sync::DynBase;
Expand Down Expand Up @@ -174,12 +173,11 @@ impl<'a> MatterStack<'a> {
&TEST_DEV_DET,
TEST_DEV_COMM,
&TEST_DEV_ATT,
dummy_epoch,
MATTER_PORT,
),
buffers <- PooledBuffers::init(0),
subscriptions <- Subscriptions::init(),
events <- Events::init(dummy_epoch),
events <- Events::init(),
networks <- SharedNetworks::init(WifiNetworks::init()),
net_ctl_state <- NetCtlState::init_with_mutex(),
btp <- Btp::init(),
Expand All @@ -196,13 +194,12 @@ type AppNetworks = SharedNetworks<WifiNetworks<3>>;
type AppNetCtl<'a> = NetCtlWithStatusImpl<'a, FakeWifi>;
type AppWirelessMgr<'a> = WirelessMgr<'a, &'a AppNetworks, &'a AppNetCtl<'a>>;
type AppTransport<'a> = ChainedNetwork<FakeUdp, &'a Btp, fn(&Address) -> bool>;
type AppHandler<'a> = handler_chain_type!(
type AppDmHandler<'a> = handler_chain_type!(
EpClMatcher => on_off::HandlerAsyncAdaptor<on_off::OnOffHandler<'a, TestOnOffDeviceLogic, NoLevelControl>>,
EpClMatcher => Async<desc::HandlerAdaptor<DescHandler<'a>>>
| EmptyHandler
| WifiSysHandler<'a, &'a AppNetCtl<'a>>
);
type AppCrypto = RustCrypto<'static, WeakTestOnlyRand>;
type AppDmHandler<'a> = WifiSysHandler<'a, &'a AppNetCtl<'a>, AppHandler<'a>>;
type AppDataModel<'a> = DataModel<
'a,
DEFAULT_MAX_SUBSCRIPTIONS,
Expand Down Expand Up @@ -465,11 +462,9 @@ fn main() -> ! {
.matter
.print_standard_qr_code(QrTextType::Unicode, DiscoveryCapabilities::IP));

unwrap!(stack.matter.open_basic_comm_window(
MAX_COMM_WINDOW_TIMEOUT_SECS,
crypto,
&(),
));
unwrap!(stack
.matter
.open_basic_comm_window(MAX_COMM_WINDOW_TIMEOUT_SECS, crypto, &()));
}

executor.run(|spawner| {
Expand Down Expand Up @@ -553,7 +548,11 @@ fn mdns_task_fut<'a, C: Crypto + 'a>(
}

#[embassy_executor::task]
async fn mdns_task(mdns: &'static mut BuiltinMdnsResponder, matter: &'static Matter<'static>, crypto: &'static AppCrypto) {
async fn mdns_task(
mdns: &'static mut BuiltinMdnsResponder,
matter: &'static Matter<'static>,
crypto: &'static AppCrypto,
) {
info!("Starting mDNS task...");
unwrap!(mdns_task_fut(mdns, matter, crypto).await);
}
Expand Down Expand Up @@ -646,32 +645,21 @@ const NODE: Node<'static> = Node {

/// The Data Model handler for our Matter device.
/// The handler is the root endpoint 0 handler plus the on-off handler and its descriptor.
fn dm_handler<'a, T>(
fn dm_handler<'a>(
mut rand: impl RngCore + Copy,
on_off: on_off::OnOffHandler<'a, TestOnOffDeviceLogic, NoLevelControl>,
wifi_diag: &'a dyn WifiDiag,
net_ctl: T,
) -> WifiSysHandler<'a, T, AppHandler<'a>>
where
T: NetCtl + NetCtlStatus + WifiDiag,
{
endpoints::with_wifi_sys(
&true,
&(),
&(),
wifi_diag,
net_ctl,
rand,
EmptyHandler
.chain(
EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
)
.chain(
EpClMatcher::new(Some(1), Some(TestOnOffDeviceLogic::CLUSTER.id)),
on_off::HandlerAsyncAdaptor(on_off),
),
)
net_ctl: &'a AppNetCtl,
) -> AppDmHandler<'a> {
endpoints::WifiSysHandlerBuilder::new(net_ctl, wifi_diag).build(rand)
.chain(
EpClMatcher::new(Some(1), Some(desc::DescHandler::CLUSTER.id)),
Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
)
.chain(
EpClMatcher::new(Some(1), Some(TestOnOffDeviceLogic::CLUSTER.id)),
on_off::HandlerAsyncAdaptor(on_off),
)
}

/// A fake UDP implementation
Expand Down
128 changes: 62 additions & 66 deletions examples/src/bin/bridge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ use rs_matter::dm::networks::eth::EthNetwork;
use rs_matter::dm::networks::SysNetifs;
use rs_matter::dm::subscriptions::Subscriptions;
use rs_matter::dm::{
Async, Cluster, DataModel, DataModelHandler, Dataver, EmptyHandler, Endpoint, EpClMatcher,
InvokeContext, Node, ReadContext,
Async, Cluster, DataModel, DataModelHandler, Dataver, Endpoint, EpClMatcher, InvokeContext,
Node, ReadContext,
};
use rs_matter::error::Error;
use rs_matter::pairing::qr::QrTextType;
Expand All @@ -69,10 +69,10 @@ fn main() -> Result<(), Error> {
);

// Create the Matter object
let mut matter = Matter::new_default(&TEST_DEV_DET, TEST_DEV_COMM, &TEST_DEV_ATT, MATTER_PORT);
let mut matter = Matter::new(&TEST_DEV_DET, TEST_DEV_COMM, &TEST_DEV_ATT, MATTER_PORT);

// Create the events
let mut events: Events = Events::new_default();
let mut events: Events = Events::new();

// Persistence
let mut kv_buf = [0; 4096];
Expand Down Expand Up @@ -208,68 +208,64 @@ fn dm_handler<'a, OH: OnOffHooks, LH: LevelControlHooks>(
) -> impl DataModelHandler + 'a {
(
NODE,
endpoints::with_eth_sys(
&false,
&(),
&SysNetifs,
rand,
EmptyHandler
// The next chain is the handler for the "aggregator" endpoint 1.
//
// Note how the descriptor cluster is a bit different compared to the normal ones.
// The `Aggregator` descriptor cluster takes care of declaring all bridged endpoints
// as such.
//
// Implementing the "Actions" cluster (and declaring it in the ep1 meta-data)
// would allow one to designate locations/areas to the bridged devices. However, this is
// not yet supported by Google home and Apple, as per
// 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(&mut rand)).adapt()),
)
// The following chains are the handlers for the bridged devices corresponding to ep 2 and ep3.
//
// In addition to the usual clusters, every bridged endpoint needs to implement the
// "Bridged" cluster as well.
//
// Note also that we are re-using here the ready-made `OnOffHandler` from `rs-matter` for demoing purposes.
// In production setups, user is expected to define their own handler for their bridge device cluster(s)
// which is likely to do remote calls over a proprietary protocol so as to e.g. retrieve the state of
// 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(&mut rand)).adapt()),
)
.chain(
EpClMatcher::new(Some(2), Some(groups::GroupsHandler::CLUSTER.id)),
Async(groups::GroupsHandler::new(Dataver::new_rand(&mut rand)).adapt()),
)
.chain(
EpClMatcher::new(Some(2), Some(TestOnOffDeviceLogic::CLUSTER.id)),
on_off::HandlerAsyncAdaptor(on_off_ep2),
)
.chain(
EpClMatcher::new(Some(2), Some(BridgedHandler::CLUSTER.id)),
Async(BridgedHandler::new(Dataver::new_rand(&mut rand)).adapt()),
)
.chain(
EpClMatcher::new(Some(3), Some(desc::DescHandler::CLUSTER.id)),
Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
)
.chain(
EpClMatcher::new(Some(3), Some(groups::GroupsHandler::CLUSTER.id)),
Async(groups::GroupsHandler::new(Dataver::new_rand(&mut rand)).adapt()),
)
.chain(
EpClMatcher::new(Some(3), Some(TestOnOffDeviceLogic::CLUSTER.id)),
on_off::HandlerAsyncAdaptor(on_off_ep3),
)
.chain(
EpClMatcher::new(Some(3), Some(BridgedHandler::CLUSTER.id)),
Async(BridgedHandler::new(Dataver::new_rand(&mut rand)).adapt()),
),
),
endpoints::EthSysHandlerBuilder::new()
.netif_diag(&SysNetifs)
.build(rand)
// The next chain is the handler for the "aggregator" endpoint 1.
//
// Note how the descriptor cluster is a bit different compared to the normal ones.
// The `Aggregator` descriptor cluster takes care of declaring all bridged endpoints
// as such.
//
// Implementing the "Actions" cluster (and declaring it in the ep1 meta-data)
// would allow one to designate locations/areas to the bridged devices. However, this is
// not yet supported by Google home and Apple, as per
// 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(&mut rand)).adapt()),
)
// The following chains are the handlers for the bridged devices corresponding to ep 2 and ep3.
//
// In addition to the usual clusters, every bridged endpoint needs to implement the
// "Bridged" cluster as well.
//
// Note also that we are re-using here the ready-made `OnOffHandler` from `rs-matter` for demoing purposes.
// In production setups, user is expected to define their own handler for their bridge device cluster(s)
// which is likely to do remote calls over a proprietary protocol so as to e.g. retrieve the state of
// 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(&mut rand)).adapt()),
)
.chain(
EpClMatcher::new(Some(2), Some(groups::GroupsHandler::CLUSTER.id)),
Async(groups::GroupsHandler::new(Dataver::new_rand(&mut rand)).adapt()),
)
.chain(
EpClMatcher::new(Some(2), Some(TestOnOffDeviceLogic::CLUSTER.id)),
on_off::HandlerAsyncAdaptor(on_off_ep2),
)
.chain(
EpClMatcher::new(Some(2), Some(BridgedHandler::CLUSTER.id)),
Async(BridgedHandler::new(Dataver::new_rand(&mut rand)).adapt()),
)
.chain(
EpClMatcher::new(Some(3), Some(desc::DescHandler::CLUSTER.id)),
Async(desc::DescHandler::new(Dataver::new_rand(&mut rand)).adapt()),
)
.chain(
EpClMatcher::new(Some(3), Some(groups::GroupsHandler::CLUSTER.id)),
Async(groups::GroupsHandler::new(Dataver::new_rand(&mut rand)).adapt()),
)
.chain(
EpClMatcher::new(Some(3), Some(TestOnOffDeviceLogic::CLUSTER.id)),
on_off::HandlerAsyncAdaptor(on_off_ep3),
)
.chain(
EpClMatcher::new(Some(3), Some(BridgedHandler::CLUSTER.id)),
Async(BridgedHandler::new(Dataver::new_rand(&mut rand)).adapt()),
),
)
}

Expand Down
Loading
Loading