aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/cpp/server/server_builder.cc4
-rw-r--r--src/cpp/server/server_cc.cc4
-rw-r--r--test/cpp/thread_manager/thread_manager_test.cc2
-rw-r--r--tools/run_tests/tests.json312
4 files changed, 161 insertions, 161 deletions
diff --git a/src/cpp/server/server_builder.cc b/src/cpp/server/server_builder.cc
index 9bf3221e6a..8ca29ee58c 100644
--- a/src/cpp/server/server_builder.cc
+++ b/src/cpp/server/server_builder.cc
@@ -216,8 +216,8 @@ std::unique_ptr<Server> ServerBuilder::BuildAndStart() {
// ServerBuilder's AddCompletionQueue() method (those completion queues
// are in 'cqs_' member variable of ServerBuilder object)
std::shared_ptr<std::vector<std::unique_ptr<ServerCompletionQueue>>>
- sync_server_cqs = std::make_shared<
- std::vector<std::unique_ptr<ServerCompletionQueue>>>();
+ sync_server_cqs(std::make_shared<
+ std::vector<std::unique_ptr<ServerCompletionQueue>>>());
if (has_sync_methods) {
// This is a Sync server
diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
index 050f593d44..59af7087cf 100644
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@@ -332,7 +332,7 @@ class Server::SyncRequestThreadManager : public ThreadManager {
m->Request(server_->c_server(), server_cq_->cq());
}
- ThreadManager::Initialize();
+ Initialize(); // ThreadManager's Initialize()
}
}
@@ -513,7 +513,7 @@ void Server::ShutdownInternal(gpr_timespec deadline) {
// Shutdown all ThreadManagers. This will try to gracefully stop all the
// threads in the ThreadManagers (once they process any inflight requests)
for (auto it = sync_req_mgrs_.begin(); it != sync_req_mgrs_.end(); it++) {
- (*it)->Shutdown();
+ (*it)->Shutdown(); // ThreadManager's Shutdown()
}
shutdown_cq.Shutdown();
diff --git a/test/cpp/thread_manager/thread_manager_test.cc b/test/cpp/thread_manager/thread_manager_test.cc
index 326e30e895..1391c387fc 100644
--- a/test/cpp/thread_manager/thread_manager_test.cc
+++ b/test/cpp/thread_manager/thread_manager_test.cc
@@ -83,7 +83,7 @@ grpc::ThreadManager::WorkStatus ThreadManagerTest::PollForWork(void **tag,
int call_num = num_poll_for_work_.fetch_add(1);
if (call_num >= kMaxNumPollForWork) {
- ThreadManager::Shutdown();
+ Shutdown();
return SHUTDOWN;
}
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index 8cc7d3c441..b26bba71be 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -17023,7 +17023,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17044,7 +17046,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17065,7 +17069,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17086,7 +17092,9 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17107,7 +17115,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17128,7 +17138,9 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17149,7 +17161,9 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17170,7 +17184,9 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17191,7 +17207,9 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17212,7 +17230,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17233,7 +17253,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17254,7 +17276,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17275,7 +17299,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17296,7 +17322,9 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17317,7 +17345,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17338,7 +17368,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17359,7 +17391,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17380,7 +17414,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17401,7 +17437,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17422,7 +17460,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17443,7 +17483,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17464,7 +17506,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17485,7 +17529,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17506,7 +17552,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17527,7 +17575,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17548,7 +17598,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17569,7 +17621,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17590,7 +17644,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17611,7 +17667,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17632,7 +17690,9 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17653,7 +17713,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17674,7 +17736,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17695,7 +17759,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17716,7 +17782,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17737,7 +17805,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17758,7 +17828,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17779,7 +17851,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17800,7 +17874,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17821,7 +17897,9 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [],
+ "exclude_configs": [
+ "msan"
+ ],
"flaky": false,
"language": "c",
"name": "h2_sockpair_1byte_test",
@@ -17843,9 +17921,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -17867,9 +17943,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -17891,9 +17965,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -17915,9 +17987,7 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -17939,9 +18009,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -17963,9 +18031,7 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -17987,9 +18053,7 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18011,9 +18075,7 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18035,9 +18097,7 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18059,9 +18119,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18149,9 +18207,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18173,9 +18229,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18197,9 +18251,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18221,9 +18273,7 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18245,9 +18295,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18269,9 +18317,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18293,9 +18339,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18339,9 +18383,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18363,9 +18405,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18387,9 +18427,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18411,9 +18449,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18435,9 +18471,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18459,9 +18493,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18483,9 +18515,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18507,9 +18537,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18531,9 +18559,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18555,9 +18581,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18579,9 +18603,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18603,9 +18625,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18627,9 +18647,7 @@
"posix"
],
"cpu_cost": 0.1,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18651,9 +18669,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18675,9 +18691,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18699,9 +18713,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18723,9 +18735,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18747,9 +18757,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18793,9 +18801,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18817,9 +18823,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18841,9 +18845,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
@@ -18865,9 +18867,7 @@
"posix"
],
"cpu_cost": 1.0,
- "exclude_configs": [
- "msan"
- ],
+ "exclude_configs": [],
"flaky": false,
"language": "c",
"name": "h2_ssl_test",
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 07:19:25 +0000