Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(929)

Unified Diff: runtime/bin/eventhandler_linux.cc

Issue 83173003: Read up to 8 InterruptMessages at a time, in unix eventhandlers. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: runtime/bin/eventhandler_linux.cc
diff --git a/runtime/bin/eventhandler_linux.cc b/runtime/bin/eventhandler_linux.cc
index 5b180fc5aa1b91ac63a6be1c596e20143e2e1641..d9c49ba1a1e8148c166dfd0d08cc9788ba673fe0 100644
--- a/runtime/bin/eventhandler_linux.cc
+++ b/runtime/bin/eventhandler_linux.cc
@@ -184,32 +184,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();
UpdateEpollInstance(epoll_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();
UpdateEpollInstance(epoll_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 and move on to
// next message.
RemoveFromEpollInstance(epoll_fd_, sd);
@@ -225,13 +225,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);
UpdateEpollInstance(epoll_fd_, sd);
}
}

Powered by Google App Engine
This is Rietveld 408576698