From 8d56defa55fe826f8bb8d549a0f50c8b51ada315 Mon Sep 17 00:00:00 2001 From: mame Date: Mon, 28 Jul 2008 11:17:43 +0000 Subject: [PATCH] * vm_core.h: move the definition of struct rb_mutex_struct. * thread.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ thread.c | 9 ++++++++- vm_core.h | 9 --------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6e49270ad3..c004c62ff2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Jul 28 20:17:03 2008 Yusuke Endoh + + * vm_core.h: move the definition of struct rb_mutex_struct. + + * thread.c: ditto. + Mon Jul 28 18:58:46 2008 Yusuke Endoh * thread.c (mutex_unlock): fix typo. diff --git a/thread.c b/thread.c index c965a657de..c27595a21a 100644 --- a/thread.c +++ b/thread.c @@ -62,7 +62,14 @@ static double timeofday(void); struct timeval rb_time_interval(VALUE); static int rb_thread_dead(rb_thread_t *th); -typedef struct rb_mutex_struct mutex_t; +typedef struct rb_mutex_struct +{ + rb_thread_lock_t lock; + rb_thread_cond_t cond; + struct rb_thread_struct volatile *th; + volatile int cond_waiting, cond_notified; + struct rb_mutex_struct *next_mutex; +} mutex_t; static void rb_mutex_unlock_all(mutex_t *mutex); static void rb_check_deadlock(rb_vm_t *vm); diff --git a/vm_core.h b/vm_core.h index 5a97d10edd..88087a7dbc 100644 --- a/vm_core.h +++ b/vm_core.h @@ -498,15 +498,6 @@ struct rb_thread_struct int abort_on_exception; }; -struct rb_mutex_struct -{ - rb_thread_lock_t lock; - rb_thread_cond_t cond; - struct rb_thread_struct volatile *th; - volatile int cond_waiting, cond_notified; - struct rb_mutex_struct *next_mutex; -}; - /* iseq.c */ VALUE rb_iseq_new(NODE*, VALUE, VALUE, VALUE, VALUE); VALUE rb_iseq_new_with_bopt(NODE*, VALUE, VALUE, VALUE, VALUE, VALUE);