Index: mojo/public/c/system/wait.h |
diff --git a/mojo/public/c/system/functions.h b/mojo/public/c/system/wait.h |
similarity index 73% |
copy from mojo/public/c/system/functions.h |
copy to mojo/public/c/system/wait.h |
index 3482c5d1618238bb21213c73218fe0d99bbbe462..4ac513bfda4deebbedc8e98721066d97d7797f63 100644 |
--- a/mojo/public/c/system/functions.h |
+++ b/mojo/public/c/system/wait.h |
@@ -1,4 +1,4 @@ |
-// Copyright 2014 The Chromium Authors. All rights reserved. |
+// Copyright 2016 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -6,44 +6,17 @@ |
// |
// Note: This header should be compilable as C. |
-#ifndef MOJO_PUBLIC_C_SYSTEM_FUNCTIONS_H_ |
-#define MOJO_PUBLIC_C_SYSTEM_FUNCTIONS_H_ |
+#ifndef MOJO_PUBLIC_C_SYSTEM_WAIT_H_ |
+#define MOJO_PUBLIC_C_SYSTEM_WAIT_H_ |
#include "mojo/public/c/system/handle.h" |
#include "mojo/public/c/system/result.h" |
-#include "mojo/public/c/system/types.h" |
+#include "mojo/public/c/system/time.h" |
#ifdef __cplusplus |
extern "C" { |
#endif |
-// Note: Pointer parameters that are labelled "optional" may be null (at least |
-// under some circumstances). Non-const pointer parameters are also labeled |
-// "in", "out", or "in/out", to indicate how they are used. (Note that how/if |
-// such a parameter is used may depend on other parameters or the requested |
-// operation's success/failure. E.g., a separate |flags| parameter may control |
-// whether a given "in/out" parameter is used for input, output, or both.) |
- |
-// Returns the time, in microseconds, since some undefined point in the past. |
-// The values are only meaningful relative to other values that were obtained |
-// from the same device without an intervening system restart. Such values are |
-// guaranteed to be monotonically non-decreasing with the passage of real time. |
-// Although the units are microseconds, the resolution of the clock may vary and |
-// is typically in the range of ~1-15 ms. |
-MojoTimeTicks MojoGetTimeTicksNow(void); |
- |
-// Closes the given |handle|. |
-// |
-// Returns: |
-// |MOJO_RESULT_OK| on success. |
-// |MOJO_RESULT_INVALID_ARGUMENT| if |handle| is not a valid handle. |
-// |
-// Concurrent operations on |handle| may succeed (or fail as usual) if they |
-// happen before the close, be cancelled with result |MOJO_RESULT_CANCELLED| if |
-// they properly overlap (this is likely the case with |MojoWait()|, etc.), or |
-// fail with |MOJO_RESULT_INVALID_ARGUMENT| if they happen after. |
-MojoResult MojoClose(MojoHandle handle); |
- |
// Waits on the given handle until one of the following happens: |
// - A signal indicated by |signals| is satisfied. |
// - It becomes known that no signal indicated by |signals| will ever be |
@@ -132,4 +105,4 @@ MojoResult MojoWaitMany( |
} // extern "C" |
#endif |
-#endif // MOJO_PUBLIC_C_SYSTEM_FUNCTIONS_H_ |
+#endif // MOJO_PUBLIC_C_SYSTEM_WAIT_H_ |