Fix server starting

pull/357/head
Craig Tiller 10 years ago
parent d0179b4c34
commit 4069b682b3
  1. 2
      src/core/surface/call.c
  2. 5
      src/core/surface/call.h
  3. 2
      src/core/surface/client.c
  4. 1
      src/core/surface/server.c

@ -799,7 +799,7 @@ grpc_call_error grpc_call_server_end_initial_metadata(grpc_call *call,
return err; return err;
} }
void grpc_call_client_initial_metadata_complete( void grpc_call_initial_metadata_complete(
grpc_call_element *surface_element) { grpc_call_element *surface_element) {
grpc_call *call = grpc_call_from_top_element(surface_element); grpc_call *call = grpc_call_from_top_element(surface_element);
lock(call); lock(call);

@ -62,9 +62,8 @@ grpc_call_error grpc_call_start_ioreq_and_call_back(
grpc_call *call, const grpc_ioreq *reqs, size_t nreqs, grpc_call *call, const grpc_ioreq *reqs, size_t nreqs,
grpc_ioreq_completion_func on_complete, void *user_data); grpc_ioreq_completion_func on_complete, void *user_data);
/* Called when it's known that the initial batch of metadata is complete on the /* Called when it's known that the initial batch of metadata is complete */
client side (must not be called on the server) */ void grpc_call_initial_metadata_complete(
void grpc_call_client_initial_metadata_complete(
grpc_call_element *surface_element); grpc_call_element *surface_element);
void grpc_call_set_deadline(grpc_call_element *surface_element, void grpc_call_set_deadline(grpc_call_element *surface_element,

@ -72,7 +72,7 @@ static void call_op(grpc_call_element *elem, grpc_call_element *from_elem,
grpc_call_stream_closed(elem); grpc_call_stream_closed(elem);
break; break;
case GRPC_RECV_END_OF_INITIAL_METADATA: case GRPC_RECV_END_OF_INITIAL_METADATA:
grpc_call_client_initial_metadata_complete(elem); grpc_call_initial_metadata_complete(elem);
break; break;
default: default:
GPR_ASSERT(op->dir == GRPC_CALL_DOWN); GPR_ASSERT(op->dir == GRPC_CALL_DOWN);

@ -313,6 +313,7 @@ static void call_op(grpc_call_element *elem, grpc_call_element *from_elemn,
break; break;
case GRPC_RECV_END_OF_INITIAL_METADATA: case GRPC_RECV_END_OF_INITIAL_METADATA:
start_new_rpc(elem); start_new_rpc(elem);
grpc_call_initial_metadata_complete(elem);
break; break;
case GRPC_RECV_MESSAGE: case GRPC_RECV_MESSAGE:
grpc_call_recv_message(elem, op->data.message); grpc_call_recv_message(elem, op->data.message);

Loading…
Cancel
Save