Make use of new emscripten_dbg helper function. NFC (#18640)

Also use a helper macro similar to the one used in dynlink.c.
`emscripten_dbg` automatically prefixed the current thread ID so
we don't need to include pthread_self explicitly.

Author: sbc100

system/lib/pthread/emscripten_tls_init.c

@@ -7,6 +7,7 @@
 
 #include <emscripten/heap.h>
 #include <emscripten/threading.h>
+#include <emscripten/console.h>
 #include <stdlib.h>
 #include <malloc.h>
 
@@ -15,7 +16,9 @@
 // Uncomment to trace TLS allocations.
 // #define DEBUG_TLS
 #ifdef DEBUG_TLS
-#include <stdio.h>
+#define dbg(fmt, ...) _emscripten_dbgf(fmt, ##__VA_ARGS__)
+#else
+#define dbg(fmt, ...)
 #endif
 
 // linker-generated symbol that loads static TLS data at the given location.
@@ -49,9 +52,7 @@ static int needs_dynamic_alloc(void) {
 void _emscripten_tls_free() {
   void* tls_block = __builtin_wasm_tls_base();
   if (tls_block && needs_dynamic_alloc()) {
-#ifdef DEBUG_TLS
-    _emscripten_errf("tls free: thread=%p dso=%p <- %p", pthread_self(), &__dso_handle, tls_block);
-#endif
+    dbg("tls free: dso=%p <- %p", &__dso_handle, tls_block);
     emscripten_builtin_free(tls_block);
   }
 }
@@ -69,9 +70,7 @@ void* _emscripten_tls_init(void) {
     set_needs_dynamic_alloc();
     tls_block = emscripten_builtin_memalign(__builtin_wasm_tls_align(), tls_size);
   }
-#ifdef DEBUG_TLS
-  _emscripten_errf("tls init: size=%zu thread=%p dso=%p -> %p:%p", tls_size, pthread_self(), &__dso_handle, tls_block, ((char*)tls_block)+tls_size);
-#endif
+  dbg("tls init: size=%zu dso=%p -> %p:%p", tls_size, &__dso_handle, tls_block, ((char*)tls_block)+tls_size);
   __wasm_init_tls(tls_block);
   return tls_block;
 }

system/lib/pthread/pthread_create.c

@@ -15,12 +15,18 @@
 #include <threads.h>
 #include <unistd.h>
 #include <emscripten/heap.h>
+#include <emscripten/threading.h>
 
 #define STACK_ALIGN 16
 #define TSD_ALIGN (sizeof(void*))
 
 // Comment this line to enable tracing of thread creation and destruction:
 // #define PTHREAD_DEBUG
+#ifdef PTHREAD_DEBUG
+#define dbg(fmt, ...) _emscripten_dbgf(fmt, ##__VA_ARGS__)
+#else
+#define dbg(fmt, ...)
+#endif
 
 // See musl's pthread_create.c
 
@@ -218,10 +224,14 @@ int __pthread_create(pthread_t* restrict res,
 #endif
 
   struct pthread *self = __pthread_self();
-#ifdef PTHREAD_DEBUG
-  _emscripten_errf("start __pthread_create: self=%p new=%p new_end=%p stack=%p->%p stack_size=%zu tls_base=%p",
-                   self, new, new+1, (char*)new->stack - new->stack_size, new->stack, new->stack_size, new->tls_base);
-#endif
+  dbg("start __pthread_create: new=%p new_end=%p stack=%p->%p "
+      "stack_size=%zu tls_base=%p",
+      new,
+      new + 1,
+      (char*)new->stack - new->stack_size,
+      new->stack,
+      new->stack_size,
+      new->tls_base);
 
   // thread may already be running/exited after the _pthread_create_js call below
   __tl_lock();
@@ -250,13 +260,14 @@ int __pthread_create(pthread_t* restrict res,
     new->next = new->prev = new;
 
     __tl_unlock();
-    
+
     return rtn;
   }
 
-#ifdef PTHREAD_DEBUG
-  _emscripten_errf("done __pthread_create self=%p next=%p prev=%p new=%p", self, self->next, self->prev, new);
-#endif
+  dbg("done __pthread_create next=%p prev=%p new=%p",
+      self->next,
+      self->prev,
+      new);
   *res = new;
   return 0;
 }
@@ -278,9 +289,7 @@ void _emscripten_thread_free_data(pthread_t t) {
   // musl normally allocates this using mmap).  This region
   // includes the pthread structure itself.
   unsigned char* block = t->map_base;
-#ifdef PTHREAD_DEBUG
-  _emscripten_errf("_emscripten_thread_free_data thread=%p map_base=%p", t, block);
-#endif
+  dbg("_emscripten_thread_free_data thread=%p map_base=%p", t, block);
   // To aid in debugging, set the entire region to zero.
   memset(block, 0, sizeof(struct pthread));
   emscripten_builtin_free(block);