[#36679] [Ruby 1.9 - Bug #4814][Open] minitest 2.2.x and test/unit do not get along — Ryan Davis <ryand-ruby@...>
9 messages
2011/06/01
[#36707] [Ruby 1.9 - Feature #4818][Open] Add method marshalable? — Joey Zhou <yimutang@...>
5 messages
2011/06/03
[#36711] [Ruby 1.9 - Bug #4821][Open] Random Segfaults (in start_thread?) — Ivan Bortko <b2630639@...>
22 messages
2011/06/03
[#36714] [Ruby 1.9 - Feature #4822][Open] String#capitalize improvements — Anurag Priyam <anurag08priyam@...>
8 messages
2011/06/03
[#36720] Direct modifications to RubyGems in trunk? — Luis Lavena <luislavena@...>
Hello,
4 messages
2011/06/03
[#36730] [Ruby 1.9 - Feature #4824][Open] Provide method Kernel#executed? — Lazaridis Ilias <ilias@...>
56 messages
2011/06/04
[#36900] [Ruby 1.9 - Feature #4824] Provide method Kernel#executed?
— Cezary Baginski <cezary.baginski@...>
2011/06/09
[#36902] [Ruby 1.9 - Feature #4824] Provide method Kernel#executed?
— Rocky Bernstein <rocky@...>
2011/06/09
[#36935] Re: [Ruby 1.9 - Feature #4824] Provide method Kernel#executed?
— Cezary <cezary.baginski@...>
2011/06/10
On Fri, Jun 10, 2011 at 07:20:32AM +0900, Rocky Bernstein wrote:
[#36957] Re: [Ruby 1.9 - Feature #4824] Provide method Kernel#executed?
— Rocky Bernstein <rockyb@...>
2011/06/11
On Fri, Jun 10, 2011 at 10:03 AM, Cezary <cezary.baginski@gmail.com> wrote:
[#37089] Re: [Ruby 1.9 - Feature #4824] Provide method Kernel#executed?
— Cezary <cezary.baginski@...>
2011/06/13
On Sat, Jun 11, 2011 at 11:20:31AM +0900, Rocky Bernstein wrote:
[#36732] [Ruby 1.9 - Feature #4824] Provide method Kernel#executed?
— Yukihiro Matsumoto <matz@...>
2011/06/04
[#36758] [Ruby 1.9 - Feature #4824] Provide method Kernel#executed?
— Benoit Daloze <redmine@...>
2011/06/05
[#36784] [Ruby 1.9 - Feature #4824] Provide method Kernel#executed?
— Rodrigo Rosenfeld Rosas <rr.rosas@...>
2011/06/06
[#36833] Re: [Ruby 1.9 - Feature #4824] Provide method Kernel#executed?
— Charles Oliver Nutter <headius@...>
2011/06/08
On Mon, Jun 6, 2011 at 7:09 AM, Rodrigo Rosenfeld Rosas
[#36741] [Ruby 1.9 - Bug #4828][Open] crash in test_thread_instance_variable — Motohiro KOSAKI <kosaki.motohiro@...>
8 messages
2011/06/05
[#36750] [Ruby 1.9 - Feature #4830][Open] Provide Default Variables for Array#each and other iterators — Lazaridis Ilias <ilias@...>
24 messages
2011/06/05
[#36907] [Ruby 1.9 - Feature #4830] Provide Default Variables for Array#each and other iterators
— Jan Lelis <mail@...>
2011/06/10
[#36764] [Ruby 1.9 - Feature #4831][Open] Integer#prime_factors — Yusuke Endoh <mame@...>
5 messages
2011/06/05
[#36785] [Ruby 1.9 - Feature #4840][Open] Allow returning from require — Rodrigo Rosenfeld Rosas <rr.rosas@...>
53 messages
2011/06/06
[#36811] Re: [Ruby 1.9 - Feature #4840][Open] Allow returning from require
— Yusuke ENDOH <mame@...>
2011/06/07
Hello,
[#36830] Re: [Ruby 1.9 - Feature #4840][Open] Allow returning from require
— Yukihiro Matsumoto <matz@...>
2011/06/08
Hi,
[#46648] [ruby-trunk - Feature #4840] Allow returning from require
— "mame (Yusuke Endoh)" <mame@...>
2012/07/23
[#46667] Re: [ruby-trunk - Feature #4840] Allow returning from require
— Rodrigo Rosenfeld Rosas <rr.rosas@...>
2012/07/23
Em 23-07-2012 10:12, mame (Yusuke Endoh) escreveu:
[#36786] Re: [Ruby 1.9 - Feature #4840][Open] Allow returning from require
— Michael Edgar <adgar@...>
2011/06/06
On Jun 6, 2011, at 10:11 AM, Rodrigo Rosenfeld Rosas wrote:
[#36804] Re: [Ruby 1.9 - Feature #4840][Open] Allow returning from require
— Clifford Heath <clifford.heath@...>
2011/06/06
On 07/06/2011, at 12:18 AM, Michael Edgar wrote:
[#46673] [ruby-trunk - Feature #4840] Allow returning from require
— "alexeymuranov (Alexey Muranov)" <redmine@...>
2012/07/23
[#46701] Re: [ruby-trunk - Feature #4840] Allow returning from require
— SASADA Koichi <ko1@...>
2012/07/24
(2012/07/24 0:44), alexeymuranov (Alexey Muranov) wrote:
[#54874] [ruby-trunk - Feature #4840] Allow returning from require
— "nobu (Nobuyoshi Nakada)" <nobu@...>
2013/05/09
[#36787] [Ruby 1.9 - Bug #4841][Open] WEBrick threading leads to infinite loop — Peak Xu <peak.xu+ruby@...>
8 messages
2011/06/06
[#36799] [Ruby 1.9 - Feature #4845][Open] Provide Class#cb_object_instantiated_from_literal(object) — Lazaridis Ilias <ilias@...>
11 messages
2011/06/06
[#36834] [Ruby 1.9 - Feature #3905] rb_clear_cache_by_class() called often during GC for non-blocking I/O — Charles Nutter <headius@...>
10 messages
2011/06/08
[#36860] Re: [Ruby 1.9 - Feature #3905] rb_clear_cache_by_class() called often during GC for non-blocking I/O
— Eric Wong <normalperson@...>
2011/06/08
Charles Nutter <headius@headius.com> wrote:
[#36875] Re: [Ruby 1.9 - Feature #3905] rb_clear_cache_by_class() called often during GC for non-blocking I/O
— Charles Oliver Nutter <headius@...>
2011/06/09
On Wed, Jun 8, 2011 at 4:00 PM, Eric Wong <normalperson@yhbt.net> wrote:
[#36878] Re: [Ruby 1.9 - Feature #3905] rb_clear_cache_by_class() called often during GC for non-blocking I/O
— Eric Wong <normalperson@...>
2011/06/09
Charles Oliver Nutter <headius@headius.com> wrote:
[#36863] Object#trust vs Object#taint — Aaron Patterson <aaron@...>
Hi,
16 messages
2011/06/08
[#36866] Re: Object#trust vs Object#taint
— Yukihiro Matsumoto <matz@...>
2011/06/08
Hi,
[#36873] Re: Object#trust vs Object#taint
— Aaron Patterson <aaron@...>
2011/06/09
On Thu, Jun 09, 2011 at 07:49:06AM +0900, Yukihiro Matsumoto wrote:
[#36876] Re: Object#trust vs Object#taint
— Charles Oliver Nutter <headius@...>
2011/06/09
On Wed, Jun 8, 2011 at 8:19 PM, Aaron Patterson
[#36877] Re: Object#trust vs Object#taint
— Shugo Maeda <shugo@...>
2011/06/09
Hi,
[#36911] Re: Object#trust vs Object#taint
— Charles Oliver Nutter <headius@...>
2011/06/10
On Thu, Jun 9, 2011 at 12:46 AM, Shugo Maeda <shugo@ruby-lang.org> wrote:
[#36914] Re: Object#trust vs Object#taint
— Shugo Maeda <shugo@...>
2011/06/10
Hi,
[#36939] Re: Object#trust vs Object#taint
— James Gray <james@...>
2011/06/10
On Fri, Jun 10, 2011 at 4:21 AM, Shugo Maeda <shugo@ruby-lang.org> wrote:
[#37071] [Ruby 1.9 - Feature #4877][Open] Unify Variable Expansion within Strings — Lazaridis Ilias <ilias@...>
12 messages
2011/06/12
[#37106] ruby core tutorials location — Roger Pack <rogerdpack2@...>
Hello all.
10 messages
2011/06/13
[#37107] Re: ruby core tutorials location
— Jon <jon.forums@...>
2011/06/13
> Hello all.
[#37115] Re: ruby core tutorials location
— Roger Pack <rogerdpack2@...>
2011/06/13
> Rather than adding links to source code, I would prefer the wikibooks link and others under a new Tutorials section of http://www.ruby-lang.org/en/documentation/ as well as adding http://ruby.runpaint.org/ to the existing Getting Started section.
[#37117] Re: ruby core tutorials location
— Jon <jon.forums@...>
2011/06/13
> > Rather than adding links to source code, I would prefer the wikibooks link and others under a new Tutorials section of http://www.ruby-lang.org/en/documentation/ as well as adding http://ruby.runpaint.org/ to the existing Getting Started section.
[#37128] Re: ruby core tutorials location
— Roger Pack <rogerdpack2@...>
2011/06/14
> I like what you're trying to do and see how great that tutorial connection from rdoc/yard could be, say, mixing with existing ruby-doc.org and rubydoc.info. ut I question embedding source links to info in which the info can easily grow outdated or abandoned as time passes. I also question the ongoing maintenance burdens.
[#37137] Re: ruby core tutorials location
— Jon <jon.forums@...>
2011/06/14
> > I like what you're trying to do and see how great that tutorial connection from rdoc/yard could be, say, mixing with existing ruby-doc.org and rubydoc.info. ut I question embedding source links to info in which the info can easily grow outdated or abandoned as time passes. I also question the ongoing maintenance burdens.
[#37182] Re: ruby core tutorials location
— Roger Pack <rogerdpack2@...>
2011/06/16
> My feedback was specific to the suggestion of embedding links into the Ruby source tree, not the issue of whether more documentation is needed. For the tutorials scenario you raised, I believe links from http://www.ruby-lang.org/en/documentation/ (e.g. - a new Tutorials section) are a more adaptable and maintainable _implementation_ for dealing with documentation realities than links in source.
[#37139] [Bug: ruby-1.9] test-all on without openssl system — SASADA Koichi <ko1@...>
Hi,
4 messages
2011/06/14
[#37144] Ruby 1.8.6 status — Tanaka Akira <akr@...>
Hi.
6 messages
2011/06/14
[#37274] Re: Ruby 1.8.6 status
— Ryan Davis <ryand-ruby@...>
2011/06/21
[#37164] [Ruby 1.9 - Feature #4890][Open] Enumerable#lazy — Yutaka HARA <redmine@...>
30 messages
2011/06/16
[#37170] [Ruby 1.9 - Bug #4893][Open] Literal Instantiation breaks Object Model — Lazaridis Ilias <ilias@...>
61 messages
2011/06/16
[#37192] rb_w32_add_socket / rb_w32_remove_socket — ghazel@...
Hello,
3 messages
2011/06/17
[#37206] [Ruby 1.9 - Feature #4896][Open] Add newpad() support to Curses — Eric Hodel <drbrain@...7.net>
6 messages
2011/06/17
[#37207] [Ruby 1.9 - Feature #4897][Open] Define Math::TAU and BigMath.TAU. The "true" circle constant, Tau=2*Pi. See http://tauday.com/ — Simon Baird <simon.baird@...>
43 messages
2011/06/17
[#77620] [Ruby trunk Feature#4897] Define Math::TAU and BigMath.TAU. The "true" circle constant, Tau=2*Pi. See http://tauday.com/
— nobu@...
2016/10/14
Issue #4897 has been updated by Nobuyoshi Nakada.
[#37217] coerce — Ondřej Bílka <neleai@...>
Hello
8 messages
2011/06/18
[#37256] Re: coerce
— Robert Klemme <shortcutter@...>
2011/06/21
2011/6/18 Ondřej Bílka <neleai@seznam.cz>:
[#37260] Re: coerce
— Ondřej Bílka <neleai@...>
2011/06/21
On Tue, Jun 21, 2011 at 04:06:05PM +0900, Robert Klemme wrote:
[#37261] Re: coerce
— Robert Klemme <shortcutter@...>
2011/06/21
2011/6/21 Ondřej Bílka <neleai@seznam.cz>:
[#37265] Re: Welcome to our (ruby-core ML) You are added automatically — "Anthony Crognale" <anthony@...>
mget last:10 mp
3 messages
2011/06/21
[#37286] [Ruby 1.9 - Bug #4916][Open] [BUG] Segmentation fault - dyld: lazy symbol binding failed: Symbol not found: _ASN1_put_eoc — Hiroshi NAKAMURA <nakahiro@...>
9 messages
2011/06/22
[#37288] [Ruby 1.9 - Bug #4917][Open] NilClass#to_ary — Jay Feldblum <y_feldblum@...>
8 messages
2011/06/22
[#37298] [Ruby 1.9 - Feature #4917][Rejected] NilClass#to_ary
— Marc-Andre Lafortune <ruby-core@...>
2011/06/22
[#37289] [Ruby 1.9 - Feature #4918][Assigned] Make all core tests inherit from Test::Unit::TestCase — Martin Bosslet <Martin.Bosslet@...>
4 messages
2011/06/22
[#37336] I have imported Rake 0.9.2 to trunk — Eric Hodel <drbrain@...7.net>
I asked Jim if he would like me to import rake 0.9.2 to trunk, so I have.
4 messages
2011/06/23
[#37401] [Ruby 1.9 - Bug #3784] Seg fault in webrick — Yui NARUSE <redmine@...>
1 message
2011/06/26
[#37463] [Ruby 1.9 - Bug #4480][Assigned] Thread-local variables issue: Thread#[] returns nil when called first time — Yui NARUSE <redmine@...>
3 messages
2011/06/26
[#37546] [Ruby 1.9 - Bug #4934][Open] winsock listen backlog may only be set once, and is set to 5 — Greg Hazel <ghazel@...>
6 messages
2011/06/26
[#37551] [ANN] Ruby Weekly Report — "Shota Fukumori (sora_h)" <sorah@...>
Hi,
4 messages
2011/06/26
[#37576] [Ruby 1.9 - Feature #4938][Open] Add Random.bytes [patch] — Marc-Andre Lafortune <ruby-core@...>
13 messages
2011/06/27
[#37588] CI? — Ryan Davis <ryand-ruby@...>
Is this an official CI for ruby?
7 messages
2011/06/27
[#37590] Re: CI?
— "NARUSE, Yui" <naruse@...>
2011/06/27
(2011/06/28 6:28), Ryan Davis wrote:
[#37612] [Ruby 1.9 - Bug #4941][Open] cannot load such file -- rubygems.rb (LoadError) — Lazaridis Ilias <ilias@...>
25 messages
2011/06/28
[ruby-core:37080] Re: [Request for Comment] avoid timer thread
From:
Mark Somerville <mark@...>
Date:
2011-06-13 10:25:45 UTC
List:
ruby-core #37080
On Sat, Jun 11, 2011 at 05:57:11AM +0900, Eric Wong wrote: > Mark Somerville <mark@scottishclimbs.com> wrote: > > On Tue, Feb 08, 2011 at 09:24:13PM +0900, Mark Somerville wrote: > > > On Mon, Nov 29, 2010 at 11:53:03AM +0900, SASADA Koichi wrote: > > > > I attached a patch to avoid timer thread. Your reviews are welcome. > > > > > > I *finally* got around to testing this patch. > > > > > > I applied this to trunk (it doesn't quite apply cleanly, but is easy to > > > fix). All the Ruby tests pass. I also ran the tests in all of my 1.9 > > > compatible projects - everything was happy! > > > > > > Most importantly, it fixes the wakeups/context switching problem nicely! > > > > Has anyone else looked at this patch yet? > > Mind reposting your updated patch? ML archives mangled the original > one. I can host a branch for it on git://bogomips.org/ruby.git too The patch I was testing was Koichi's. My earlier patch for this problem was shown to have problems. I've attached Koichi's patch again. Unfortunately it doesn't apply cleanly to master and I haven't got the experience/time needed to get it to a working state. If you or someone else does, I'll be very happy to test it out or help in any other way I can. > > It would be great to get this (or something like it) into 1.9.3. > > > > I consider this a pretty bad regression from 1.8. I don't want to have > > to use 1.8 any more! > > I completely agree. I plan on running Ruby 1.9 daemons on my laptop > more; so having this in 1.9.3 would be great. I'm in the same position - wanting to run tens of Ruby processes for a long time on my laptop.
Attachments (1)
avoid_timerthread.patch
(15.1 KB, text/x-diff)
Index: thread_pthread.c
===================================================================
--- thread_pthread.c (revision 29964)
+++ thread_pthread.c (working copy)
@@ -11,6 +11,7 @@
#ifdef THREAD_SYSTEM_DEPENDENT_IMPLEMENTATION
+#include <semaphore.h>
#include "gc.h"
#ifdef HAVE_SYS_RESOURCE_H
@@ -48,6 +49,20 @@ gvl_show_waiting_threads(rb_vm_t *vm)
}
}
+static void
+native_set_timer(long usec)
+{
+ struct itimerval it;
+ int r;
+
+ it.it_interval.tv_sec = 0;
+ it.it_interval.tv_usec = usec; /* 10ms */
+ it.it_value.tv_sec = 0;
+ it.it_value.tv_usec = usec;
+ r = setitimer(ITIMER_VIRTUAL, &it, 0);
+ if (r != 0) rb_bug_errno("setitimer", r);
+}
+
#if !GVL_SIMPLE_LOCK
static void
gvl_waiting_push(rb_vm_t *vm, rb_thread_t *th)
@@ -64,6 +79,11 @@ gvl_waiting_push(rb_vm_t *vm, rb_thread_
}
th = vm->gvl.waiting_threads;
vm->gvl.waiting++;
+
+ if (vm->gvl.waiting == 1) {
+ /* invoke timer */
+ native_set_timer(10000 /* 10ms */);
+ }
}
static void
@@ -71,6 +91,11 @@ gvl_waiting_shift(rb_vm_t *vm, rb_thread
{
vm->gvl.waiting_threads = vm->gvl.waiting_threads->native_thread_data.gvl_next;
vm->gvl.waiting--;
+
+ if (vm->gvl.waiting == 0) {
+ /* stop timer */
+ native_set_timer(0);
+ }
}
#endif
@@ -85,7 +110,6 @@ gvl_acquire(rb_vm_t *vm, rb_thread_t *th
if (GVL_DEBUG) fprintf(stderr, "gvl acquire (%p): sleep\n", th);
gvl_waiting_push(vm, th);
if (GVL_DEBUG) gvl_show_waiting_threads(vm);
-
while (vm->gvl.acquired != 0 || vm->gvl.waiting_threads != th) {
native_cond_wait(&th->native_thread_data.gvl_cond, &vm->gvl.lock);
}
@@ -297,9 +321,10 @@ static rb_thread_lock_t signal_thread_li
static pthread_key_t ruby_native_thread_key;
static void
-null_func(int i)
+vtalrm_handler(int i)
{
- /* null */
+ rb_vm_t *vm = GET_VM(); /* TODO: fix me for Multi-VM */
+ RUBY_VM_SET_TIMER_INTERRUPT(vm->running_thread);
}
static rb_thread_t *
@@ -314,7 +339,14 @@ ruby_thread_set_native(rb_thread_t *th)
return pthread_setspecific(ruby_native_thread_key, th) == 0;
}
-static void native_thread_init(rb_thread_t *th);
+static void
+native_thread_init(rb_thread_t *th)
+{
+ native_cond_initialize(&th->native_thread_data.sleep_cond);
+ native_cond_initialize(&th->native_thread_data.gvl_cond);
+ ruby_thread_set_native(th);
+ posix_signal(SIGVTALRM, vtalrm_handler);
+}
void
Init_native_thread(void)
@@ -325,15 +357,6 @@ Init_native_thread(void)
th->thread_id = pthread_self();
native_thread_init(th);
native_mutex_initialize(&signal_thread_list_lock);
- posix_signal(SIGVTALRM, null_func);
-}
-
-static void
-native_thread_init(rb_thread_t *th)
-{
- native_cond_initialize(&th->native_thread_data.sleep_cond);
- native_cond_initialize(&th->native_thread_data.gvl_cond);
- ruby_thread_set_native(th);
}
static void
@@ -536,8 +559,6 @@ thread_start_func_1(void *th_ptr)
return 0;
}
-void rb_thread_create_control_thread(void);
-
struct cached_thread_entry {
volatile rb_thread_t **th_area;
pthread_cond_t *cond;
@@ -816,6 +837,8 @@ struct signal_thread_list {
struct signal_thread_list *next;
};
+sem_t interrupt_sem;
+
#ifndef __CYGWIN__
static struct signal_thread_list signal_thread_list_anchor = {
0, 0, 0,
@@ -870,6 +893,7 @@ add_signal_thread_list(rb_thread_t *th)
th->native_thread_data.signal_thread_list = list;
});
}
+ sem_post(&interrupt_sem);
}
#endif
@@ -896,9 +920,9 @@ remove_signal_thread_list(rb_thread_t *t
}
}
-static pthread_t timer_thread_id;
-static pthread_cond_t timer_thread_cond = PTHREAD_COND_INITIALIZER;
-static pthread_mutex_t timer_thread_lock = PTHREAD_MUTEX_INITIALIZER;
+static pthread_t interrupt_thread_id;
+static pthread_cond_t interrupt_thread_cond = PTHREAD_COND_INITIALIZER;
+static pthread_mutex_t interrupt_thread_lock = PTHREAD_MUTEX_INITIALIZER;
static struct timespec *
get_ts(struct timespec *ts, unsigned long nsec)
@@ -915,22 +939,40 @@ get_ts(struct timespec *ts, unsigned lon
}
static void *
-thread_timer(void *dummy)
+interrupt_thread_func(void *dummy)
{
struct timespec ts;
- native_mutex_lock(&timer_thread_lock);
- native_cond_broadcast(&timer_thread_cond);
-#define WAIT_FOR_10MS() native_cond_timedwait(&timer_thread_cond, &timer_thread_lock, get_ts(&ts, PER_NANO/100))
+ /* sync with creater thread */
+ native_mutex_lock(&interrupt_thread_lock);
+ native_cond_broadcast(&interrupt_thread_cond);
+ native_mutex_unlock(&interrupt_thread_lock);
+
while (system_working > 0) {
- int err = WAIT_FOR_10MS();
- if (err == ETIMEDOUT);
- else if (err == 0 || err == EINTR) {
- if (rb_signal_buff_size() == 0) break;
+#if !defined(__CYGWIN__) && !defined(__SYMBIAN32__)
+ if (signal_thread_list_anchor.next) {
+ struct timespec ts;
+ sem_timedwait(&interrupt_sem, get_ts(&ts, PER_NANO/100));
+ }
+ else
+#endif
+ sem_wait(&interrupt_sem);
+
+ switch (errno) {
+ case EINVAL:
+ case EDEADLK:
+ rb_bug_errno("interrupt_thread_core/sem_wait or sem_timedwait", errno);
+ }
+
+ if (rb_signal_buff_size() > 0) {
+ /* signal deliverly */
+ rb_vm_t *vm = GET_VM();
+ rb_threadptr_check_signal(vm->main_thread);
}
- else rb_bug_errno("thread_timer/timedwait", err);
#if !defined(__CYGWIN__) && !defined(__SYMBIAN32__)
+ /* Send a signal to interrupt specific ruby thread */
+ /* to cancel blocking region */
if (signal_thread_list_anchor.next) {
FGLOCK(&signal_thread_list_lock, {
struct signal_thread_list *list;
@@ -942,59 +984,59 @@ thread_timer(void *dummy)
});
}
#endif
- timer_thread_function(dummy);
}
- native_mutex_unlock(&timer_thread_lock);
return NULL;
}
-static void
-rb_thread_create_timer_thread(void)
+/* called from signal handler */
+void
+rb_thread_set_signal(void)
{
- rb_enable_interrupt();
+ sem_post(&interrupt_sem);
+}
- if (!timer_thread_id) {
+static void
+rb_thread_create_interrupt_thread(void)
+{
+ if (!interrupt_thread_id) {
pthread_attr_t attr;
int err;
+ sem_init(&interrupt_sem, 0, 0);
+
pthread_attr_init(&attr);
#ifdef PTHREAD_STACK_MIN
pthread_attr_setstacksize(&attr,
PTHREAD_STACK_MIN + (THREAD_DEBUG ? BUFSIZ : 0));
#endif
- native_mutex_lock(&timer_thread_lock);
- err = pthread_create(&timer_thread_id, &attr, thread_timer, 0);
+ native_mutex_lock(&interrupt_thread_lock);
+ err = pthread_create(&interrupt_thread_id, &attr, interrupt_thread_func, 0);
if (err != 0) {
- native_mutex_unlock(&timer_thread_lock);
+ native_mutex_unlock(&interrupt_thread_lock);
fprintf(stderr, "[FATAL] Failed to create timer thread (errno: %d)\n", err);
exit(EXIT_FAILURE);
}
- native_cond_wait(&timer_thread_cond, &timer_thread_lock);
- native_mutex_unlock(&timer_thread_lock);
+
+ native_cond_wait(&interrupt_thread_cond, &interrupt_thread_lock);
+ native_mutex_unlock(&interrupt_thread_lock);
}
rb_disable_interrupt(); /* only timer thread recieve signal */
}
static int
-native_stop_timer_thread(void)
+native_stop_interrupt_thread(void)
{
int stopped;
- native_mutex_lock(&timer_thread_lock);
stopped = --system_working <= 0;
- if (stopped) {
- native_cond_signal(&timer_thread_cond);
- }
- native_mutex_unlock(&timer_thread_lock);
- if (stopped) {
- native_thread_join(timer_thread_id);
- }
+ sem_post(&interrupt_sem);
+ native_thread_join(interrupt_thread_id);
return stopped;
}
static void
-native_reset_timer_thread(void)
+native_reset_interrupt_thread(void)
{
- timer_thread_id = 0;
+ interrupt_thread_id = 0;
}
#ifdef HAVE_SIGALTSTACK
Index: vm_core.h
===================================================================
--- vm_core.h (revision 29961)
+++ vm_core.h (working copy)
@@ -641,9 +641,10 @@ VALUE rb_vm_make_proc(rb_thread_t *th, c
VALUE rb_vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp);
void rb_vm_gvl_destroy(rb_vm_t *vm);
-void rb_thread_start_timer_thread(void);
-void rb_thread_stop_timer_thread(void);
-void rb_thread_reset_timer_thread(void);
+void rb_thread_start_interrupt_thread(void);
+void rb_thread_stop_interrupt_thread(void);
+void rb_thread_reset_interrupt_thread(void);
+
void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
int ruby_thread_has_gvl_p(void);
VALUE rb_make_backtrace(void);
Index: thread.c
===================================================================
--- thread.c (revision 29961)
+++ thread.c (working copy)
@@ -193,7 +193,6 @@ rb_thread_s_debug_set(VALUE self, VALUE
#endif
NOINLINE(static int thread_start_func_2(rb_thread_t *th, VALUE *stack_start,
VALUE *register_stack_start));
-static void timer_thread_function(void *);
#if defined(_WIN32)
#include "thread_win32.c"
@@ -367,7 +366,7 @@ rb_thread_terminate_all(void)
}
POP_TAG();
}
- rb_thread_stop_timer_thread();
+ rb_thread_stop_interrupt_thread();
}
static void
@@ -2684,48 +2683,25 @@ rb_threadptr_check_signal(rb_thread_t *m
}
}
-static void
-timer_thread_function(void *arg)
-{
- rb_vm_t *vm = GET_VM(); /* TODO: fix me for Multi-VM */
-
- /* for time slice */
- RUBY_VM_SET_TIMER_INTERRUPT(vm->running_thread);
-
- /* check signal */
- rb_threadptr_check_signal(vm->main_thread);
-
-#if 0
- /* prove profiler */
- if (vm->prove_profile.enable) {
- rb_thread_t *th = vm->running_thread;
-
- if (vm->during_gc) {
- /* GC prove profiling */
- }
- }
-#endif
-}
-
void
-rb_thread_stop_timer_thread(void)
+rb_thread_stop_interrupt_thread(void)
{
- if (timer_thread_id && native_stop_timer_thread()) {
- native_reset_timer_thread();
+ if (interrupt_thread_id && native_stop_interrupt_thread()) {
+ native_reset_interrupt_thread();
}
}
void
-rb_thread_reset_timer_thread(void)
+rb_thread_reset_interrupt_thread(void)
{
- native_reset_timer_thread();
+ native_reset_interrupt_thread();
}
void
-rb_thread_start_timer_thread(void)
+rb_thread_start_interrupt_thread(void)
{
system_working = 1;
- rb_thread_create_timer_thread();
+ rb_thread_create_interrupt_thread();
}
static int
@@ -4389,7 +4365,7 @@ Init_Thread(void)
}
}
- rb_thread_create_timer_thread();
+ rb_thread_create_interrupt_thread();
(void)native_mutex_trylock;
}
Index: eval.c
===================================================================
--- eval.c (revision 29961)
+++ eval.c (working copy)
@@ -35,7 +35,6 @@ VALUE rb_eSysStackError;
/* initialize ruby */
void rb_clear_trace_func(void);
-void rb_thread_stop_timer_thread(void);
void rb_call_inits(void);
void Init_heap(void);
@@ -118,8 +117,6 @@ ruby_finalize(void)
ruby_finalize_1();
}
-void rb_thread_stop_timer_thread(void);
-
int
ruby_cleanup(volatile int ex)
{
@@ -160,7 +157,7 @@ ruby_cleanup(volatile int ex)
ex = error_handle(ex);
ruby_finalize_1();
POP_TAG();
- rb_thread_stop_timer_thread();
+ rb_thread_stop_interrupt_thread();
#if EXIT_SUCCESS != 0 || EXIT_FAILURE != 1
switch (ex) {
Index: process.c
===================================================================
--- process.c (revision 29961)
+++ process.c (working copy)
@@ -989,16 +989,12 @@ proc_detach(VALUE obj, VALUE pid)
char *strtok();
#endif
-void rb_thread_stop_timer_thread(void);
-void rb_thread_start_timer_thread(void);
-void rb_thread_reset_timer_thread(void);
-
static int forked_child = 0;
#define before_exec() \
- (rb_enable_interrupt(), (void)(forked_child ? 0 : (rb_thread_stop_timer_thread(), 1)))
+ (rb_enable_interrupt(), (void)(forked_child ? 0 : (rb_thread_stop_interrupt_thread(), 1)))
#define after_exec() \
- (rb_thread_reset_timer_thread(), rb_thread_start_timer_thread(), forked_child = 0, rb_disable_interrupt())
+ (rb_thread_reset_interrupt_thread(), rb_thread_start_interrupt_thread(), forked_child = 0, rb_disable_interrupt())
#define before_fork() before_exec()
#define after_fork() (GET_THREAD()->thrown_errinfo = 0, after_exec())
Index: signal.c
===================================================================
--- signal.c (revision 29961)
+++ signal.c (working copy)
@@ -522,11 +522,15 @@ ruby_nativethread_signal(int signum, sig
#endif
#endif
+void rb_thread_set_signal(void);
+
static RETSIGTYPE
sighandler(int sig)
{
ATOMIC_INC(signal_buff.cnt[sig]);
ATOMIC_INC(signal_buff.size);
+ rb_thread_set_signal();
+
#if !defined(BSD_SIGNAL) && !defined(POSIX_SIGNAL)
ruby_signal(sig, sighandler);
#endif
@@ -556,8 +560,6 @@ rb_disable_interrupt(void)
#if USE_TRAP_MASK
sigset_t mask;
sigfillset(&mask);
- sigdelset(&mask, SIGVTALRM);
- sigdelset(&mask, SIGSEGV);
pthread_sigmask(SIG_SETMASK, &mask, NULL);
#endif
}
@@ -1057,6 +1059,44 @@ int ruby_enable_coredump = 0;
#define ruby_enable_coredump 0
#endif
+#if HAVE_PTHREAD
+#include <pthread.h>
+#include <signal.h>
+
+static VALUE
+sigset2hash(sigset_t *set)
+{
+ VALUE hash = rb_hash_new();
+ const struct signals *sigs;
+
+ for (sigs = siglist; sigs->signm; sigs++) {
+ if (sigs->signo == 0) continue;
+ rb_hash_aset(hash, rb_str_new2(sigs->signm), sigismember(set, sigs->signo) ? Qtrue : Qfalse);
+ fprintf(stderr, "signal: SIG%-6s is %d\n", sigs->signm, sigismember(set, sigs->signo));
+ }
+
+ return hash;
+}
+
+static VALUE
+sigmask_of_current_thread(VALUE klass)
+{
+ sigset_t oldset;
+ int r;
+ r = pthread_sigmask(0, NULL, &oldset);
+ if (r != 0) {rb_bug_errno("pthread_sigmask", r);}
+ return sigset2hash(&oldset);
+}
+
+static VALUE
+sigmask_of_current_process(VALUE klass)
+{
+ sigset_t oldset;
+ sigprocmask(0, NULL, &oldset);
+ return sigset2hash(&oldset);
+}
+#endif
+
/*
* Many operating systems allow signals to be sent to running
* processes. Some signals have a defined effect on the process, while
@@ -1102,6 +1142,11 @@ Init_signal(void)
rb_define_global_function("trap", sig_trap, -1);
rb_define_module_function(mSignal, "trap", sig_trap, -1);
rb_define_module_function(mSignal, "list", sig_list, 0);
+
+#if HAVE_PTHREAD
+ rb_define_module_function(mSignal, "sigmask_of_current_thread", sigmask_of_current_thread, 0);
+ rb_define_module_function(mSignal, "sigmask_of_current_process", sigmask_of_current_process, 0);
+#endif
rb_define_method(rb_eSignal, "initialize", esignal_init, -1);
rb_define_method(rb_eSignal, "signo", esignal_signo, 0);
Mon Nov 29 11:38:42 2010 Koichi Sasada <ko1@atdot.net>
* eval.c:
* eval.c (ruby_cleanup):
* eval.c (ruby_finalize):
* process.c:
* process.c (proc_detach):
* signal.c:
* signal.c (Init_signal):
* signal.c (rb_disable_interrupt):
* signal.c (ruby_nativethread_signal):
* thread.c:
* thread.c (Init_Thread):
* thread.c (rb_thread_s_debug_set):
* thread.c (rb_thread_terminate_all):
* thread.c (rb_threadptr_check_signal):
* thread_pthread.c:
* thread_pthread.c (Init_native_thread):
* thread_pthread.c (add_signal_thread_list):
* thread_pthread.c (get_ts):
* thread_pthread.c (gvl_acquire):
* thread_pthread.c (gvl_show_waiting_threads):
* thread_pthread.c (gvl_waiting_push):
* thread_pthread.c (gvl_waiting_shift):
* thread_pthread.c (remove_signal_thread_list):
* thread_pthread.c (ruby_thread_set_native):
* thread_pthread.c (thread_start_func_1):
* thread_pthread.c (thread_timer):
* vm_core.h:
* vm_core.h (rb_vm_make_proc):