diff options
| author |  Yuxuan Li <yuxuanli@google.com> | 2017-05-08 11:36:07 -0700 |
|---|---|---|
| committer | Yuxuan Li <yuxuanli@google.com> | 2017-05-08 11:36:07 -0700 |
| commit | 57e12b1786aa21fadc11704d84db66e38c480453 (patch) | |
| tree | db2684a6e392977ed3ef96746dd28f04ce0bea44 /src/core/lib | |
| parent | a7f7fcf94ac4d32152ef7fdd8e558e18393e1706 (diff) | |
| parent | 85d3a539053d6960473bc78a2818d94b7953c197 (diff) | |
Merge branch 'poll_stat' of github.com:lyuxuan/grpc into poll_stat
Diffstat (limited to 'src/core/lib')
| -rw-r--r-- | src/core/lib/surface/completion_queue.c | 2 | ||||
| -rw-r--r-- | src/core/lib/surface/completion_queue.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/lib/surface/completion_queue.c b/src/core/lib/surface/completion_queue.c index e48d2f8f46..be1a4a1df5 100644 --- a/src/core/lib/surface/completion_queue.c +++ b/src/core/lib/surface/completion_queue.c @@ -310,7 +310,7 @@ grpc_cq_completion_type grpc_get_cq_completion_type(grpc_completion_queue *cc) { return cc->completion_type; } -gpr_atm grpc_get_cq_poll_num(grpc_completion_queue *cc) { +int grpc_get_cq_poll_num(grpc_completion_queue *cc) { int cur_num_polls; gpr_mu_lock(cc->mu); cur_num_polls = cc->num_polls; diff --git a/src/core/lib/surface/completion_queue.h b/src/core/lib/surface/completion_queue.h index d8c812f2ae..add52e8a07 100644 --- a/src/core/lib/surface/completion_queue.h +++ b/src/core/lib/surface/completion_queue.h @@ -100,7 +100,7 @@ bool grpc_cq_can_listen(grpc_completion_queue *cc); grpc_cq_completion_type grpc_get_cq_completion_type(grpc_completion_queue *cc); -gpr_atm grpc_get_cq_poll_num(grpc_completion_queue *cc); +int grpc_get_cq_poll_num(grpc_completion_queue *cc); grpc_completion_queue *grpc_completion_queue_create_internal( grpc_cq_completion_type completion_type, grpc_cq_polling_type polling_type); |