[nrfconnect] Stop using cooperative threads (#8025)

nRF Connect platform used cooperative threads, that is threads that cannot be preempted, to workaround some synchronization issues in the past, but it's no longer needed and is risky. The latter was revealed by #7927, which caused that `select()` never waits (needs to be fixed in another PR). Signed-off-by: Damian Krolik <[email protected]>
project-chip · Sep 13, 2021 · 9649145 · 9649145
1 parent 761e3d5
commit 9649145
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 11 deletions.
diff --git a/examples/lighting-app/nrfconnect/main/main.cpp b/examples/lighting-app/nrfconnect/main/main.cpp
@@ -38,8 +38,6 @@ int main(void)
 
     int ret = 0;
 
-    k_thread_priority_set(k_current_get(), K_PRIO_COOP(CONFIG_NUM_COOP_PRIORITIES - 1));
-
     ret = chip::Platform::MemoryInit();
     if (ret != CHIP_NO_ERROR)
     {

diff --git a/examples/lighting-app/telink/src/main.cpp b/examples/lighting-app/telink/src/main.cpp
@@ -33,8 +33,6 @@ int main(void)
 {
     int ret = 0;
 
-    k_thread_priority_set(k_current_get(), K_PRIO_COOP(CONFIG_NUM_COOP_PRIORITIES - 1));
-
     ret = chip::Platform::MemoryInit();
     if (ret != CHIP_NO_ERROR)
     {

diff --git a/examples/lock-app/nrfconnect/main/main.cpp b/examples/lock-app/nrfconnect/main/main.cpp
@@ -34,8 +34,6 @@ int main()
 {
     int ret = 0;
 
-    k_thread_priority_set(k_current_get(), K_PRIO_COOP(CONFIG_NUM_COOP_PRIORITIES - 1));
-
     ret = chip::Platform::MemoryInit();
     if (ret != CHIP_NO_ERROR)
     {

diff --git a/examples/pump-app/nrfconnect/main/main.cpp b/examples/pump-app/nrfconnect/main/main.cpp
@@ -34,8 +34,6 @@ int main()
 {
     int ret = 0;
 
-    k_thread_priority_set(k_current_get(), K_PRIO_COOP(CONFIG_NUM_COOP_PRIORITIES - 1));
-
     ret = chip::Platform::MemoryInit();
     if (ret != CHIP_NO_ERROR)
     {

diff --git a/examples/pump-controller-app/nrfconnect/main/main.cpp b/examples/pump-controller-app/nrfconnect/main/main.cpp
@@ -34,8 +34,6 @@ int main()
 {
     int ret = 0;
 
-    k_thread_priority_set(k_current_get(), K_PRIO_COOP(CONFIG_NUM_COOP_PRIORITIES - 1));
-
     ret = chip::Platform::MemoryInit();
     if (ret != CHIP_NO_ERROR)
     {

diff --git a/src/platform/nrfconnect/CHIPDevicePlatformConfig.h b/src/platform/nrfconnect/CHIPDevicePlatformConfig.h
@@ -50,7 +50,7 @@
 // ========== Platform-specific Configuration Overrides =========
 
 #ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY
-#define CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY (K_PRIO_COOP(CONFIG_NUM_COOP_PRIORITIES - 1))
+#define CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY (K_PRIO_PREEMPT(1))
 #endif // CHIP_DEVICE_CONFIG_CHIP_TASK_PRIORITY
 
 #ifndef CHIP_DEVICE_CONFIG_CHIP_TASK_STACK_SIZE