Chiebot-Mirror
/
grpc
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

moar renamings

Browse Source
pull/6190/head
David Garcia Quintas 9 years ago
parent 2a50dfefdc
commit c4d5112719
14 changed files with 71 additions and 71 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/core/ext/lb_policy/pick_first/pick_first.c
  2. 8
      src/core/ext/lb_policy/round_robin/round_robin.c
  3. 4
      src/core/lib/http/httpcli.c
  4. 14
      src/core/lib/iomgr/polling_entity.c
  5. 14
      src/core/lib/iomgr/polling_entity.h
  6. 12
      src/core/lib/security/credentials/google_default/google_default_credentials.c
  7. 2
      src/core/lib/security/credentials/jwt/jwt_verifier.c
  8. 10
      src/core/lib/surface/call.c
  9. 4
      src/core/lib/transport/transport.c
  10. 14
      test/core/http/httpcli_test.c
  11. 14
      test/core/http/httpscli_test.c
  12. 10
      test/core/security/oauth2_utils.c
  13. 8
      test/core/security/print_google_default_creds_token.c
  14. 18
      test/core/util/port_server_client.c

10
src/core/ext/lb_policy/pick_first/pick_first.c
Unescape View File

@ -118,7 +118,7 @@ static void pf_shutdown(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol) {
while (pp != NULL) { while (pp != NULL) {
pending_pick *next = pp->next; pending_pick *next = pp->next;
*pp->target = NULL; *pp->target = NULL;
grpc_pops_del_to_pollset_set(exec_ctx, pp->pollent, grpc_polling_entity_del_from_pollset_set(exec_ctx, pp->pollent,
p->base.interested_parties); p->base.interested_parties);
grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, true, NULL); grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, true, NULL);
gpr_free(pp); gpr_free(pp);
@ -136,7 +136,7 @@ static void pf_cancel_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
while (pp != NULL) { while (pp != NULL) {
pending_pick *next = pp->next; pending_pick *next = pp->next;
if (pp->target == target) { if (pp->target == target) {
grpc_pops_del_to_pollset_set(exec_ctx, pp->pollent, grpc_polling_entity_del_from_pollset_set(exec_ctx, pp->pollent,
p->base.interested_parties); p->base.interested_parties);
*target = NULL; *target = NULL;
grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, false, NULL); grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, false, NULL);
@ -162,7 +162,7 @@ static void pf_cancel_picks(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
pending_pick *next = pp->next; pending_pick *next = pp->next;
if ((pp->initial_metadata_flags & initial_metadata_flags_mask) == if ((pp->initial_metadata_flags & initial_metadata_flags_mask) ==
initial_metadata_flags_eq) { initial_metadata_flags_eq) {
grpc_pops_del_to_pollset_set(exec_ctx, pp->pollent, grpc_polling_entity_del_from_pollset_set(exec_ctx, pp->pollent,
p->base.interested_parties); p->base.interested_parties);
grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, false, NULL); grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, false, NULL);
gpr_free(pp); gpr_free(pp);
@ -222,7 +222,7 @@ static int pf_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
if (!p->started_picking) { if (!p->started_picking) {
start_picking(exec_ctx, p); start_picking(exec_ctx, p);
} }
grpc_pops_add_to_pollset_set(exec_ctx, pollent, p->base.interested_parties); grpc_polling_entity_add_to_pollset_set(exec_ctx, pollent, p->base.interested_parties);
pp = gpr_malloc(sizeof(*pp)); pp = gpr_malloc(sizeof(*pp));
pp->next = p->pending_picks; pp->next = p->pending_picks;
pp->pollent = pollent; pp->pollent = pollent;
@ -305,7 +305,7 @@ static void pf_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg,
while ((pp = p->pending_picks)) { while ((pp = p->pending_picks)) {
p->pending_picks = pp->next; p->pending_picks = pp->next;
*pp->target = selected; *pp->target = selected;
grpc_pops_del_to_pollset_set(exec_ctx, pp->pollent, grpc_polling_entity_del_from_pollset_set(exec_ctx, pp->pollent,
p->base.interested_parties); p->base.interested_parties);
grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, true, NULL); grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, true, NULL);
gpr_free(pp); gpr_free(pp);

8
src/core/ext/lb_policy/round_robin/round_robin.c
Unescape View File

@ -262,7 +262,7 @@ static void rr_cancel_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
while (pp != NULL) { while (pp != NULL) {
pending_pick *next = pp->next; pending_pick *next = pp->next;
if (pp->target == target) { if (pp->target == target) {
grpc_pops_del_to_pollset_set(exec_ctx, pp->pollent, grpc_polling_entity_del_from_pollset_set(exec_ctx, pp->pollent,
p->base.interested_parties); p->base.interested_parties);
*target = NULL; *target = NULL;
grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, false, NULL); grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, false, NULL);
@ -288,7 +288,7 @@ static void rr_cancel_picks(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
pending_pick *next = pp->next; pending_pick *next = pp->next;
if ((pp->initial_metadata_flags & initial_metadata_flags_mask) == if ((pp->initial_metadata_flags & initial_metadata_flags_mask) ==
initial_metadata_flags_eq) { initial_metadata_flags_eq) {
grpc_pops_del_to_pollset_set(exec_ctx, pp->pollent, grpc_polling_entity_del_from_pollset_set(exec_ctx, pp->pollent,
p->base.interested_parties); p->base.interested_parties);
*pp->target = NULL; *pp->target = NULL;
grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, false, NULL); grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, false, NULL);
@ -355,7 +355,7 @@ static int rr_pick(grpc_exec_ctx *exec_ctx, grpc_lb_policy *pol,
if (!p->started_picking) { if (!p->started_picking) {
start_picking(exec_ctx, p); start_picking(exec_ctx, p);
} }
grpc_pops_add_to_pollset_set(exec_ctx, pollent, p->base.interested_parties); grpc_polling_entity_add_to_pollset_set(exec_ctx, pollent, p->base.interested_parties);
pp = gpr_malloc(sizeof(*pp)); pp = gpr_malloc(sizeof(*pp));
pp->next = p->pending_picks; pp->next = p->pending_picks;
pp->pollent = pollent; pp->pollent = pollent;
@ -407,7 +407,7 @@ static void rr_connectivity_changed(grpc_exec_ctx *exec_ctx, void *arg,
"[RR CONN CHANGED] TARGET <-- SUBCHANNEL %p (NODE %p)", "[RR CONN CHANGED] TARGET <-- SUBCHANNEL %p (NODE %p)",
selected->subchannel, selected); selected->subchannel, selected);
} }
grpc_pops_del_to_pollset_set(exec_ctx, pp->pollent, grpc_polling_entity_del_from_pollset_set(exec_ctx, pp->pollent,
p->base.interested_parties); p->base.interested_parties);
grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, true, NULL); grpc_exec_ctx_enqueue(exec_ctx, pp->on_complete, true, NULL);
gpr_free(pp); gpr_free(pp);

4
src/core/lib/http/httpcli.c
Unescape View File

@ -97,7 +97,7 @@ static void next_address(grpc_exec_ctx *exec_ctx, internal_request *req);
static void finish(grpc_exec_ctx *exec_ctx, internal_request *req, static void finish(grpc_exec_ctx *exec_ctx, internal_request *req,
int success) { int success) {
grpc_pops_del_to_pollset_set(exec_ctx, req->pollent, grpc_polling_entity_del_from_pollset_set(exec_ctx, req->pollent,
req->context->pollset_set); req->context->pollset_set);
req->on_response(exec_ctx, req->user_data, req->on_response(exec_ctx, req->user_data,
success ? &req->parser.http.response : NULL); success ? &req->parser.http.response : NULL);
@ -245,7 +245,7 @@ static void internal_request_begin(
req->ssl_host_override = gpr_strdup(request->ssl_host_override); req->ssl_host_override = gpr_strdup(request->ssl_host_override);
GPR_ASSERT(pollent); GPR_ASSERT(pollent);
grpc_pops_add_to_pollset_set(exec_ctx, req->pollent, grpc_polling_entity_add_to_pollset_set(exec_ctx, req->pollent,
req->context->pollset_set); req->context->pollset_set);
grpc_resolve_address(exec_ctx, request->host, req->handshaker->default_port, grpc_resolve_address(exec_ctx, request->host, req->handshaker->default_port,
on_resolved, req); on_resolved, req);

14
src/core/lib/iomgr/polling_entity.c
Unescape View File

@ -36,7 +36,7 @@
#include "src/core/lib/iomgr/polling_entity.h" #include "src/core/lib/iomgr/polling_entity.h"
grpc_polling_entity grpc_pops_create_from_pollset_set( grpc_polling_entity grpc_polling_entity_create_from_pollset_set(
grpc_pollset_set *pollset_set) { grpc_pollset_set *pollset_set) {
grpc_polling_entity pollent; grpc_polling_entity pollent;
pollent.pollent.pollset_set = pollset_set; pollent.pollent.pollset_set = pollset_set;
@ -44,32 +44,32 @@ grpc_polling_entity grpc_pops_create_from_pollset_set(
return pollent; return pollent;
} }
grpc_polling_entity grpc_pops_create_from_pollset(grpc_pollset *pollset) { grpc_polling_entity grpc_polling_entity_create_from_pollset(grpc_pollset *pollset) {
grpc_polling_entity pollent; grpc_polling_entity pollent;
pollent.pollent.pollset = pollset; pollent.pollent.pollset = pollset;
pollent.tag = POPS_POLLSET; pollent.tag = POPS_POLLSET;
return pollent; return pollent;
} }
grpc_pollset *grpc_pops_pollset(grpc_polling_entity *pollent) { grpc_pollset *grpc_polling_entity_pollset(grpc_polling_entity *pollent) {
if (pollent->tag == POPS_POLLSET) { if (pollent->tag == POPS_POLLSET) {
return pollent->pollent.pollset; return pollent->pollent.pollset;
} }
return NULL; return NULL;
} }
grpc_pollset_set *grpc_pops_pollset_set(grpc_polling_entity *pollent) { grpc_pollset_set *grpc_polling_entity_pollset_set(grpc_polling_entity *pollent) {
if (pollent->tag == POPS_POLLSET_SET) { if (pollent->tag == POPS_POLLSET_SET) {
return pollent->pollent.pollset_set; return pollent->pollent.pollset_set;
} }
return NULL; return NULL;
} }
bool grpc_pops_is_empty(const grpc_polling_entity *pollent) { bool grpc_polling_entity_is_empty(const grpc_polling_entity *pollent) {
return pollent->tag == POPS_NONE; return pollent->tag == POPS_NONE;
} }
void grpc_pops_add_to_pollset_set(grpc_exec_ctx *exec_ctx, void grpc_polling_entity_add_to_pollset_set(grpc_exec_ctx *exec_ctx,
grpc_polling_entity *pollent, grpc_polling_entity *pollent,
grpc_pollset_set *pss_dst) { grpc_pollset_set *pss_dst) {
if (pollent->tag == POPS_POLLSET) { if (pollent->tag == POPS_POLLSET) {
@ -85,7 +85,7 @@ void grpc_pops_add_to_pollset_set(grpc_exec_ctx *exec_ctx,
} }
} }
void grpc_pops_del_to_pollset_set(grpc_exec_ctx *exec_ctx, void grpc_polling_entity_del_from_pollset_set(grpc_exec_ctx *exec_ctx,
grpc_polling_entity *pollent, grpc_polling_entity *pollent,
grpc_pollset_set *pss_dst) { grpc_pollset_set *pss_dst) {
if (pollent->tag == POPS_POLLSET) { if (pollent->tag == POPS_POLLSET) {

14
src/core/lib/iomgr/polling_entity.h
Unescape View File

@ -50,29 +50,29 @@ typedef struct grpc_polling_entity {
enum pops_tag { POPS_NONE, POPS_POLLSET, POPS_POLLSET_SET } tag; enum pops_tag { POPS_NONE, POPS_POLLSET, POPS_POLLSET_SET } tag;
} grpc_polling_entity; } grpc_polling_entity;
grpc_polling_entity grpc_pops_create_from_pollset_set( grpc_polling_entity grpc_polling_entity_create_from_pollset_set(
grpc_pollset_set *pollset_set); grpc_pollset_set *pollset_set);
grpc_polling_entity grpc_pops_create_from_pollset(grpc_pollset *pollset); grpc_polling_entity grpc_polling_entity_create_from_pollset(grpc_pollset *pollset);
/** If \a pollent contains a pollset, return it. Otherwise, return NULL */ /** If \a pollent contains a pollset, return it. Otherwise, return NULL */
grpc_pollset *grpc_pops_pollset(grpc_polling_entity *pollent); grpc_pollset *grpc_polling_entity_pollset(grpc_polling_entity *pollent);
/** If \a pollent contains a pollset_set, return it. Otherwise, return NULL */ /** If \a pollent contains a pollset_set, return it. Otherwise, return NULL */
grpc_pollset_set *grpc_pops_pollset_set(grpc_polling_entity *pollent); grpc_pollset_set *grpc_polling_entity_pollset_set(grpc_polling_entity *pollent);
bool grpc_pops_is_empty(const grpc_polling_entity *pollent); bool grpc_polling_entity_is_empty(const grpc_polling_entity *pollent);
/** Add the pollset or pollset_set in \a pollent to the destination pollset_set /** Add the pollset or pollset_set in \a pollent to the destination pollset_set
* \a * \a
* pss_dst */ * pss_dst */
void grpc_pops_add_to_pollset_set(grpc_exec_ctx *exec_ctx, void grpc_polling_entity_add_to_pollset_set(grpc_exec_ctx *exec_ctx,
grpc_polling_entity *pollent, grpc_polling_entity *pollent,
grpc_pollset_set *pss_dst); grpc_pollset_set *pss_dst);
/** Delete the pollset or pollset_set in \a pollent from the destination /** Delete the pollset or pollset_set in \a pollent from the destination
* pollset_set \a * pollset_set \a
* pss_dst */ * pss_dst */
void grpc_pops_del_to_pollset_set(grpc_exec_ctx *exec_ctx, void grpc_polling_entity_del_from_pollset_set(grpc_exec_ctx *exec_ctx,
grpc_polling_entity *pollent, grpc_polling_entity *pollent,
grpc_pollset_set *pss_dst); grpc_pollset_set *pss_dst);
/* pollset_set specific */ /* pollset_set specific */

12
src/core/lib/security/credentials/google_default/google_default_credentials.c
Unescape View File

@ -87,7 +87,7 @@ static void on_compute_engine_detection_http_response(
} }
gpr_mu_lock(g_polling_mu); gpr_mu_lock(g_polling_mu);
detector->is_done = 1; detector->is_done = 1;
grpc_pollset_kick(grpc_pops_pollset(&detector->pollent), NULL); grpc_pollset_kick(grpc_polling_entity_pollset(&detector->pollent), NULL);
gpr_mu_unlock(g_polling_mu); gpr_mu_unlock(g_polling_mu);
} }
@ -108,7 +108,7 @@ static int is_stack_running_on_compute_engine(void) {
grpc_pollset *pollset = gpr_malloc(grpc_pollset_size()); grpc_pollset *pollset = gpr_malloc(grpc_pollset_size());
grpc_pollset_init(pollset, &g_polling_mu); grpc_pollset_init(pollset, &g_polling_mu);
detector.pollent = grpc_pops_create_from_pollset(pollset); detector.pollent = grpc_polling_entity_create_from_pollset(pollset);
detector.is_done = 0; detector.is_done = 0;
detector.success = 0; detector.success = 0;
@ -130,7 +130,7 @@ static int is_stack_running_on_compute_engine(void) {
gpr_mu_lock(g_polling_mu); gpr_mu_lock(g_polling_mu);
while (!detector.is_done) { while (!detector.is_done) {
grpc_pollset_worker *worker = NULL; grpc_pollset_worker *worker = NULL;
grpc_pollset_work(&exec_ctx, grpc_pops_pollset(&detector.pollent), &worker, grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&detector.pollent), &worker,
gpr_now(GPR_CLOCK_MONOTONIC), gpr_now(GPR_CLOCK_MONOTONIC),
gpr_inf_future(GPR_CLOCK_MONOTONIC)); gpr_inf_future(GPR_CLOCK_MONOTONIC));
} }
@ -138,13 +138,13 @@ static int is_stack_running_on_compute_engine(void) {
grpc_httpcli_context_destroy(&context); grpc_httpcli_context_destroy(&context);
grpc_closure_init(&destroy_closure, destroy_pollset, grpc_closure_init(&destroy_closure, destroy_pollset,
grpc_pops_pollset(&detector.pollent)); grpc_polling_entity_pollset(&detector.pollent));
grpc_pollset_shutdown(&exec_ctx, grpc_pops_pollset(&detector.pollent), grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&detector.pollent),
&destroy_closure); &destroy_closure);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
g_polling_mu = NULL; g_polling_mu = NULL;
gpr_free(grpc_pops_pollset(&detector.pollent)); gpr_free(grpc_polling_entity_pollset(&detector.pollent));
return detector.success; return detector.success;
} }

2
src/core/lib/security/credentials/jwt/jwt_verifier.c
Unescape View File

@ -342,7 +342,7 @@ static verifier_cb_ctx *verifier_cb_ctx_create(
verifier_cb_ctx *ctx = gpr_malloc(sizeof(verifier_cb_ctx)); verifier_cb_ctx *ctx = gpr_malloc(sizeof(verifier_cb_ctx));
memset(ctx, 0, sizeof(verifier_cb_ctx)); memset(ctx, 0, sizeof(verifier_cb_ctx));
ctx->verifier = verifier; ctx->verifier = verifier;
ctx->pollent = grpc_pops_create_from_pollset(pollset); ctx->pollent = grpc_polling_entity_create_from_pollset(pollset);
ctx->header = header; ctx->header = header;
ctx->audience = gpr_strdup(audience); ctx->audience = gpr_strdup(audience);
ctx->claims = claims; ctx->claims = claims;

10
src/core/lib/surface/call.c
Unescape View File

@ -289,12 +289,12 @@ grpc_call *grpc_call_create(
pollset_set_alternative == NULL && pollset_set_alternative == NULL &&
"Only one of 'cq' and 'pollset_set_alternative' should be non-NULL."); "Only one of 'cq' and 'pollset_set_alternative' should be non-NULL.");
GRPC_CQ_INTERNAL_REF(cq, "bind"); GRPC_CQ_INTERNAL_REF(cq, "bind");
call->pollent = grpc_pops_create_from_pollset(grpc_cq_pollset(cq)); call->pollent = grpc_polling_entity_create_from_pollset(grpc_cq_pollset(cq));
} }
if (pollset_set_alternative != NULL) { if (pollset_set_alternative != NULL) {
call->pollent = grpc_pops_create_from_pollset_set(pollset_set_alternative); call->pollent = grpc_polling_entity_create_from_pollset_set(pollset_set_alternative);
} }
if (!grpc_pops_is_empty(&call->pollent)) { if (!grpc_polling_entity_is_empty(&call->pollent)) {
grpc_call_stack_set_pollset_or_pollset_set( grpc_call_stack_set_pollset_or_pollset_set(
&exec_ctx, CALL_STACK_FROM_CALL(call), &call->pollent); &exec_ctx, CALL_STACK_FROM_CALL(call), &call->pollent);
} }
@ -352,13 +352,13 @@ void grpc_call_set_completion_queue(grpc_exec_ctx *exec_ctx, grpc_call *call,
grpc_completion_queue *cq) { grpc_completion_queue *cq) {
GPR_ASSERT(cq); GPR_ASSERT(cq);
if (grpc_pops_pollset_set(&call->pollent) != NULL) { if (grpc_polling_entity_pollset_set(&call->pollent) != NULL) {
gpr_log(GPR_ERROR, "A pollset_set is already registered for this call."); gpr_log(GPR_ERROR, "A pollset_set is already registered for this call.");
abort(); abort();
} }
call->cq = cq; call->cq = cq;
GRPC_CQ_INTERNAL_REF(cq, "bind"); GRPC_CQ_INTERNAL_REF(cq, "bind");
call->pollent = grpc_pops_create_from_pollset(grpc_cq_pollset(cq)); call->pollent = grpc_polling_entity_create_from_pollset(grpc_cq_pollset(cq));
grpc_call_stack_set_pollset_or_pollset_set( grpc_call_stack_set_pollset_or_pollset_set(
exec_ctx, CALL_STACK_FROM_CALL(call), &call->pollent); exec_ctx, CALL_STACK_FROM_CALL(call), &call->pollent);
} }

4
src/core/lib/transport/transport.c
Unescape View File

@ -130,9 +130,9 @@ void grpc_transport_set_pops(grpc_exec_ctx *exec_ctx, grpc_transport *transport,
grpc_polling_entity *pollent) { grpc_polling_entity *pollent) {
grpc_pollset *pollset; grpc_pollset *pollset;
grpc_pollset_set *pollset_set; grpc_pollset_set *pollset_set;
if ((pollset = grpc_pops_pollset(pollent)) != NULL) { if ((pollset = grpc_polling_entity_pollset(pollent)) != NULL) {
transport->vtable->set_pollset(exec_ctx, transport, stream, pollset); transport->vtable->set_pollset(exec_ctx, transport, stream, pollset);
} else if ((pollset_set = grpc_pops_pollset_set(pollent)) != NULL) { } else if ((pollset_set = grpc_polling_entity_pollset_set(pollent)) != NULL) {
transport->vtable->set_pollset_set(exec_ctx, transport, stream, transport->vtable->set_pollset_set(exec_ctx, transport, stream,
pollset_set); pollset_set);
} else { } else {

14
test/core/http/httpcli_test.c
Unescape View File

@ -66,7 +66,7 @@ static void on_finish(grpc_exec_ctx *exec_ctx, void *arg,
GPR_ASSERT(0 == memcmp(expect, response->body, response->body_length)); GPR_ASSERT(0 == memcmp(expect, response->body, response->body_length));
gpr_mu_lock(g_mu); gpr_mu_lock(g_mu);
g_done = 1; g_done = 1;
grpc_pollset_kick(grpc_pops_pollset(&g_pops), NULL); grpc_pollset_kick(grpc_polling_entity_pollset(&g_pops), NULL);
gpr_mu_unlock(g_mu); gpr_mu_unlock(g_mu);
} }
@ -91,7 +91,7 @@ static void test_get(int port) {
gpr_mu_lock(g_mu); gpr_mu_lock(g_mu);
while (!g_done) { while (!g_done) {
grpc_pollset_worker *worker = NULL; grpc_pollset_worker *worker = NULL;
grpc_pollset_work(&exec_ctx, grpc_pops_pollset(&g_pops), &worker, grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), &worker,
gpr_now(GPR_CLOCK_MONOTONIC), n_seconds_time(20)); gpr_now(GPR_CLOCK_MONOTONIC), n_seconds_time(20));
gpr_mu_unlock(g_mu); gpr_mu_unlock(g_mu);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
@ -122,7 +122,7 @@ static void test_post(int port) {
gpr_mu_lock(g_mu); gpr_mu_lock(g_mu);
while (!g_done) { while (!g_done) {
grpc_pollset_worker *worker = NULL; grpc_pollset_worker *worker = NULL;
grpc_pollset_work(&exec_ctx, grpc_pops_pollset(&g_pops), &worker, grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), &worker,
gpr_now(GPR_CLOCK_MONOTONIC), n_seconds_time(20)); gpr_now(GPR_CLOCK_MONOTONIC), n_seconds_time(20));
gpr_mu_unlock(g_mu); gpr_mu_unlock(g_mu);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
@ -133,7 +133,7 @@ static void test_post(int port) {
} }
static void destroy_pops(grpc_exec_ctx *exec_ctx, void *p, bool success) { static void destroy_pops(grpc_exec_ctx *exec_ctx, void *p, bool success) {
grpc_pollset_destroy(grpc_pops_pollset(p)); grpc_pollset_destroy(grpc_polling_entity_pollset(p));
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
@ -182,18 +182,18 @@ int main(int argc, char **argv) {
grpc_httpcli_context_init(&g_context); grpc_httpcli_context_init(&g_context);
grpc_pollset *pollset = gpr_malloc(grpc_pollset_size()); grpc_pollset *pollset = gpr_malloc(grpc_pollset_size());
grpc_pollset_init(pollset, &g_mu); grpc_pollset_init(pollset, &g_mu);
g_pops = grpc_pops_create_from_pollset(pollset); g_pops = grpc_polling_entity_create_from_pollset(pollset);
test_get(port); test_get(port);
test_post(port); test_post(port);
grpc_httpcli_context_destroy(&g_context); grpc_httpcli_context_destroy(&g_context);
grpc_closure_init(&destroyed, destroy_pops, &g_pops); grpc_closure_init(&destroyed, destroy_pops, &g_pops);
grpc_pollset_shutdown(&exec_ctx, grpc_pops_pollset(&g_pops), &destroyed); grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&g_pops), &destroyed);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
grpc_shutdown(); grpc_shutdown();
gpr_free(grpc_pops_pollset(&g_pops)); gpr_free(grpc_polling_entity_pollset(&g_pops));
gpr_subprocess_destroy(server); gpr_subprocess_destroy(server);

14
test/core/http/httpscli_test.c
Unescape View File

@ -66,7 +66,7 @@ static void on_finish(grpc_exec_ctx *exec_ctx, void *arg,
GPR_ASSERT(0 == memcmp(expect, response->body, response->body_length)); GPR_ASSERT(0 == memcmp(expect, response->body, response->body_length));
gpr_mu_lock(g_mu); gpr_mu_lock(g_mu);
g_done = 1; g_done = 1;
grpc_pollset_kick(grpc_pops_pollset(&g_pops), NULL); grpc_pollset_kick(grpc_polling_entity_pollset(&g_pops), NULL);
gpr_mu_unlock(g_mu); gpr_mu_unlock(g_mu);
} }
@ -92,7 +92,7 @@ static void test_get(int port) {
gpr_mu_lock(g_mu); gpr_mu_lock(g_mu);
while (!g_done) { while (!g_done) {
grpc_pollset_worker *worker = NULL; grpc_pollset_worker *worker = NULL;
grpc_pollset_work(&exec_ctx, grpc_pops_pollset(&g_pops), &worker, grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), &worker,
gpr_now(GPR_CLOCK_MONOTONIC), n_seconds_time(20)); gpr_now(GPR_CLOCK_MONOTONIC), n_seconds_time(20));
gpr_mu_unlock(g_mu); gpr_mu_unlock(g_mu);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
@ -124,7 +124,7 @@ static void test_post(int port) {
gpr_mu_lock(g_mu); gpr_mu_lock(g_mu);
while (!g_done) { while (!g_done) {
grpc_pollset_worker *worker = NULL; grpc_pollset_worker *worker = NULL;
grpc_pollset_work(&exec_ctx, grpc_pops_pollset(&g_pops), &worker, grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&g_pops), &worker,
gpr_now(GPR_CLOCK_MONOTONIC), n_seconds_time(20)); gpr_now(GPR_CLOCK_MONOTONIC), n_seconds_time(20));
gpr_mu_unlock(g_mu); gpr_mu_unlock(g_mu);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
@ -135,7 +135,7 @@ static void test_post(int port) {
} }
static void destroy_pops(grpc_exec_ctx *exec_ctx, void *p, bool success) { static void destroy_pops(grpc_exec_ctx *exec_ctx, void *p, bool success) {
grpc_pollset_destroy(grpc_pops_pollset(p)); grpc_pollset_destroy(grpc_polling_entity_pollset(p));
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
@ -185,18 +185,18 @@ int main(int argc, char **argv) {
grpc_httpcli_context_init(&g_context); grpc_httpcli_context_init(&g_context);
grpc_pollset *pollset = gpr_malloc(grpc_pollset_size()); grpc_pollset *pollset = gpr_malloc(grpc_pollset_size());
grpc_pollset_init(pollset, &g_mu); grpc_pollset_init(pollset, &g_mu);
g_pops = grpc_pops_create_from_pollset(pollset); g_pops = grpc_polling_entity_create_from_pollset(pollset);
test_get(port); test_get(port);
test_post(port); test_post(port);
grpc_httpcli_context_destroy(&g_context); grpc_httpcli_context_destroy(&g_context);
grpc_closure_init(&destroyed, destroy_pops, &g_pops); grpc_closure_init(&destroyed, destroy_pops, &g_pops);
grpc_pollset_shutdown(&exec_ctx, grpc_pops_pollset(&g_pops), &destroyed); grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&g_pops), &destroyed);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
grpc_shutdown(); grpc_shutdown();
gpr_free(grpc_pops_pollset(&g_pops)); gpr_free(grpc_polling_entity_pollset(&g_pops));
gpr_subprocess_destroy(server); gpr_subprocess_destroy(server);

10
test/core/security/oauth2_utils.c
Unescape View File

@ -70,7 +70,7 @@ static void on_oauth2_response(grpc_exec_ctx *exec_ctx, void *user_data,
gpr_mu_lock(request->mu); gpr_mu_lock(request->mu);
request->is_done = 1; request->is_done = 1;
request->token = token; request->token = token;
grpc_pollset_kick(grpc_pops_pollset(&request->pops), NULL); grpc_pollset_kick(grpc_polling_entity_pollset(&request->pops), NULL);
gpr_mu_unlock(request->mu); gpr_mu_unlock(request->mu);
} }
@ -85,7 +85,7 @@ char *grpc_test_fetch_oauth2_token_with_credentials(
grpc_pollset *pollset = gpr_malloc(grpc_pollset_size()); grpc_pollset *pollset = gpr_malloc(grpc_pollset_size());
grpc_pollset_init(pollset, &request.mu); grpc_pollset_init(pollset, &request.mu);
request.pops = grpc_pops_create_from_pollset(pollset); request.pops = grpc_polling_entity_create_from_pollset(pollset);
request.is_done = 0; request.is_done = 0;
grpc_closure_init(&do_nothing_closure, do_nothing, NULL); grpc_closure_init(&do_nothing_closure, do_nothing, NULL);
@ -98,15 +98,15 @@ char *grpc_test_fetch_oauth2_token_with_credentials(
gpr_mu_lock(request.mu); gpr_mu_lock(request.mu);
while (!request.is_done) { while (!request.is_done) {
grpc_pollset_worker *worker = NULL; grpc_pollset_worker *worker = NULL;
grpc_pollset_work(&exec_ctx, grpc_pops_pollset(&request.pops), &worker, grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&request.pops), &worker,
gpr_now(GPR_CLOCK_MONOTONIC), gpr_now(GPR_CLOCK_MONOTONIC),
gpr_inf_future(GPR_CLOCK_MONOTONIC)); gpr_inf_future(GPR_CLOCK_MONOTONIC));
} }
gpr_mu_unlock(request.mu); gpr_mu_unlock(request.mu);
grpc_pollset_shutdown(&exec_ctx, grpc_pops_pollset(&request.pops), grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&request.pops),
&do_nothing_closure); &do_nothing_closure);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
gpr_free(grpc_pops_pollset(&request.pops)); gpr_free(grpc_polling_entity_pollset(&request.pops));
return request.token; return request.token;
} }

8
test/core/security/print_google_default_creds_token.c
Unescape View File

@ -67,7 +67,7 @@ static void on_metadata_response(grpc_exec_ctx *exec_ctx, void *user_data,
} }
gpr_mu_lock(sync->mu); gpr_mu_lock(sync->mu);
sync->is_done = 1; sync->is_done = 1;
grpc_pollset_kick(grpc_pops_pollset(&sync->pops), NULL); grpc_pollset_kick(grpc_polling_entity_pollset(&sync->pops), NULL);
gpr_mu_unlock(sync->mu); gpr_mu_unlock(sync->mu);
} }
@ -96,7 +96,7 @@ int main(int argc, char **argv) {
grpc_pollset *pollset = gpr_malloc(grpc_pollset_size()); grpc_pollset *pollset = gpr_malloc(grpc_pollset_size());
grpc_pollset_init(pollset, &sync.mu); grpc_pollset_init(pollset, &sync.mu);
sync.pops = grpc_pops_create_from_pollset(pollset); sync.pops = grpc_polling_entity_create_from_pollset(pollset);
sync.is_done = 0; sync.is_done = 0;
grpc_call_credentials_get_request_metadata( grpc_call_credentials_get_request_metadata(
@ -106,7 +106,7 @@ int main(int argc, char **argv) {
gpr_mu_lock(sync.mu); gpr_mu_lock(sync.mu);
while (!sync.is_done) { while (!sync.is_done) {
grpc_pollset_worker *worker = NULL; grpc_pollset_worker *worker = NULL;
grpc_pollset_work(&exec_ctx, grpc_pops_pollset(&sync.pops), &worker, grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&sync.pops), &worker,
gpr_now(GPR_CLOCK_MONOTONIC), gpr_now(GPR_CLOCK_MONOTONIC),
gpr_inf_future(GPR_CLOCK_MONOTONIC)); gpr_inf_future(GPR_CLOCK_MONOTONIC));
gpr_mu_unlock(sync.mu); gpr_mu_unlock(sync.mu);
@ -118,7 +118,7 @@ int main(int argc, char **argv) {
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
grpc_channel_credentials_release(creds); grpc_channel_credentials_release(creds);
gpr_free(grpc_pops_pollset(&sync.pops)); gpr_free(grpc_polling_entity_pollset(&sync.pops));
end: end:
gpr_cmdline_destroy(cl); gpr_cmdline_destroy(cl);

18
test/core/util/port_server_client.c
Unescape View File

@ -57,7 +57,7 @@ typedef struct freereq {
static void destroy_pops_and_shutdown(grpc_exec_ctx *exec_ctx, void *p, static void destroy_pops_and_shutdown(grpc_exec_ctx *exec_ctx, void *p,
bool success) { bool success) {
grpc_pollset *pollset = grpc_pops_pollset(p); grpc_pollset *pollset = grpc_polling_entity_pollset(p);
grpc_pollset_destroy(pollset); grpc_pollset_destroy(pollset);
gpr_free(pollset); gpr_free(pollset);
grpc_shutdown(); grpc_shutdown();
@ -68,7 +68,7 @@ static void freed_port_from_server(grpc_exec_ctx *exec_ctx, void *arg,
freereq *pr = arg; freereq *pr = arg;
gpr_mu_lock(pr->mu); gpr_mu_lock(pr->mu);
pr->done = 1; pr->done = 1;
grpc_pollset_kick(grpc_pops_pollset(&pr->pops), NULL); grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), NULL);
gpr_mu_unlock(pr->mu); gpr_mu_unlock(pr->mu);
} }
@ -87,7 +87,7 @@ void grpc_free_port_using_server(char *server, int port) {
grpc_pollset *pollset = gpr_malloc(grpc_pollset_size()); grpc_pollset *pollset = gpr_malloc(grpc_pollset_size());
grpc_pollset_init(pollset, &pr.mu); grpc_pollset_init(pollset, &pr.mu);
pr.pops = grpc_pops_create_from_pollset(pollset); pr.pops = grpc_polling_entity_create_from_pollset(pollset);
shutdown_closure = grpc_closure_create(destroy_pops_and_shutdown, &pr.pops); shutdown_closure = grpc_closure_create(destroy_pops_and_shutdown, &pr.pops);
req.host = server; req.host = server;
@ -101,7 +101,7 @@ void grpc_free_port_using_server(char *server, int port) {
gpr_mu_lock(pr.mu); gpr_mu_lock(pr.mu);
while (!pr.done) { while (!pr.done) {
grpc_pollset_worker *worker = NULL; grpc_pollset_worker *worker = NULL;
grpc_pollset_work(&exec_ctx, grpc_pops_pollset(&pr.pops), &worker, grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), &worker,
gpr_now(GPR_CLOCK_MONOTONIC), gpr_now(GPR_CLOCK_MONOTONIC),
GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1));
} }
@ -109,7 +109,7 @@ void grpc_free_port_using_server(char *server, int port) {
grpc_httpcli_context_destroy(&context); grpc_httpcli_context_destroy(&context);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
grpc_pollset_shutdown(&exec_ctx, grpc_pops_pollset(&pr.pops), grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&pr.pops),
shutdown_closure); shutdown_closure);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);
gpr_free(path); gpr_free(path);
@ -167,7 +167,7 @@ static void got_port_from_server(grpc_exec_ctx *exec_ctx, void *arg,
GPR_ASSERT(port > 1024); GPR_ASSERT(port > 1024);
gpr_mu_lock(pr->mu); gpr_mu_lock(pr->mu);
pr->port = port; pr->port = port;
grpc_pollset_kick(grpc_pops_pollset(&pr->pops), NULL); grpc_pollset_kick(grpc_polling_entity_pollset(&pr->pops), NULL);
gpr_mu_unlock(pr->mu); gpr_mu_unlock(pr->mu);
} }
@ -184,7 +184,7 @@ int grpc_pick_port_using_server(char *server) {
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
grpc_pollset *pollset = gpr_malloc(grpc_pollset_size()); grpc_pollset *pollset = gpr_malloc(grpc_pollset_size());
grpc_pollset_init(pollset, &pr.mu); grpc_pollset_init(pollset, &pr.mu);
pr.pops = grpc_pops_create_from_pollset(pollset); pr.pops = grpc_polling_entity_create_from_pollset(pollset);
shutdown_closure = grpc_closure_create(destroy_pops_and_shutdown, &pr.pops); shutdown_closure = grpc_closure_create(destroy_pops_and_shutdown, &pr.pops);
pr.port = -1; pr.port = -1;
pr.server = server; pr.server = server;
@ -201,14 +201,14 @@ int grpc_pick_port_using_server(char *server) {
gpr_mu_lock(pr.mu); gpr_mu_lock(pr.mu);
while (pr.port == -1) { while (pr.port == -1) {
grpc_pollset_worker *worker = NULL; grpc_pollset_worker *worker = NULL;
grpc_pollset_work(&exec_ctx, grpc_pops_pollset(&pr.pops), &worker, grpc_pollset_work(&exec_ctx, grpc_polling_entity_pollset(&pr.pops), &worker,
gpr_now(GPR_CLOCK_MONOTONIC), gpr_now(GPR_CLOCK_MONOTONIC),
GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1));
} }
gpr_mu_unlock(pr.mu); gpr_mu_unlock(pr.mu);
grpc_httpcli_context_destroy(&context); grpc_httpcli_context_destroy(&context);
grpc_pollset_shutdown(&exec_ctx, grpc_pops_pollset(&pr.pops), grpc_pollset_shutdown(&exec_ctx, grpc_polling_entity_pollset(&pr.pops),
shutdown_closure); shutdown_closure);
grpc_exec_ctx_finish(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx);

Write Preview
Loading…
Cancel
Save