summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-10 15:58:40 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-10 15:58:40 +0000
commit100046ed75d0a05b1d4e9212585a4ca4723ac599 (patch)
tree8fd0a1a4570d059a7c58dc104fb7a5aa44b242c3 /thread.c
parentb0722b599d9639729890a8a0bf7933797afe85e5 (diff)
merges r28055 from trunk into ruby_1_9_2.
-- * thread.c (blocking_region_begin): avoid RUBY_VM_CHECK_INTS() call during GVL state transition. [Bug#3354] [ruby-dev:41435] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28263 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/thread.c b/thread.c
index 0d58a6b3c2..0b36f15bcb 100644
--- a/thread.c
+++ b/thread.c
@@ -125,8 +125,8 @@ static inline void blocking_region_end(rb_thread_t *th, struct rb_blocking_regio
#define blocking_region_begin(th, region, func, arg) \
do { \
(region)->prev_status = (th)->status; \
- (th)->blocking_region_buffer = (region); \
set_unblock_function((th), (func), (arg), &(region)->oldubf); \
+ (th)->blocking_region_buffer = (region); \
(th)->status = THREAD_STOPPED; \
thread_debug("enter blocking region (%p)\n", (void *)(th)); \
RB_GC_SAVE_MACHINE_CONTEXT(th); \