Fix ScheduleLambda and Add unit-tests

src/include/platform/PlatformManager.h

@@ -133,6 +133,7 @@ class PlatformManager
      * before calling Shutdown.
      */
     void RunEventLoop();
+    void ProcessDeviceEvents();
 
     /**
      * Process work items until StopEventLoopTask is called.
@@ -222,9 +223,7 @@ class PlatformManager
     friend class Internal::GenericThreadStackManagerImpl_OpenThread_LwIP;
     template <class>
     friend class Internal::GenericConfigurationManagerImpl;
-#if CHIP_SYSTEM_CONFIG_USE_LWIP
     friend class System::PlatformEventing;
-#endif // CHIP_SYSTEM_CONFIG_USE_LWIP
 
     /*
      * PostEvent can be called safely on any thread without locking the stack.
@@ -351,6 +350,11 @@ inline void PlatformManager::RunEventLoop()
     static_cast<ImplClass *>(this)->_RunEventLoop();
 }
 
+inline void PlatformManager::ProcessDeviceEvents()
+{
+    static_cast<ImplClass *>(this)->_ProcessDeviceEvents();
+}
+
 /**
  * @brief
  *  Starts the stack on its own task with an associated event queue

src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.cpp

@@ -187,6 +187,18 @@ void GenericPlatformManagerImpl_FreeRTOS<ImplClass>::_RunEventLoop(void)
     }
 }
 
+template <class ImplClass>
+void GenericPlatformManagerImpl_FreeRTOS<ImplClass>::_ProcessDeviceEvents()
+{
+    ChipDeviceEvent event;
+    BaseType_t eventReceived = xQueueReceive(mChipEventQueue, &event, 0);
+    while (eventReceived == pdTRUE)
+    {
+        Impl()->DispatchEvent(&event);
+        eventReceived = xQueueReceive(mChipEventQueue, &event, 0);
+    }
+}
+
 template <class ImplClass>
 CHIP_ERROR GenericPlatformManagerImpl_FreeRTOS<ImplClass>::_StartEventLoopTask(void)
 {

src/include/platform/internal/GenericPlatformManagerImpl_FreeRTOS.h

@@ -71,6 +71,7 @@ class GenericPlatformManagerImpl_FreeRTOS : public GenericPlatformManagerImpl<Im
     void _UnlockChipStack(void);
     CHIP_ERROR _PostEvent(const ChipDeviceEvent * event);
     void _RunEventLoop(void);
+    void _ProcessDeviceEvents();
     CHIP_ERROR _StartEventLoopTask(void);
     CHIP_ERROR _StopEventLoopTask();
     CHIP_ERROR _StartChipTimer(System::Clock::Timeout duration);

src/include/platform/internal/GenericPlatformManagerImpl_POSIX.cpp

@@ -138,7 +138,7 @@ CHIP_ERROR GenericPlatformManagerImpl_POSIX<ImplClass>::_PostEvent(const ChipDev
 }
 
 template <class ImplClass>
-void GenericPlatformManagerImpl_POSIX<ImplClass>::ProcessDeviceEvents()
+void GenericPlatformManagerImpl_POSIX<ImplClass>::_ProcessDeviceEvents()
 {
     while (!mChipEventQueue.Empty())
     {
@@ -180,7 +180,7 @@ void GenericPlatformManagerImpl_POSIX<ImplClass>::_RunEventLoop()
 
         SystemLayerSocketsLoop().HandleEvents();
 
-        ProcessDeviceEvents();
+        _ProcessDeviceEvents();
     } while (mShouldRunEventLoop.load(std::memory_order_relaxed));
     SystemLayerSocketsLoop().EventLoopEnds();
 

src/include/platform/internal/GenericPlatformManagerImpl_POSIX.h

@@ -91,6 +91,8 @@ class GenericPlatformManagerImpl_POSIX : public GenericPlatformManagerImpl<ImplC
     void _UnlockChipStack();
     CHIP_ERROR _PostEvent(const ChipDeviceEvent * event);
     void _RunEventLoop();
+    void _ProcessDeviceEvents();
+
     CHIP_ERROR _StartEventLoopTask();
     CHIP_ERROR _StopEventLoopTask();
     CHIP_ERROR _StartChipTimer(System::Clock::Timeout duration);
@@ -107,8 +109,6 @@ class GenericPlatformManagerImpl_POSIX : public GenericPlatformManagerImpl<ImplC
 
     inline ImplClass * Impl() { return static_cast<ImplClass *>(this); }
 
-    void ProcessDeviceEvents();
-
     DeviceSafeQueue mChipEventQueue;
     std::atomic<bool> mShouldRunEventLoop;
     static void * EventLoopTaskMain(void * arg);

src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.cpp

@@ -124,7 +124,7 @@ CHIP_ERROR GenericPlatformManagerImpl_Zephyr<ImplClass>::_PostEvent(const ChipDe
 }
 
 template <class ImplClass>
-void GenericPlatformManagerImpl_Zephyr<ImplClass>::ProcessDeviceEvents()
+void GenericPlatformManagerImpl_Zephyr<ImplClass>::_ProcessDeviceEvents()
 {
     ChipDeviceEvent event;
 
@@ -148,7 +148,7 @@ void GenericPlatformManagerImpl_Zephyr<ImplClass>::_RunEventLoop(void)
 
         SystemLayerSocketsLoop().HandleEvents();
 
-        ProcessDeviceEvents();
+        _ProcessDeviceEvents();
     }
     SystemLayerSocketsLoop().EventLoopEnds();
 

src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.h

@@ -76,6 +76,7 @@ class GenericPlatformManagerImpl_Zephyr : public GenericPlatformManagerImpl<Impl
     void _UnlockChipStack(void);
     CHIP_ERROR _PostEvent(const ChipDeviceEvent * event);
     void _RunEventLoop(void);
+    void _ProcessDeviceEvents();
     CHIP_ERROR _StartEventLoopTask(void);
     CHIP_ERROR _StopEventLoopTask();
     CHIP_ERROR _StartChipTimer(System::Clock::Timeout duration);
@@ -89,7 +90,6 @@ class GenericPlatformManagerImpl_Zephyr : public GenericPlatformManagerImpl<Impl
     ImplClass * Impl() { return static_cast<ImplClass *>(this); }
     void SysUpdate();
     void SysProcess();
-    void ProcessDeviceEvents();
 
     static void EventLoopTaskMain(void * thisPtr, void *, void *);
 };

src/lib/support/LambdaBridge.h

@@ -17,6 +17,7 @@
 #pragma once
 
 #include <string.h>
+#include <type_traits>
 
 #include <lib/core/CHIPConfig.h>
 
@@ -35,17 +36,16 @@ class LambdaBridge
         static_assert(CHIP_CONFIG_LAMBDA_EVENT_ALIGN % alignof(Lambda) == 0, "lambda align too large");
 
         // Implicit cast a capture-less lambda into a raw function pointer.
-        mLambdaProxy = [](const std::aligned_storage<CHIP_CONFIG_LAMBDA_EVENT_SIZE, CHIP_CONFIG_LAMBDA_EVENT_ALIGN> & body) {
-            (*reinterpret_cast<const Lambda *>(&body))();
-        };
-        memcpy(&mLambdaBody, &lambda, sizeof(Lambda));
+        mLambdaProxy = [](const LambdaStorage & body) { (*reinterpret_cast<const Lambda *>(&body))(); };
+        ::memcpy(&mLambdaBody, &lambda, sizeof(Lambda));
     }
 
     void operator()() const { mLambdaProxy(mLambdaBody); }
 
 private:
-    void (*mLambdaProxy)(const std::aligned_storage<CHIP_CONFIG_LAMBDA_EVENT_SIZE, CHIP_CONFIG_LAMBDA_EVENT_ALIGN> & body);
-    std::aligned_storage<CHIP_CONFIG_LAMBDA_EVENT_SIZE, CHIP_CONFIG_LAMBDA_EVENT_ALIGN> mLambdaBody;
+    using LambdaStorage = std::aligned_storage<CHIP_CONFIG_LAMBDA_EVENT_SIZE, CHIP_CONFIG_LAMBDA_EVENT_ALIGN>::type;
+    void (*mLambdaProxy)(const LambdaStorage & body);
+    LambdaStorage mLambdaBody;
 };
 
 static_assert(std::is_trivial<LambdaBridge>::value, "LambdaBridge is not trivial");

src/platform/Darwin/PlatformManagerImpl.cpp

@@ -108,6 +108,11 @@ void PlatformManagerImpl::_RunEventLoop()
     dispatch_semaphore_wait(mRunLoopSem, DISPATCH_TIME_FOREVER);
 }
 
+void PlatformManagerImpl::_ProcessDeviceEvents()
+{
+    // Not implemented
+}
+
 CHIP_ERROR PlatformManagerImpl::_Shutdown()
 {
     // Call up to the base class _Shutdown() to perform the bulk of the shutdown.

src/platform/Darwin/PlatformManagerImpl.h

@@ -62,6 +62,7 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
     CHIP_ERROR _StartEventLoopTask();
     CHIP_ERROR _StopEventLoopTask();
     void _RunEventLoop();
+    void _ProcessDeviceEvents();
     void _LockChipStack(){};
     bool _TryLockChipStack() { return false; };
     void _UnlockChipStack(){};

src/platform/PlatformEventSupport.cpp

@@ -27,8 +27,6 @@
 
 #include <platform/PlatformManager.h>
 
-#if CHIP_SYSTEM_CONFIG_USE_LWIP
-
 namespace chip {
 namespace System {
 
@@ -62,5 +60,3 @@ CHIP_ERROR PlatformEventing::StartTimer(System::Layer & aLayer, System::Clock::T
 
 } // namespace System
 } // namespace chip
-
-#endif // CHIP_SYSTEM_CONFIG_USE_LWIP

src/platform/fake/PlatformManagerImpl.h

@@ -24,6 +24,8 @@
 
 #include <platform/PlatformManager.h>
 
+#include <queue>
+
 namespace chip {
 namespace DeviceLayer {
 
@@ -43,21 +45,62 @@ class PlatformManagerImpl final : public PlatformManager
     // ===== Methods that implement the PlatformManager abstract interface.
 
     CHIP_ERROR _InitChipStack() { return CHIP_NO_ERROR; }
+    CHIP_ERROR _Shutdown() { return CHIP_NO_ERROR; }
 
     CHIP_ERROR _AddEventHandler(EventHandlerFunct handler, intptr_t arg = 0) { return CHIP_ERROR_NOT_IMPLEMENTED; }
     void _RemoveEventHandler(EventHandlerFunct handler, intptr_t arg = 0) {}
     void _ScheduleWork(AsyncWorkFunct workFunct, intptr_t arg = 0) {}
-    void _RunEventLoop() {}
+
+    void _RunEventLoop()
+    {
+        do
+        {
+            _ProcessDeviceEvents();
+        } while (mShouldRunEventLoop);
+    }
+
+    void _ProcessDeviceEvents()
+    {
+        while (!mQueue.empty())
+        {
+            const ChipDeviceEvent & event = mQueue.front();
+            _DispatchEvent(&event);
+            mQueue.pop();
+        }
+    }
+
     CHIP_ERROR _StartEventLoopTask() { return CHIP_ERROR_NOT_IMPLEMENTED; }
-    CHIP_ERROR _StopEventLoopTask() { return CHIP_ERROR_NOT_IMPLEMENTED; }
-    CHIP_ERROR _PostEvent(const ChipDeviceEvent * event) { return CHIP_NO_ERROR; }
-    void _DispatchEvent(const ChipDeviceEvent * event) {}
+
+    CHIP_ERROR _StopEventLoopTask()
+    {
+        mShouldRunEventLoop = false;
+        return CHIP_NO_ERROR;
+    }
+
+    CHIP_ERROR _PostEvent(const ChipDeviceEvent * event)
+    {
+        mQueue.emplace(*event);
+        return CHIP_NO_ERROR;
+    }
+
+    void _DispatchEvent(const ChipDeviceEvent * event)
+    {
+        switch (event->Type)
+        {
+        case DeviceEventType::kChipLambdaEvent:
+            event->LambdaEvent();
+            break;
+
+        default:
+            break;
+        }
+    }
+
     CHIP_ERROR _StartChipTimer(System::Clock::Timeout duration) { return CHIP_ERROR_NOT_IMPLEMENTED; }
 
     void _LockChipStack() {}
     bool _TryLockChipStack() { return true; }
     void _UnlockChipStack() {}
-    CHIP_ERROR _Shutdown() { return CHIP_ERROR_NOT_IMPLEMENTED; }
 
     CHIP_ERROR _GetCurrentHeapFree(uint64_t & currentHeapFree);
     CHIP_ERROR _GetCurrentHeapUsed(uint64_t & currentHeapUsed);
@@ -75,6 +118,9 @@ class PlatformManagerImpl final : public PlatformManager
     friend class Internal::BLEManagerImpl;
 
     static PlatformManagerImpl sInstance;
+
+    bool mShouldRunEventLoop = true;
+    std::queue<ChipDeviceEvent> mQueue;
 };
 
 /**

src/platform/mbed/PlatformManagerImpl.cpp

@@ -130,7 +130,7 @@ CHIP_ERROR PlatformManagerImpl::_PostEvent(const ChipDeviceEvent * eventPtr)
     return CHIP_NO_ERROR;
 }
 
-void PlatformManagerImpl::ProcessDeviceEvents()
+void PlatformManagerImpl::_ProcessDeviceEvents()
 {
     mQueue.dispatch(0);
 }
@@ -178,7 +178,7 @@ void PlatformManagerImpl::_RunEventLoop()
 
         SystemLayerSocketsLoop().HandleEvents();
 
-        ProcessDeviceEvents();
+        _ProcessDeviceEvents();
     }
     SystemLayerSocketsLoop().EventLoopEnds();
 

src/platform/mbed/PlatformManagerImpl.h

@@ -86,13 +86,12 @@ class PlatformManagerImpl final : public PlatformManager, public Internal::Gener
     void _UnlockChipStack();
     CHIP_ERROR _PostEvent(const ChipDeviceEvent * event);
     void _RunEventLoop();
+    void _ProcessDeviceEvents();
     CHIP_ERROR _StartEventLoopTask();
     CHIP_ERROR _StopEventLoopTask();
     CHIP_ERROR _StartChipTimer(System::Clock::Timeout duration);
     CHIP_ERROR _Shutdown();
 
-    void ProcessDeviceEvents();
-
     // ===== Members for internal use by the following friends.
 
     friend PlatformManager & PlatformMgr(void);

src/system/BUILD.gn

@@ -123,6 +123,7 @@ static_library("system") {
   output_name = "libSystemLayer"
 
   sources = [
+    "PlatformEventSupport.h",
     "SystemAlignSize.h",
     "SystemClock.cpp",
     "SystemClock.h",
@@ -170,10 +171,6 @@ static_library("system") {
     }
   }
 
-  if (chip_system_config_use_lwip) {
-    sources += [ "PlatformEventSupport.h" ]
-  }
-
   if (chip_with_nlfaultinjection) {
     sources += [ "SystemFaultInjection.cpp" ]
     public_deps += [ "${nlfaultinjection_root}:nlfaultinjection" ]

src/system/SystemLayer.h

@@ -25,8 +25,6 @@
 
 #pragma once
 
-#include <type_traits>
-
 // Include configuration headers
 #include <system/SystemConfig.h>
 

src/system/tests/BUILD.gn

@@ -26,6 +26,7 @@ chip_test_suite("tests") {
     "TestSystemErrorStr.cpp",
     "TestSystemObject.cpp",
     "TestSystemPacketBuffer.cpp",
+    "TestSystemScheduleLambda.cpp",
     "TestSystemTimer.cpp",
     "TestSystemWakeEvent.cpp",
     "TestTimeSource.cpp",