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

Unified Diff: runtime/bin/eventhandler_macos.cc

Issue 82943004: Revert using one-shot on mac, as it doesn't work as expected. (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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/eventhandler_macos.cc
diff --git a/runtime/bin/eventhandler_macos.cc b/runtime/bin/eventhandler_macos.cc
index 4b0566351be3a2a5faba11a09c1404a7a01c9baf..00c0c2619fe94d966a03f7621cbb8cab167e6785 100644
--- a/runtime/bin/eventhandler_macos.cc
+++ b/runtime/bin/eventhandler_macos.cc
@@ -78,19 +78,11 @@ static void UpdateKqueue(intptr_t kqueue_fd_, SocketData* sd) {
static const intptr_t kMaxChanges = 2;
intptr_t changes = 0;
struct kevent events[kMaxChanges];
- // Only report events once and wait for them to be re-enabled after the
- // event has been handled by the Dart code. This is done by using EV_ONESHOT.
if (sd->port() != 0) {
// Register or unregister READ filter if needed.
if (sd->HasReadEvent()) {
if (!sd->read_tracked_by_kqueue()) {
- EV_SET(events + changes,
- sd->fd(),
- EVFILT_READ,
- EV_ADD | EV_ONESHOT,
- 0,
- 0,
- sd);
+ EV_SET(events + changes, sd->fd(), EVFILT_READ, EV_ADD, 0, 0, sd);
++changes;
sd->set_read_tracked_by_kqueue(true);
}
@@ -102,13 +94,7 @@ static void UpdateKqueue(intptr_t kqueue_fd_, SocketData* sd) {
// Register or unregister WRITE filter if needed.
if (sd->HasWriteEvent()) {
if (!sd->write_tracked_by_kqueue()) {
- EV_SET(events + changes,
- sd->fd(),
- EVFILT_WRITE,
- EV_ADD | EV_ONESHOT,
- 0,
- 0,
- sd);
+ EV_SET(events + changes, sd->fd(), EVFILT_WRITE, EV_ADD, 0, 0, sd);
++changes;
sd->set_write_tracked_by_kqueue(true);
}
@@ -356,8 +342,7 @@ void EventHandlerImplementation::HandleEvents(struct kevent* events,
interrupt_seen = true;
} else {
SocketData* sd = reinterpret_cast<SocketData*>(events[i].udata);
- sd->set_read_tracked_by_kqueue(false);
- sd->set_write_tracked_by_kqueue(false);
+ RemoveFromKqueue(kqueue_fd_, sd);
intptr_t event_mask = GetEvents(events + i, sd);
if (event_mask != 0) {
Dart_Port port = sd->port();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698