diff options
| author |  Yang Gao <yangg@google.com> | 2015-07-23 16:35:29 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-07-23 16:35:29 -0700 |
| commit | b5bbf667798f28d960edd6f1145d9479a3b39831 (patch) | |
| tree | 9774314bc3a0388d6ba769d5da274417a56a717b /src/python | |
| parent | 2e7ce156354f77bcbdfe0c096b6fa29ebe320200 (diff) | |
| parent | 94329d09656f3eeb8eee40b72b96ec9cd3578559 (diff) | |
Merge pull request #2629 from ctiller/always-with-the-mono
Make the server report monotonic times for deadlines
Diffstat (limited to 'src/python')
| -rw-r--r-- | src/python/src/grpc/_adapter/_c/utility.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/python/src/grpc/_adapter/_c/utility.c b/src/python/src/grpc/_adapter/_c/utility.c index d9f911a41a..51f3c9be01 100644 --- a/src/python/src/grpc/_adapter/_c/utility.c +++ b/src/python/src/grpc/_adapter/_c/utility.c @@ -374,6 +374,7 @@ PyObject *pygrpc_consume_ops(grpc_op *op, size_t nops) { } double pygrpc_cast_gpr_timespec_to_double(gpr_timespec timespec) { + timespec = gpr_convert_clock_type(timespec, GPR_CLOCK_REALTIME); return timespec.tv_sec + 1e-9*timespec.tv_nsec; } |