1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert broken thread_pthread.c in 539459abda3

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2022-05-22 14:18:27 +09:00
parent 539459abda
commit 009a514668
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
thread_pthread.c
View File

@ -1765,23 +1765,10 @@ native_thread_native_thread_id(rb_thread_t *target_th)
if (tid == 0) return Qnil; if (tid == 0) return Qnil;
return INT2FIX(tid); return INT2FIX(tid);
#elif defined(__APPLE__) #elif defined(__APPLE__)
#if MAC_OS_X_VERSION_MAX_ALLOWED < 1060 uint64_t tid;
uint64_t tid; int e = pthread_threadid_np(target_th->nt->thread_id, &tid);
tid = pthread_mach_thread_np(pthread_self()); if (e != 0) rb_syserr_fail(e, "pthread_threadid_np");
#elif MAC_OS_X_VERSION_MIN_REQUIRED < 1060 return ULL2NUM((unsigned long long)tid);
uint64_t tid;
if (&pthread_threadid_np) {
int error = pthread_threadid_np(target_th->thread_id, &tid);
if (error != 0) rb_syserr_fail(error, "pthread_threadid_np");
} else {
uint64_t tid;
tid = pthread_mach_thread_np(pthread_self());
}
#else
int error = pthread_threadid_np(target_th->thread_id, &tid);
if (error != 0) rb_syserr_fail(error, "pthread_threadid_np");
return ULL2NUM((unsigned long long)tid);
#endif
#endif #endif
} }
# define USE_NATIVE_THREAD_NATIVE_THREAD_ID 1 # define USE_NATIVE_THREAD_NATIVE_THREAD_ID 1