diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-18 05:46:40 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-18 05:46:40 +0000 |
commit | 28144433b2f951279552b39bc358769a5267e26a (patch) | |
tree | a3cd6ea5ed28ca07afde89b07dba43906f7ca6ef /vm_core.h | |
parent | 18c04b880a2ee244cf350ff88004e868d72836eb (diff) | |
download | ruby-28144433b2f951279552b39bc358769a5267e26a.tar.gz |
* thread.c (rb_threadptr_async_errinfo_*): manage async errors queue.
Async events such as an exception throwed by Thread#raise,
Thread#kill and thread termination (after main thread termination)
will be queued to th->async_errinfo_queue.
- clear: clear the queue.
- enque: enque err object into queue.
- deque: deque err object from queue.
- active_p: return 1 if the queue should be checked.
rb_thread_t#thrown_errinfo was removed.
* vm_core.h: add declarations of rb_threadptr_async_errinfo_*.
remove rb_thread_t#thrown_errinfo field and
add rb_thread_t#async_errinfo_queue (queue body: Array),
rb_thread_t#async_errinfo_queue_checked (flag),
rb_thread_t#async_errinfo_mask_stack(Array, not used yet).
* vm.c (rb_thread_mark): fix a mark function.
* cont.c (rb_fiber_start): enque an error.
* process.c (after_fork): clear async errinfo queue.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36430 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_core.h')
-rw-r--r-- | vm_core.h | 11 |
1 files changed, 10 insertions, 1 deletions
@@ -446,8 +446,13 @@ typedef struct rb_thread_struct { VALUE thgroup; VALUE value; + /* temporary place of errinfo */ VALUE errinfo; - VALUE thrown_errinfo; + + /* async errinfo queue */ + VALUE async_errinfo_queue; + int async_errinfo_queue_checked; + VALUE async_errinfo_mask_stack; rb_atomic_t interrupt_flag; rb_thread_lock_t interrupt_lock; @@ -767,6 +772,10 @@ void rb_threadptr_signal_exit(rb_thread_t *th); void rb_threadptr_execute_interrupts(rb_thread_t *); void rb_threadptr_interrupt(rb_thread_t *th); void rb_threadptr_unlock_all_locking_mutexes(rb_thread_t *th); +void rb_threadptr_async_errinfo_clear(rb_thread_t *th); +void rb_threadptr_async_errinfo_enque(rb_thread_t *th, VALUE v); +VALUE rb_threadptr_async_errinfo_deque(rb_thread_t *th); +int rb_threadptr_async_errinfo_active_p(rb_thread_t *th); void rb_thread_lock_unlock(rb_thread_lock_t *); void rb_thread_lock_destroy(rb_thread_lock_t *); |