| Index: native_client_sdk/src/libraries/nacl_io/event_listener.cc
|
| diff --git a/native_client_sdk/src/libraries/nacl_io/event_listener.cc b/native_client_sdk/src/libraries/nacl_io/event_listener.cc
|
| index c0341473402b0c8d37b9329f02355d7073dcd17f..773b1df36868c59895be108ac7c39eb49e3af2b0 100644
|
| --- a/native_client_sdk/src/libraries/nacl_io/event_listener.cc
|
| +++ b/native_client_sdk/src/libraries/nacl_io/event_listener.cc
|
| @@ -55,7 +55,7 @@ EventListener::~EventListener() {
|
| static void AbsoluteFromDeltaMS(struct timespec* timeout, int ms_timeout) {
|
| if (ms_timeout >= 0) {
|
| uint64_t usec = usec_since_epoch();
|
| - usec += ((int64_t) ms_timeout * 1000);
|
| + usec += ((int64_t)ms_timeout * 1000);
|
|
|
| timeout->tv_nsec = (usec % 1000000) * 1000;
|
| timeout->tv_sec = (usec / 1000000);
|
| @@ -65,7 +65,6 @@ static void AbsoluteFromDeltaMS(struct timespec* timeout, int ms_timeout) {
|
| }
|
| }
|
|
|
| -
|
| EventListenerLock::EventListenerLock(EventEmitter* emitter)
|
| : EventListener(),
|
| emitter_(emitter),
|
| @@ -77,8 +76,7 @@ EventListenerLock::~EventListenerLock() {
|
| delete lock_;
|
| }
|
|
|
| -void EventListenerLock::ReceiveEvents(EventEmitter* emitter,
|
| - uint32_t events) {
|
| +void EventListenerLock::ReceiveEvents(EventEmitter* emitter, uint32_t events) {
|
| // We are using the emitter's mutex, which is already locked.
|
| pthread_cond_signal(&signal_cond_);
|
| }
|
| @@ -113,8 +111,7 @@ Error EventListenerLock::WaitOnEvent(uint32_t events, int ms_timeout) {
|
| return 0;
|
| }
|
|
|
| -void EventListenerPoll::ReceiveEvents(EventEmitter* emitter,
|
| - uint32_t events) {
|
| +void EventListenerPoll::ReceiveEvents(EventEmitter* emitter, uint32_t events) {
|
| AUTO_LOCK(signal_lock_);
|
| emitters_[emitter]->events |= events;
|
| signaled_++;
|
| @@ -124,7 +121,6 @@ void EventListenerPoll::ReceiveEvents(EventEmitter* emitter,
|
| Error EventListenerPoll::WaitOnAny(EventRequest* requests,
|
| size_t cnt,
|
| int ms_timeout) {
|
| -
|
| signaled_ = 0;
|
|
|
| // Build a map of request emitters to request data before
|
|
|