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

Unified Diff: mojo/edk/system/simple_dispatcher.cc

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more cleanup Created 5 years, 3 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: mojo/edk/system/simple_dispatcher.cc
diff --git a/third_party/mojo/src/mojo/edk/system/simple_dispatcher.cc b/mojo/edk/system/simple_dispatcher.cc
similarity index 86%
copy from third_party/mojo/src/mojo/edk/system/simple_dispatcher.cc
copy to mojo/edk/system/simple_dispatcher.cc
index f8baae788418e31adae9bfef573b0885e3b668df..447fe2e1b7fee88b9944ff2dad2f339ed4c0c227 100644
--- a/third_party/mojo/src/mojo/edk/system/simple_dispatcher.cc
+++ b/mojo/edk/system/simple_dispatcher.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "third_party/mojo/src/mojo/edk/system/simple_dispatcher.h"
+#include "mojo/edk/system/simple_dispatcher.h"
#include "base/logging.h"
namespace mojo {
-namespace system {
+namespace edk {
SimpleDispatcher::SimpleDispatcher() {
}
@@ -16,12 +16,12 @@ SimpleDispatcher::~SimpleDispatcher() {
}
void SimpleDispatcher::HandleSignalsStateChangedNoLock() {
- mutex().AssertHeld();
+ lock().AssertAcquired();
awakable_list_.AwakeForStateChange(GetHandleSignalsStateImplNoLock());
}
void SimpleDispatcher::CancelAllAwakablesNoLock() {
- mutex().AssertHeld();
+ lock().AssertAcquired();
awakable_list_.CancelAll();
}
@@ -30,7 +30,7 @@ MojoResult SimpleDispatcher::AddAwakableImplNoLock(
MojoHandleSignals signals,
uint32_t context,
HandleSignalsState* signals_state) {
- mutex().AssertHeld();
+ lock().AssertAcquired();
HandleSignalsState state(GetHandleSignalsStateImplNoLock());
if (state.satisfies(signals)) {
@@ -51,11 +51,11 @@ MojoResult SimpleDispatcher::AddAwakableImplNoLock(
void SimpleDispatcher::RemoveAwakableImplNoLock(
Awakable* awakable,
HandleSignalsState* signals_state) {
- mutex().AssertHeld();
+ lock().AssertAcquired();
awakable_list_.Remove(awakable);
if (signals_state)
*signals_state = GetHandleSignalsStateImplNoLock();
}
-} // namespace system
+} // namespace edk
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698