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

Unified Diff: base/message_loop/message_pump_libevent.cc

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 months 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: base/message_loop/message_pump_libevent.cc
diff --git a/base/message_loop/message_pump_libevent.cc b/base/message_loop/message_pump_libevent.cc
index d52025a1990ac6bb1895b35be5c22fd43862f1d2..b5b1fb7e81e860340920174309f968fe0048a0a6 100644
--- a/base/message_loop/message_pump_libevent.cc
+++ b/base/message_loop/message_pump_libevent.cc
@@ -15,6 +15,7 @@
#include "base/observer_list.h"
#include "base/posix/eintr_wrapper.h"
#include "base/time/time.h"
+#include "base/trace_event/trace_event.h"
#include "third_party/libevent/event.h"
#if defined(OS_MACOSX)
@@ -274,6 +275,9 @@ void MessagePumpLibevent::Run(Delegate* delegate) {
delayed_work_time_ = TimeTicks();
}
}
+
+ if (!keep_running_)
+ break;
}
}
@@ -341,6 +345,8 @@ void MessagePumpLibevent::OnLibeventNotification(int fd, short flags,
WeakPtr<FileDescriptorWatcher> controller =
static_cast<FileDescriptorWatcher*>(context)->weak_factory_.GetWeakPtr();
DCHECK(controller.get());
+ TRACE_EVENT1("toplevel", "MessagePumpLibevent::OnLibeventNotification",
+ "fd", fd);
MessagePumpLibevent* pump = controller->pump();
pump->processed_io_events_ = true;

Powered by Google App Engine
This is Rietveld 408576698