| Index: runtime/bin/eventhandler_macos.cc
|
| diff --git a/runtime/bin/eventhandler_macos.cc b/runtime/bin/eventhandler_macos.cc
|
| index 00c0c2619fe94d966a03f7621cbb8cab167e6785..615dbccc4ff8fb4524685fa511c500a88a902154 100644
|
| --- a/runtime/bin/eventhandler_macos.cc
|
| +++ b/runtime/bin/eventhandler_macos.cc
|
| @@ -199,32 +199,32 @@ void EventHandlerImplementation::WakeupHandler(intptr_t id,
|
|
|
|
|
| void EventHandlerImplementation::HandleInterruptFd() {
|
| - InterruptMessage msg;
|
| - intptr_t available = FDUtils::AvailableBytes(interrupt_fds_[0]);
|
| - for (int i = 0;
|
| - i + kInterruptMessageSize <= available;
|
| - i += kInterruptMessageSize) {
|
| - VOID_TEMP_FAILURE_RETRY(read(interrupt_fds_[0],
|
| - reinterpret_cast<char*>(&msg),
|
| - kInterruptMessageSize));
|
| - if (msg.id == kTimerId) {
|
| - timeout_queue_.UpdateTimeout(msg.dart_port, msg.data);
|
| - } else if (msg.id == kShutdownId) {
|
| + const intptr_t BUFFER_SIZE = 8 * kInterruptMessageSize;
|
| + char buffer[BUFFER_SIZE];
|
| + ssize_t bytes = TEMP_FAILURE_RETRY(read(interrupt_fds_[0],
|
| + buffer,
|
| + BUFFER_SIZE));
|
| + for (ssize_t i = 0; i < bytes / kInterruptMessageSize; i++) {
|
| + InterruptMessage* msg = reinterpret_cast<InterruptMessage*>(
|
| + buffer + i * kInterruptMessageSize);
|
| + if (msg->id == kTimerId) {
|
| + timeout_queue_.UpdateTimeout(msg->dart_port, msg->data);
|
| + } else if (msg->id == kShutdownId) {
|
| shutdown_ = true;
|
| } else {
|
| - SocketData* sd = GetSocketData(msg.id);
|
| - if ((msg.data & (1 << kShutdownReadCommand)) != 0) {
|
| - ASSERT(msg.data == (1 << kShutdownReadCommand));
|
| + SocketData* sd = GetSocketData(msg->id);
|
| + if ((msg->data & (1 << kShutdownReadCommand)) != 0) {
|
| + ASSERT(msg->data == (1 << kShutdownReadCommand));
|
| // Close the socket for reading.
|
| sd->ShutdownRead();
|
| UpdateKqueue(kqueue_fd_, sd);
|
| - } else if ((msg.data & (1 << kShutdownWriteCommand)) != 0) {
|
| - ASSERT(msg.data == (1 << kShutdownWriteCommand));
|
| + } else if ((msg->data & (1 << kShutdownWriteCommand)) != 0) {
|
| + ASSERT(msg->data == (1 << kShutdownWriteCommand));
|
| // Close the socket for writing.
|
| sd->ShutdownWrite();
|
| UpdateKqueue(kqueue_fd_, sd);
|
| - } else if ((msg.data & (1 << kCloseCommand)) != 0) {
|
| - ASSERT(msg.data == (1 << kCloseCommand));
|
| + } else if ((msg->data & (1 << kCloseCommand)) != 0) {
|
| + ASSERT(msg->data == (1 << kCloseCommand));
|
| // Close the socket and free system resources.
|
| RemoveFromKqueue(kqueue_fd_, sd);
|
| intptr_t fd = sd->fd();
|
| @@ -239,13 +239,13 @@ void EventHandlerImplementation::HandleInterruptFd() {
|
| }
|
| socket_map_.Remove(GetHashmapKeyFromFd(fd), GetHashmapHashFromFd(fd));
|
| delete sd;
|
| - DartUtils::PostInt32(msg.dart_port, 1 << kDestroyedEvent);
|
| + DartUtils::PostInt32(msg->dart_port, 1 << kDestroyedEvent);
|
| } else {
|
| - if ((msg.data & (1 << kInEvent)) != 0 && sd->IsClosedRead()) {
|
| - DartUtils::PostInt32(msg.dart_port, 1 << kCloseEvent);
|
| + if ((msg->data & (1 << kInEvent)) != 0 && sd->IsClosedRead()) {
|
| + DartUtils::PostInt32(msg->dart_port, 1 << kCloseEvent);
|
| } else {
|
| // Setup events to wait for.
|
| - sd->SetPortAndMask(msg.dart_port, msg.data);
|
| + sd->SetPortAndMask(msg->dart_port, msg->data);
|
| UpdateKqueue(kqueue_fd_, sd);
|
| }
|
| }
|
|
|