kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* thread.c (rb_thread_blocking_region): must ensure to unlock GVL.

Browse source 
[ruby-dev:39579]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25566 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-10-30 01:55:38 +00:00
parent 22bd95ded4
commit 411b747091
2 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Oct 30 10:55:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (rb_thread_blocking_region): must ensure to unlock GVL.
[ruby-dev:39579]
Fri Oct 30 04:47:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Oct 30 04:47:26 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/ruby.h (RSTRING_END): trivial optimization. * include/ruby/ruby.h (RSTRING_END): trivial optimization.

30
thread.c
View file

@ -1028,6 +1028,23 @@ rb_thread_blocking_region_end(struct rb_blocking_region_buffer *region)
RUBY_VM_CHECK_INTS(); RUBY_VM_CHECK_INTS();
} }
#ifndef PROHIBIT_FUNCTION_CAST
#define PROHIBIT_FUNCTION_CAST 0
#endif
#if PROHIBIT_FUNCTION_CAST
struct blocking_function_args {
rb_blocking_function_t *func;
void *data;
};
static VALUE
call_blocking_function(VALUE arg)
{
struct blocking_function_args *blocking = (void *)arg;
return (blocking->func)(blocking->data);
}
#endif
/* /*
* rb_thread_blocking_region - permit concurrent/parallel execution. * rb_thread_blocking_region - permit concurrent/parallel execution.
* *
@ -1070,6 +1087,10 @@ rb_thread_blocking_region(
{ {
VALUE val; VALUE val;
rb_thread_t *th = GET_THREAD(); rb_thread_t *th = GET_THREAD();
int status;
#if PROHIBIT_FUNCTION_CAST
struct blocking_function_args args;
#endif
if (ubf == RUBY_UBF_IO || ubf == RUBY_UBF_PROCESS) { if (ubf == RUBY_UBF_IO || ubf == RUBY_UBF_PROCESS) {
ubf = ubf_select; ubf = ubf_select;
@ -1077,8 +1098,15 @@ rb_thread_blocking_region(
} }
BLOCKING_REGION({ BLOCKING_REGION({
val = func(data1); #if PROHIBIT_FUNCTION_CAST
args.func = func;
args.data = data1;
val = rb_protect(call_blocking_function, (VALUE)&args, &status);
#else
val = rb_protect((VALUE (*)(VALUE))func, (VALUE)data1, &status);
#endif
}, ubf, data2); }, ubf, data2);
if (status) rb_jump_tag(status);
return val; return val;
} }