aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core/security
diff options
context:
space:
mode:
Diffstat (limited to 'test/core/security')
-rw-r--r--test/core/security/oauth2_utils.c10
-rw-r--r--test/core/security/print_google_default_creds_token.c20
-rw-r--r--test/core/security/secure_endpoint_test.c6
-rw-r--r--test/core/security/verify_jwt.c16
4 files changed, 24 insertions, 28 deletions
diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c
index 3280eac801..9b70afffe1 100644
--- a/test/core/security/oauth2_utils.c
+++ b/test/core/security/oauth2_utils.c
@@ -45,7 +45,7 @@
#include "src/core/security/credentials.h"
typedef struct {
- gpr_mu mu;
+ gpr_mu *mu;
grpc_pollset *pollset;
int is_done;
char *token;
@@ -67,11 +67,11 @@ static void on_oauth2_response(grpc_exec_ctx *exec_ctx, void *user_data,
GPR_SLICE_LENGTH(token_slice));
token[GPR_SLICE_LENGTH(token_slice)] = '\0';
}
- gpr_mu_lock(&request->mu);
+ gpr_mu_lock(request->mu);
request->is_done = 1;
request->token = token;
grpc_pollset_kick(request->pollset, NULL);
- gpr_mu_unlock(&request->mu);
+ gpr_mu_unlock(request->mu);
}
static void do_nothing(grpc_exec_ctx *exec_ctx, void *unused, bool success) {}
@@ -95,14 +95,14 @@ char *grpc_test_fetch_oauth2_token_with_credentials(
grpc_exec_ctx_finish(&exec_ctx);
- gpr_mu_lock(&request.mu);
+ gpr_mu_lock(request.mu);
while (!request.is_done) {
grpc_pollset_worker *worker = NULL;
grpc_pollset_work(&exec_ctx, request.pollset, &worker,
gpr_now(GPR_CLOCK_MONOTONIC),
gpr_inf_future(GPR_CLOCK_MONOTONIC));
}
- gpr_mu_unlock(&request.mu);
+ gpr_mu_unlock(request.mu);
grpc_pollset_shutdown(&exec_ctx, request.pollset, &do_nothing_closure);
grpc_exec_ctx_finish(&exec_ctx);
diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c
index 2145a79ff9..09673f362c 100644
--- a/test/core/security/print_google_default_creds_token.c
+++ b/test/core/security/print_google_default_creds_token.c
@@ -46,7 +46,7 @@
#include "src/core/support/string.h"
typedef struct {
- gpr_mu mu;
+ gpr_mu *mu;
grpc_pollset *pollset;
int is_done;
} synchronizer;
@@ -64,10 +64,10 @@ static void on_metadata_response(grpc_exec_ctx *exec_ctx, void *user_data,
printf("\nGot token: %s\n\n", token);
gpr_free(token);
}
- gpr_mu_lock(&sync->mu);
+ gpr_mu_lock(sync->mu);
sync->is_done = 1;
grpc_pollset_kick(sync->pollset, NULL);
- gpr_mu_unlock(&sync->mu);
+ gpr_mu_unlock(sync->mu);
}
int main(int argc, char **argv) {
@@ -94,7 +94,6 @@ int main(int argc, char **argv) {
}
sync.pollset = gpr_malloc(grpc_pollset_size());
- gpr_mu_init(&sync.mu);
grpc_pollset_init(sync.pollset, &sync.mu);
sync.is_done = 0;
@@ -102,21 +101,22 @@ int main(int argc, char **argv) {
&exec_ctx, ((grpc_composite_channel_credentials *)creds)->call_creds,
sync.pollset, context, on_metadata_response, &sync);
- gpr_mu_lock(&sync.mu);
+ gpr_mu_lock(sync.mu);
while (!sync.is_done) {
grpc_pollset_worker *worker = NULL;
grpc_pollset_work(&exec_ctx, sync.pollset, &worker,
gpr_now(GPR_CLOCK_MONOTONIC),
gpr_inf_future(GPR_CLOCK_MONOTONIC));
- gpr_mu_unlock(&sync.mu);
- grpc_exec_ctx_finish(&exec_ctx);
- gpr_mu_lock(&sync.mu);
+ gpr_mu_unlock(sync.mu);
+ grpc_exec_ctx_flush(&exec_ctx);
+ gpr_mu_lock(sync.mu);
}
- gpr_mu_unlock(&sync.mu);
+ gpr_mu_unlock(sync.mu);
+
+ grpc_exec_ctx_finish(&exec_ctx);
grpc_channel_credentials_release(creds);
gpr_free(sync.pollset);
- gpr_mu_destroy(&sync.mu);
end:
gpr_cmdline_destroy(cl);
diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c
index 61543ada43..0e8c38a53e 100644
--- a/test/core/security/secure_endpoint_test.c
+++ b/test/core/security/secure_endpoint_test.c
@@ -45,7 +45,7 @@
#include "src/core/tsi/fake_transport_security.h"
#include "test/core/util/test_config.h"
-static gpr_mu g_mu;
+static gpr_mu *g_mu;
static grpc_pollset *g_pollset;
static grpc_endpoint_test_fixture secure_endpoint_create_fixture_tcp_socketpair(
@@ -183,9 +183,8 @@ int main(int argc, char **argv) {
grpc_init();
g_pollset = gpr_malloc(grpc_pollset_size());
- gpr_mu_init(&g_mu);
grpc_pollset_init(g_pollset, &g_mu);
- grpc_endpoint_tests(configs[0], g_pollset, &g_mu);
+ grpc_endpoint_tests(configs[0], g_pollset, g_mu);
test_leftover(configs[1], 1);
grpc_closure_init(&destroyed, destroy_pollset, g_pollset);
grpc_pollset_shutdown(&exec_ctx, g_pollset, &destroyed);
@@ -193,7 +192,6 @@ int main(int argc, char **argv) {
grpc_shutdown();
gpr_free(g_pollset);
- gpr_mu_destroy(&g_mu);
return 0;
}
diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.c
index c3cf6bb739..eb86589681 100644
--- a/test/core/security/verify_jwt.c
+++ b/test/core/security/verify_jwt.c
@@ -46,7 +46,7 @@
typedef struct {
grpc_pollset *pollset;
- gpr_mu mu;
+ gpr_mu *mu;
int is_done;
int success;
} synchronizer;
@@ -79,10 +79,10 @@ static void on_jwt_verification_done(void *user_data,
grpc_jwt_verifier_status_to_string(status));
}
- gpr_mu_lock(&sync->mu);
+ gpr_mu_lock(sync->mu);
sync->is_done = 1;
grpc_pollset_kick(sync->pollset, NULL);
- gpr_mu_unlock(&sync->mu);
+ gpr_mu_unlock(sync->mu);
}
int main(int argc, char **argv) {
@@ -106,26 +106,24 @@ int main(int argc, char **argv) {
grpc_init();
sync.pollset = gpr_malloc(grpc_pollset_size());
- gpr_mu_init(&sync.mu);
grpc_pollset_init(sync.pollset, &sync.mu);
sync.is_done = 0;
grpc_jwt_verifier_verify(&exec_ctx, verifier, sync.pollset, jwt, aud,
on_jwt_verification_done, &sync);
- gpr_mu_lock(&sync.mu);
+ gpr_mu_lock(sync.mu);
while (!sync.is_done) {
grpc_pollset_worker *worker = NULL;
grpc_pollset_work(&exec_ctx, sync.pollset, &worker,
gpr_now(GPR_CLOCK_MONOTONIC),
gpr_inf_future(GPR_CLOCK_MONOTONIC));
- gpr_mu_unlock(&sync.mu);
+ gpr_mu_unlock(sync.mu);
grpc_exec_ctx_finish(&exec_ctx);
- gpr_mu_lock(&sync.mu);
+ gpr_mu_lock(sync.mu);
}
- gpr_mu_unlock(&sync.mu);
+ gpr_mu_unlock(sync.mu);
- gpr_mu_destroy(&sync.mu);
gpr_free(sync.pollset);
grpc_jwt_verifier_destroy(verifier);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 14:30:06 +0000