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

* thread.c (thread_s_new): uses main_thread->status instead of

Browse Source 
th->inhibit_thread_creation for preventing thread creation.
* vm_core.h (rb_vm_struct): remove inhibit_thread_creation field.
* thread.c (rb_thread_terminate_all): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37921 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2012-11-28 04:43:15 +00:00
parent d5c463b576
commit 8111b32d68
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Nov 28 13:39:54 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread.c (thread_s_new): uses main_thread->status instead of
th->inhibit_thread_creation for preventing thread creation.
* vm_core.h (rb_vm_struct): remove inhibit_thread_creation field.
* thread.c (rb_thread_terminate_all): ditto.
Wed Nov 28 13:27:29 2012 Aaron Patterson <aaron@tenderlovemaking.com> Wed Nov 28 13:27:29 2012 Aaron Patterson <aaron@tenderlovemaking.com>
* ext/psych/extconf.rb: use embedded libyaml if no system libyaml is * ext/psych/extconf.rb: use embedded libyaml if no system libyaml is

4
thread.c
View File

@ -378,8 +378,6 @@ rb_thread_terminate_all(void)
/* unlock all locking mutexes */ /* unlock all locking mutexes */
rb_threadptr_unlock_all_locking_mutexes(th); rb_threadptr_unlock_all_locking_mutexes(th);
vm->inhibit_thread_creation = 1;
retry: retry:
thread_debug("rb_thread_terminate_all (main thread: %p)\n", (void *)th); thread_debug("rb_thread_terminate_all (main thread: %p)\n", (void *)th);
st_foreach(vm->living_threads, terminate_i, (st_data_t)th); st_foreach(vm->living_threads, terminate_i, (st_data_t)th);
@ -611,7 +609,7 @@ thread_s_new(int argc, VALUE *argv, VALUE klass)
rb_thread_t *th; rb_thread_t *th;
VALUE thread = rb_thread_alloc(klass); VALUE thread = rb_thread_alloc(klass);
if (GET_VM()->inhibit_thread_creation) if (GET_VM()->main_thread->status == THREAD_KILLED)
rb_raise(rb_eThreadError, "can't alloc thread"); rb_raise(rb_eThreadError, "can't alloc thread");
rb_obj_call_init(thread, argc, argv); rb_obj_call_init(thread, argc, argv);

1
vm_core.h
View File

@ -341,7 +341,6 @@ typedef struct rb_vm_struct {
VALUE thgroup_default; VALUE thgroup_default;
int running; int running;
int inhibit_thread_creation;
int thread_abort_on_exception; int thread_abort_on_exception;
int trace_running; int trace_running;
volatile int sleeper; volatile int sleeper;