summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
author Mathias Agopian <mathias@google.com> 2013-05-16 18:03:22 -0700
committer Mathias Agopian <mathias@google.com> 2013-05-16 18:15:57 -0700
commitea74d3b78d607cde17790a7bb83e6f68ffd34cfd (patch)
tree5f8c6c6905868d4f92c6834ddf46d6e42981116b /include
parentf743e3db27dd639421913ee5e99d7a13ccc236ea (diff)
make the warning timout of Fence::waitForever() implicit and longer
- timeout is now 3 seconds instead of 1 - simplifies the API a bit - allows us to change/tweak this timeout globaly Bug: 8988871 Change-Id: I8d3c6ec43a372f602fb3f29856710339f86c0ec9
Diffstat (limited to 'include')
-rw-r--r--include/ui/Fence.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/ui/Fence.h b/include/ui/Fence.h
index 81d5d09826..60156e7bbb 100644
--- a/include/ui/Fence.h
+++ b/include/ui/Fence.h
@@ -70,9 +70,10 @@ public:
// waitForever is a convenience function for waiting forever for a fence to
// signal (just like wait(TIMEOUT_NEVER)), but issuing an error to the
// system log and fence state to the kernel log if the wait lasts longer
- // than warningTimeout. The logname argument should be a string identifying
+ // than a warning timeout.
+ // The logname argument should be a string identifying
// the caller and will be included in the log message.
- status_t waitForever(unsigned int warningTimeout, const char* logname);
+ status_t waitForever(const char* logname);
// merge combines two Fence objects, creating a new Fence object that
// becomes signaled when both f1 and f2 are signaled (even if f1 or f2 is