| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 #if !defined(DART_IO_DISABLED) | 5 #if !defined(DART_IO_DISABLED) |
| 6 | 6 |
| 7 #include "platform/globals.h" | 7 #include "platform/globals.h" |
| 8 #if defined(TARGET_OS_LINUX) | 8 #if defined(TARGET_OS_LINUX) |
| 9 | 9 |
| 10 #include "bin/eventhandler.h" | 10 #include "bin/eventhandler.h" |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 VOID_TEMP_FAILURE_RETRY_NO_SIGNAL_BLOCKER( | 355 VOID_TEMP_FAILURE_RETRY_NO_SIGNAL_BLOCKER( |
| 356 read(timer_fd_, &val, sizeof(val))); | 356 read(timer_fd_, &val, sizeof(val))); |
| 357 if (timeout_queue_.HasTimeout()) { | 357 if (timeout_queue_.HasTimeout()) { |
| 358 DartUtils::PostNull(timeout_queue_.CurrentPort()); | 358 DartUtils::PostNull(timeout_queue_.CurrentPort()); |
| 359 timeout_queue_.RemoveCurrent(); | 359 timeout_queue_.RemoveCurrent(); |
| 360 } | 360 } |
| 361 } else { | 361 } else { |
| 362 DescriptorInfo* di = | 362 DescriptorInfo* di = |
| 363 reinterpret_cast<DescriptorInfo*>(events[i].data.ptr); | 363 reinterpret_cast<DescriptorInfo*>(events[i].data.ptr); |
| 364 const intptr_t old_mask = di->Mask(); | 364 const intptr_t old_mask = di->Mask(); |
| 365 intptr_t event_mask = GetPollEvents(events[i].events, di); | 365 const intptr_t event_mask = GetPollEvents(events[i].events, di); |
| 366 if ((event_mask & (1 << kErrorEvent)) != 0) { | 366 if ((event_mask & (1 << kErrorEvent)) != 0) { |
| 367 di->NotifyAllDartPorts(event_mask); | 367 di->NotifyAllDartPorts(event_mask); |
| 368 } | 368 UpdateEpollInstance(old_mask, di); |
| 369 event_mask &= ~(1 << kErrorEvent); | 369 } else if (event_mask != 0) { |
| 370 | |
| 371 if (event_mask != 0) { | |
| 372 Dart_Port port = di->NextNotifyDartPort(event_mask); | 370 Dart_Port port = di->NextNotifyDartPort(event_mask); |
| 373 ASSERT(port != 0); | 371 ASSERT(port != 0); |
| 374 UpdateEpollInstance(old_mask, di); | 372 UpdateEpollInstance(old_mask, di); |
| 375 DartUtils::PostInt32(port, event_mask); | 373 DartUtils::PostInt32(port, event_mask); |
| 376 } | 374 } |
| 377 } | 375 } |
| 378 } | 376 } |
| 379 if (interrupt_seen) { | 377 if (interrupt_seen) { |
| 380 // Handle after socket events, so we avoid closing a socket before we handle | 378 // Handle after socket events, so we avoid closing a socket before we handle |
| 381 // the current events. | 379 // the current events. |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 // The hashmap does not support keys with value 0. | 437 // The hashmap does not support keys with value 0. |
| 440 return dart::Utils::WordHash(fd + 1); | 438 return dart::Utils::WordHash(fd + 1); |
| 441 } | 439 } |
| 442 | 440 |
| 443 } // namespace bin | 441 } // namespace bin |
| 444 } // namespace dart | 442 } // namespace dart |
| 445 | 443 |
| 446 #endif // defined(TARGET_OS_LINUX) | 444 #endif // defined(TARGET_OS_LINUX) |
| 447 | 445 |
| 448 #endif // !defined(DART_IO_DISABLED) | 446 #endif // !defined(DART_IO_DISABLED) |
| OLD | NEW |