archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merges r24591 from trunk into ruby_1_9_1.

Browse source 
--
* thread.c (rb_thread_terminate_all): do not ignore interrupt when
  reaping threads on termination.  [ruby-dev:39107]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-10-28 14:15:39 +00:00
parent 8e996b793e
commit d1154deec8
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Aug 20 08:39:50 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* thread.c (rb_thread_terminate_all): do not ignore interrupt when
reaping threads on termination. [ruby-dev:39107]
Thu Aug 20 01:06:48 2009 Yukihiro Matsumoto <matz@ruby-lang.org> Thu Aug 20 01:06:48 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c (DEFINE_STRUCT_DIRENT): use union to allocate sufficient * dir.c (DEFINE_STRUCT_DIRENT): use union to allocate sufficient

12
thread.c
View file

@ -298,6 +298,9 @@ rb_thread_terminate_all(void)
{ {
rb_thread_t *th = GET_THREAD(); /* main thread */ rb_thread_t *th = GET_THREAD(); /* main thread */
rb_vm_t *vm = th->vm; rb_vm_t *vm = th->vm;
VALUE einfo = vm->main_thread->errinfo;
int state;
if (vm->main_thread != th) { if (vm->main_thread != th) {
rb_bug("rb_thread_terminate_all: called by child thread (%p, %p)", rb_bug("rb_thread_terminate_all: called by child thread (%p, %p)",
(void *)vm->main_thread, (void *)th); (void *)vm->main_thread, (void *)th);
@ -313,13 +316,14 @@ rb_thread_terminate_all(void)
while (!rb_thread_alone()) { while (!rb_thread_alone()) {
PUSH_TAG(); PUSH_TAG();
if (EXEC_TAG() == 0) { if ((state = EXEC_TAG()) == 0) {
rb_thread_schedule(); rb_thread_schedule();
} }
else {
/* ignore exception */
}
POP_TAG(); POP_TAG();
if (state && einfo != vm->main_thread->errinfo &&
RUBY_VM_SET_INTERRUPT(vm->main_thread)) {
break;
}
} }
rb_thread_stop_timer_thread(); rb_thread_stop_timer_thread();
} }

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1" #define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 298 #define RUBY_PATCHLEVEL 299
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1