diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 16:48:02 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 16:48:02 +0000 |
commit | 9ead0d771ba70c87f434748bf6309f839a4a3f90 (patch) | |
tree | 7687b06cd467917e13615f4baab18eb5ff06660c | |
parent | 818bb6dd219691dc3964124008eb2856b6f8ce27 (diff) |
* vm_core.h, thread.c: rename global_interpreter_lock to
global_vm_lock.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17349 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | thread.c | 14 | ||||
-rw-r--r-- | version.h | 6 | ||||
-rw-r--r-- | vm_core.h | 2 |
4 files changed, 16 insertions, 11 deletions
@@ -1,3 +1,8 @@ +Mon Jun 16 01:33:08 2008 Koichi Sasada <ko1@atdot.net> + + * vm_core.h, thread.c: rename global_interpreter_lock to + global_vm_lock. + Sun Jun 15 18:40:35 2008 NARUSE, Yui <naruse@ruby-lang.org> * ext/syck/rubyext.c (yaml_org_handler): associate encoding. @@ -89,10 +89,10 @@ static void reset_unblock_function(rb_thread_t *th, const struct rb_unblock_call #define GVL_UNLOCK_BEGIN() do { \ rb_thread_t *_th_stored = GET_THREAD(); \ rb_gc_save_machine_context(_th_stored); \ - native_mutex_unlock(&_th_stored->vm->global_interpreter_lock) + native_mutex_unlock(&_th_stored->vm->global_vm_lock) #define GVL_UNLOCK_END() \ - native_mutex_lock(&_th_stored->vm->global_interpreter_lock); \ + native_mutex_lock(&_th_stored->vm->global_vm_lock); \ rb_thread_set_current(_th_stored); \ } while(0) @@ -331,7 +331,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s #endif thread_debug("thread start: %p\n", th); - native_mutex_lock(&th->vm->global_interpreter_lock); + native_mutex_lock(&th->vm->global_vm_lock); { thread_debug("thread start (get lock): %p\n", th); rb_thread_set_current(th); @@ -404,7 +404,7 @@ thread_start_func_2(rb_thread_t *th, VALUE *stack_start, VALUE *register_stack_s } } thread_cleanup_func(th); - native_mutex_unlock(&th->vm->global_interpreter_lock); + native_mutex_unlock(&th->vm->global_vm_lock); return 0; } @@ -785,11 +785,11 @@ rb_thread_schedule(void) thread_debug("rb_thread_schedule/switch start\n"); rb_gc_save_machine_context(th); - native_mutex_unlock(&th->vm->global_interpreter_lock); + native_mutex_unlock(&th->vm->global_vm_lock); { native_thread_yield(); } - native_mutex_lock(&th->vm->global_interpreter_lock); + native_mutex_lock(&th->vm->global_vm_lock); rb_thread_set_current(th); thread_debug("rb_thread_schedule/switch done\n"); @@ -3385,7 +3385,7 @@ Init_Thread(void) /* main thread setting */ { /* acquire global interpreter lock */ - rb_thread_lock_t *lp = &GET_THREAD()->vm->global_interpreter_lock; + rb_thread_lock_t *lp = &GET_THREAD()->vm->global_vm_lock; native_mutex_initialize(lp); native_mutex_lock(lp); native_mutex_initialize(&GET_THREAD()->interrupt_lock); @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-06-15" +#define RUBY_RELEASE_DATE "2008-06-16" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080615 +#define RUBY_RELEASE_CODE 20080616 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 15 +#define RUBY_RELEASE_DAY 16 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; @@ -297,7 +297,7 @@ struct rb_vm_struct { VALUE self; - rb_thread_lock_t global_interpreter_lock; + rb_thread_lock_t global_vm_lock; struct rb_thread_struct *main_thread; struct rb_thread_struct *running_thread; |