aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/stream_executor/stream.h
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <gardener@tensorflow.org>2017-12-13 08:43:09 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2017-12-13 08:46:42 -0800
commit246d5b95723a275b80f4b803024182b4221b4e43 (patch)
tree9edc1808fdfddf37ada6ea1d4245b48771ff5637 /tensorflow/stream_executor/stream.h
parent2eae1ac21ce28f3b2cafe9e12a25b3bddc475847 (diff)
Stream::BlockHostUntilDone now returns Status rather than bool.
The now-deprecated Stream::BlockHostUntilDoneWithStatus remains, to facilitate a multi-CL renaming transition. Once all callers have been renamed to BlockHostUntilDone, *WithStatus will be removed. The StreamExecutor (private) method has also been renamed to BlockHostUntilDone. It's only used by Stream. The StreamExecutorInterface method will be renamed in a separate atomic CL. It's harder to perform that transition gradually, and we've already performed an atomic change previously, so we might as well fix it up in one shot. PiperOrigin-RevId: 178907807
Diffstat (limited to 'tensorflow/stream_executor/stream.h')
-rw-r--r--tensorflow/stream_executor/stream.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/tensorflow/stream_executor/stream.h b/tensorflow/stream_executor/stream.h
index 15a5a2b6cb..4c34452048 100644
--- a/tensorflow/stream_executor/stream.h
+++ b/tensorflow/stream_executor/stream.h
@@ -1905,15 +1905,12 @@ class Stream {
//
// Returns an OK status if the blocking was successful and the stream is ok().
// Otherwise returns an error describing why the blocking failed.
- //
- // TODO(b/70298427): Rename to BlockHostUntilDone, once all callers have been
- // converted from the bool form.
- port::Status BlockHostUntilDoneWithStatus() LOCKS_EXCLUDED(mu_);
+ port::Status BlockHostUntilDone() LOCKS_EXCLUDED(mu_);
- // DEPRECATED(b/70298427) - new code should use BlockHostUntilDoneWithStatus()
+ // DEPRECATED(b/70298427) - new code should use BlockHostUntilDone()
//
- // Equivalent to BlockHostUntilDoneWithStatus().ok().
- bool BlockHostUntilDone() LOCKS_EXCLUDED(mu_);
+ // Equivalent to BlockHostUntilDone()
+ port::Status BlockHostUntilDoneWithStatus() LOCKS_EXCLUDED(mu_);
// Warning! This method interacts with internal threads in
// sometimes-unpredictable ways and is intended for GPU-Executor-internal