Merge branch 'pxtgc' into js-event-semantics

.gitignore

@@ -1,5 +1,6 @@
 build
 .yotta.json
+.vscode
 yotta_modules
 yotta_targets
 *.swp

README.md

@@ -1,6 +1,6 @@
 # microbit-dal
 
-The core set of drivers, mechanisms and types that make up the micro:bit runtime.
+The Device Abstraction Layer (DAL) provides the core set of drivers, mechanisms and types that make up the micro:bit runtime.
 
 ## Overview
 

inc/core/MicroBitFiber.h

@@ -382,6 +382,16 @@ inline int inInterruptContext()
     return (((int)__get_IPSR()) & 0x003F) > 0;
 }
 
+/**
+ * Return all current fibers.
+ * 
+ * @param dest If non-null, it points to an array of pointers to fibers to store results in.
+ * 
+ * @return the number of fibers (potentially) stored
+ */
+int list_fibers(Fiber **dest);
+
+
 /**
   * Assembler Context switch routing.
   * Defined in CortexContextSwitch.s.

inc/core/MicroBitHeapAllocator.h

@@ -119,4 +119,4 @@ extern "C" void microbit_free(void *mem);
   */
 extern "C" void* microbit_realloc(void* ptr, size_t size);
 
-#endif
+#endif

inc/platform/yotta_cfg_mappings.h

@@ -24,6 +24,10 @@
     #define MICROBIT_NESTED_HEAP_SIZE YOTTA_CFG_MICROBIT_DAL_NESTED_HEAP_PROPORTION
 #endif
 
+#ifdef YOTTA_CFG_MICROBIT_DAL_FIBER_USER_DATA
+    #define MICROBIT_FIBER_USER_DATA YOTTA_CFG_MICROBIT_DAL_FIBER_USER_DATA
+#endif
+
 #ifdef YOTTA_CFG_MICROBIT_DAL_REUSE_SD
     #define MICROBIT_HEAP_REUSE_SD YOTTA_CFG_MICROBIT_DAL_REUSE_SD
 #endif

source/core/MicroBitFiber.cpp

@@ -34,6 +34,8 @@ DEALINGS IN THE SOFTWARE.
 #include "MicroBitConfig.h"
 #include "MicroBitFiber.h"
 #include "MicroBitSystemTimer.h"
+#include "ErrorNo.h"
+#include "MicroBitDevice.h"
 
 /*
  * Statically allocated values used to create and destroy Fibers.
@@ -65,6 +67,44 @@ static EventModel *messageBus = NULL;
 // Array of components which are iterated during idle thread execution.
 static MicroBitComponent* idleThreadComponents[MICROBIT_IDLE_COMPONENTS];
 
+static void get_fibers_from(Fiber ***dest, int *sum, Fiber *queue)
+{
+    if (queue && queue->prev)
+        microbit_panic(MICROBIT_HEAP_ERROR);
+    while (queue) {
+        if (*dest)
+            *(*dest)++ = queue;
+        (*sum)++;
+        queue = queue->next;
+    }
+}
+
+/**
+  * Return all current fibers.
+  *
+  * @param dest If non-null, it points to an array of pointers to fibers to store results in.
+  *
+  * @return the number of fibers (potentially) stored
+  */
+int list_fibers(Fiber **dest)
+{
+    int sum = 0;
+
+    // interrupts might move fibers between queues, but should not create new ones
+    __disable_irq();
+    get_fibers_from(&dest, &sum, runQueue);
+    get_fibers_from(&dest, &sum, sleepQueue);
+    get_fibers_from(&dest, &sum, waitQueue);
+    __enable_irq();
+
+    // idleFiber is used to start event handlers using invoke(),
+    // so it may in fact have the user_data set if in FOB context
+    if (dest)
+        *dest++ = idleFiber;
+    sum++;
+    return sum;
+}
+
 /**
   * Utility function to add the currenty running fiber to the given queue.
   *
@@ -216,7 +256,7 @@ void scheduler_init(EventModel &_messageBus)
 
 	// Store a reference to the messageBus provided.
 	// This parameter will be NULL if we're being run without a message bus.
-	messageBus = &_messageBus;
+    messageBus = &_messageBus;
 
     // Create a new fiber context
     currentFiber = getFiberContext();
@@ -431,7 +471,7 @@ int fiber_wait_for_event(uint16_t id, uint16_t value)
     if(ret == MICROBIT_OK)
         schedule();
 
-	return ret;
+    return ret;
 }
 
 /**
@@ -481,6 +521,12 @@ int fiber_wake_on_event(uint16_t id, uint16_t value)
     return MICROBIT_OK;
 }
 
+#if CONFIG_ENABLED(MICROBIT_FIBER_USER_DATA)
+#define HAS_THREAD_USER_DATA (currentFiber->user_data != NULL)
+#else
+#define HAS_THREAD_USER_DATA false
+#endif
+
 /**
   * Executes the given function asynchronously if necessary.
   *