Merge b8d21ede7c into 32e581636f

Previously, the shared thread key was deleted in xPortStartScheduler
after scheduler was ended. This created a race condition where
prvThreadKeyDestructor (responsible for freeing thread-specific heap
memory) would not be called if xPortStartScheduler deleted the key
before the last task deletion, as destructors are not invoked after key
deletion (see https://github.com/walac/glibc/blob/master/nptl/pthread_create.c#L145-L150).

Move thread key deletion to process exit to ensure all thread-specific
memory is properly freed.

Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>

CMakeLists.txt

@@ -241,7 +241,7 @@ add_library(freertos_kernel STATIC)
 add_subdirectory(include)
 add_subdirectory(portable)
 
-target_sources(freertos_kernel PRIVATE
+target_sources(freertos_kernel PUBLIC
     croutine.c
     event_groups.c
     list.c

portable/MSVC-MingW/port.c

@@ -33,6 +33,17 @@
 #include "FreeRTOS.h"
 #include "task.h"
 
+#ifdef WIN32_LEAN_AND_MEAN
+    #include <winsock2.h>
+#else
+    #include <winsock.h>
+#endif
+
+#include <windows.h>
+#include <timeapi.h>
+#include <mmsystem.h>
+#include <winbase.h>
+
 #ifdef __GNUC__
     #include "mmsystem.h"
 #else

portable/MSVC-MingW/portmacro.h

@@ -29,16 +29,7 @@
 #ifndef PORTMACRO_H
 #define PORTMACRO_H
 
-#ifdef WIN32_LEAN_AND_MEAN
-    #include <winsock2.h>
-#else
-    #include <winsock.h>
-#endif
 
-#include <windows.h>
-#include <timeapi.h>
-#include <mmsystem.h>
-#include <winbase.h>
 
 #ifdef __cplusplus
 extern "C" {

portable/ThirdParty/GCC/Posix/port.c

@@ -140,6 +140,8 @@ static void prvThreadKeyDestructor( void * pvData )
 static void prvInitThreadKey( void )
 {
     pthread_key_create( &xThreadKey, prvThreadKeyDestructor );
+    /* Destroy xThreadKey when the process exits. */
+    atexit( prvDestroyThreadKey );
 }
 /*-----------------------------------------------------------*/
 
@@ -315,8 +317,6 @@ BaseType_t xPortStartScheduler( void )
     /* Restore original signal mask. */
     ( void ) pthread_sigmask( SIG_SETMASK, &xSchedulerOriginalSignalMask, NULL );
 
-    prvDestroyThreadKey();
-
     return 0;
 }
 /*-----------------------------------------------------------*/