Use emscripten_err for logging in dynlink.c. NFC

This is more direct that using stderr/stdout and (under node) it doesn't
involve any proxying to them main thread.

Author: sbc100

system/lib/libc/dynlink.c

@@ -20,6 +20,8 @@
 #include <string.h>
 #include <dynlink.h>
 
+#include <emscripten/console.h>
+
 //#define DYLINK_DEBUG
 
 struct async_data {
@@ -65,7 +67,14 @@ int __dl_invalid_handle(void* h) {
 
 static void load_library_done(struct dso* p) {
 #ifdef DYLINK_DEBUG
-  fprintf(stderr, "%p: load_library_done: dso=%p mem_addr=%p mem_size=%d table_addr=%p table_size=%d\n", pthread_self(), p, p->mem_addr, p->mem_size, p->table_addr, p->table_size);
+  _emscripten_errf("%p: load_library_done: dso=%p mem_addr=%p mem_size=%zu "
+                   "table_addr=%p table_size=%zu",
+                   pthread_self(),
+                   p,
+                   p->mem_addr,
+                   p->mem_size,
+                   p->table_addr,
+                   p->table_size);
 #endif
 
   // insert into linked list
@@ -98,7 +107,11 @@ static struct dso* load_library_start(const char* name, int flags) {
 
 static void dlopen_js_onsuccess(struct dso* dso, struct async_data* data) {
 #ifdef DYLINK_DEBUG
-  fprintf(stderr, "%p: dlopen_js_onsuccess: dso=%p mem_addr=%p mem_size=%p\n", pthread_self(), p, p->mem_addr, p->mem_size);
+  _emscripten_errf("%p: dlopen_js_onsuccess: dso=%p mem_addr=%p mem_size=%zu",
+                   pthread_self(),
+                   dso,
+                   dso->mem_addr,
+                   dso->mem_size);
 #endif
   load_library_done(dso);
   pthread_rwlock_unlock(&lock);
@@ -108,7 +121,7 @@ static void dlopen_js_onsuccess(struct dso* dso, struct async_data* data) {
 
 static void dlopen_js_onerror(struct dso* dso, struct async_data* data) {
 #ifdef DYLINK_DEBUG
-  fprintf(stderr, "%p: dlopen_js_onerror: dso=%p\n", pthread_self(), handle);
+  _emscripten_errf("%p: dlopen_js_onerror: dso=%p", pthread_self(), dso);
 #endif
   pthread_rwlock_unlock(&lock);
   data->onerror(data->user_data);
@@ -141,7 +154,7 @@ void* dlopen(const char* file, int flags) {
     return head;
   }
 #ifdef DYLINK_DEBUG
-  fprintf(stderr, "%p: dlopen: %s [%d]\n", pthread_self(), file, flags);
+  _emscripten_errf("%p: dlopen: %s [%d]", pthread_self(), file, flags);
 #endif
 
   struct dso* p;
@@ -153,7 +166,7 @@ void* dlopen(const char* file, int flags) {
   for (p = head; p; p = p->next) {
     if (!strcmp(p->name, file)) {
 #ifdef DYLINK_DEBUG
-      fprintf(stderr, "%p: dlopen: already opened: %p\n", pthread_self(), p);
+      _emscripten_errf("%p: dlopen: already opened: %p", pthread_self(), p);
 #endif
       goto end;
     }
@@ -166,14 +179,14 @@ void* dlopen(const char* file, int flags) {
   void* success = _dlopen_js(p);
   if (!success) {
 #ifdef DYLINK_DEBUG
-    fprintf(stderr, "%p: dlopen_js: failed\n", pthread_self(), p);
+    _emscripten_errf("%p: dlopen_js: failed: %p", pthread_self(), p);
 #endif
     free(p);
     p = NULL;
     goto end;
   }
 #ifdef DYLINK_DEBUG
-  fprintf(stderr, "%p: dlopen_js: success: %p\n", pthread_self(), p);
+  _emscripten_errf("%p: dlopen_js: success: %p", pthread_self(), p);
 #endif
   load_library_done(p);
 end:
@@ -204,15 +217,15 @@ void emscripten_dlopen(const char* filename, int flags, void* user_data,
   d->onerror = onerror;
 
 #ifdef DYLINK_DEBUG
-  fprintf(stderr, "%p: calling emscripten_dlopen_js %p\n", pthread_self(), p);
+  _emscripten_errf("%p: calling emscripten_dlopen_js %p", pthread_self(), p);
 #endif
   // Unlock happens in dlopen_js_onsuccess/dlopen_js_onerror
   _emscripten_dlopen_js(p, dlopen_js_onsuccess, dlopen_js_onerror, d);
 }
 
 void* __dlsym(void* restrict p, const char* restrict s, void* restrict ra) {
 #ifdef DYLINK_DEBUG
-  fprintf(stderr, "%p: __dlsym dso:%p sym:%s\n", pthread_self(), p, s);
+  _emscripten_errf("%p: __dlsym dso:%p sym:%s", pthread_self(), p, s);
 #endif
   if (p != RTLD_DEFAULT && p != RTLD_NEXT && __dl_invalid_handle(p)) {
     return 0;
@@ -247,7 +260,7 @@ void _emscripten_thread_sync_code() {
   ensure_init();
   if (thread_local_tail == tail) {
 #ifdef DYLINK_DEBUG
-    fprintf(stderr, "%p: emscripten_thread_sync_code: already in sync\n", pthread_self());
+    _emscripten_errf("%p: emscripten_thread_sync_code: already in sync", pthread_self());
 #endif
     goto done;
   }
@@ -258,22 +271,29 @@ void _emscripten_thread_sync_code() {
   while (thread_local_tail->next) {
     struct dso* p = thread_local_tail->next;
 #ifdef DYLINK_DEBUG
-    fprintf(stderr, "%p: emscripten_thread_sync_code: %s mem_addr=%p mem_size=%d table_addr=%p table_size=%d\n", pthread_self(), p->name, p->mem_addr, p->mem_size, p->table_addr, p->table_size);
+    _emscripten_errf("%p: emscripten_thread_sync_code: %s mem_addr=%p "
+                     "mem_size=%zu table_addr=%p table_size=%zu",
+                     pthread_self(),
+                     p->name,
+                     p->mem_addr,
+                     p->mem_size,
+                     p->table_addr,
+                     p->table_size);
 #endif
     void* success = _dlopen_js(p);
     if (!success) {
       // If any on the libraries fails to load here then we give up.
       // TODO(sbc): Ideally this would never happen and we could/should
       // abort, but on the main thread (where we don't have sync xhr) its
       // often not possible to syncronously load side module.
-      fprintf(stderr, "emscripten_thread_sync_code failed: %s\n", dlerror());
+      _emscripten_errf("emscripten_thread_sync_code failed: %s", dlerror());
       break;
     }
     thread_local_tail = p;
   }
   pthread_rwlock_unlock(&lock);
 #ifdef DYLINK_DEBUG
-  fprintf(stderr, "%p: emscripten_thread_sync_code done\n", pthread_self());
+  _emscripten_errf("%p: emscripten_thread_sync_code done", pthread_self());
 #endif
 
 done: