Darwin: Make it possible to build with chip_system_config_use_dispatch=false

Note: This is for unit testing / development purposes only.

Author: ksperling-apple

src/platform/Darwin/PlatformManagerImpl.cpp

@@ -35,7 +35,11 @@
 #include <platform/PlatformManager.h>
 
 // Include the non-inline definitions for the GenericPlatformManagerImpl<> template,
+#if CHIP_SYSTEM_CONFIG_USE_DISPATCH
 #include <platform/internal/GenericPlatformManagerImpl.ipp>
+#else
+#include <platform/internal/GenericPlatformManagerImpl_POSIX.ipp>
+#endif // CHIP_SYSTEM_CONFIG_USE_DISPATCH
 
 #include <CoreFoundation/CoreFoundation.h>
 #include <tracing/metric_event.h>
@@ -64,7 +68,7 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack()
     ReturnErrorOnFailure(Internal::PosixConfig::Init());
 #endif // CHIP_DISABLE_PLATFORM_KVS
 
-#if !CHIP_SYSTEM_CONFIG_USE_LIBEV
+#if CHIP_SYSTEM_CONFIG_USE_DISPATCH
     // Ensure there is a dispatch queue available
     static_cast<System::LayerSocketsLoop &>(DeviceLayer::SystemLayer()).SetDispatchQueue(GetWorkQueue());
 #endif
@@ -83,6 +87,7 @@ CHIP_ERROR PlatformManagerImpl::_InitChipStack()
     return CHIP_NO_ERROR;
 }
 
+#if CHIP_SYSTEM_CONFIG_USE_DISPATCH
 CHIP_ERROR PlatformManagerImpl::_StartEventLoopTask()
 {
     auto expected = WorkQueueState::kSuspended;
@@ -128,12 +133,6 @@ void PlatformManagerImpl::_RunEventLoop()
     mRunLoopSem = nullptr;
 }
 
-void PlatformManagerImpl::_Shutdown()
-{
-    // Call up to the base class _Shutdown() to perform the bulk of the shutdown.
-    GenericPlatformManagerImpl<ImplClass>::_Shutdown();
-}
-
 CHIP_ERROR PlatformManagerImpl::_PostEvent(const ChipDeviceEvent * event)
 {
     const ChipDeviceEvent eventCopy = *event;
@@ -142,6 +141,7 @@ CHIP_ERROR PlatformManagerImpl::_PostEvent(const ChipDeviceEvent * event)
     });
     return CHIP_NO_ERROR;
 }
+#endif // CHIP_SYSTEM_CONFIG_USE_DISPATCH
 
 #if CHIP_STACK_LOCK_TRACKING_ENABLED
 bool PlatformManagerImpl::_IsChipStackLockedByCurrentThread() const

src/platform/Darwin/PlatformManagerImpl.h

@@ -25,7 +25,12 @@
 
 #include <lib/core/Global.h>
 #include <platform/Darwin/BleScannerDelegate.h>
+
+#if CHIP_SYSTEM_CONFIG_USE_DISPATCH
 #include <platform/internal/GenericPlatformManagerImpl.h>
+#else
+#include <platform/internal/GenericPlatformManagerImpl_POSIX.h>
+#endif // CHIP_SYSTEM_CONFIG_USE_DISPATCH
 
 #include <atomic>
 #include <dispatch/dispatch.h>
@@ -38,7 +43,12 @@ class BleScannerDelegate;
 /**
  * Concrete implementation of the PlatformManager singleton object for Darwin platforms.
  */
-class PlatformManagerImpl final : public PlatformManager, public Internal::GenericPlatformManagerImpl<PlatformManagerImpl>
+class PlatformManagerImpl final : public PlatformManager,
+#if CHIP_SYSTEM_CONFIG_USE_DISPATCH
+                                  public Internal::GenericPlatformManagerImpl<PlatformManagerImpl>
+#else
+                                  public Internal::GenericPlatformManagerImpl_POSIX<PlatformManagerImpl>
+#endif // CHIP_SYSTEM_CONFIG_USE_DISPATCH
 {
     // Allow the PlatformManager interface class to delegate method calls to
     // the implementation methods provided by this class.
@@ -58,8 +68,8 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
 private:
     // ===== Methods that implement the PlatformManager abstract interface.
     CHIP_ERROR _InitChipStack();
-    void _Shutdown();
 
+#if CHIP_SYSTEM_CONFIG_USE_DISPATCH
     CHIP_ERROR _StartChipTimer(System::Clock::Timeout delay) { return CHIP_ERROR_NOT_IMPLEMENTED; };
     CHIP_ERROR _StartEventLoopTask();
     CHIP_ERROR _StopEventLoopTask();
@@ -69,6 +79,7 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
     bool _TryLockChipStack() { return false; };
     void _UnlockChipStack(){};
     CHIP_ERROR _PostEvent(const ChipDeviceEvent * event);
+#endif // CHIP_SYSTEM_CONFIG_USE_DISPATCH
 
 #if CHIP_STACK_LOCK_TRACKING_ENABLED
     bool _IsChipStackLockedByCurrentThread() const;

src/platform/Darwin/SystemPlatformConfig.h

@@ -34,14 +34,6 @@ struct ChipDeviceEvent;
 
 // ==================== Platform Adaptations ====================
 
-#if !CHIP_SYSTEM_CONFIG_USE_LIBEV
-// FIXME: these should not be hardcoded here, it is set via build config
-// Need to exclude these for now in libev case
-#define CHIP_SYSTEM_CONFIG_POSIX_LOCKING 0
-#define CHIP_SYSTEM_CONFIG_FREERTOS_LOCKING 0
-#define CHIP_SYSTEM_CONFIG_NO_LOCKING 1
-#endif
-
 #define CHIP_SYSTEM_CONFIG_PLATFORM_PROVIDES_TIME 1
 #define CHIP_SYSTEM_CONFIG_USE_POSIX_TIME_FUNCTS 1
 #define CHIP_SYSTEM_CONFIG_POOL_USE_HEAP 1

src/system/system.gni

@@ -80,6 +80,10 @@ assert(
         chip_system_config_locking == "zephyr",
     "Please select a valid mutex implementation: posix, freertos, mbed, cmsis-rtos, zephyr, none")
 
+assert(
+    !chip_system_config_use_dispatch || chip_system_config_locking == "none",
+    "When chip_system_config_use_dispatch is true, chip_system_config_locking must be 'none'")
+
 assert(
     chip_system_config_clock == "clock_gettime" ||
         chip_system_config_clock == "gettimeofday",