Move CLRStartup to its own OS thread (#425)

- this makes it easy to isolate it and adjust stack size, for example - fixes #416 Signed-off-by: José Simões <[email protected]>
nanoframework · Aug 11, 2017 · b5ad6a0 · b5ad6a0
1 parent d56a38e
commit b5ad6a0
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 84 deletions.
diff --git a/targets/CMSIS-OS/ChibiOS/Include/CLR_Startup_Thread.h b/targets/CMSIS-OS/ChibiOS/Include/CLR_Startup_Thread.h
@@ -0,0 +1,12 @@
+//
+// Copyright (c) 2017 The nanoFramework project contributors
+// See LICENSE file in the project root for full license information.
+//
+
+#ifndef _CLRSTARTUPTHREAD_
+#define _CLRSTARTUPTHREAD_
+
+// declaration of RTOS thread
+void CLRStartupThread(void const * argument);
+
+#endif //_CLRSTARTUPTHREAD_
diff --git a/targets/CMSIS-OS/ChibiOS/MBN_QUAIL/nanoCLR/main.c b/targets/CMSIS-OS/ChibiOS/MBN_QUAIL/nanoCLR/main.c
@@ -10,6 +10,7 @@
 #include <cmsis_os.h>
 
 #include "usbcfg.h"
+#include <CLR_Startup_Thread.h>
 #include <WireProtocol_ReceiverThread.h>
 #include <nanoCLR_Application.h>
 #include <nanoPAL_BlockStorage.h>
@@ -41,6 +42,8 @@ void DisplayWrite(uint8_t x, uint8_t y, char * text)
 
 // need to declare the Receiver thread here
 osThreadDef(ReceiverThread, osPriorityNormal, 2048, "ReceiverThread");
+// declare CLRStartup thread here 
+osThreadDef(CLRStartupThread, osPriorityNormal, 2048, "CLRStartupThread"); 
 
 static const I2CConfig i2cconfig = { OPMODE_I2C, 100000U, STD_DUTY_CYCLE };
 
@@ -68,6 +71,8 @@ int main(void) {
 
   // create the receiver thread
   osThreadCreate(osThread(ReceiverThread), NULL);
+  // create the CLR Startup thread 
+  osThreadCreate(osThread(CLRStartupThread), NULL); 
 
   // start kernel, after this main() will behave like a thread with priority osPriorityNormal
   osKernelStart();
@@ -83,20 +88,6 @@ int main(void) {
   osDelay(3000);
   DisplayClear (0);
 
-  // preparation for the CLR startup
-  BlockStorage_AddDevices();
-
-  CLR_SETTINGS clrSettings;
-
-  memset(&clrSettings, 0, sizeof(CLR_SETTINGS));
-
-  clrSettings.MaxContextSwitches         = 50;
-  clrSettings.WaitForDebugger            = false;
-  clrSettings.EnterDebuggerLoopAfterExit = true;
-
-  // startup CLR now
-  ClrStartup(clrSettings);
-
   while (true) { 
     osDelay(100);
   }

diff --git a/targets/CMSIS-OS/ChibiOS/ST_NUCLEO144_F746ZG/nanoCLR/main.c b/targets/CMSIS-OS/ChibiOS/ST_NUCLEO144_F746ZG/nanoCLR/main.c
@@ -8,12 +8,15 @@
 #include <cmsis_os.h>
 
 #include "usbcfg.h"
+#include <CLR_Startup_Thread.h>
 #include <WireProtocol_ReceiverThread.h>
 #include <nanoCLR_Application.h>
 #include <nanoPAL_BlockStorage.h>
 
 // need to declare the Receiver thread here
 osThreadDef(ReceiverThread, osPriorityNormal, 2048, "ReceiverThread");
+// declare CLRStartup thread here 
+osThreadDef(CLRStartupThread, osPriorityNormal, 2048, "CLRStartupThread"); 
 
 //  Application entry point.
 int main(void) {
@@ -39,24 +42,12 @@ int main(void) {
 
   // create the receiver thread
   osThreadCreate(osThread(ReceiverThread), NULL);
+  // create the CLR Startup thread 
+  osThreadCreate(osThread(CLRStartupThread), NULL); 
 
   // start kernel, after this main() will behave like a thread with priority osPriorityNormal
   osKernelStart();
 
-  // preparation for the CLR startup
-  BlockStorage_AddDevices();
-
-  CLR_SETTINGS clrSettings;
-
-  memset(&clrSettings, 0, sizeof(CLR_SETTINGS));
-
-  clrSettings.MaxContextSwitches         = 50;
-  clrSettings.WaitForDebugger            = false;
-  clrSettings.EnterDebuggerLoopAfterExit = true;
-
-  // startup CLR now
-  ClrStartup(clrSettings);
-
   while (true) { 
     osDelay(100);
   }

diff --git a/targets/CMSIS-OS/ChibiOS/ST_NUCLEO64_F091RC/nanoCLR/main.c b/targets/CMSIS-OS/ChibiOS/ST_NUCLEO64_F091RC/nanoCLR/main.c
@@ -8,6 +8,7 @@
 #include <cmsis_os.h>
 
 #include <targetHAL.h>
+#include <CLR_Startup_Thread.h>
 #include <WireProtocol_ReceiverThread.h>
 #include <nanoCLR_Application.h>
 #include <nanoPAL_BlockStorage.h>
@@ -22,6 +23,8 @@ __IO uint32_t vectorTable[48] __attribute__((section(".RAMVectorTable")));
 
 // need to declare the Receiver thread here
 osThreadDef(ReceiverThread, osPriorityNormal, 2048, "ReceiverThread");
+// declare CLRStartup thread here 
+osThreadDef(CLRStartupThread, osPriorityNormal, 2048, "CLRStartupThread"); 
 
 //  Application entry point.
 int main(void) {
@@ -52,24 +55,12 @@ int main(void) {
 
   // create the receiver thread
   osThreadCreate(osThread(ReceiverThread), NULL);
+  // create the CLR Startup thread 
+  osThreadCreate(osThread(CLRStartupThread), NULL); 
 
   // start kernel, after this main() will behave like a thread with priority osPriorityNormal
   osKernelStart();
 
-  // preparation for the CLR startup
-  BlockStorage_AddDevices();
-
-  CLR_SETTINGS clrSettings;
-
-  memset(&clrSettings, 0, sizeof(CLR_SETTINGS));
-
-  clrSettings.MaxContextSwitches         = 50;
-  clrSettings.WaitForDebugger            = false;
-  clrSettings.EnterDebuggerLoopAfterExit = true;
-
-  // startup CLR now
-  ClrStartup(clrSettings);
-
   while (true) { 
     osDelay(100);
   }

diff --git a/targets/CMSIS-OS/ChibiOS/ST_STM32F429I_DISCOVERY/nanoCLR/main.c b/targets/CMSIS-OS/ChibiOS/ST_STM32F429I_DISCOVERY/nanoCLR/main.c
@@ -8,12 +8,15 @@
 #include <cmsis_os.h>
 
 #include "usbcfg.h"
+#include <CLR_Startup_Thread.h>
 #include <WireProtocol_ReceiverThread.h>
 #include <nanoCLR_Application.h>
 #include <nanoPAL_BlockStorage.h>
 
 // need to declare the Receiver thread here
 osThreadDef(ReceiverThread, osPriorityNormal, 2048, "ReceiverThread");
+// declare CLRStartup thread here 
+osThreadDef(CLRStartupThread, osPriorityNormal, 2048, "CLRStartupThread"); 
 
 //  Application entry point.
 int main(void) {
@@ -39,24 +42,12 @@ int main(void) {
 
   // create the receiver thread
   osThreadCreate(osThread(ReceiverThread), NULL);
+  // create the CLR Startup thread 
+  osThreadCreate(osThread(CLRStartupThread), NULL); 
 
   // start kernel, after this main() will behave like a thread with priority osPriorityNormal
   osKernelStart();
 
-  // preparation for the CLR startup
-  BlockStorage_AddDevices();
-
-  CLR_SETTINGS clrSettings;
-
-  memset(&clrSettings, 0, sizeof(CLR_SETTINGS));
-
-  clrSettings.MaxContextSwitches         = 50;
-  clrSettings.WaitForDebugger            = false;
-  clrSettings.EnterDebuggerLoopAfterExit = true;
-
-  // startup CLR now
-  ClrStartup(clrSettings);
-
   while (true) { 
     osDelay(100);
   }

diff --git a/targets/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/nanoCLR/main.c b/targets/CMSIS-OS/ChibiOS/ST_STM32F4_DISCOVERY/nanoCLR/main.c
@@ -8,12 +8,15 @@
 #include <cmsis_os.h>
 
 #include "usbcfg.h"
+#include <CLR_Startup_Thread.h>
 #include <WireProtocol_ReceiverThread.h>
 #include <nanoCLR_Application.h>
 #include <nanoPAL_BlockStorage.h>
 
 // need to declare the Receiver thread here
 osThreadDef(ReceiverThread, osPriorityNormal, 2048, "ReceiverThread");
+// declare CLRStartup thread here 
+osThreadDef(CLRStartupThread, osPriorityNormal, 2048, "CLRStartupThread"); 
 
 //  Application entry point.
 int main(void) {
@@ -39,24 +42,12 @@ int main(void) {
 
   // create the receiver thread
   osThreadCreate(osThread(ReceiverThread), NULL);
+  // create the CLR Startup thread 
+  osThreadCreate(osThread(CLRStartupThread), NULL); 
 
   // start kernel, after this main() will behave like a thread with priority osPriorityNormal
   osKernelStart();
 
-  // preparation for the CLR startup
-  BlockStorage_AddDevices();
-
-  CLR_SETTINGS clrSettings;
-
-  memset(&clrSettings, 0, sizeof(CLR_SETTINGS));
-
-  clrSettings.MaxContextSwitches         = 50;
-  clrSettings.WaitForDebugger            = false;
-  clrSettings.EnterDebuggerLoopAfterExit = true;
-
-  // startup CLR now
-  ClrStartup(clrSettings);
-
   while (true) { 
     osDelay(100);
   }

diff --git a/targets/CMSIS-OS/ChibiOS/ST_STM32F769I_DISCOVERY/nanoCLR/main.c b/targets/CMSIS-OS/ChibiOS/ST_STM32F769I_DISCOVERY/nanoCLR/main.c
@@ -8,12 +8,15 @@
 #include <cmsis_os.h>
 
 #include "usbcfg.h"
+#include <CLR_Startup_Thread.h>
 #include <WireProtocol_ReceiverThread.h>
 #include <nanoCLR_Application.h>
 #include <nanoPAL_BlockStorage.h>
 
 // need to declare the Receiver thread here
 osThreadDef(ReceiverThread, osPriorityNormal, 2048, "ReceiverThread");
+// declare CLRStartup thread here 
+osThreadDef(CLRStartupThread, osPriorityNormal, 2048, "CLRStartupThread"); 
 
 //  Application entry point.
 int main(void) {
@@ -39,24 +42,12 @@ int main(void) {
 
   // create the receiver thread
   osThreadCreate(osThread(ReceiverThread), NULL);
+  // create the CLR Startup thread 
+  osThreadCreate(osThread(CLRStartupThread), NULL); 
 
   // start kernel, after this main() will behave like a thread with priority osPriorityNormal
   osKernelStart();
 
-  // preparation for the CLR startup
-  BlockStorage_AddDevices();
-
-  CLR_SETTINGS clrSettings;
-
-  memset(&clrSettings, 0, sizeof(CLR_SETTINGS));
-
-  clrSettings.MaxContextSwitches         = 50;
-  clrSettings.WaitForDebugger            = false;
-  clrSettings.EnterDebuggerLoopAfterExit = true;
-
-  // startup CLR now
-  ClrStartup(clrSettings);
-
   while (true) { 
     osDelay(100);
   }

diff --git a/targets/CMSIS-OS/ChibiOS/nanoCLR/CLR_Startup_Thread.c b/targets/CMSIS-OS/ChibiOS/nanoCLR/CLR_Startup_Thread.c
@@ -0,0 +1,37 @@
+//
+// Copyright (c) 2017 The nanoFramework project contributors
+// See LICENSE file in the project root for full license information.
+//
+
+#include <ch.h>
+#include <cmsis_os.h>
+
+#include <nanoCLR_Application.h>
+#include <nanoPAL_BlockStorage.h>
+
+// This thread needs to be implemented at ChibiOS level because it has to include a call to chThdShouldTerminateX()
+// in case the thread is requested to terminate by the CMSIS call osThreadTerminate()
+
+void CLRStartupThread(void const * argument)
+{
+  (void)argument;
+
+  BlockStorage_AddDevices();
+
+  CLR_SETTINGS clrSettings;
+
+  memset(&clrSettings, 0, sizeof(CLR_SETTINGS));
+
+  clrSettings.MaxContextSwitches         = 50;
+  clrSettings.WaitForDebugger            = false;
+  clrSettings.EnterDebuggerLoopAfterExit = true;
+
+  ClrStartup(clrSettings);
+
+  // loop until thread receives a request to terminate
+  while (!chThdShouldTerminateX()) {
+    osDelay(500);
+  }
+
+  // nothing to deinitialize or cleanup, so it's safe to return
+}
diff --git a/targets/CMSIS-OS/ChibiOS/nanoCLR/CMakeLists.txt b/targets/CMSIS-OS/ChibiOS/nanoCLR/CMakeLists.txt
@@ -13,6 +13,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/target_platform.h.in"
 list(APPEND TARGET_CHIBIOS_NANOCLR_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/WireProtocol_App_Interface.c)
 list(APPEND TARGET_CHIBIOS_NANOCLR_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/WireProtocol_MonitorCommands.c)
 list(APPEND TARGET_CHIBIOS_NANOCLR_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Aborts_CortexM3.cpp)
+list(APPEND TARGET_CHIBIOS_NANOCLR_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/CLR_Startup_Thread.c") 
 
 # append target HAL source files
 list(APPEND TARGET_CHIBIOS_NANOCLR_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/targetHAL_Time.cpp")