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 r24616 from trunk into ruby_1_9_1.

Browse source 
--
* thread.c (rb_check_deadlock): decrease number of sleepers before
  deadlock detection because the deadlock exception makes main thread
  run.  [ruby-dev:39142]

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

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Aug 22 00:03:19 2009 Yusuke Endoh <mame@tsg.ne.jp>
* thread.c (rb_check_deadlock): decrease number of sleepers before
deadlock detection because the deadlock exception makes main thread
run. [ruby-dev:39142]
Fri Aug 21 15:01:35 2009 NARUSE, Yui <naruse@ruby-lang.org> Fri Aug 21 15:01:35 2009 NARUSE, Yui <naruse@ruby-lang.org>
* ext/readline/readline.c (readline_readline): use rb_prep_terminal * ext/readline/readline.c (readline_readline): use rb_prep_terminal

1
thread.c
View file

@ -3955,6 +3955,7 @@ rb_check_deadlock(rb_vm_t *vm)
printf("%d %d %p %p\n", vm->living_threads->num_entries, vm->sleeper, GET_THREAD(), vm->main_thread); printf("%d %d %p %p\n", vm->living_threads->num_entries, vm->sleeper, GET_THREAD(), vm->main_thread);
st_foreach(vm->living_threads, debug_i, (st_data_t)0); st_foreach(vm->living_threads, debug_i, (st_data_t)0);
#endif #endif
vm->sleeper--;
rb_thread_raise(2, argv, vm->main_thread); rb_thread_raise(2, argv, vm->main_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 300 #define RUBY_PATCHLEVEL 301
#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