diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/iomgr/iomgr.c | 2 | ||||
-rw-r--r-- | src/core/iomgr/resolve_address_posix.c | 2 | ||||
-rw-r--r-- | src/core/security/credentials.c | 4 | ||||
-rw-r--r-- | src/core/security/google_default_credentials.c | 2 | ||||
-rw-r--r-- | src/core/security/server_auth_filter.c | 2 | ||||
-rw-r--r-- | src/core/security/server_secure_chttp2.c | 2 | ||||
-rw-r--r-- | src/core/surface/call.c | 10 | ||||
-rw-r--r-- | src/core/surface/channel.c | 2 | ||||
-rw-r--r-- | src/core/surface/channel_connectivity.c | 4 | ||||
-rw-r--r-- | src/core/surface/channel_create.c | 2 | ||||
-rw-r--r-- | src/core/surface/completion_queue.c | 6 | ||||
-rw-r--r-- | src/core/surface/lame_client.c | 2 | ||||
-rw-r--r-- | src/core/surface/secure_channel_create.c | 2 | ||||
-rw-r--r-- | src/core/surface/server.c | 12 | ||||
-rw-r--r-- | src/core/surface/server_chttp2.c | 2 |
15 files changed, 28 insertions, 28 deletions
diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index dac906e6e9..06413eed68 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -99,7 +99,7 @@ grpc_iomgr_shutdown (void) { gpr_timespec shutdown_deadline = gpr_time_add (gpr_now (GPR_CLOCK_REALTIME), gpr_time_from_seconds (10, GPR_TIMESPAN)); gpr_timespec last_warning_time = gpr_now (GPR_CLOCK_REALTIME); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock (&g_mu); g_shutdown = 1; diff --git a/src/core/iomgr/resolve_address_posix.c b/src/core/iomgr/resolve_address_posix.c index 9f22047bb6..9d269d364a 100644 --- a/src/core/iomgr/resolve_address_posix.c +++ b/src/core/iomgr/resolve_address_posix.c @@ -160,7 +160,7 @@ static void do_request_thread (void *rp) { request *r = rp; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_resolved_addresses *resolved = grpc_blocking_resolve_address (r->name, r->default_port); void *arg = r->arg; grpc_resolve_cb cb = r->cb; diff --git a/src/core/security/credentials.c b/src/core/security/credentials.c index 0abcfeff05..0b76ba563a 100644 --- a/src/core/security/credentials.c +++ b/src/core/security/credentials.c @@ -809,7 +809,7 @@ on_simulated_token_fetch_done (void *user_data) { grpc_credentials_metadata_request *r = (grpc_credentials_metadata_request *) user_data; grpc_md_only_test_credentials *c = (grpc_md_only_test_credentials *) r->creds; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; r->cb (r->user_data, c->md_store->entries, c->md_store->num_entries, GRPC_CREDENTIALS_OK, &closure_list); grpc_credentials_metadata_request_destroy (r); grpc_exec_ctx_finish (&exec_ctx); @@ -1322,7 +1322,7 @@ static void plugin_md_request_metadata_ready (void *request, const grpc_metadata * md, size_t num_md, grpc_status_code status, const char *error_details) { /* called from application code */ - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_metadata_plugin_request *r = (grpc_metadata_plugin_request *) request; if (status != GRPC_STATUS_OK) { diff --git a/src/core/security/google_default_credentials.c b/src/core/security/google_default_credentials.c index e420d1d889..afa4b9971c 100644 --- a/src/core/security/google_default_credentials.c +++ b/src/core/security/google_default_credentials.c @@ -104,7 +104,7 @@ is_stack_running_on_compute_engine (void) compute_engine_detector detector; grpc_httpcli_request request; grpc_httpcli_context context; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_closure destroy_closure; /* The http call is local. If it takes more than one sec, it is for sure not diff --git a/src/core/security/server_auth_filter.c b/src/core/security/server_auth_filter.c index 090c326b8f..a1516abb41 100644 --- a/src/core/security/server_auth_filter.c +++ b/src/core/security/server_auth_filter.c @@ -120,7 +120,7 @@ on_md_processing_done (void *user_data, const grpc_metadata * consumed_md, size_ { grpc_call_element *elem = user_data; call_data *calld = elem->call_data; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; /* TODO(jboeuf): Implement support for response_md. */ if (response_md != NULL && num_response_md > 0) diff --git a/src/core/security/server_secure_chttp2.c b/src/core/security/server_secure_chttp2.c index c605fc52eb..7ca7beaf52 100644 --- a/src/core/security/server_secure_chttp2.c +++ b/src/core/security/server_secure_chttp2.c @@ -234,7 +234,7 @@ grpc_server_add_secure_http2_port (grpc_server * server, const char *addr, grpc_ int port_temp; grpc_security_status status = GRPC_SECURITY_ERROR; grpc_security_connector *sc = NULL; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; /* create security context */ if (creds == NULL) diff --git a/src/core/surface/call.c b/src/core/surface/call.c index e7fbab7b5b..38bcc750b9 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -303,7 +303,7 @@ grpc_call_create (grpc_channel * channel, grpc_call * parent_call, gpr_uint32 pr grpc_transport_stream_op initial_op; grpc_transport_stream_op *initial_op_ptr = NULL; grpc_channel_stack *channel_stack = grpc_channel_get_channel_stack (channel); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_call *call = gpr_malloc (sizeof (grpc_call) + channel_stack->call_stack_size); memset (call, 0, sizeof (grpc_call)); gpr_mu_init (&call->mu); @@ -1395,7 +1395,7 @@ grpc_call_destroy (grpc_call * c) { int cancel; grpc_call *parent = c->parent; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; if (parent) { @@ -1440,7 +1440,7 @@ grpc_call_error grpc_call_cancel_with_status (grpc_call * c, grpc_status_code status, const char *description, void *reserved) { grpc_call_error r; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT (reserved == NULL); lock (c); r = cancel_with_status (c, status, description); @@ -1515,7 +1515,7 @@ char * grpc_call_get_peer (grpc_call * call) { grpc_call_element *elem = CALL_ELEM_FROM_CALL (call, 0); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; char *result = elem->filter->get_peer (elem, &closure_list); grpc_exec_ctx_finish (&exec_ctx); return result; @@ -1742,7 +1742,7 @@ grpc_call_start_batch (grpc_call * call, const grpc_op * ops, size_t nops, void grpc_ioreq *req; void (*finish_func) (grpc_call *, int, void *, grpc_closure_list *) = finish_batch; grpc_call_error error; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; if (reserved != NULL) { diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 376c4adfad..1896555eba 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -318,7 +318,7 @@ grpc_channel_destroy (grpc_channel * channel) { grpc_transport_op op; grpc_channel_element *elem; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; memset (&op, 0, sizeof (op)); op.disconnect = 1; elem = grpc_channel_stack_element (CHANNEL_STACK_FROM_CHANNEL (channel), 0); diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index c021ea3db0..30017b3b9f 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -45,7 +45,7 @@ grpc_channel_check_connectivity_state (grpc_channel * channel, int try_to_connec { /* forward through to the underlying client channel */ grpc_channel_element *client_channel_elem = grpc_channel_stack_last_element (grpc_channel_get_channel_stack (channel)); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; grpc_connectivity_state state; if (client_channel_elem->filter != &grpc_client_channel_filter) { @@ -180,7 +180,7 @@ void grpc_channel_watch_connectivity_state (grpc_channel * channel, grpc_connectivity_state last_observed_state, gpr_timespec deadline, grpc_completion_queue * cq, void *tag) { grpc_channel_element *client_channel_elem = grpc_channel_stack_last_element (grpc_channel_get_channel_stack (channel)); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; state_watcher *w = gpr_malloc (sizeof (*w)); grpc_cq_begin_op (cq); diff --git a/src/core/surface/channel_create.c b/src/core/surface/channel_create.c index 2fc2b39f5f..10c57ae9ad 100644 --- a/src/core/surface/channel_create.c +++ b/src/core/surface/channel_create.c @@ -197,7 +197,7 @@ grpc_insecure_channel_create (const char *target, const grpc_channel_args * args grpc_resolver *resolver; subchannel_factory *f; grpc_mdctx *mdctx = grpc_mdctx_create (); - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; size_t n = 0; GPR_ASSERT (!reserved); if (grpc_channel_args_is_census_enabled (args)) diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index 2740691d18..ff1c20e9f0 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -192,7 +192,7 @@ grpc_completion_queue_next (grpc_completion_queue * cc, gpr_timespec deadline, v grpc_pollset_worker worker; int first_loop = 1; gpr_timespec now; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT (!reserved); @@ -280,7 +280,7 @@ grpc_completion_queue_pluck (grpc_completion_queue * cc, void *tag, gpr_timespec grpc_pollset_worker worker; gpr_timespec now; int first_loop = 1; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GPR_ASSERT (!reserved); @@ -350,7 +350,7 @@ done: void grpc_completion_queue_shutdown (grpc_completion_queue * cc) { - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock (GRPC_POLLSET_MU (&cc->pollset)); if (cc->shutdown_called) { diff --git a/src/core/surface/lame_client.c b/src/core/surface/lame_client.c index e1d4657ebf..26c53410f3 100644 --- a/src/core/surface/lame_client.c +++ b/src/core/surface/lame_client.c @@ -163,7 +163,7 @@ grpc_lame_client_channel_create (const char *target, grpc_status_code error_code grpc_channel *channel; grpc_channel_element *elem; channel_data *chand; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; static const grpc_channel_filter *filters[] = { &lame_filter }; channel = grpc_channel_create_from_filters (target, filters, 1, NULL, grpc_mdctx_create (), 1, &closure_list); elem = grpc_channel_stack_element (grpc_channel_get_channel_stack (channel), 0); diff --git a/src/core/surface/secure_channel_create.c b/src/core/surface/secure_channel_create.c index 7187bbf198..96ddfd8035 100644 --- a/src/core/surface/secure_channel_create.c +++ b/src/core/surface/secure_channel_create.c @@ -258,7 +258,7 @@ grpc_secure_channel_create (grpc_credentials * creds, const char *target, const subchannel_factory *f; #define MAX_FILTERS 3 const grpc_channel_filter *filters[MAX_FILTERS]; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; size_t n = 0; GPR_ASSERT (reserved == NULL); diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 940050e9d9..83fe3a7686 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -981,7 +981,7 @@ grpc_server_start (grpc_server * server) { listener *l; size_t i; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; server->pollsets = gpr_malloc (sizeof (grpc_pollset *) * server->cq_count); for (i = 0; i < server->cq_count; i++) @@ -1115,7 +1115,7 @@ grpc_server_shutdown_and_notify (grpc_server * server, grpc_completion_queue * c listener *l; shutdown_tag *sdt; channel_broadcaster broadcaster; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; GRPC_SERVER_LOG_SHUTDOWN (GPR_INFO, server, cq, tag); @@ -1168,7 +1168,7 @@ void grpc_server_cancel_all_calls (grpc_server * server) { channel_broadcaster broadcaster; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock (&server->mu_global); channel_broadcaster_init (server, &broadcaster); @@ -1182,7 +1182,7 @@ void grpc_server_destroy (grpc_server * server) { listener *l; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock (&server->mu_global); GPR_ASSERT (gpr_atm_acq_load (&server->shutdown_flag) || !server->listeners); @@ -1278,7 +1278,7 @@ grpc_call_error grpc_server_request_call (grpc_server * server, grpc_call ** call, grpc_call_details * details, grpc_metadata_array * initial_metadata, grpc_completion_queue * cq_bound_to_call, grpc_completion_queue * cq_for_notification, void *tag) { grpc_call_error error; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; requested_call *rc = gpr_malloc (sizeof (*rc)); GRPC_SERVER_LOG_REQUEST_CALL (GPR_INFO, server, call, details, initial_metadata, cq_bound_to_call, cq_for_notification, tag); if (!grpc_cq_is_server_cq (cq_for_notification)) @@ -1307,7 +1307,7 @@ grpc_call_error grpc_server_request_registered_call (grpc_server * server, void *rm, grpc_call ** call, gpr_timespec * deadline, grpc_metadata_array * initial_metadata, grpc_byte_buffer ** optional_payload, grpc_completion_queue * cq_bound_to_call, grpc_completion_queue * cq_for_notification, void *tag) { grpc_call_error error; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; requested_call *rc = gpr_malloc (sizeof (*rc)); registered_method *registered_method = rm; if (!grpc_cq_is_server_cq (cq_for_notification)) diff --git a/src/core/surface/server_chttp2.c b/src/core/surface/server_chttp2.c index c7e7849ed2..23b36b5f37 100644 --- a/src/core/surface/server_chttp2.c +++ b/src/core/surface/server_chttp2.c @@ -93,7 +93,7 @@ grpc_server_add_insecure_http2_port (grpc_server * server, const char *addr) unsigned count = 0; int port_num = -1; int port_temp; - grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; + grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; resolved = grpc_blocking_resolve_address (addr, "http"); if (!resolved) |