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

thread*: all condvars are monotonic

Browse Source 
There's no reason to use CLOCK_REALTIME for any condvars in Ruby.
Indeed, we initialized all condvars with RB_CONDATTR_CLOCK_MONOTONIC
anyway; so simplify our code and reduce ifdefs.

[ruby-core:85639] [Misc #14497]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2018-04-22 12:09:07 +00:00
parent 7a6f34103d
commit ed590bdbfc
4 changed files with 37 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mjit.c
View File

@ -101,7 +101,7 @@ extern void rb_native_mutex_unlock(rb_nativethread_lock_t *lock);
extern void rb_native_mutex_initialize(rb_nativethread_lock_t *lock); extern void rb_native_mutex_initialize(rb_nativethread_lock_t *lock);
extern void rb_native_mutex_destroy(rb_nativethread_lock_t *lock); extern void rb_native_mutex_destroy(rb_nativethread_lock_t *lock);
extern void rb_native_cond_initialize(rb_nativethread_cond_t *cond, int flags); extern void rb_native_cond_initialize(rb_nativethread_cond_t *cond);
extern void rb_native_cond_destroy(rb_nativethread_cond_t *cond); extern void rb_native_cond_destroy(rb_nativethread_cond_t *cond);
extern void rb_native_cond_signal(rb_nativethread_cond_t *cond); extern void rb_native_cond_signal(rb_nativethread_cond_t *cond);
extern void rb_native_cond_broadcast(rb_nativethread_cond_t *cond); extern void rb_native_cond_broadcast(rb_nativethread_cond_t *cond);
@ -1370,10 +1370,10 @@ mjit_init(struct mjit_options *opts)
/* Initialize mutex */ /* Initialize mutex */
rb_native_mutex_initialize(&mjit_engine_mutex); rb_native_mutex_initialize(&mjit_engine_mutex);
rb_native_cond_initialize(&mjit_pch_wakeup, RB_CONDATTR_CLOCK_MONOTONIC); rb_native_cond_initialize(&mjit_pch_wakeup);
rb_native_cond_initialize(&mjit_client_wakeup, RB_CONDATTR_CLOCK_MONOTONIC); rb_native_cond_initialize(&mjit_client_wakeup);
rb_native_cond_initialize(&mjit_worker_wakeup, RB_CONDATTR_CLOCK_MONOTONIC); rb_native_cond_initialize(&mjit_worker_wakeup);
rb_native_cond_initialize(&mjit_gc_wakeup, RB_CONDATTR_CLOCK_MONOTONIC); rb_native_cond_initialize(&mjit_gc_wakeup);
/* Initialize class_serials cache for compilation */ /* Initialize class_serials cache for compilation */
valid_class_serials = rb_hash_new(); valid_class_serials = rb_hash_new();

77
thread_pthread.c
View File

@ -43,7 +43,7 @@ void rb_native_mutex_destroy(rb_nativethread_lock_t *lock);
void rb_native_cond_signal(rb_nativethread_cond_t *cond); void rb_native_cond_signal(rb_nativethread_cond_t *cond);
void rb_native_cond_broadcast(rb_nativethread_cond_t *cond); void rb_native_cond_broadcast(rb_nativethread_cond_t *cond);
void rb_native_cond_wait(rb_nativethread_cond_t *cond, rb_nativethread_lock_t *mutex); void rb_native_cond_wait(rb_nativethread_cond_t *cond, rb_nativethread_lock_t *mutex);
void rb_native_cond_initialize(rb_nativethread_cond_t *cond, int flags); void rb_native_cond_initialize(rb_nativethread_cond_t *cond);
void rb_native_cond_destroy(rb_nativethread_cond_t *cond); void rb_native_cond_destroy(rb_nativethread_cond_t *cond);
static void rb_thread_wakeup_timer_thread_low(void); static void rb_thread_wakeup_timer_thread_low(void);
static struct { static struct {
@ -52,14 +52,13 @@ static struct {
} timer_thread; } timer_thread;
#define TIMER_THREAD_CREATED_P() (timer_thread.created != 0) #define TIMER_THREAD_CREATED_P() (timer_thread.created != 0)
#define RB_CONDATTR_CLOCK_MONOTONIC 1 #if defined(HAVE_PTHREAD_CONDATTR_SETCLOCK) && \
#if defined(HAVE_PTHREAD_CONDATTR_SETCLOCK) && defined(HAVE_CLOCKID_T) && \
defined(CLOCK_REALTIME) && defined(CLOCK_MONOTONIC) && \ defined(CLOCK_REALTIME) && defined(CLOCK_MONOTONIC) && \
defined(HAVE_CLOCK_GETTIME) defined(HAVE_CLOCK_GETTIME)
#define USE_MONOTONIC_COND 1 static pthread_condattr_t condattr_mono;
static pthread_condattr_t *const condattr_monotonic = &condattr_mono;
#else #else
#define USE_MONOTONIC_COND 0 static const void *condattr_monotonic;
#endif #endif
#if defined(HAVE_POLL) && defined(HAVE_FCNTL) && defined(F_GETFL) && defined(F_SETFL) && defined(O_NONBLOCK) #if defined(HAVE_POLL) && defined(HAVE_FCNTL) && defined(F_GETFL) && defined(F_SETFL) && defined(O_NONBLOCK)
@ -161,9 +160,9 @@ static void
gvl_init(rb_vm_t *vm) gvl_init(rb_vm_t *vm)
{ {
rb_native_mutex_initialize(&vm->gvl.lock); rb_native_mutex_initialize(&vm->gvl.lock);
rb_native_cond_initialize(&vm->gvl.cond, RB_CONDATTR_CLOCK_MONOTONIC); rb_native_cond_initialize(&vm->gvl.cond);
rb_native_cond_initialize(&vm->gvl.switch_cond, RB_CONDATTR_CLOCK_MONOTONIC); rb_native_cond_initialize(&vm->gvl.switch_cond);
rb_native_cond_initialize(&vm->gvl.switch_wait_cond, RB_CONDATTR_CLOCK_MONOTONIC); rb_native_cond_initialize(&vm->gvl.switch_wait_cond);
vm->gvl.acquired = 0; vm->gvl.acquired = 0;
vm->gvl.waiting = 0; vm->gvl.waiting = 0;
vm->gvl.need_yield = 0; vm->gvl.need_yield = 0;
@ -262,38 +261,18 @@ rb_native_mutex_destroy(pthread_mutex_t *lock)
} }
void void
rb_native_cond_initialize(rb_nativethread_cond_t *cond, int flags) rb_native_cond_initialize(rb_nativethread_cond_t *cond)
{ {
int r; int r = pthread_cond_init(cond, condattr_monotonic);
# if USE_MONOTONIC_COND
pthread_condattr_t attr;
pthread_condattr_init(&attr);
cond->clockid = CLOCK_REALTIME;
if (flags & RB_CONDATTR_CLOCK_MONOTONIC) {
r = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC);
if (r == 0) {
cond->clockid = CLOCK_MONOTONIC;
}
}
r = pthread_cond_init(&cond->cond, &attr);
pthread_condattr_destroy(&attr);
# else
r = pthread_cond_init(&cond->cond, NULL);
# endif
if (r != 0) { if (r != 0) {
rb_bug_errno("pthread_cond_init", r); rb_bug_errno("pthread_cond_init", r);
} }
return;
} }
void void
rb_native_cond_destroy(rb_nativethread_cond_t *cond) rb_native_cond_destroy(rb_nativethread_cond_t *cond)
{ {
int r = pthread_cond_destroy(&cond->cond); int r = pthread_cond_destroy(cond);
if (r != 0) { if (r != 0) {
rb_bug_errno("pthread_cond_destroy", r); rb_bug_errno("pthread_cond_destroy", r);
} }
@ -314,7 +293,7 @@ rb_native_cond_signal(rb_nativethread_cond_t *cond)
{ {
int r; int r;
do { do {
r = pthread_cond_signal(&cond->cond); r = pthread_cond_signal(cond);
} while (r == EAGAIN); } while (r == EAGAIN);
if (r != 0) { if (r != 0) {
rb_bug_errno("pthread_cond_signal", r); rb_bug_errno("pthread_cond_signal", r);
@ -326,7 +305,7 @@ rb_native_cond_broadcast(rb_nativethread_cond_t *cond)
{ {
int r; int r;
do { do {
r = pthread_cond_broadcast(&cond->cond); r = pthread_cond_broadcast(cond);
} while (r == EAGAIN); } while (r == EAGAIN);
if (r != 0) { if (r != 0) {
rb_bug_errno("rb_native_cond_broadcast", r); rb_bug_errno("rb_native_cond_broadcast", r);
@ -336,7 +315,7 @@ rb_native_cond_broadcast(rb_nativethread_cond_t *cond)
void void
rb_native_cond_wait(rb_nativethread_cond_t *cond, pthread_mutex_t *mutex) rb_native_cond_wait(rb_nativethread_cond_t *cond, pthread_mutex_t *mutex)
{ {
int r = pthread_cond_wait(&cond->cond, mutex); int r = pthread_cond_wait(cond, mutex);
if (r != 0) { if (r != 0) {
rb_bug_errno("pthread_cond_wait", r); rb_bug_errno("pthread_cond_wait", r);
} }
@ -354,7 +333,7 @@ native_cond_timedwait(rb_nativethread_cond_t *cond, pthread_mutex_t *mutex, cons
* Let's hide it from arch generic code. * Let's hide it from arch generic code.
*/ */
do { do {
r = pthread_cond_timedwait(&cond->cond, mutex, ts); r = pthread_cond_timedwait(cond, mutex, ts);
} while (r == EINTR); } while (r == EINTR);
if (r != 0 && r != ETIMEDOUT) { if (r != 0 && r != ETIMEDOUT) {
@ -369,20 +348,12 @@ native_cond_timeout(rb_nativethread_cond_t *cond, struct timespec timeout_rel)
{ {
struct timespec abs; struct timespec abs;
#if USE_MONOTONIC_COND if (condattr_monotonic) {
if (cond->clockid == CLOCK_MONOTONIC) {
getclockofday(&abs); getclockofday(&abs);
goto out;
} }
else {
if (cond->clockid != CLOCK_REALTIME)
rb_bug("unsupported clockid %"PRIdVALUE, (SIGNED_VALUE)cond->clockid);
#endif
rb_timespec_now(&abs); rb_timespec_now(&abs);
}
#if USE_MONOTONIC_COND
out:
#endif
timespec_add(&abs, &timeout_rel); timespec_add(&abs, &timeout_rel);
return abs; return abs;
@ -426,6 +397,12 @@ static void native_thread_init(rb_thread_t *th);
void void
Init_native_thread(rb_thread_t *th) Init_native_thread(rb_thread_t *th)
{ {
#if defined(HAVE_PTHREAD_CONDATTR_SETCLOCK)
if (condattr_monotonic) {
int r = pthread_condattr_setclock(condattr_monotonic, CLOCK_MONOTONIC);
if (r) rb_bug_errno("pthread_condattr_setclock", r);
}
#endif
pthread_key_create(&ruby_native_thread_key, NULL); pthread_key_create(&ruby_native_thread_key, NULL);
th->thread_id = pthread_self(); th->thread_id = pthread_self();
fill_thread_id_str(th); fill_thread_id_str(th);
@ -444,7 +421,7 @@ native_thread_init(rb_thread_t *th)
#ifdef USE_UBF_LIST #ifdef USE_UBF_LIST
list_node_init(&nd->ubf_list); list_node_init(&nd->ubf_list);
#endif #endif
rb_native_cond_initialize(&nd->sleep_cond, RB_CONDATTR_CLOCK_MONOTONIC); rb_native_cond_initialize(&nd->sleep_cond);
ruby_thread_set_native(th); ruby_thread_set_native(th);
} }
@ -899,7 +876,7 @@ register_cached_thread_and_wait(rb_nativethread_id_t thread_self_id)
struct timespec end = { 60, 0 }; struct timespec end = { 60, 0 };
struct cached_thread_entry entry; struct cached_thread_entry entry;
rb_native_cond_initialize(&entry.cond, RB_CONDATTR_CLOCK_MONOTONIC); rb_native_cond_initialize(&entry.cond);
entry.th = NULL; entry.th = NULL;
entry.thread_id = thread_self_id; entry.thread_id = thread_self_id;
end = native_cond_timeout(&entry.cond, end); end = native_cond_timeout(&entry.cond, end);
@ -1504,7 +1481,7 @@ thread_timer(void *p)
#if !USE_SLEEPY_TIMER_THREAD #if !USE_SLEEPY_TIMER_THREAD
rb_native_mutex_initialize(&timer_thread_lock); rb_native_mutex_initialize(&timer_thread_lock);
rb_native_cond_initialize(&timer_thread_cond, RB_CONDATTR_CLOCK_MONOTONIC); rb_native_cond_initialize(&timer_thread_cond);
rb_native_mutex_lock(&timer_thread_lock); rb_native_mutex_lock(&timer_thread_lock);
#endif #endif
while (system_working > 0) { while (system_working > 0) {

9
thread_pthread.h
View File

@ -16,14 +16,9 @@
#endif #endif
#define RB_NATIVETHREAD_LOCK_INIT PTHREAD_MUTEX_INITIALIZER #define RB_NATIVETHREAD_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
#define RB_NATIVETHREAD_COND_INIT { PTHREAD_COND_INITIALIZER, } #define RB_NATIVETHREAD_COND_INIT PTHREAD_COND_INITIALIZER
typedef struct rb_thread_cond_struct { typedef pthread_cond_t rb_nativethread_cond_t;
pthread_cond_t cond;
#ifdef HAVE_CLOCKID_T
clockid_t clockid;
#endif
} rb_nativethread_cond_t;
typedef struct native_thread_data_struct { typedef struct native_thread_data_struct {
struct list_node ubf_list; struct list_node ubf_list;

2
thread_win32.c
View File

@ -508,7 +508,7 @@ native_cond_timeout(rb_nativethread_cond_t *cond, struct timespec timeout_rel)
#endif #endif
void void
rb_native_cond_initialize(rb_nativethread_cond_t *cond, int flags) rb_native_cond_initialize(rb_nativethread_cond_t *cond)
{ {
cond->next = (struct cond_event_entry *)cond; cond->next = (struct cond_event_entry *)cond;
cond->prev = (struct cond_event_entry *)cond; cond->prev = (struct cond_event_entry *)cond;