summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/thread.c b/thread.c
index bf17dc8..c38130f 100644
--- a/thread.c
+++ b/thread.c
@@ -389,7 +389,7 @@ thread_join(rb_thread_t *target_th, double delay)
rb_thread_t *th = GET_THREAD();
double now, limit = timeofday() + delay;
- thread_debug("thread_join (thid: %p)\n", (void*)target_th->thread_id);
+ thread_debug("thread_join (thid: %p)\n", (void *)target_th->thread_id);
if (target_th->status != THREAD_KILLED) {
th->join_list_next = target_th->join_list_head;
@@ -404,17 +404,17 @@ thread_join(rb_thread_t *target_th, double delay)
now = timeofday();
if (now > limit) {
thread_debug("thread_join: timeout (thid: %p)\n",
- (void*)target_th->thread_id);
+ (void *)target_th->thread_id);
return Qnil;
}
sleep_wait_for_interrupt(th, limit - now);
}
thread_debug("thread_join: interrupted (thid: %p)\n",
- (void*)target_th->thread_id);
+ (void *)target_th->thread_id);
}
thread_debug("thread_join: success (thid: %p)\n",
- (void*)target_th->thread_id);
+ (void *)target_th->thread_id);
if (target_th->errinfo != Qnil) {
VALUE err = target_th->errinfo;
@@ -2349,7 +2349,7 @@ thlist_signal(rb_thread_list_t **list, unsigned int maxth)
int woken = 0;
rb_thread_list_t *q;
- while ((q = *list) != 0) {
+ while ((q = *list) != NULL) {
rb_thread_t *th = q->th;
*list = q->next;
@@ -2922,10 +2922,12 @@ Init_Thread(void)
rb_define_method(rb_cMutex, "lock", rb_mutex_lock, 0);
rb_define_method(rb_cMutex, "unlock", rb_mutex_unlock, 0);
rb_define_method(rb_cMutex, "sleep", mutex_sleep, -1);
- yarvcore_eval(Qnil, rb_str_new2(
- "class Mutex;"
- " def synchronize; self.lock; yield; ensure; self.unlock; end;"
- "end;"), rb_str_new2("<preload>"), INT2FIX(1));
+
+ rb_iseq_eval(rb_iseq_compile(
+ rb_str_new2("class Mutex;"
+ " def synchronize; self.lock; yield; ensure; self.unlock; end;"
+ "end;"),
+ rb_str_new2(__FILE__), INT2FIX(__LINE__)));
recursive_key = rb_intern("__recursive_key__");
rb_eThreadError = rb_define_class("ThreadError", rb_eStandardError);