Further fixes

pull/1472/head
Craig Tiller 10 years ago
parent 667ca409ed
commit 9eb47ada08
  1. 6
      include/grpc/grpc.h
  2. 11
      src/core/surface/completion_queue.h
  3. 1
      src/python/src/grpc/_adapter/_completion_queue.c

@ -335,8 +335,7 @@ grpc_completion_queue *grpc_completion_queue_create(void);
/* Blocks until an event is available, the completion queue is being shut down,
or deadline is reached. Returns NULL on timeout, otherwise the event that
occurred. Callers should call grpc_event_finish once they have processed
the event.
occurred.
Callers must not call grpc_completion_queue_next and
grpc_completion_queue_pluck simultaneously on the same completion queue. */
@ -345,8 +344,7 @@ grpc_event grpc_completion_queue_next(grpc_completion_queue *cq,
/* Blocks until an event with tag 'tag' is available, the completion queue is
being shutdown or deadline is reached. Returns NULL on timeout, or a pointer
to the event that occurred. Callers should call grpc_event_finish once they
have processed the event.
to the event that occurred.
Callers must not call grpc_completion_queue_next and
grpc_completion_queue_pluck simultaneously on the same completion queue. */

@ -46,17 +46,6 @@ void grpc_cq_internal_unref(grpc_completion_queue *cc);
shutdown until a corrensponding grpc_cq_end_* call is made */
void grpc_cq_begin_op(grpc_completion_queue *cc, grpc_call *call);
/* grpc_cq_end_* functions pair with a grpc_cq_begin_op
grpc_cq_end_* common arguments:
cc - the completion channel to queue on
tag - the user supplied operation tag
on_finish - grpc_event_finish_func that is called during grpc_event_finish
can be NULL to not get a callback
user_data - user_data parameter to be passed to on_finish
Other parameters match the data member of grpc_event */
/* Queue a GRPC_OP_COMPLETED operation */
void grpc_cq_end_op(grpc_completion_queue *cc, void *tag, grpc_call *call,
int success);

@ -440,7 +440,6 @@ static PyObject *pygrpc_completion_queue_get(CompletionQueue *self,
if (tag) {
pygrpc_tag_destroy(tag);
}
grpc_event_finish(c_event);
return event;
}

Loading…
Cancel
Save