Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
82fef0bc
Commit
82fef0bc
authored
7 years ago
by
Alexander Polcyn
Browse files
Options
Downloads
Patches
Plain Diff
tentative fix for global side effect on interrupted constructor
parent
d7455abf
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/ruby/ext/grpc/rb_channel.c
+21
-5
21 additions, 5 deletions
src/ruby/ext/grpc/rb_channel.c
with
21 additions
and
5 deletions
src/ruby/ext/grpc/rb_channel.c
+
21
−
5
View file @
82fef0bc
...
...
@@ -107,6 +107,7 @@ static bg_watched_channel *bg_watched_channel_list_head = NULL;
static
void
grpc_rb_channel_try_register_connection_polling
(
bg_watched_channel
*
bg
);
static
void
*
wait_until_channel_polling_thread_started_no_gil
(
void
*
);
static
void
wait_until_channel_polling_thread_started_unblocking_func
(
void
*
);
static
void
*
channel_init_try_register_connection_polling_without_gil
(
void
*
arg
);
...
...
@@ -227,12 +228,15 @@ static VALUE grpc_rb_channel_init(int argc, VALUE *argv, VALUE self) {
char
*
target_chars
=
NULL
;
grpc_channel_args
args
;
channel_init_try_register_stack
stack
;
int
stop_waiting_for_thread_start
=
0
;
MEMZERO
(
&
args
,
grpc_channel_args
,
1
);
grpc_ruby_once_init
();
rb_thread_call_without_gvl
(
wait_until_channel_polling_thread_started_no_gil
,
NULL
,
run_poll_channels_loop_unblocking_func
,
NULL
);
rb_thread_call_without_gvl
(
wait_until_channel_polling_thread_started_no_gil
,
&
stop_waiting_for_thread_start
,
wait_until_channel_polling_thread_started_unblocking_func
,
&
stop_waiting_for_thread_start
);
/* "3" == 3 mandatory args */
rb_scan_args
(
argc
,
argv
,
"3"
,
&
target
,
&
channel_args
,
&
credentials
);
...
...
@@ -699,10 +703,11 @@ static VALUE run_poll_channels_loop(VALUE arg) {
}
static
void
*
wait_until_channel_polling_thread_started_no_gil
(
void
*
arg
)
{
(
void
)
arg
;
int
*
stop_waiting
=
(
int
*
)
arg
;
gpr_log
(
GPR_DEBUG
,
"GRPC_RUBY: wait for channel polling thread to start"
);
gpr_mu_lock
(
&
global_connection_polling_mu
);
while
(
!
channel_polling_thread_started
&&
!
abort_channel_polling
)
{
while
(
!
channel_polling_thread_started
&&
!
abort_channel_polling
&&
!*
stop_waiting
)
{
gpr_cv_wait
(
&
global_connection_polling_cv
,
&
global_connection_polling_mu
,
gpr_inf_future
(
GPR_CLOCK_REALTIME
));
}
...
...
@@ -711,6 +716,17 @@ static void *wait_until_channel_polling_thread_started_no_gil(void *arg) {
return
NULL
;
}
static
void
wait_until_channel_polling_thread_started_unblocking_func
(
void
*
arg
)
{
int
*
stop_waiting
=
(
int
*
)
arg
;
gpr_mu_lock
(
&
global_connection_polling_mu
);
gpr_log
(
GPR_DEBUG
,
"GRPC_RUBY: interrupt wait for channel polling thread to start"
);
*
stop_waiting
=
1
;
gpr_cv_broadcast
(
&
global_connection_polling_cv
);
gpr_mu_unlock
(
&
global_connection_polling_mu
);
}
static
void
*
set_abort_channel_polling_without_gil
(
void
*
arg
)
{
(
void
)
arg
;
gpr_mu_lock
(
&
global_connection_polling_mu
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment