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
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
|
--- a/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc (index)
+++ b/grpc/src/core/lib/event_engine/posix_engine/ev_epoll1_linux.cc (working tree)
@@ -255,10 +255,6 @@ void ResetEventManagerOnFork() {
poller->Close();
}
gpr_mu_unlock(&fork_fd_list_mu);
- if (grpc_core::Fork::Enabled()) {
- gpr_mu_destroy(&fork_fd_list_mu);
- grpc_core::Fork::SetResetChildPollingEngineFunc(nullptr);
- }
InitEpoll1PollerLinux();
}
@@ -273,8 +269,10 @@ bool InitEpoll1PollerLinux() {
return false;
}
if (grpc_core::Fork::Enabled()) {
- gpr_mu_init(&fork_fd_list_mu);
- grpc_core::Fork::SetResetChildPollingEngineFunc(ResetEventManagerOnFork);
+ if (grpc_core::Fork::RegisterResetChildPollingEngineFunc(
+ ResetEventManagerOnFork)) {
+ gpr_mu_init(&fork_fd_list_mu);
+ }
}
close(fd);
return true;
--- a/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc (index)
+++ b/grpc/src/core/lib/event_engine/posix_engine/ev_poll_posix.cc (working tree)
@@ -323,10 +323,6 @@ void ResetEventManagerOnFork() {
delete poller;
}
gpr_mu_unlock(&fork_fd_list_mu);
- if (grpc_core::Fork::Enabled()) {
- gpr_mu_destroy(&fork_fd_list_mu);
- grpc_core::Fork::SetResetChildPollingEngineFunc(nullptr);
- }
InitPollPollerPosix();
}
@@ -337,8 +333,10 @@ bool InitPollPollerPosix() {
return false;
}
if (grpc_core::Fork::Enabled()) {
- gpr_mu_init(&fork_fd_list_mu);
- grpc_core::Fork::SetResetChildPollingEngineFunc(ResetEventManagerOnFork);
+ if (grpc_core::Fork::RegisterResetChildPollingEngineFunc(
+ ResetEventManagerOnFork)) {
+ gpr_mu_init(&fork_fd_list_mu);
+ }
}
return true;
}
--- a/src/core/lib/gprpp/fork.cc (index)
+++ b/src/core/lib/gprpp/fork.cc (working tree)
@@ -20,6 +20,8 @@
#include "src/core/lib/gprpp/fork.h"
+#include <utility>
+
#include <grpc/support/atm.h>
#include <grpc/support/sync.h>
#include <grpc/support/time.h>
@@ -195,19 +197,16 @@ void Fork::DoDecExecCtxCount() {
NoDestructSingleton<ExecCtxState>::Get()->DecExecCtxCount();
}
-void Fork::SetResetChildPollingEngineFunc(
+bool Fork::RegisterResetChildPollingEngineFunc(
Fork::child_postfork_func reset_child_polling_engine) {
if (reset_child_polling_engine_ == nullptr) {
- reset_child_polling_engine_ = new std::vector<Fork::child_postfork_func>();
- }
- if (reset_child_polling_engine == nullptr) {
- reset_child_polling_engine_->clear();
- } else {
- reset_child_polling_engine_->emplace_back(reset_child_polling_engine);
+ reset_child_polling_engine_ = new std::set<Fork::child_postfork_func>();
}
+ auto ret = reset_child_polling_engine_->insert(reset_child_polling_engine);
+ return ret.second;
}
-const std::vector<Fork::child_postfork_func>&
+const std::set<Fork::child_postfork_func>&
Fork::GetResetChildPollingEngineFunc() {
return *reset_child_polling_engine_;
}
@@ -244,6 +243,6 @@ void Fork::AwaitThreads() {
std::atomic<bool> Fork::support_enabled_(false);
bool Fork::override_enabled_ = false;
-std::vector<Fork::child_postfork_func>* Fork::reset_child_polling_engine_ =
+std::set<Fork::child_postfork_func>* Fork::reset_child_polling_engine_ =
nullptr;
} // namespace grpc_core
--- a/src/core/lib/gprpp/fork.h (index)
+++ b/src/core/lib/gprpp/fork.h (working tree)
@@ -22,7 +22,7 @@
#include <grpc/support/port_platform.h>
#include <atomic>
-#include <vector>
+#include <set>
//
// NOTE: FORKING IS NOT GENERALLY SUPPORTED, THIS IS ONLY INTENDED TO WORK
@@ -57,10 +57,11 @@ class Fork {
// Provide a function that will be invoked in the child's postfork handler to
// reset the polling engine's internal state.
- static void SetResetChildPollingEngineFunc(
+ // Returns true if reset_child_polling_engine was not previously registered,
+ // otherwise returns false and does nothing.
+ static bool RegisterResetChildPollingEngineFunc(
child_postfork_func reset_child_polling_engine);
- static const std::vector<child_postfork_func>&
- GetResetChildPollingEngineFunc();
+ static const std::set<child_postfork_func>& GetResetChildPollingEngineFunc();
// Check if there is a single active ExecCtx
// (the one used to invoke this function). If there are more,
@@ -89,7 +90,7 @@ class Fork {
static std::atomic<bool> support_enabled_;
static bool override_enabled_;
- static std::vector<child_postfork_func>* reset_child_polling_engine_;
+ static std::set<child_postfork_func>* reset_child_polling_engine_;
};
} // namespace grpc_core
--- a/src/core/lib/iomgr/ev_epoll1_linux.cc (index)
+++ b/src/core/lib/iomgr/ev_epoll1_linux.cc (working tree)
@@ -1237,10 +1237,6 @@ static void shutdown_engine(void) {
fd_global_shutdown();
pollset_global_shutdown();
epoll_set_shutdown();
- if (grpc_core::Fork::Enabled()) {
- gpr_mu_destroy(&fork_fd_list_mu);
- grpc_core::Fork::SetResetChildPollingEngineFunc(nullptr);
- }
g_is_shutdown = true;
}
@@ -1297,6 +1293,7 @@ const grpc_event_engine_vtable grpc_ev_epoll1_posix = {
// the global epoll fd. This allows gRPC to shutdown in the child process
// without interfering with connections or RPCs ongoing in the parent.
static void reset_event_manager_on_fork() {
+ if (g_is_shutdown) return;
gpr_mu_lock(&fork_fd_list_mu);
while (fork_fd_list_head != nullptr) {
close(fork_fd_list_head->fd);
@@ -1331,9 +1328,10 @@ static bool init_epoll1_linux() {
}
if (grpc_core::Fork::Enabled()) {
- gpr_mu_init(&fork_fd_list_mu);
- grpc_core::Fork::SetResetChildPollingEngineFunc(
- reset_event_manager_on_fork);
+ if (grpc_core::Fork::RegisterResetChildPollingEngineFunc(
+ reset_event_manager_on_fork)) {
+ gpr_mu_init(&fork_fd_list_mu);
+ }
}
g_is_shutdown = false;
return true;
--- a/src/core/lib/iomgr/ev_poll_posix.cc (index)
+++ b/src/core/lib/iomgr/ev_poll_posix.cc (working tree)
@@ -1405,10 +1405,11 @@ const grpc_event_engine_vtable grpc_ev_poll_posix = {
return false;
}
if (grpc_core::Fork::Enabled()) {
- track_fds_for_fork = true;
- gpr_mu_init(&fork_fd_list_mu);
- grpc_core::Fork::SetResetChildPollingEngineFunc(
- reset_event_manager_on_fork);
+ if (grpc_core::Fork::RegisterResetChildPollingEngineFunc(
+ reset_event_manager_on_fork)) {
+ track_fds_for_fork = true;
+ gpr_mu_init(&fork_fd_list_mu);
+ }
}
return true;
},
|
