| Index: mojo/public/c/system/functions.h
|
| diff --git a/mojo/public/c/system/functions.h b/mojo/public/c/system/functions.h
|
| index 21a0db594dbf32137a7c030fd7b2d0ec8677181a..5e0a0c414df9dfd88afabb91e18c3ce75f86b11d 100644
|
| --- a/mojo/public/c/system/functions.h
|
| +++ b/mojo/public/c/system/functions.h
|
| @@ -42,65 +42,6 @@ MOJO_SYSTEM_EXPORT MojoTimeTicks MojoGetTimeTicksNow(void);
|
| // fail with |MOJO_RESULT_INVALID_ARGUMENT| if they happen after.
|
| MOJO_SYSTEM_EXPORT MojoResult MojoClose(MojoHandle handle);
|
|
|
| -// Waits on the given handle until a signal indicated by |signals| is satisfied,
|
| -// it becomes known that no signal indicated by |signals| will ever be satisfied
|
| -// (see the description of the |MOJO_RESULT_CANCELLED| and
|
| -// |MOJO_RESULT_FAILED_PRECONDITION| return values below), or until |deadline|
|
| -// has passed.
|
| -//
|
| -// If |deadline| is |MOJO_DEADLINE_INDEFINITE|, this will wait "forever" (until
|
| -// one of the other wait termination conditions is satisfied). If |deadline| is
|
| -// 0, this will return |MOJO_RESULT_DEADLINE_EXCEEDED| only if one of the other
|
| -// termination conditions (e.g., a signal is satisfied, or all signals are
|
| -// unsatisfiable) is not already satisfied.
|
| -//
|
| -// Returns:
|
| -// |MOJO_RESULT_OK| if some signal in |signals| was satisfied (or is already
|
| -// satisfied).
|
| -// |MOJO_RESULT_CANCELLED| if |handle| was closed (necessarily from another
|
| -// thread) during the wait.
|
| -// |MOJO_RESULT_INVALID_ARGUMENT| if |handle| is not a valid handle (e.g., if
|
| -// it has already been closed).
|
| -// |MOJO_RESULT_DEADLINE_EXCEEDED| if the deadline has passed without any of
|
| -// the signals being satisfied.
|
| -// |MOJO_RESULT_FAILED_PRECONDITION| if it becomes known that none of the
|
| -// signals in |signals| can ever be satisfied (e.g., when waiting on one
|
| -// end of a message pipe and the other end is closed).
|
| -//
|
| -// If there are multiple waiters (on different threads, obviously) waiting on
|
| -// the same handle and signal, and that signal becomes is satisfied, all waiters
|
| -// will be awoken.
|
| -MOJO_SYSTEM_EXPORT MojoResult MojoWait(MojoHandle handle,
|
| - MojoHandleSignals signals,
|
| - MojoDeadline deadline);
|
| -
|
| -// Waits on |handles[0]|, ..., |handles[num_handles-1]| until (at least) one
|
| -// satisfies a signal indicated in its respective |signals[0]|, ...,
|
| -// |signals[num_handles-1]|, it becomes known that no signal in some
|
| -// |signals[i]| will ever be satisfied, or until |deadline| has passed.
|
| -//
|
| -// This means that |MojoWaitMany()| behaves as if |MojoWait()| were called on
|
| -// each handle/signals pair simultaneously, completing when the first
|
| -// |MojoWait()| would complete.
|
| -//
|
| -// See |MojoWait()| for more details about |deadline|.
|
| -//
|
| -// Returns:
|
| -// The index |i| (from 0 to |num_handles-1|) if |handle[i]| satisfies a signal
|
| -// from |signals[i]|.
|
| -// |MOJO_RESULT_CANCELLED| if some |handle[i]| was closed (necessarily from
|
| -// another thread) during the wait.
|
| -// |MOJO_RESULT_INVALID_ARGUMENT| if some |handle[i]| is not a valid handle
|
| -// (e.g., if it has already been closed).
|
| -// |MOJO_RESULT_DEADLINE_EXCEEDED| if the deadline has passed without any of
|
| -// handles satisfying any of its signals.
|
| -// |MOJO_RESULT_FAILED_PRECONDITION| if it is or becomes impossible that SOME
|
| -// |handle[i]| will ever satisfy any of the signals in |signals[i]|.
|
| -MOJO_SYSTEM_EXPORT MojoResult MojoWaitMany(const MojoHandle* handles,
|
| - const MojoHandleSignals* signals,
|
| - uint32_t num_handles,
|
| - MojoDeadline deadline);
|
| -
|
| // 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
|
| @@ -133,10 +74,10 @@ MOJO_SYSTEM_EXPORT MojoResult MojoWaitMany(const MojoHandle* handles,
|
| // the same handle and signal, and that signal becomes is satisfied, all waiters
|
| // will be awoken.
|
| MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoNewWait(MojoHandle handle,
|
| - MojoHandleSignals signals,
|
| - MojoDeadline deadline,
|
| - struct MojoHandleSignalsState* signals_state); // Optional out.
|
| +MojoWait(MojoHandle handle,
|
| + MojoHandleSignals signals,
|
| + MojoDeadline deadline,
|
| + struct MojoHandleSignalsState* signals_state); // Optional out.
|
|
|
| // Waits on |handles[0]|, ..., |handles[num_handles-1]| until:
|
| // - (At least) one handle satisfies a signal indicated in its respective
|
| @@ -178,12 +119,12 @@ MojoNewWait(MojoHandle handle,
|
| // |MOJO_RESULT_FAILED_PRECONDITION| if it is or becomes impossible that SOME
|
| // |handle[i]| will ever satisfy any of the signals in |signals[i]|.
|
| MOJO_SYSTEM_EXPORT MojoResult
|
| -MojoNewWaitMany(const MojoHandle* handles,
|
| - const MojoHandleSignals* signals,
|
| - uint32_t num_handles,
|
| - MojoDeadline deadline,
|
| - uint32_t* result_index, // Optional out
|
| - struct MojoHandleSignalsState* signals_states); // Optional out
|
| +MojoWaitMany(const MojoHandle* handles,
|
| + const MojoHandleSignals* signals,
|
| + uint32_t num_handles,
|
| + MojoDeadline deadline,
|
| + uint32_t* result_index, // Optional out
|
| + struct MojoHandleSignalsState* signals_states); // Optional out
|
|
|
| #ifdef __cplusplus
|
| } // extern "C"
|
|
|