diff --git a/src/core/surface/call.c b/src/core/surface/call.c index f6001166e682ac9a5f2dde939963ad6c6396de77..3eb0fe528c0cb2a3b3681f5129ad897b7dfd57ea 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -168,13 +168,11 @@ legacy_state *get_legacy_state(grpc_call *call) { return call->legacy_state; } -void grpc_call_internal_ref(grpc_call *c, const char *reason) { - gpr_log(GPR_DEBUG, "ref %p %s %d", c, reason, (int)c->internal_refcount.count); +void grpc_call_internal_ref(grpc_call *c) { gpr_ref(&c->internal_refcount); } -void grpc_call_internal_unref(grpc_call *c, const char *reason) { - gpr_log(GPR_DEBUG, "unref %p %s %d", c, reason, (int)c->internal_refcount.count); +void grpc_call_internal_unref(grpc_call *c) { if (gpr_unref(&c->internal_refcount)) { grpc_call_stack_destroy(CALL_STACK_FROM_CALL(c)); grpc_channel_internal_unref(c->channel); @@ -564,7 +562,7 @@ void grpc_call_destroy(grpc_call *c) { cancel = !c->stream_closed; unlock(c); if (cancel) grpc_call_cancel(c); - grpc_call_internal_unref(c, "destroy"); + grpc_call_internal_unref(c); } static void maybe_set_status_code(grpc_call *call, gpr_uint32 status) { @@ -896,7 +894,7 @@ static void call_alarm(void *arg, int success) { grpc_call_cancel(call); } } - grpc_call_internal_unref(call, "alarm"); + grpc_call_internal_unref(call); } void grpc_call_set_deadline(grpc_call_element *elem, gpr_timespec deadline) { @@ -905,7 +903,7 @@ void grpc_call_set_deadline(grpc_call_element *elem, gpr_timespec deadline) { if (call->have_alarm) { gpr_log(GPR_ERROR, "Attempt to set deadline alarm twice"); } - grpc_call_internal_ref(call, "alarm"); + grpc_call_internal_ref(call); call->have_alarm = 1; grpc_alarm_init(&call->alarm, deadline, call_alarm, call, gpr_now()); } diff --git a/src/core/surface/call.h b/src/core/surface/call.h index 6ed6fdf54a22cc4049d99601b6f1bc666d44b7e0..10f8dbe6c8f93cc0c829db7099ee0c3d12a966e5 100644 --- a/src/core/surface/call.h +++ b/src/core/surface/call.h @@ -45,8 +45,8 @@ typedef void (*grpc_ioreq_completion_func)(grpc_call *call, grpc_call *grpc_call_create(grpc_channel *channel, const void *server_transport_data); -void grpc_call_internal_ref(grpc_call *call, const char *reason); -void grpc_call_internal_unref(grpc_call *call, const char *reason); +void grpc_call_internal_ref(grpc_call *call); +void grpc_call_internal_unref(grpc_call *call); /* Helpers for grpc_client, grpc_server filters to publish received data to the completion queue/surface layer */ diff --git a/src/core/surface/completion_queue.c b/src/core/surface/completion_queue.c index 62008648207248bb93f39515ca626896fd326547..5854afbeefdf67216eab8f51a7adb1578f3e087a 100644 --- a/src/core/surface/completion_queue.c +++ b/src/core/surface/completion_queue.c @@ -132,26 +132,10 @@ static event *add_locked(grpc_completion_queue *cc, grpc_completion_type type, return ev; } -static char *op_string(grpc_completion_type type) { - switch (type) { - case GRPC_QUEUE_SHUTDOWN: return "shutdown"; - case GRPC_IOREQ: return "ioreq"; - case GRPC_WRITE_ACCEPTED: return "write_accepted"; - case GRPC_READ: return "read"; - case GRPC_FINISH_ACCEPTED: return "finish_accepted"; - case GRPC_CLIENT_METADATA_READ: return "client_metadata_read"; - case GRPC_FINISHED: return "finished"; - case GRPC_SERVER_RPC_NEW: return "rpc_new"; - case GRPC_SERVER_SHUTDOWN: return "server_shutdown"; - case GRPC_COMPLETION_DO_NOT_USE: return "do_not_use"; - } - return "unknown"; -} - void grpc_cq_begin_op(grpc_completion_queue *cc, grpc_call *call, grpc_completion_type type) { gpr_ref(&cc->refs); - if (call) grpc_call_internal_ref(call, op_string(type)); + if (call) grpc_call_internal_ref(call); #ifndef NDEBUG gpr_atm_no_barrier_fetch_add(&cc->pending_op_count[type], 1); #endif @@ -404,7 +388,7 @@ void grpc_event_finish(grpc_event *base) { event *ev = (event *)base; ev->on_finish(ev->on_finish_user_data, GRPC_OP_OK); if (ev->base.call) { - grpc_call_internal_unref(ev->base.call, op_string(base->type)); + grpc_call_internal_unref(ev->base.call); } gpr_free(ev); } diff --git a/src/core/surface/server.c b/src/core/surface/server.c index 8d31870e27c82b49aae746a1381953289d51fc49..e0f3766022fed4fe6247b84af85515afe99bdaf0 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -712,7 +712,7 @@ static void publish_legacy_request(grpc_call *call, grpc_op_error status, grpc_server *server = chand->server; if (status == GRPC_OP_OK) { - grpc_call_internal_ref(call, "rpc_new"); + grpc_call_internal_ref(call); grpc_cq_end_new_rpc(server->cq, tag, call, do_nothing, NULL, grpc_mdstr_as_c_string(calld->path), grpc_mdstr_as_c_string(calld->host), calld->deadline,