Skip to content

Commit 894b964

Browse files
committed
[Test commit] Inherit main tid for the proxied main thread
1 parent bfdb0be commit 894b964

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

system/lib/pthread/library_pthread.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -906,7 +906,8 @@ static char** _main_argv;
906906

907907
extern int __call_main(int argc, char** argv);
908908

909-
static void* _main_thread(void* param) {
909+
static void* _main_thread(void* tid) {
910+
pthread_self()->tid = (int)tid;
910911
// This is the main runtime thread for the application.
911912
emscripten_set_thread_name(pthread_self(), "Application main thread");
912913
return (void*)__call_main(_main_argc, _main_argv);
@@ -925,7 +926,7 @@ int emscripten_proxy_main(int argc, char** argv) {
925926
_main_argc = argc;
926927
_main_argv = argv;
927928
pthread_t thread;
928-
int rc = pthread_create(&thread, &attr, _main_thread, NULL);
929+
int rc = pthread_create(&thread, &attr, _main_thread, (void*)pthread_self()->tid);
929930
pthread_attr_destroy(&attr);
930931
return rc;
931932
}

0 commit comments

Comments
 (0)