#28 spin lock improvements for ESP32 and mbed to detect thread usage.

Author: dave

src/SimpleSpinLock.cpp

@@ -6,8 +6,13 @@
 #include "SimpleSpinLock.h"
 
 bool SimpleSpinLock::tryLock() {
-    // if our task already owns the lock then we are good.
-    return (locked && initiatingTask && taskManager.getRunningTask() == initiatingTask);
+#if defined(IOA_MULTITHREADED)
+    if(locked && getCurrentThreadId() != currentThread) return false;
+    return (locked && taskManager.getRunningTask() == initiatingTask);
+#else
+    // We are not on RTOS, if our task already owns the lock then we are good.
+    return (locked && taskManager.getRunningTask() == initiatingTask);
+#endif
 }
 
 bool SimpleSpinLock::spinLock(unsigned long iterations) {
@@ -20,6 +25,9 @@ bool SimpleSpinLock::spinLock(unsigned long iterations) {
     while(iterations) {
         if (tm_internal::atomicSwapBool(&locked, false, true)) {
             tm_internal::atomicWritePtr(&initiatingTask, taskManager.getRunningTask());
+#if defined(IOA_MULTITHREADED)
+            currentThread = (void*)getCurrentThreadId();
+#endif
             ++count;
             return true;
         }
@@ -42,6 +50,11 @@ void SimpleSpinLock::unlock() {
     if(count == 0) {
         tm_internal::atomicWritePtr(&initiatingTask, nullptr);
         tm_internal::atomicWriteBool(&locked, false);
+
+#if defined(IOA_MULTITHREADED)
+        currentThread = nullptr;
+#endif
+
     }
 }
 

src/SimpleSpinLock.h

@@ -16,9 +16,11 @@
 class SimpleSpinLock {
 private:
     tm_internal::TimerTaskAtomicPtr initiatingTask;
-    volatile uint8_t count;
+#if defined(IOA_MULTITHREADED)
+    volatile void* currentThread = nullptr;
+#endif
     tm_internal::TmAtomicBool locked;
-
+    volatile uint8_t count;
 public:
     /**
      * Construct a lock that represents this object

src/TaskPlatformDeps.h

@@ -11,16 +11,24 @@ class TimerTask;
 
 #if defined(__MBED__) || defined(ARDUINO_ARDUINO_NANO33BLE)
 
+#if !defined(TM_DONT_USE_CAPTURE)
 #define TM_ALLOW_CAPTURED_LAMBDA
+#endif
 
 // check if this is Arduino mbed or regular mbed.
 #if defined(ARDUINO_ARDUINO_NANO33BLE)
 # define IOA_USE_ARDUINO
 # define ARDUINO_MBED_MODE
 # include "Arduino.h"
+# define IOA_MULTITHREADED
+#include "rtos/rtos.h"
+inline void* getCurrentThreadId() { return rtos::ThisThread::get_id(); }
 #else
 # define IOA_USE_MBED
 # include "mbed.h"
+# define IOA_MULTITHREADED
+inline void* getCurrentThreadId() { return ThisThread::get_id(); }
+
 # if !defined(PIO_NEEDS_RTOS_WORKAROUND)
 #  include "rtos.h"
 # endif // PIO_NEED_RTOS_WORKAROUND
@@ -81,8 +89,9 @@ namespace tm_internal {
 #include "Arduino.h"
 typedef uint8_t pintype_t;
 # define IOA_USE_ARDUINO
+#if !defined(TM_DONT_USE_CAPTURE)
 # define TM_ALLOW_CAPTURED_LAMBDA
-
+#endif
 
 #if defined(ESP8266)
 #include <atomic>
@@ -151,6 +160,9 @@ namespace tm_internal {
     }
 }
 #else
+# define IOA_MULTITHREADED
+inline void* getCurrentThreadId() { return xTaskGetCurrentTaskHandle() ; }
+
 namespace tm_internal {
 
     typedef TimerTask* volatile TimerTaskAtomicPtr;
@@ -261,7 +273,7 @@ inline void atomicWritePtr(TimerTaskAtomicPtr* pPtr, TimerTask* newValue) {
 
 // for all mbed and ESP boards we already enable lambda captures, SAMD is a known extra case that works.
 // we can only enable on larger boards with enough memory to take the extra size of the structures.
-#if !defined(TM_DONT_USE_LAMBDA) && defined(ARDUINO_ARCH_SAMD)
+#if !defined(TM_DONT_USE_CAPTURE) && defined(ARDUINO_ARCH_SAMD)
 # define TM_ALLOW_CAPTURED_LAMBDA
 #endif
 
@@ -345,10 +357,10 @@ namespace tm_internal {
 // Here we have one last go at determining if we should enable capture lambdas by checking if the functional include
 // is available, we only do so if we are on GCC > 5
 //
-# if !defined(TM_ALLOW_CAPTURED_LAMBDA) && __GNUC__ >= 5
+# if !defined(TM_ALLOW_CAPTURED_LAMBDA) && !defined(TM_DONT_USE_CAPTURE) && __GNUC__ >= 5
 #if __has_include(<functional>)
 # define TM_ALLOW_CAPTURED_LAMBDA
-#endif
+#endif // _has_include
 #endif // GCC>=5 and !TM_ALLOW_CAPTURED_LAMBDA
 
 #endif //TASKMANGERIO_PLATFORMDETERMINATION_H