Skip to content

Commit bead23c

Browse files
committed
Retire the notion of Epoch and replace it with an optional, limited-use WallClock and use it only where a wall clock is strictly necessary
1 parent c6076ba commit bead23c

33 files changed

Lines changed: 378 additions & 247 deletions

bloat-check/src/bin/bloat-check.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ use rs_matter::transport::network::mdns::builtin::{BuiltinMdnsResponder, Host};
8989
use rs_matter::transport::network::{
9090
Address, ChainedNetwork, Ipv4Addr, Ipv6Addr, NetworkReceive, NetworkSend, NoNetwork,
9191
};
92-
use rs_matter::utils::epoch::dummy_epoch;
9392
use rs_matter::utils::init::{init, Init, InitMaybeUninit};
9493
use rs_matter::utils::storage::pooled::PooledBuffers;
9594
use rs_matter::utils::sync::DynBase;
@@ -174,12 +173,11 @@ impl<'a> MatterStack<'a> {
174173
&TEST_DEV_DET,
175174
TEST_DEV_COMM,
176175
&TEST_DEV_ATT,
177-
dummy_epoch,
178176
MATTER_PORT,
179177
),
180178
buffers <- PooledBuffers::init(0),
181179
subscriptions <- Subscriptions::init(),
182-
events <- Events::init(dummy_epoch),
180+
events <- Events::init(),
183181
networks <- SharedNetworks::init(WifiNetworks::init()),
184182
net_ctl_state <- NetCtlState::init_with_mutex(),
185183
btp <- Btp::init(),

examples/src/bin/bridge.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ fn main() -> Result<(), Error> {
6969
);
7070

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

7474
// Create the events
75-
let mut events: Events = Events::new_default();
75+
let mut events: Events = Events::new();
7676

7777
// Persistence
7878
let mut kv_buf = [0; 4096];

examples/src/bin/camera_tests.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@ fn main() -> Result<(), Error> {
406406
&BASIC_INFO,
407407
TEST_DEV_COMM,
408408
&TEST_DEV_ATT,
409-
rs_matter::utils::epoch::sys_epoch,
410409
MATTER_PORT,
411410
));
412411

@@ -566,7 +565,7 @@ fn main() -> Result<(), Error> {
566565
core::mem::size_of::<PooledBuffers<10, rs_matter::dm::IMBuffer>>(),
567566
);
568567

569-
let events = NoEvents::new_default();
568+
let events = NoEvents::new();
570569
let dm = DataModel::new(
571570
matter,
572571
&crypto,

examples/src/bin/chip_tool_tests.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -146,16 +146,13 @@ fn main() -> Result<(), Error> {
146146
comm_data.discriminator, passcode, port,
147147
);
148148

149-
let matter = MATTER.uninit().init_with(Matter::init(
150-
&BASIC_INFO,
151-
comm_data,
152-
&TEST_DEV_ATT,
153-
rs_matter::utils::epoch::sys_epoch,
154-
port,
155-
));
149+
let matter =
150+
MATTER
151+
.uninit()
152+
.init_with(Matter::init(&BASIC_INFO, comm_data, &TEST_DEV_ATT, port));
156153

157154
// Create the event queue
158-
let events = EVENTS.uninit().init_with(Events::init_default());
155+
let events = EVENTS.uninit().init_with(Events::init());
159156

160157
// Persistence
161158
let kv_buf = KV_BUF.uninit().init_zeroed().as_mut_slice();

examples/src/bin/dimmable_light.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,11 @@ fn run() -> Result<(), Error> {
125125
&TEST_DEV_DET,
126126
TEST_DEV_COMM,
127127
&TEST_DEV_ATT,
128-
rs_matter::utils::epoch::sys_epoch,
129128
MATTER_PORT,
130129
));
131130

132131
// Create the event queue
133-
let events = EVENTS.uninit().init_with(Events::init_default());
132+
let events = EVENTS.uninit().init_with(Events::init());
134133

135134
// Persistence
136135
let kv_buf = KV_BUF.uninit().init_zeroed().as_mut_slice();

examples/src/bin/media_player.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ fn main() -> Result<(), Error> {
8585
);
8686

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

9090
// Create the event queue
91-
let mut events: Events = Events::new_default();
91+
let mut events: Events = Events::new();
9292

9393
// Persistence
9494
let mut kv_buf = [0; 4096];

examples/src/bin/onoff_light.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ fn run() -> Result<(), Error> {
9999
&TEST_DEV_DET,
100100
TEST_DEV_COMM,
101101
&TEST_DEV_ATT,
102-
rs_matter::utils::epoch::sys_epoch,
103102
MATTER_PORT,
104103
));
105104

@@ -126,7 +125,7 @@ fn run() -> Result<(), Error> {
126125
TestOnOffDeviceLogic::new(true),
127126
);
128127

129-
let events = NoEvents::new_default();
128+
let events = NoEvents::new();
130129

131130
// Create the Data Model instance
132131
let dm = DataModel::new(

examples/src/bin/onoff_light_bt.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ fn main() -> Result<(), Error> {
119119

120120
fn run<N: NetCtl + WifiDiag>(connection: &Connection, net_ctl: N) -> Result<(), Error> {
121121
// Create the Matter object
122-
let mut matter = Matter::new_default(&TEST_DEV_DET, TEST_DEV_COMM, &TEST_DEV_ATT, MATTER_PORT);
122+
let mut matter = Matter::new(&TEST_DEV_DET, TEST_DEV_COMM, &TEST_DEV_ATT, MATTER_PORT);
123123

124124
// A storage for the Wifi networks
125125
let mut networks = WifiNetworks::<3>::new();
126126

127127
// Create the event queue
128-
let mut events: Events = Events::new_default();
128+
let mut events: Events = Events::new();
129129

130130
// Persistence
131131
let mut kv_buf = [0; 4096];

examples/src/bin/onoff_light_work_stealing.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,11 @@ fn run() -> Result<(), Error> {
106106
&TEST_DEV_DET,
107107
TEST_DEV_COMM,
108108
&TEST_DEV_ATT,
109-
rs_matter::utils::epoch::sys_epoch,
110109
MATTER_PORT,
111110
));
112111

113112
// Create the events
114-
let events = EVENTS.uninit().init_with(Events::init_default());
113+
let events = EVENTS.uninit().init_with(Events::init());
115114

116115
// Persistence
117116
let kv_buf = KV_BUF.uninit().init_zeroed().as_mut_slice();

examples/src/bin/speaker.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ fn main() -> Result<(), Error> {
6464
);
6565

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

6969
// Create the event queue
70-
let mut events: Events = Events::new_default();
70+
let mut events: Events = Events::new();
7171

7272
// Persistence
7373
let mut kv_buf = [0; 4096];

0 commit comments

Comments
 (0)