1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
|
From 63c7424ad0c93f7a7aa1ce0e84ea7916c4cbdc5f Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 25 Sep 2023 22:29:22 -0700
Subject: [PATCH] [ruby] Fix compilation errors on clang 16
As announced in
https://discourse.llvm.org/t/clang-16-notice-of-potentially-breaking-changes/65562,
clang 16 defaults `-Wincompatible-function-pointer-types` to be
on. This causes a number of hard errors due to implicit conversions
between `void *` and `void`, such as:
```
../../../../src/ruby/ext/grpc/rb_channel.c:770:47: error: incompatible function pointer types passing 'VALUE (VALUE)' (aka 'unsigned long (unsigned long)') to parameter of type 'VALUE (*)(void *)' (aka 'unsigned long (*)(void *)') [-Wincompatible-function-pointer-types]
g_channel_polling_thread = rb_thread_create(run_poll_channels_loop, NULL);
^~~~~~~~~~~~~~~~~~~~~~
/root/.rbenv/versions/3.1.4/include/ruby-3.1.0/ruby/internal/intern/thread.h:190:32: note: passing argument to parameter 'f' here
VALUE rb_thread_create(VALUE (*f)(void *g), void *g);
^
../../../../src/ruby/ext/grpc/rb_channel.c:780:41: warning: a function declaration without a prototype is deprecated in all versions of C [-Wstrict-prototypes]
void grpc_rb_channel_polling_thread_stop() {
^
void
../../../../src/ruby/ext/grpc/rb_channel.c:786:30: error: incompatible function pointer types passing 'void (void *)' to parameter of type 'void *(*)(void *)' [-Wincompatible-function-pointer-types]
rb_thread_call_without_gvl(run_poll_channels_loop_unblocking_func, NULL, NULL,
```
This commit fixes these pointer types using wrapper functions where
necessary.
This issue was also raised on the FreeBSD port of the grpc gem:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=271540
---
src/ruby/ext/grpc/rb_channel.c | 16 +++++++++++-----
src/ruby/ext/grpc/rb_event_thread.c | 12 +++++++++---
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/ruby/ext/grpc/rb_channel.c b/src/ruby/ext/grpc/rb_channel.c
index c8b4af07b998d..165708e6951c3 100644
--- a/src/ruby/ext/grpc/rb_channel.c
+++ b/src/ruby/ext/grpc/rb_channel.c
@@ -117,6 +117,7 @@ static bg_watched_channel* bg_watched_channel_list_create_and_add(
grpc_channel* channel);
static void bg_watched_channel_list_free_and_remove(bg_watched_channel* bg);
static void run_poll_channels_loop_unblocking_func(void* arg);
+static void* run_poll_channels_loop_unblocking_func_wrapper(void* arg);
// Needs to be called under global_connection_polling_mu
static void grpc_rb_channel_watch_connection_state_op_complete(
@@ -689,8 +690,12 @@ static void* run_poll_channels_loop_no_gil(void* arg) {
return NULL;
}
-// Notify the channel polling loop to cleanup and shutdown.
static void run_poll_channels_loop_unblocking_func(void* arg) {
+ run_poll_channels_loop_unblocking_func_wrapper(arg);
+}
+
+// Notify the channel polling loop to cleanup and shutdown.
+static void* run_poll_channels_loop_unblocking_func_wrapper(void* arg) {
bg_watched_channel* bg = NULL;
(void)arg;
@@ -701,7 +706,7 @@ static void run_poll_channels_loop_unblocking_func(void* arg) {
// early out after first time through
if (g_abort_channel_polling) {
gpr_mu_unlock(&global_connection_polling_mu);
- return;
+ return NULL;
}
g_abort_channel_polling = 1;
@@ -723,10 +728,11 @@ static void run_poll_channels_loop_unblocking_func(void* arg) {
gpr_log(GPR_DEBUG,
"GRPC_RUBY: run_poll_channels_loop_unblocking_func - end aborting "
"connection polling");
+ return NULL;
}
// Poll channel connectivity states in background thread without the GIL.
-static VALUE run_poll_channels_loop(VALUE arg) {
+static VALUE run_poll_channels_loop(void* arg) {
(void)arg;
gpr_log(
GPR_DEBUG,
@@ -783,8 +789,8 @@ void grpc_rb_channel_polling_thread_stop() {
"GRPC_RUBY: channel polling thread stop: thread was not started");
return;
}
- rb_thread_call_without_gvl(run_poll_channels_loop_unblocking_func, NULL, NULL,
- NULL);
+ rb_thread_call_without_gvl(run_poll_channels_loop_unblocking_func_wrapper,
+ NULL, NULL, NULL);
rb_funcall(g_channel_polling_thread, rb_intern("join"), 0);
// state associated with the channel polling thread is destroyed, reset so
// we can start again later
diff --git a/src/ruby/ext/grpc/rb_event_thread.c b/src/ruby/ext/grpc/rb_event_thread.c
index 49ac61c52f08a..b22ca4c7f5d3e 100644
--- a/src/ruby/ext/grpc/rb_event_thread.c
+++ b/src/ruby/ext/grpc/rb_event_thread.c
@@ -106,17 +106,22 @@ static void* grpc_rb_wait_for_event_no_gil(void* param) {
return NULL;
}
-static void grpc_rb_event_unblocking_func(void* arg) {
+static void* grpc_rb_event_unblocking_func_wrapper(void* arg) {
(void)arg;
gpr_mu_lock(&event_queue.mu);
event_queue.abort = true;
gpr_cv_signal(&event_queue.cv);
gpr_mu_unlock(&event_queue.mu);
+ return NULL;
+}
+
+static void grpc_rb_event_unblocking_func(void* arg) {
+ grpc_rb_event_unblocking_func_wrapper(arg);
}
/* This is the implementation of the thread that handles auth metadata plugin
* events */
-static VALUE grpc_rb_event_thread(VALUE arg) {
+static VALUE grpc_rb_event_thread(void* arg) {
grpc_rb_event* event;
(void)arg;
while (true) {
@@ -155,7 +160,8 @@ void grpc_rb_event_queue_thread_stop() {
"GRPC_RUBY: call credentials thread stop: thread not running");
return;
}
- rb_thread_call_without_gvl(grpc_rb_event_unblocking_func, NULL, NULL, NULL);
+ rb_thread_call_without_gvl(grpc_rb_event_unblocking_func_wrapper, NULL, NULL,
+ NULL);
rb_funcall(g_event_thread, rb_intern("join"), 0);
g_event_thread = Qnil;
}
|
