Add StopThreadTask API.

project-chip · Jan 9, 2025 · d7bb2c5 · d7bb2c5
1 parent 4a19630
commit d7bb2c5
Show file tree

Hide file tree

Showing 21 changed files with 44 additions and 17 deletions.
diff --git a/examples/platform/esp32/common/Esp32ThreadInit.cpp b/examples/platform/esp32/common/Esp32ThreadInit.cpp
@@ -105,6 +105,7 @@ void ESPOpenThreadDeinit()
 #if defined(CONFIG_OPENTHREAD_BORDER_ROUTER) && defined(CONFIG_AUTO_UPDATE_RCP)
     openthread_deinit_br_rcp();
 #endif // CONFIG_OPENTHREAD_BORDER_ROUTER && CONFIG_AUTO_UPDATE_RCP
+    ThreadStackMgr().StopThreadStack();
     ThreadStackMgr().DeinitThreadStack();
 #endif // CHIP_DEVICE_CONFIG_ENABLE_THREAD
 }
diff --git a/src/include/platform/ThreadStackManager.h b/src/include/platform/ThreadStackManager.h
@@ -95,6 +95,7 @@ class ThreadStackManager
     void DeinitThreadStack();
     void ProcessThreadActivity();
     CHIP_ERROR StartThreadTask();
+    void StopThreadStack();
     void LockThreadStack();
     bool TryLockThreadStack();
     void UnlockThreadStack();
@@ -257,6 +258,11 @@ inline CHIP_ERROR ThreadStackManager::StartThreadTask()
     return static_cast<ImplClass *>(this)->_StartThreadTask();
 }
 
+inline void ThreadStackManager::StopThreadStack()
+{
+    static_cast<ImplClass *>(this)->_StopThreadStack();
+}
+
 inline void ThreadStackManager::LockThreadStack()
 {
     static_cast<ImplClass *>(this)->_LockThreadStack();

diff --git a/src/platform/ESP32/ESP32Utils.cpp b/src/platform/ESP32/ESP32Utils.cpp
@@ -370,7 +370,7 @@ CHIP_ERROR ESP32Utils::InitWiFiStack(void)
     return CHIP_NO_ERROR;
 }
 
-CHIP_ERROR ESP32Utils::DeInitWiFiStack(void)
+CHIP_ERROR ESP32Utils::DeinitWiFiStack(void)
 {
     esp_err_t err = esp_event_handler_unregister(WIFI_EVENT, ESP_EVENT_ANY_ID, PlatformManagerImpl::HandleESPSystemEvent);
     if (err != ESP_OK)

diff --git a/src/platform/ESP32/ESP32Utils.h b/src/platform/ESP32/ESP32Utils.h
@@ -47,7 +47,7 @@ class ESP32Utils
     static CHIP_ERROR SetWiFiStationProvision(const Internal::DeviceNetworkInfo & netInfo);
     static CHIP_ERROR ClearWiFiStationProvision(void);
     static CHIP_ERROR InitWiFiStack(void);
-    static CHIP_ERROR DeInitWiFiStack(void);
+    static CHIP_ERROR DeinitWiFiStack(void);
 
     static CHIP_ERROR MapError(esp_err_t error);
     static void RegisterESP32ErrorFormatter();

diff --git a/src/platform/ESP32/ThreadStackManagerImpl.cpp b/src/platform/ESP32/ThreadStackManagerImpl.cpp
@@ -62,7 +62,6 @@ CHIP_ERROR ThreadStackManagerImpl::_InitThreadStack()
 
 void ThreadStackManagerImpl::_DeinitThreadStack()
 {
-    openthread_delete_task();
     openthread_deinit_stack();
 }
 
@@ -72,6 +71,11 @@ CHIP_ERROR ThreadStackManagerImpl::_StartThreadTask()
     return CHIP_NO_ERROR;
 }
 
+void ThreadStackManagerImpl::_StopThreadStack()
+{
+    openthread_delete_task();
+}
+
 void ThreadStackManagerImpl::_LockThreadStack()
 {
     esp_openthread_lock_acquire(portMAX_DELAY);

diff --git a/src/platform/ESP32/ThreadStackManagerImpl.h b/src/platform/ESP32/ThreadStackManagerImpl.h
@@ -62,6 +62,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
 
 protected:
     CHIP_ERROR _StartThreadTask();
+    void _StopThreadStack();
     void _LockThreadStack();
     bool _TryLockThreadStack();
     void _UnlockThreadStack();

diff --git a/src/platform/Infineon/CYW30739/ThreadStackManagerImpl.h b/src/platform/Infineon/CYW30739/ThreadStackManagerImpl.h
@@ -55,6 +55,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _StartThreadTask();
+    void _DeinitThreadStack() {}
     void _LockThreadStack();
     bool _TryLockThreadStack();
     void _UnlockThreadStack();

diff --git a/src/platform/Linux/ThreadStackManagerImpl.h b/src/platform/Linux/ThreadStackManagerImpl.h
@@ -50,10 +50,11 @@ class ThreadStackManagerImpl : public ThreadStackManager
     }
 
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
     void _ProcessThreadActivity();
 
     CHIP_ERROR _StartThreadTask() { return CHIP_NO_ERROR; } // Intentionally left blank
+    void _StopThreadStack() {}                              // Intentionally left blank
     void _LockThreadStack() {}                              // Intentionally left blank
     bool _TryLockThreadStack() { return false; }            // Intentionally left blank
     void _UnlockThreadStack() {}                            // Intentionally left blank

diff --git a/src/platform/NuttX/ThreadStackManagerImpl.h b/src/platform/NuttX/ThreadStackManagerImpl.h
@@ -51,10 +51,11 @@ class ThreadStackManagerImpl : public ThreadStackManager
     }
 
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
     void _ProcessThreadActivity();
 
     CHIP_ERROR _StartThreadTask() { return CHIP_NO_ERROR; } // Intentionally left blank
+    void _StopThreadStack() {}                              // Intentionally left blank
     void _LockThreadStack() {}                              // Intentionally left blank
     bool _TryLockThreadStack() { return false; }            // Intentionally left blank
     void _UnlockThreadStack() {}                            // Intentionally left blank

diff --git a/src/platform/Tizen/ThreadStackManagerImpl.h b/src/platform/Tizen/ThreadStackManagerImpl.h
@@ -49,10 +49,11 @@ class ThreadStackManagerImpl : public ThreadStackManager
     ThreadStackManagerImpl();
 
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
     void _ProcessThreadActivity();
 
     CHIP_ERROR _StartThreadTask() { return CHIP_NO_ERROR; } // Intentionally left blank
+    void _StopThreadStack() {}                              // Intentionally left blank
     void _LockThreadStack() {}                              // Intentionally left blank
     bool _TryLockThreadStack() { return false; }            // Intentionally left blank
     void _UnlockThreadStack() {}                            // Intentionally left blank

diff --git a/src/platform/Zephyr/ThreadStackManagerImpl.h b/src/platform/Zephyr/ThreadStackManagerImpl.h
@@ -60,12 +60,13 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
 public:
     // ===== Methods that implement the ThreadStackManager abstract interface.
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
 
 protected:
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _StartThreadTask() { return CHIP_NO_ERROR; }
+    void _StopThreadStack() {}
     void _LockThreadStack();
     bool _TryLockThreadStack();
     void _UnlockThreadStack();

diff --git a/src/platform/bouffalolab/common/ThreadStackManagerImpl.h b/src/platform/bouffalolab/common/ThreadStackManagerImpl.h
@@ -70,7 +70,8 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
+    void _StopThreadStack() {}
 
     // ===== Members for internal use by the following friends.
 

