aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core/end2end/fixtures
diff options
context:
space:
mode:
Diffstat (limited to 'test/core/end2end/fixtures')
-rw-r--r--test/core/end2end/fixtures/h2_census.cc2
-rw-r--r--test/core/end2end/fixtures/h2_compress.cc3
-rw-r--r--test/core/end2end/fixtures/h2_fd.cc4
-rw-r--r--test/core/end2end/fixtures/h2_full+workarounds.cc1
-rw-r--r--test/core/end2end/fixtures/h2_load_reporting.cc1
-rw-r--r--test/core/end2end/fixtures/h2_oauth2.cc1
-rw-r--r--test/core/end2end/fixtures/h2_sockpair+trace.cc4
-rw-r--r--test/core/end2end/fixtures/h2_sockpair.cc3
-rw-r--r--test/core/end2end/fixtures/h2_sockpair_1byte.cc3
-rw-r--r--test/core/end2end/fixtures/h2_ssl.cc1
-rw-r--r--test/core/end2end/fixtures/h2_ssl_proxy.cc2
-rw-r--r--test/core/end2end/fixtures/http_proxy_fixture.cc15
12 files changed, 7 insertions, 33 deletions
diff --git a/test/core/end2end/fixtures/h2_census.cc b/test/core/end2end/fixtures/h2_census.cc
index c3c3e961e7..a43d963c54 100644
--- a/test/core/end2end/fixtures/h2_census.cc
+++ b/test/core/end2end/fixtures/h2_census.cc
@@ -76,7 +76,6 @@ void chttp2_init_client_fullstack(grpc_end2end_test_fixture* f,
{
ExecCtx _local_exec_ctx;
grpc_channel_args_destroy(client_args);
- grpc_exec_ctx_finish();
}
}
@@ -93,7 +92,6 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f,
{
ExecCtx _local_exec_ctx;
grpc_channel_args_destroy(server_args);
- grpc_exec_ctx_finish();
}
grpc_server_register_completion_queue(f->server, f->cq, NULL);
GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr));
diff --git a/test/core/end2end/fixtures/h2_compress.cc b/test/core/end2end/fixtures/h2_compress.cc
index f520b48fa3..3f9a87d0fc 100644
--- a/test/core/end2end/fixtures/h2_compress.cc
+++ b/test/core/end2end/fixtures/h2_compress.cc
@@ -68,7 +68,6 @@ void chttp2_init_client_fullstack_compression(grpc_end2end_test_fixture* f,
if (ffd->client_args_compression != NULL) {
ExecCtx _local_exec_ctx;
grpc_channel_args_destroy(ffd->client_args_compression);
- grpc_exec_ctx_finish();
}
ffd->client_args_compression = grpc_channel_args_set_compression_algorithm(
client_args, GRPC_COMPRESS_GZIP);
@@ -83,7 +82,6 @@ void chttp2_init_server_fullstack_compression(grpc_end2end_test_fixture* f,
if (ffd->server_args_compression != NULL) {
ExecCtx _local_exec_ctx;
grpc_channel_args_destroy(ffd->server_args_compression);
- grpc_exec_ctx_finish();
}
ffd->server_args_compression = grpc_channel_args_set_compression_algorithm(
server_args, GRPC_COMPRESS_GZIP);
@@ -104,7 +102,6 @@ void chttp2_tear_down_fullstack_compression(grpc_end2end_test_fixture* f) {
grpc_channel_args_destroy(ffd->server_args_compression);
gpr_free(ffd->localaddr);
gpr_free(ffd);
- grpc_exec_ctx_finish();
}
/* All test configurations */
diff --git a/test/core/end2end/fixtures/h2_fd.cc b/test/core/end2end/fixtures/h2_fd.cc
index 48e1b313fd..99bced8651 100644
--- a/test/core/end2end/fixtures/h2_fd.cc
+++ b/test/core/end2end/fixtures/h2_fd.cc
@@ -75,8 +75,6 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f,
f->client = grpc_insecure_channel_create_from_fd(
"fixture_client", sfd->fd_pair[0], client_args);
GPR_ASSERT(f->client);
-
- grpc_exec_ctx_finish();
}
static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f,
@@ -90,8 +88,6 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f,
grpc_server_start(f->server);
grpc_server_add_insecure_channel_from_fd(f->server, NULL, sfd->fd_pair[1]);
-
- grpc_exec_ctx_finish();
}
static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) {
diff --git a/test/core/end2end/fixtures/h2_full+workarounds.cc b/test/core/end2end/fixtures/h2_full+workarounds.cc
index 563e1e1ac2..e98df083f2 100644
--- a/test/core/end2end/fixtures/h2_full+workarounds.cc
+++ b/test/core/end2end/fixtures/h2_full+workarounds.cc
@@ -90,7 +90,6 @@ void chttp2_init_server_fullstack(grpc_end2end_test_fixture* f,
GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr));
grpc_server_start(f->server);
grpc_channel_args_destroy(server_args_new);
- grpc_exec_ctx_finish();
}
void chttp2_tear_down_fullstack(grpc_end2end_test_fixture* f) {
diff --git a/test/core/end2end/fixtures/h2_load_reporting.cc b/test/core/end2end/fixtures/h2_load_reporting.cc
index 74b5983364..84eb9e4513 100644
--- a/test/core/end2end/fixtures/h2_load_reporting.cc
+++ b/test/core/end2end/fixtures/h2_load_reporting.cc
@@ -79,7 +79,6 @@ void chttp2_init_server_load_reporting(grpc_end2end_test_fixture* f,
{
ExecCtx _local_exec_ctx;
grpc_channel_args_destroy(server_args);
- grpc_exec_ctx_finish();
}
grpc_server_register_completion_queue(f->server, f->cq, NULL);
GPR_ASSERT(grpc_server_add_insecure_http2_port(f->server, ffd->localaddr));
diff --git a/test/core/end2end/fixtures/h2_oauth2.cc b/test/core/end2end/fixtures/h2_oauth2.cc
index 8ff7cb304c..9ffc5b7b7e 100644
--- a/test/core/end2end/fixtures/h2_oauth2.cc
+++ b/test/core/end2end/fixtures/h2_oauth2.cc
@@ -160,7 +160,6 @@ static void chttp2_init_client_simple_ssl_with_oauth2_secure_fullstack(
grpc_channel_args_destroy(new_client_args);
grpc_channel_credentials_release(ssl_creds);
grpc_call_credentials_release(oauth2_creds);
- grpc_exec_ctx_finish();
}
static int fail_server_auth_check(grpc_channel_args* server_args) {
diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.cc b/test/core/end2end/fixtures/h2_sockpair+trace.cc
index 391de0bd0b..9e87a22962 100644
--- a/test/core/end2end/fixtures/h2_sockpair+trace.cc
+++ b/test/core/end2end/fixtures/h2_sockpair+trace.cc
@@ -55,7 +55,6 @@ static void server_setup_transport(void* ts, grpc_transport* transport) {
grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq));
grpc_server_setup_transport(f->server, transport, NULL,
grpc_server_get_channel_args(f->server));
- grpc_exec_ctx_finish();
}
typedef struct {
@@ -98,7 +97,6 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f,
client_setup_transport(&cs, transport);
GPR_ASSERT(f->client);
grpc_chttp2_transport_start_reading(transport, NULL);
- grpc_exec_ctx_finish();
}
static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f,
@@ -113,7 +111,6 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f,
transport = grpc_create_chttp2_transport(server_args, sfd->server, 0);
server_setup_transport(f, transport);
grpc_chttp2_transport_start_reading(transport, NULL);
- grpc_exec_ctx_finish();
}
static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) {
@@ -143,7 +140,6 @@ int main(int argc, char** argv) {
grpc_test_init(argc, argv);
grpc_end2end_tests_pre_init();
grpc_init();
- grpc_exec_ctx_finish();
GPR_ASSERT(0 == grpc_tracer_set_enabled("also-doesnt-exist", 0));
GPR_ASSERT(1 == grpc_tracer_set_enabled("http", 1));
diff --git a/test/core/end2end/fixtures/h2_sockpair.cc b/test/core/end2end/fixtures/h2_sockpair.cc
index 4e7eb3dbb8..fa69ad84cf 100644
--- a/test/core/end2end/fixtures/h2_sockpair.cc
+++ b/test/core/end2end/fixtures/h2_sockpair.cc
@@ -49,7 +49,6 @@ static void server_setup_transport(void* ts, grpc_transport* transport) {
grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq));
grpc_server_setup_transport(f->server, transport, NULL,
grpc_server_get_channel_args(f->server));
- grpc_exec_ctx_finish();
}
typedef struct {
@@ -92,7 +91,6 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f,
client_setup_transport(&cs, transport);
GPR_ASSERT(f->client);
grpc_chttp2_transport_start_reading(transport, NULL);
- grpc_exec_ctx_finish();
}
static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f,
@@ -107,7 +105,6 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f,
transport = grpc_create_chttp2_transport(server_args, sfd->server, 0);
server_setup_transport(f, transport);
grpc_chttp2_transport_start_reading(transport, NULL);
- grpc_exec_ctx_finish();
}
static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) {
diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.cc b/test/core/end2end/fixtures/h2_sockpair_1byte.cc
index cfa32d4a27..a12d60575b 100644
--- a/test/core/end2end/fixtures/h2_sockpair_1byte.cc
+++ b/test/core/end2end/fixtures/h2_sockpair_1byte.cc
@@ -49,7 +49,6 @@ static void server_setup_transport(void* ts, grpc_transport* transport) {
grpc_endpoint_add_to_pollset(sfd->server, grpc_cq_pollset(f->cq));
grpc_server_setup_transport(f->server, transport, NULL,
grpc_server_get_channel_args(f->server));
- grpc_exec_ctx_finish();
}
typedef struct {
@@ -103,7 +102,6 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture* f,
client_setup_transport(&cs, transport);
GPR_ASSERT(f->client);
grpc_chttp2_transport_start_reading(transport, NULL);
- grpc_exec_ctx_finish();
}
static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f,
@@ -118,7 +116,6 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture* f,
transport = grpc_create_chttp2_transport(server_args, sfd->server, 0);
server_setup_transport(f, transport);
grpc_chttp2_transport_start_reading(transport, NULL);
- grpc_exec_ctx_finish();
}
static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture* f) {
diff --git a/test/core/end2end/fixtures/h2_ssl.cc b/test/core/end2end/fixtures/h2_ssl.cc
index ac555d9ee8..c137cec8b9 100644
--- a/test/core/end2end/fixtures/h2_ssl.cc
+++ b/test/core/end2end/fixtures/h2_ssl.cc
@@ -112,7 +112,6 @@ static void chttp2_init_client_simple_ssl_secure_fullstack(
{
ExecCtx _local_exec_ctx;
grpc_channel_args_destroy(new_client_args);
- grpc_exec_ctx_finish();
}
}
diff --git a/test/core/end2end/fixtures/h2_ssl_proxy.cc b/test/core/end2end/fixtures/h2_ssl_proxy.cc
index 66c5b167e1..0c130d6ae1 100644
--- a/test/core/end2end/fixtures/h2_ssl_proxy.cc
+++ b/test/core/end2end/fixtures/h2_ssl_proxy.cc
@@ -68,7 +68,6 @@ static grpc_channel* create_proxy_client(const char* target,
{
ExecCtx _local_exec_ctx;
grpc_channel_args_destroy(new_client_args);
- grpc_exec_ctx_finish();
}
return channel;
}
@@ -150,7 +149,6 @@ static void chttp2_init_client_simple_ssl_secure_fullstack(
{
ExecCtx _local_exec_ctx;
grpc_channel_args_destroy(new_client_args);
- grpc_exec_ctx_finish();
}
}
diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc
index b3ec44d77b..73a3e2c444 100644
--- a/test/core/end2end/fixtures/http_proxy_fixture.cc
+++ b/test/core/end2end/fixtures/http_proxy_fixture.cc
@@ -391,7 +391,7 @@ static void on_read_request_done(void* arg, grpc_error* error) {
GPR_ASSERT(resolved_addresses->naddrs >= 1);
// Connect to requested address.
// The connection callback inherits our reference to conn.
- const grpc_millis deadline = grpc_exec_ctx_now() + 10 * GPR_MS_PER_SEC;
+ const grpc_millis deadline = ExecCtx::Get()->Now() + 10 * GPR_MS_PER_SEC;
grpc_tcp_client_connect(&conn->on_server_connect_done, &conn->server_endpoint,
conn->pollset_set, NULL,
&resolved_addresses->addrs[0], deadline);
@@ -449,13 +449,13 @@ static void thread_main(void* arg) {
gpr_ref(&proxy->users);
grpc_pollset_worker* worker = NULL;
gpr_mu_lock(proxy->mu);
- GRPC_LOG_IF_ERROR("grpc_pollset_work",
- grpc_pollset_work(proxy->pollset, &worker,
- grpc_exec_ctx_now() + GPR_MS_PER_SEC));
+ GRPC_LOG_IF_ERROR(
+ "grpc_pollset_work",
+ grpc_pollset_work(proxy->pollset, &worker,
+ ExecCtx::Get()->Now() + GPR_MS_PER_SEC));
gpr_mu_unlock(proxy->mu);
- grpc_exec_ctx_flush();
+ ExecCtx::Get()->Flush();
} while (!gpr_unref(&proxy->users));
- grpc_exec_ctx_finish();
}
grpc_end2end_http_proxy* grpc_end2end_http_proxy_create(
@@ -489,7 +489,7 @@ grpc_end2end_http_proxy* grpc_end2end_http_proxy_create(
proxy->pollset = (grpc_pollset*)gpr_zalloc(grpc_pollset_size());
grpc_pollset_init(proxy->pollset, &proxy->mu);
grpc_tcp_server_start(proxy->server, &proxy->pollset, 1, on_accept, proxy);
- grpc_exec_ctx_finish();
+
// Start proxy thread.
gpr_thd_options opt = gpr_thd_options_default();
gpr_thd_options_set_joinable(&opt);
@@ -516,7 +516,6 @@ void grpc_end2end_http_proxy_destroy(grpc_end2end_http_proxy* proxy) {
grpc_schedule_on_exec_ctx));
GRPC_COMBINER_UNREF(proxy->combiner, "test");
gpr_free(proxy);
- grpc_exec_ctx_finish();
}
const char* grpc_end2end_http_proxy_get_proxy_name(
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 04:26:01 +0000