Move thread profile block declaration into pthread_impl.h. NFC. (#13840)

Moves the declaration to where its actaully used/needed.  Also mark the
profileBlock as atomic so that native code can access it (although right
now its only accessed via JS atomic APIs).

Author: sbc100

src/library_pthread.js

@@ -135,7 +135,7 @@ var LibraryPThread = {
     setThreadName: function(pthreadPtr, name) {
       var profilerBlock = Atomics.load(HEAPU32, (pthreadPtr + {{{ C_STRUCTS.pthread.profilerBlock }}} ) >> 2);
       if (!profilerBlock) return;
-      stringToUTF8(name, profilerBlock + {{{ C_STRUCTS.thread_profiler_block.name }}}, 32);
+      stringToUTF8(name, profilerBlock + {{{ C_STRUCTS.thread_profiler_block.name }}}, {{{ cDefine('EM_THREAD_NAME_MAX') }}});
     },
 
     getThreadName: function(pthreadPtr) {

src/struct_info.json

@@ -1258,14 +1258,6 @@
     },
     {
         "file": "emscripten/threading.h",
-        "structs": {
-            "thread_profiler_block": [
-                "threadStatus",
-                "currentStatusStartTime",
-                "timeSpentInStatus",
-                "name"
-            ]
-        },
         "defines": [
             "EM_PROXIED_PTHREAD_CREATE",
             "EM_PROXIED_CREATE_CONTEXT",

src/struct_info_internal.json

@@ -20,9 +20,18 @@
               "canceldisable",
               "cancelasync",
               "locale"
+            ],
+            "thread_profiler_block": [
+                "threadStatus",
+                "currentStatusStartTime",
+                "timeSpentInStatus",
+                "name"
             ]
         },
-        "defines": ["__ATTRP_C11_THREAD"]
+        "defines": [
+          "__ATTRP_C11_THREAD",
+          "EM_THREAD_NAME_MAX"
+        ]
     },
     {
         "file": "libc.h",

system/include/emscripten/threading.h

@@ -345,19 +345,6 @@ int emscripten_pthread_attr_gettransferredcanvases(const pthread_attr_t *a, cons
 // The special value "#canvas" denotes the element stored in Module.canvas.
 int emscripten_pthread_attr_settransferredcanvases(pthread_attr_t *a, const char *str);
 
-struct thread_profiler_block
-{
-  // One of THREAD_STATUS_*
-  int threadStatus;
-  // Wallclock time denoting when the current thread state was entered in.
-  double currentStatusStartTime;
-  // Accumulated duration times denoting how much time has been spent in each
-  // state, in msecs.
-  double timeSpentInStatus[EM_THREAD_STATUS_NUMFIELDS];
-  // A human-readable name for this thread.
-  char name[32];
-};
-
 // Called when blocking on the main thread. This will error if main thread
 // blocking is not enabled, see ALLOW_BLOCKING_ON_MAIN_THREAD.
 void emscripten_check_blocking_allowed(void);

system/lib/libc/musl/src/internal/pthread_impl.h

@@ -15,14 +15,30 @@
 
 #define pthread __pthread
 
+#ifdef __EMSCRIPTEN__
+#define EM_THREAD_NAME_MAX 32
+
+typedef struct thread_profiler_block {
+	// One of THREAD_STATUS_*
+	int threadStatus;
+	// Wallclock time denoting when the current thread state was entered in.
+	double currentStatusStartTime;
+	// Accumulated duration times denoting how much time has been spent in each
+	// state, in msecs.
+	double timeSpentInStatus[EM_THREAD_STATUS_NUMFIELDS];
+	// A human-readable name for this thread.
+	char name[EM_THREAD_NAME_MAX];
+} thread_profiler_block;
+#endif
+
 struct pthread {
 // XXX Emscripten: Need some custom thread control structures.
 #ifdef __EMSCRIPTEN__
 	// Note: The specific order of these fields is important, since these are accessed
 	// by direct pointer arithmetic in worker.js.
 	int threadStatus; // 0: thread not exited, 1: exited.
 	int threadExitCode; // Thread exit code.
-	void *profilerBlock; // If --threadprofiler is enabled, this pointer is allocated to contain internal information about the thread state for profiling purposes.
+	thread_profiler_block * _Atomic profilerBlock; // If --threadprofiler is enabled, this pointer is allocated to contain internal information about the thread state for profiling purposes.
 #endif
 
 	struct pthread *self;

tests/reference_struct_info.json

@@ -237,6 +237,7 @@
         "EM_PROXIED_RESIZE_OFFSCREENCANVAS": 657457152,
         "EM_QUEUED_CALL_MAX_ARGS": 11,
         "EM_QUEUED_JS_CALL_MAX_ARGS": 20,
+        "EM_THREAD_NAME_MAX": 32,
         "EM_THREAD_STATUS_FINISHED": 6,
         "EM_THREAD_STATUS_NOTSTARTED": 0,
         "EM_THREAD_STATUS_RUNNING": 1,