aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/core/distributed_runtime/local_master.cc
diff options
context:
space:
mode:
authorGravatar Yuan Yu <yuanbyu@google.com>2017-02-16 14:03:41 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2017-02-16 14:23:24 -0800
commit9d3eebb35ae339bfc8d58f56bb912336ca733e2d (patch)
tree191fa1bec57ca01596d1a628793ba3ab1e3eeb9d /tensorflow/core/distributed_runtime/local_master.cc
parent3fbcb798ada73d8cb0e5bf598f2f472741c4816c (diff)
Changed the second argument of WaitForNotificationWithTimeout() to mean microseconds from milliseconds.
Change: 147764063
Diffstat (limited to 'tensorflow/core/distributed_runtime/local_master.cc')
-rw-r--r--tensorflow/core/distributed_runtime/local_master.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/tensorflow/core/distributed_runtime/local_master.cc b/tensorflow/core/distributed_runtime/local_master.cc
index 61ead9f31d..1bb706e930 100644
--- a/tensorflow/core/distributed_runtime/local_master.cc
+++ b/tensorflow/core/distributed_runtime/local_master.cc
@@ -27,7 +27,8 @@ namespace {
Status WaitForNotification(CallOptions* call_options, Notification* n) {
int64 timeout_in_ms = call_options->GetTimeout();
if (timeout_in_ms > 0) {
- bool notified = WaitForNotificationWithTimeout(n, timeout_in_ms);
+ int64 timeout_in_us = timeout_in_ms * 1000;
+ bool notified = WaitForNotificationWithTimeout(n, timeout_in_us);
if (!notified) {
call_options->StartCancel();
// The call has borrowed pointers to the request and response