Make System::Layer mockable (#9546)
* Make System::Layer mockable
#### Problem
System::Layer is now an abstract base class, but in normal builds is
still accessed through a static global variable.
#### Change overview
Replace the direct global access `DeviceLayer::SystemLayer` with
a function indirecting through a pointer. In the normal case, the
pointer is initialized by `InitChipStack()` with the global, but
it can be set with a mock implementation before that.
#### Testing
Added a unit test case to TestPlatformMgr.
* rename globals in line with comments on #9547
diff --git a/src/platform/Darwin/BLEManagerImpl.cpp b/src/platform/Darwin/BLEManagerImpl.cpp
index 3109690..91c3a81 100644
--- a/src/platform/Darwin/BLEManagerImpl.cpp
+++ b/src/platform/Darwin/BLEManagerImpl.cpp
@@ -52,7 +52,7 @@
BleApplicationDelegateImpl * appDelegate = new BleApplicationDelegateImpl();
BleConnectionDelegateImpl * connDelegate = new BleConnectionDelegateImpl();
BlePlatformDelegateImpl * platformDelegate = new BlePlatformDelegateImpl();
- err = BleLayer::Init(platformDelegate, connDelegate, appDelegate, &SystemLayer);
+ err = BleLayer::Init(platformDelegate, connDelegate, appDelegate, &DeviceLayer::SystemLayer());
return err;
}
diff --git a/src/platform/Darwin/PlatformManagerImpl.cpp b/src/platform/Darwin/PlatformManagerImpl.cpp
index cce976d..bb55bb2 100644
--- a/src/platform/Darwin/PlatformManagerImpl.cpp
+++ b/src/platform/Darwin/PlatformManagerImpl.cpp
@@ -51,7 +51,7 @@
err = Internal::GenericPlatformManagerImpl<PlatformManagerImpl>::_InitChipStack();
SuccessOrExit(err);
- SystemLayer.SetDispatchQueue(GetWorkQueue());
+ static_cast<System::LayerSocketsLoop &>(DeviceLayer::SystemLayer()).SetDispatchQueue(GetWorkQueue());
exit:
return err;
diff --git a/src/platform/DeviceControlServer.cpp b/src/platform/DeviceControlServer.cpp
index 0f85b96..e945cf4 100644
--- a/src/platform/DeviceControlServer.cpp
+++ b/src/platform/DeviceControlServer.cpp
@@ -52,13 +52,13 @@
CHIP_ERROR DeviceControlServer::ArmFailSafe(uint16_t expiryLengthSeconds)
{
uint32_t timerMs = expiryLengthSeconds * 1000;
- SystemLayer.StartTimer(timerMs, HandleArmFailSafe, this);
+ DeviceLayer::SystemLayer().StartTimer(timerMs, HandleArmFailSafe, this);
return CHIP_NO_ERROR;
}
CHIP_ERROR DeviceControlServer::DisarmFailSafe()
{
- SystemLayer.CancelTimer(HandleArmFailSafe, this);
+ DeviceLayer::SystemLayer().CancelTimer(HandleArmFailSafe, this);
return CHIP_NO_ERROR;
}
diff --git a/src/platform/EFR32/BLEManagerImpl.cpp b/src/platform/EFR32/BLEManagerImpl.cpp
index 0ed06b9..f98305c 100644
--- a/src/platform/EFR32/BLEManagerImpl.cpp
+++ b/src/platform/EFR32/BLEManagerImpl.cpp
@@ -159,7 +159,7 @@
sl_status_t ret;
// Initialize the CHIP BleLayer.
- err = BleLayer::Init(this, this, &SystemLayer);
+ err = BleLayer::Init(this, this, &DeviceLayer::SystemLayer());
SuccessOrExit(err);
memset(mBleConnections, 0, sizeof(mBleConnections));
diff --git a/src/platform/ESP32/ConnectivityManagerImpl.cpp b/src/platform/ESP32/ConnectivityManagerImpl.cpp
index 57b8b67..8087adc 100644
--- a/src/platform/ESP32/ConnectivityManagerImpl.cpp
+++ b/src/platform/ESP32/ConnectivityManagerImpl.cpp
@@ -90,7 +90,7 @@
err = Internal::ESP32Utils::SetAPMode(autoConnect);
SuccessOrExit(err);
- SystemLayer.ScheduleWork(DriveStationState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
}
if (mWiFiStationMode != val)
@@ -119,8 +119,8 @@
memset(&stationConfig, 0, sizeof(stationConfig));
esp_wifi_set_config(WIFI_IF_STA, &stationConfig);
- SystemLayer.ScheduleWork(DriveStationState, NULL);
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
}
}
@@ -137,7 +137,7 @@
mWiFiAPMode = val;
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
exit:
return err;
@@ -148,7 +148,7 @@
if (mWiFiAPMode == kWiFiAPMode_OnDemand || mWiFiAPMode == kWiFiAPMode_OnDemand_NoStationProvision)
{
mLastAPDemandTime = System::Clock::GetMonotonicMilliseconds();
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
}
}
@@ -157,7 +157,7 @@
if (mWiFiAPMode == kWiFiAPMode_OnDemand || mWiFiAPMode == kWiFiAPMode_OnDemand_NoStationProvision)
{
mLastAPDemandTime = 0;
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
}
}
@@ -175,7 +175,7 @@
void ConnectivityManagerImpl::_SetWiFiAPIdleTimeoutMS(uint32_t val)
{
mWiFiAPIdleTimeoutMS = val;
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
}
#define WIFI_BAND_2_4GHZ 2400
@@ -442,8 +442,8 @@
ReturnErrorOnFailure(Internal::ESP32Utils::SetAPMode(false));
// Queue work items to bootstrap the AP and station state machines once the Chip event loop is running.
- ReturnErrorOnFailure(SystemLayer.ScheduleWork(DriveStationState, NULL));
- ReturnErrorOnFailure(SystemLayer.ScheduleWork(DriveAPState, NULL));
+ ReturnErrorOnFailure(DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL));
+ ReturnErrorOnFailure(DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL));
return CHIP_NO_ERROR;
}
@@ -527,13 +527,13 @@
{
// Schedule a call to DriveStationState method in case a station connect attempt was
// deferred because the scan was in progress.
- SystemLayer.ScheduleWork(DriveStationState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
}
void ConnectivityManagerImpl::_OnWiFiStationProvisionChange()
{
// Schedule a call to the DriveStationState method to adjust the station state as needed.
- SystemLayer.ScheduleWork(DriveStationState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
}
// ==================== ConnectivityManager Private Methods ====================
@@ -642,7 +642,7 @@
ChipLogProgress(DeviceLayer, "Next WiFi station reconnect in %" PRIu32 " ms", timeToNextConnect);
- ReturnOnFailure(SystemLayer.StartTimer(timeToNextConnect, DriveStationState, NULL));
+ ReturnOnFailure(DeviceLayer::SystemLayer().StartTimer(timeToNextConnect, DriveStationState, NULL));
}
}
}
@@ -765,7 +765,7 @@
// Compute the amount of idle time before the AP should be deactivated and
// arm a timer to fire at that time.
apTimeout = (uint32_t)((mLastAPDemandTime + mWiFiAPIdleTimeoutMS) - now);
- err = SystemLayer.StartTimer(apTimeout, DriveAPState, NULL);
+ err = DeviceLayer::SystemLayer().StartTimer(apTimeout, DriveAPState, NULL);
SuccessOrExit(err);
ChipLogProgress(DeviceLayer, "Next WiFi AP timeout in %" PRIu32 " ms", apTimeout);
}
diff --git a/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp b/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp
index 3d9718e..3815cc8 100644
--- a/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp
+++ b/src/platform/ESP32/bluedroid/BLEManagerImpl.cpp
@@ -130,7 +130,7 @@
CHIP_ERROR err;
// Initialize the Chip BleLayer.
- err = BleLayer::Init(this, this, &SystemLayer);
+ err = BleLayer::Init(this, this, &DeviceLayer::SystemLayer());
SuccessOrExit(err);
memset(mCons, 0, sizeof(mCons));
@@ -176,8 +176,8 @@
if (val)
{
mAdvertiseStartTime = System::Clock::GetMonotonicMilliseconds();
- ReturnErrorOnFailure(SystemLayer.StartTimer(kAdvertiseTimeout, HandleAdvertisementTimer, this));
- ReturnErrorOnFailure(SystemLayer.StartTimer(kFastAdvertiseTimeout, HandleFastAdvertisementTimer, this));
+ ReturnErrorOnFailure(DeviceLayer::SystemLayer().StartTimer(kAdvertiseTimeout, HandleAdvertisementTimer, this));
+ ReturnErrorOnFailure(DeviceLayer::SystemLayer().StartTimer(kFastAdvertiseTimeout, HandleFastAdvertisementTimer, this));
}
mFlags.Set(Flags::kFastAdvertisingEnabled, val);
mFlags.Set(Flags::kAdvertisingRefreshNeeded, 1);
diff --git a/src/platform/ESP32/nimble/BLEManagerImpl.cpp b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
index e19e0da..21c5367 100644
--- a/src/platform/ESP32/nimble/BLEManagerImpl.cpp
+++ b/src/platform/ESP32/nimble/BLEManagerImpl.cpp
@@ -126,7 +126,7 @@
CHIP_ERROR err;
// Initialize the Chip BleLayer.
- err = BleLayer::Init(this, this, &SystemLayer);
+ err = BleLayer::Init(this, this, &DeviceLayer::SystemLayer());
SuccessOrExit(err);
mRXCharAttrHandle = 0;
@@ -170,8 +170,8 @@
if (val)
{
mAdvertiseStartTime = System::Clock::GetMonotonicMilliseconds();
- ReturnErrorOnFailure(SystemLayer.StartTimer(kAdvertiseTimeout, HandleAdvertisementTimer, this));
- ReturnErrorOnFailure(SystemLayer.StartTimer(kFastAdvertiseTimeout, HandleFastAdvertisementTimer, this));
+ ReturnErrorOnFailure(DeviceLayer::SystemLayer().StartTimer(kAdvertiseTimeout, HandleAdvertisementTimer, this));
+ ReturnErrorOnFailure(DeviceLayer::SystemLayer().StartTimer(kFastAdvertiseTimeout, HandleFastAdvertisementTimer, this));
}
mFlags.Set(Flags::kFastAdvertisingEnabled, val);
diff --git a/src/platform/Globals.cpp b/src/platform/Globals.cpp
index d0223fc..3f727be 100644
--- a/src/platform/Globals.cpp
+++ b/src/platform/Globals.cpp
@@ -25,11 +25,12 @@
namespace chip {
namespace DeviceLayer {
-chip::System::LayerImpl SystemLayer;
chip::Inet::InetLayer InetLayer;
namespace Internal {
+chip::System::Layer * gSystemLayer = nullptr;
+chip::System::LayerImpl gSystemLayerImpl;
const char * const TAG = "CHIP[DL]";
} // namespace Internal
diff --git a/src/platform/K32W/BLEManagerImpl.cpp b/src/platform/K32W/BLEManagerImpl.cpp
index d3ec43a..76c0f13 100644
--- a/src/platform/K32W/BLEManagerImpl.cpp
+++ b/src/platform/K32W/BLEManagerImpl.cpp
@@ -155,7 +155,7 @@
VerifyOrExit(!mFlags.Has(Flags::kK32WBLEStackInitialized), err = CHIP_ERROR_INCORRECT_STATE);
// Initialize the Chip BleLayer.
- err = BleLayer::Init(this, this, &SystemLayer);
+ err = BleLayer::Init(this, this, &DeviceLayer::SystemLayer());
SuccessOrExit(err);
(void) RNG_Init();
diff --git a/src/platform/Linux/BLEManagerImpl.cpp b/src/platform/Linux/BLEManagerImpl.cpp
index 04be62f..0ff3022 100644
--- a/src/platform/Linux/BLEManagerImpl.cpp
+++ b/src/platform/Linux/BLEManagerImpl.cpp
@@ -75,7 +75,7 @@
{
CHIP_ERROR err;
- err = BleLayer::Init(this, this, this, &SystemLayer);
+ err = BleLayer::Init(this, this, this, &DeviceLayer::SystemLayer());
SuccessOrExit(err);
mServiceMode = ConnectivityManager::kCHIPoBLEServiceMode_Enabled;
@@ -715,7 +715,7 @@
void BLEManagerImpl::CleanScanConfig()
{
if (mBLEScanConfig.mBleScanState == BleScanState::kConnecting)
- DeviceLayer::SystemLayer.CancelTimer(HandleConnectTimeout, mpEndpoint);
+ DeviceLayer::SystemLayer().CancelTimer(HandleConnectTimeout, mpEndpoint);
mBLEScanConfig.mBleScanState = BleScanState::kNotScanning;
}
@@ -803,7 +803,7 @@
}
mBLEScanConfig.mBleScanState = BleScanState::kConnecting;
- DeviceLayer::SystemLayer.StartTimer(kConnectTimeoutMs, HandleConnectTimeout, mpEndpoint);
+ DeviceLayer::SystemLayer().StartTimer(kConnectTimeoutMs, HandleConnectTimeout, mpEndpoint);
mDeviceScanner->StopScan();
ConnectDevice(device, mpEndpoint);
diff --git a/src/platform/Linux/ConnectivityManagerImpl.cpp b/src/platform/Linux/ConnectivityManagerImpl.cpp
index 5f2159b..f2a8251 100644
--- a/src/platform/Linux/ConnectivityManagerImpl.cpp
+++ b/src/platform/Linux/ConnectivityManagerImpl.cpp
@@ -404,7 +404,7 @@
ChipLogProgress(DeviceLayer, "WiFi AP mode change: %s -> %s", WiFiAPModeToStr(mWiFiAPMode), WiFiAPModeToStr(val));
mWiFiAPMode = val;
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
}
exit:
@@ -417,7 +417,7 @@
{
ChipLogProgress(DeviceLayer, "wpa_supplicant: Demand start WiFi AP");
mLastAPDemandTime = System::Clock::GetMonotonicMilliseconds();
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
}
else
{
@@ -431,7 +431,7 @@
{
ChipLogProgress(DeviceLayer, "wpa_supplicant: Demand stop WiFi AP");
mLastAPDemandTime = 0;
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
}
else
{
@@ -453,7 +453,7 @@
void ConnectivityManagerImpl::_SetWiFiAPIdleTimeoutMS(uint32_t val)
{
mWiFiAPIdleTimeoutMS = val;
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
}
void ConnectivityManagerImpl::_OnWpaInterfaceProxyReady(GObject * source_object, GAsyncResult * res, gpointer user_data)
@@ -688,7 +688,7 @@
// Compute the amount of idle time before the AP should be deactivated and
// arm a timer to fire at that time.
apTimeout = (uint32_t)((mLastAPDemandTime + mWiFiAPIdleTimeoutMS) - now);
- err = SystemLayer.StartTimer(apTimeout, DriveAPState, NULL);
+ err = DeviceLayer::SystemLayer().StartTimer(apTimeout, DriveAPState, NULL);
SuccessOrExit(err);
ChipLogProgress(DeviceLayer, "Next WiFi AP timeout in %" PRIu32 " s", apTimeout / 1000);
}
diff --git a/src/platform/Linux/MdnsImpl.cpp b/src/platform/Linux/MdnsImpl.cpp
index 876e954..81207e5 100644
--- a/src/platform/Linux/MdnsImpl.cpp
+++ b/src/platform/Linux/MdnsImpl.cpp
@@ -163,9 +163,9 @@
auto watch = std::make_unique<AvahiWatch>();
watch->mSocket = fd;
- LogErrorOnFailure(DeviceLayer::SystemLayer.StartWatchingSocket(fd, &watch->mSocketWatch));
- LogErrorOnFailure(DeviceLayer::SystemLayer.SetCallback(watch->mSocketWatch, AvahiWatchCallbackTrampoline,
- reinterpret_cast<intptr_t>(watch.get())));
+ LogErrorOnFailure(DeviceLayer::SystemLayerSockets().StartWatchingSocket(fd, &watch->mSocketWatch));
+ LogErrorOnFailure(DeviceLayer::SystemLayerSockets().SetCallback(watch->mSocketWatch, AvahiWatchCallbackTrampoline,
+ reinterpret_cast<intptr_t>(watch.get())));
WatchUpdate(watch.get(), event);
watch->mCallback = callback;
watch->mContext = context;
@@ -179,19 +179,19 @@
{
if (event & AVAHI_WATCH_IN)
{
- LogErrorOnFailure(DeviceLayer::SystemLayer.RequestCallbackOnPendingRead(watch->mSocketWatch));
+ LogErrorOnFailure(DeviceLayer::SystemLayerSockets().RequestCallbackOnPendingRead(watch->mSocketWatch));
}
else
{
- LogErrorOnFailure(DeviceLayer::SystemLayer.ClearCallbackOnPendingRead(watch->mSocketWatch));
+ LogErrorOnFailure(DeviceLayer::SystemLayerSockets().ClearCallbackOnPendingRead(watch->mSocketWatch));
}
if (event & AVAHI_WATCH_OUT)
{
- LogErrorOnFailure(DeviceLayer::SystemLayer.RequestCallbackOnPendingWrite(watch->mSocketWatch));
+ LogErrorOnFailure(DeviceLayer::SystemLayerSockets().RequestCallbackOnPendingWrite(watch->mSocketWatch));
}
else
{
- LogErrorOnFailure(DeviceLayer::SystemLayer.ClearCallbackOnPendingWrite(watch->mSocketWatch));
+ LogErrorOnFailure(DeviceLayer::SystemLayerSockets().ClearCallbackOnPendingWrite(watch->mSocketWatch));
}
}
@@ -207,7 +207,7 @@
void Poller::WatchFree(AvahiWatch & watch)
{
- DeviceLayer::SystemLayer.StopWatchingSocket(&watch.mSocketWatch);
+ DeviceLayer::SystemLayerSockets().StopWatchingSocket(&watch.mSocketWatch);
mWatches.erase(std::remove_if(mWatches.begin(), mWatches.end(),
[&watch](const std::unique_ptr<AvahiWatch> & aValue) { return aValue.get() == &watch; }),
mWatches.end());
diff --git a/src/platform/Linux/bluez/ChipDeviceScanner.cpp b/src/platform/Linux/bluez/ChipDeviceScanner.cpp
index d559850..bb03ba3 100644
--- a/src/platform/Linux/bluez/ChipDeviceScanner.cpp
+++ b/src/platform/Linux/bluez/ChipDeviceScanner.cpp
@@ -78,7 +78,7 @@
StopScan();
// In case the timeout timer is still active
- chip::DeviceLayer::SystemLayer.CancelTimer(TimerExpiredCallback, this);
+ chip::DeviceLayer::SystemLayer().CancelTimer(TimerExpiredCallback, this);
g_object_unref(mManager);
g_object_unref(mCancellable);
@@ -131,7 +131,7 @@
return CHIP_ERROR_INTERNAL;
}
- CHIP_ERROR err = chip::DeviceLayer::SystemLayer.StartTimer(timeoutMs, TimerExpiredCallback, static_cast<void *>(this));
+ CHIP_ERROR err = chip::DeviceLayer::SystemLayer().StartTimer(timeoutMs, TimerExpiredCallback, static_cast<void *>(this));
if (err != CHIP_NO_ERROR)
{
diff --git a/src/platform/P6/BLEManagerImpl.cpp b/src/platform/P6/BLEManagerImpl.cpp
index ec058c5..6bc0365 100644
--- a/src/platform/P6/BLEManagerImpl.cpp
+++ b/src/platform/P6/BLEManagerImpl.cpp
@@ -93,7 +93,7 @@
CHIP_ERROR err;
// Initialize the CHIP BleLayer.
- err = BleLayer::Init(this, this, &SystemLayer);
+ err = BleLayer::Init(this, this, &DeviceLayer::SystemLayer());
SuccessOrExit(err);
// Configure platform specific settings for Bluetooth
diff --git a/src/platform/P6/ConnectivityManagerImpl.cpp b/src/platform/P6/ConnectivityManagerImpl.cpp
index 58037ed..98e7849 100644
--- a/src/platform/P6/ConnectivityManagerImpl.cpp
+++ b/src/platform/P6/ConnectivityManagerImpl.cpp
@@ -69,7 +69,7 @@
if (val != kWiFiStationMode_ApplicationControlled)
{
mWiFiStationMode = val;
- SystemLayer.ScheduleWork(DriveStationState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
}
if (mWiFiStationMode != val)
{
@@ -101,8 +101,8 @@
memset(&stationConfig, 0, sizeof(stationConfig));
Internal::P6Utils::p6_wifi_set_config(WIFI_IF_STA, &stationConfig);
- SystemLayer.ScheduleWork(DriveStationState, NULL);
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
}
}
@@ -117,7 +117,7 @@
ChipLogProgress(DeviceLayer, "WiFi AP mode change: %s -> %s", WiFiAPModeToStr(mWiFiAPMode), WiFiAPModeToStr(val));
}
mWiFiAPMode = val;
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
exit:
return err;
}
@@ -127,7 +127,7 @@
if (mWiFiAPMode == kWiFiAPMode_OnDemand || mWiFiAPMode == kWiFiAPMode_OnDemand_NoStationProvision)
{
mLastAPDemandTime = System::Clock::GetMonotonicMilliseconds();
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
}
}
@@ -136,7 +136,7 @@
if (mWiFiAPMode == kWiFiAPMode_OnDemand || mWiFiAPMode == kWiFiAPMode_OnDemand_NoStationProvision)
{
mLastAPDemandTime = 0;
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
}
}
@@ -154,7 +154,7 @@
void ConnectivityManagerImpl::_SetWiFiAPIdleTimeoutMS(uint32_t val)
{
mWiFiAPIdleTimeoutMS = val;
- SystemLayer.ScheduleWork(DriveAPState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveAPState, NULL);
}
CHIP_ERROR ConnectivityManagerImpl::_GetAndLogWifiStatsCounters(void)
@@ -225,7 +225,7 @@
SuccessOrExit(err);
// Queue work items to bootstrap the station state machines once the Chip event loop is running.
- err = SystemLayer.ScheduleWork(DriveStationState, NULL);
+ err = DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
SuccessOrExit(err);
exit:
@@ -278,12 +278,12 @@
}
void ConnectivityManagerImpl::_OnWiFiScanDone()
{
- SystemLayer.ScheduleWork(DriveStationState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
}
void ConnectivityManagerImpl::_OnWiFiStationProvisionChange()
{
- SystemLayer.ScheduleWork(DriveStationState, NULL);
+ DeviceLayer::SystemLayer().ScheduleWork(DriveStationState, NULL);
}
void ConnectivityManagerImpl::DriveStationState(::chip::System::Layer * aLayer, void * aAppState)
@@ -417,7 +417,7 @@
// Compute the amount of idle time before the AP should be deactivated and
// arm a timer to fire at that time.
apTimeout = (uint32_t)((mLastAPDemandTime + mWiFiAPIdleTimeoutMS) - now);
- err = SystemLayer.StartTimer(apTimeout, DriveAPState, NULL);
+ err = DeviceLayer::SystemLayer().StartTimer(apTimeout, DriveAPState, NULL);
SuccessOrExit(err);
ChipLogProgress(DeviceLayer, "Next WiFi AP timeout in %" PRIu32 " ms", apTimeout);
}
@@ -574,7 +574,7 @@
uint32_t timeToNextConnect = (uint32_t)((mLastStationConnectFailTime + mWiFiStationReconnectIntervalMS) - now);
ChipLogProgress(DeviceLayer, "Next WiFi station reconnect in %" PRId32 " ms ", timeToNextConnect);
- err = SystemLayer.StartTimer(timeToNextConnect, DriveStationState, NULL);
+ err = DeviceLayer::SystemLayer().StartTimer(timeToNextConnect, DriveStationState, NULL);
SuccessOrExit(err);
}
}
diff --git a/src/platform/Zephyr/BLEManagerImpl.cpp b/src/platform/Zephyr/BLEManagerImpl.cpp
index baacd6d..b5196cc 100644
--- a/src/platform/Zephyr/BLEManagerImpl.cpp
+++ b/src/platform/Zephyr/BLEManagerImpl.cpp
@@ -127,7 +127,7 @@
bt_conn_cb_register(&mConnCallbacks);
// Initialize the CHIP BleLayer.
- ReturnErrorOnFailure(BleLayer::Init(this, this, &SystemLayer));
+ ReturnErrorOnFailure(BleLayer::Init(this, this, &DeviceLayer::SystemLayer()));
PlatformMgr().ScheduleWork(DriveBLEState, 0);
@@ -291,15 +291,15 @@
if (mFlags.Has(Flags::kFastAdvertisingEnabled))
{
// Start timer to change advertising interval.
- SystemLayer.StartTimer(CHIP_DEVICE_CONFIG_BLE_ADVERTISING_INTERVAL_CHANGE_TIME, HandleBLEAdvertisementIntervalChange,
- this);
+ DeviceLayer::SystemLayer().StartTimer(CHIP_DEVICE_CONFIG_BLE_ADVERTISING_INTERVAL_CHANGE_TIME,
+ HandleBLEAdvertisementIntervalChange, this);
}
// Start timer to disable CHIPoBLE advertisement after timeout expiration only if it isn't advertising rerun (in that case
// timer is already running).
if (!isAdvertisingRerun)
{
- SystemLayer.StartTimer(CHIP_DEVICE_CONFIG_BLE_ADVERTISING_TIMEOUT, HandleBLEAdvertisementTimeout, this);
+ DeviceLayer::SystemLayer().StartTimer(CHIP_DEVICE_CONFIG_BLE_ADVERTISING_TIMEOUT, HandleBLEAdvertisementTimeout, this);
}
}
@@ -328,10 +328,10 @@
}
// Cancel timer event disabling CHIPoBLE advertisement after timeout expiration
- SystemLayer.CancelTimer(HandleBLEAdvertisementTimeout, this);
+ DeviceLayer::SystemLayer().CancelTimer(HandleBLEAdvertisementTimeout, this);
// Cancel timer event changing CHIPoBLE advertisement interval
- SystemLayer.CancelTimer(HandleBLEAdvertisementIntervalChange, this);
+ DeviceLayer::SystemLayer().CancelTimer(HandleBLEAdvertisementIntervalChange, this);
}
return CHIP_NO_ERROR;
diff --git a/src/platform/cc13x2_26x2/BLEManagerImpl.cpp b/src/platform/cc13x2_26x2/BLEManagerImpl.cpp
index 1b64bcb..38f2ec2 100644
--- a/src/platform/cc13x2_26x2/BLEManagerImpl.cpp
+++ b/src/platform/cc13x2_26x2/BLEManagerImpl.cpp
@@ -106,7 +106,7 @@
BLEMGR_LOG("BLEMGR: BLE Initialization Start");
// Initialize the CHIP BleLayer.
- err = BleLayer::Init(this, this, &SystemLayer);
+ err = BleLayer::Init(this, this, &DeviceLayer::SystemLayer());
if (err != CHIP_NO_ERROR)
{
return err;
diff --git a/src/platform/mbed/BLEManagerImpl.cpp b/src/platform/mbed/BLEManagerImpl.cpp
index 8a55d8e8..7b8733b 100644
--- a/src/platform/mbed/BLEManagerImpl.cpp
+++ b/src/platform/mbed/BLEManagerImpl.cpp
@@ -627,7 +627,7 @@
VerifyOrExit(mbed_err == BLE_ERROR_NONE, err = CHIP_ERROR(chip::ChipError::Range::kOS, mbed_err));
security_mgr.setSecurityManagerEventHandler(&sSecurityManagerEventHandler);
- err = BleLayer::Init(this, this, &SystemLayer);
+ err = BleLayer::Init(this, this, &DeviceLayer::SystemLayer());
SuccessOrExit(err);
PlatformMgr().ScheduleWork(DriveBLEState, 0);
#if _BLEMGRIMPL_USE_LEDS
diff --git a/src/platform/mbed/PlatformManagerImpl.cpp b/src/platform/mbed/PlatformManagerImpl.cpp
index 2058394..66235a1 100644
--- a/src/platform/mbed/PlatformManagerImpl.cpp
+++ b/src/platform/mbed/PlatformManagerImpl.cpp
@@ -24,6 +24,13 @@
namespace chip {
namespace DeviceLayer {
+namespace {
+System::LayerSocketsLoop & SystemLayerSocketsLoop()
+{
+ return static_cast<System::LayerSocketsLoop &>(DeviceLayer::SystemLayer());
+}
+} // anonymous namespace
+
// TODO: Event and timer processing is not efficient from a memory perspective.
// Both occupy at least 24 bytes when only 4 bytes is required.
// An optimized designed could use a separate circular buffer to store events
@@ -46,8 +53,9 @@
mQueue.~EventQueue();
new (&mQueue) events::EventQueue(event_size * CHIP_DEVICE_CONFIG_MAX_EVENT_QUEUE_SIZE);
- mQueue.background(
- [&](int t) { MbedEventTimeout::AttachTimeout([&] { SystemLayer.Signal(); }, std::chrono::milliseconds{ t }); });
+ mQueue.background([&](int t) {
+ MbedEventTimeout::AttachTimeout([&] { SystemLayerSocketsLoop().Signal(); }, std::chrono::milliseconds{ t });
+ });
// Reinitialize the Mutexes
mThisStateMutex.~Mutex();
@@ -147,20 +155,20 @@
LockChipStack();
ChipLogProgress(DeviceLayer, "CHIP Run event loop");
- SystemLayer.EventLoopBegins();
+ SystemLayerSocketsLoop().EventLoopBegins();
while (true)
{
- SystemLayer.PrepareEvents();
+ SystemLayerSocketsLoop().PrepareEvents();
UnlockChipStack();
- SystemLayer.WaitForEvents();
+ SystemLayerSocketsLoop().WaitForEvents();
LockChipStack();
- SystemLayer.HandleEvents();
+ SystemLayerSocketsLoop().HandleEvents();
ProcessDeviceEvents();
}
- SystemLayer.EventLoopEnds();
+ SystemLayerSocketsLoop().EventLoopEnds();
UnlockChipStack();
@@ -210,7 +218,7 @@
// Wake from select so it unblocks processing
LockChipStack();
- SystemLayer.Signal();
+ SystemLayerSocketsLoop().Signal();
UnlockChipStack();
osStatus err = osOK;
@@ -236,7 +244,7 @@
CHIP_ERROR PlatformManagerImpl::_StartChipTimer(int64_t durationMS)
{
- // Let SystemLayer.PrepareSelect() handle timers.
+ // Let LayerSocketsLoop::PrepareSelect() handle timers.
return CHIP_NO_ERROR;
}
diff --git a/src/platform/qpg/BLEManagerImpl.cpp b/src/platform/qpg/BLEManagerImpl.cpp
index 475fcbb..3133972 100644
--- a/src/platform/qpg/BLEManagerImpl.cpp
+++ b/src/platform/qpg/BLEManagerImpl.cpp
@@ -82,7 +82,7 @@
}
// Initialize the CHIP BleLayer.
- err = BleLayer::Init(this, this, &SystemLayer);
+ err = BleLayer::Init(this, this, &DeviceLayer::SystemLayer());
SuccessOrExit(err);
appCbacks.stackCback = ExternalCbHandler;
diff --git a/src/platform/tests/TestPlatformMgr.cpp b/src/platform/tests/TestPlatformMgr.cpp
index c482969..fd8bbe5 100644
--- a/src/platform/tests/TestPlatformMgr.cpp
+++ b/src/platform/tests/TestPlatformMgr.cpp
@@ -178,6 +178,39 @@
#endif
}
+class MockSystemLayer : public System::LayerImpl
+{
+public:
+ CHIP_ERROR StartTimer(uint32_t aDelayMilliseconds, System::TimerCompleteCallback aComplete, void * aAppState) override
+ {
+ return CHIP_APPLICATION_ERROR(1);
+ }
+ CHIP_ERROR ScheduleWork(System::TimerCompleteCallback aComplete, void * aAppState) override
+ {
+ return CHIP_APPLICATION_ERROR(2);
+ }
+};
+
+static void TestPlatformMgr_MockSystemLayer(nlTestSuite * inSuite, void * inContext)
+{
+ MockSystemLayer systemLayer;
+
+ DeviceLayer::SetSystemLayerForTesting(&systemLayer);
+ NL_TEST_ASSERT(inSuite, &DeviceLayer::SystemLayer() == static_cast<chip::System::Layer *>(&systemLayer));
+
+ CHIP_ERROR err = PlatformMgr().InitChipStack();
+ NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+ NL_TEST_ASSERT(inSuite, &DeviceLayer::SystemLayer() == static_cast<chip::System::Layer *>(&systemLayer));
+
+ NL_TEST_ASSERT(inSuite, DeviceLayer::SystemLayer().StartTimer(0, nullptr, nullptr) == CHIP_APPLICATION_ERROR(1));
+ NL_TEST_ASSERT(inSuite, DeviceLayer::SystemLayer().ScheduleWork(nullptr, nullptr) == CHIP_APPLICATION_ERROR(2));
+
+ err = PlatformMgr().Shutdown();
+ NL_TEST_ASSERT(inSuite, err == CHIP_NO_ERROR);
+
+ DeviceLayer::SetSystemLayerForTesting(nullptr);
+}
+
/**
* Test Suite. It lists all the test functions.
*/
@@ -190,6 +223,7 @@
NL_TEST_DEF("Test PlatformMgr::RunEventLoop with stop before sleep", TestPlatformMgr_RunEventLoopStopBeforeSleep),
NL_TEST_DEF("Test PlatformMgr::TryLockChipStack", TestPlatformMgr_TryLockChipStack),
NL_TEST_DEF("Test PlatformMgr::AddEventHandler", TestPlatformMgr_AddEventHandler),
+ NL_TEST_DEF("Test mock System::Layer", TestPlatformMgr_MockSystemLayer),
NL_TEST_SENTINEL()
};
