Revert "Revert "Remove spam""

This reverts commit e76528ce26.
pull/6612/head
Craig Tiller 9 years ago
parent 34c6e87598
commit bc7593de7a
  1. 9
      src/core/lib/surface/server.c
  2. 14
      test/cpp/end2end/hybrid_end2end_test.cc

@ -527,8 +527,6 @@ static void publish_new_rpc(grpc_exec_ctx *exec_ctx, void *arg, bool success) {
if (request_id == -1) {
continue;
} else {
gpr_log(GPR_DEBUG, "queue lockfree, retries=%d chose=%d", i, cq_idx);
gpr_mu_lock(&calld->mu_state);
calld->state = ACTIVATED;
gpr_mu_unlock(&calld->mu_state);
@ -539,7 +537,6 @@ static void publish_new_rpc(grpc_exec_ctx *exec_ctx, void *arg, bool success) {
}
/* no cq to take the request found: queue it on the slow list */
gpr_log(GPR_DEBUG, "queue slowpath");
gpr_mu_lock(&server->mu_call);
gpr_mu_lock(&calld->mu_state);
calld->state = PENDING;
@ -1303,14 +1300,12 @@ static grpc_call_error queue_call_request(grpc_exec_ctx *exec_ctx,
server->requested_calls[request_id] = *rc;
gpr_free(rc);
if (gpr_stack_lockfree_push(rm->requests_per_cq[cq_idx], request_id)) {
gpr_log(GPR_DEBUG, "request against empty");
/* this was the first queued request: we need to lock and start
matching calls */
gpr_mu_lock(&server->mu_call);
while ((calld = rm->pending_head) != NULL) {
request_id = gpr_stack_lockfree_pop(rm->requests_per_cq[cq_idx]);
if (request_id == -1) break;
gpr_log(GPR_DEBUG, "drain1");
rm->pending_head = calld->pending_next;
gpr_mu_unlock(&server->mu_call);
gpr_mu_lock(&calld->mu_state);
@ -1331,8 +1326,6 @@ static grpc_call_error queue_call_request(grpc_exec_ctx *exec_ctx,
gpr_mu_lock(&server->mu_call);
}
gpr_mu_unlock(&server->mu_call);
} else {
gpr_log(GPR_DEBUG, "request lockfree");
}
return GRPC_CALL_OK;
}
@ -1386,7 +1379,6 @@ grpc_call_error grpc_server_request_registered_call(
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
requested_call *rc = gpr_malloc(sizeof(*rc));
registered_method *rm = rmp;
gpr_log(GPR_DEBUG, "method: %s", rm->method);
GRPC_API_TRACE(
"grpc_server_request_registered_call("
"server=%p, rmp=%p, call=%p, deadline=%p, initial_metadata=%p, "
@ -1401,7 +1393,6 @@ grpc_call_error grpc_server_request_registered_call(
break;
}
}
gpr_log(GPR_DEBUG, "cq_idx=%d, cq_count=%d", cq_idx, server->cq_count);
if (cq_idx == server->cq_count) {
gpr_free(rc);
error = GRPC_CALL_ERROR_NOT_SERVER_COMPLETION_QUEUE;

@ -513,22 +513,12 @@ TEST_F(HybridEnd2endTest, GenericEchoAsyncRequestStreamResponseStream) {
SetUpServer(&service, nullptr, &generic_service);
ResetStub();
std::thread generic_handler_thread([this, &generic_service] {
gpr_log(GPR_DEBUG, "t0 start");
HandleGenericCall(&generic_service, cqs_[0].get());
gpr_log(GPR_DEBUG, "t0 done");
});
std::thread request_stream_handler_thread(
[this, &service] {
gpr_log(GPR_DEBUG, "t1 start");
HandleClientStreaming(&service, cqs_[1].get());
gpr_log(GPR_DEBUG, "t1 done");
});
[this, &service] { HandleClientStreaming(&service, cqs_[1].get()); });
std::thread response_stream_handler_thread(
[this, &service] {
gpr_log(GPR_DEBUG, "t2 start");
HandleServerStreaming(&service, cqs_[2].get());
gpr_log(GPR_DEBUG, "t2 done");
});
[this, &service] { HandleServerStreaming(&service, cqs_[2].get()); });
TestAllMethods();
generic_handler_thread.join();
request_stream_handler_thread.join();

Loading…
Cancel
Save