diff --git a/src/platform/cc13xx_26xx/cc13x4_26x4/ThreadStackManagerImpl.h b/src/platform/cc13xx_26xx/cc13x4_26x4/ThreadStackManagerImpl.h
@@ -102,7 +102,8 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
+    void _StopThreadStack() {}
 
     // ===== Members for internal use by the following friends.
 

diff --git a/src/platform/nxp/common/ThreadStackManagerImpl.h b/src/platform/nxp/common/ThreadStackManagerImpl.h
@@ -85,7 +85,8 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
 protected:
     // ===== Methods that implement the ThreadStackManager abstract interface.
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
+    void _StopThreadStack() {}
 
 private:
     // ===== Members for internal use by the following friends.

diff --git a/src/platform/nxp/k32w0/ThreadStackManagerImpl.h b/src/platform/nxp/k32w0/ThreadStackManagerImpl.h
@@ -79,7 +79,8 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
+    void _StopThreadStack() {}
 
     // ===== Members for internal use by the following friends.
 

diff --git a/src/platform/nxp/mcxw71_k32w1/ThreadStackManagerImpl.h b/src/platform/nxp/mcxw71_k32w1/ThreadStackManagerImpl.h
@@ -79,7 +79,8 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
+    void _StopThreadStack() {}
 
     // ===== Members for internal use by the following friends.
 

diff --git a/src/platform/qpg/ThreadStackManagerImpl.h b/src/platform/qpg/ThreadStackManagerImpl.h
@@ -78,7 +78,8 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
+    void _StopThreadStack() {}
 
     // ===== Members for internal use by the following friends.
 

diff --git a/src/platform/silabs/ThreadStackManagerImpl.h b/src/platform/silabs/ThreadStackManagerImpl.h
@@ -80,8 +80,9 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
     CHIP_ERROR _StartThreadTask(void);
+    void _StopThreadStack() {}
     void _LockThreadStack(void);
     bool _TryLockThreadStack(void);
     void _UnlockThreadStack(void);

diff --git a/src/platform/stm32/ThreadStackManagerImpl.h b/src/platform/stm32/ThreadStackManagerImpl.h
@@ -79,14 +79,15 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
 
 protected:
     CHIP_ERROR _StartThreadTask();
+    void _StopThreadStack() {}
 
     void _ProcessThreadActivity();
 
 private:
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _InitThreadStack(void);
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
 
     // ===== Members for internal use by the following friends.
 

diff --git a/src/platform/telink/ThreadStackManagerImpl.h b/src/platform/telink/ThreadStackManagerImpl.h
@@ -59,7 +59,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
 public:
     // ===== Methods that implement the ThreadStackManager abstract interface.
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
     void SetRadioBlocked(bool state) { mRadioBlocked = state; }
     bool IsReadyToAttach(void) const { return mReadyToAttach; }
     void Finalize(void);
@@ -68,6 +68,7 @@ class ThreadStackManagerImpl final : public ThreadStackManager,
     // ===== Methods that implement the ThreadStackManager abstract interface.
 
     CHIP_ERROR _StartThreadTask() { return CHIP_NO_ERROR; }
+    void _StopThreadStack() {}
     void _LockThreadStack();
     bool _TryLockThreadStack();
     void _UnlockThreadStack();

diff --git a/src/platform/webos/ThreadStackManagerImpl.h b/src/platform/webos/ThreadStackManagerImpl.h
@@ -42,10 +42,11 @@ class ThreadStackManagerImpl : public ThreadStackManager
     }
 
     CHIP_ERROR _InitThreadStack();
-    void _DeinitThreadStack(){};
+    void _DeinitThreadStack() {}
     void _ProcessThreadActivity();
 
     CHIP_ERROR _StartThreadTask() { return CHIP_NO_ERROR; } // Intentionally left blank
+    void _StopThreadStack() {}                              // Intentionally left blank
     void _LockThreadStack() {}                              // Intentionally left blank
     bool _TryLockThreadStack() { return false; }            // Intentionally left blank
     void _UnlockThreadStack() {}                            // Intentionally left blank