summaryrefslogtreecommitdiffstats
path: root/mojo/common
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-18 10:18:11 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-18 10:18:11 +0000
commite3da5f90272f3064bb6b440989aba38ea29d35a9 (patch)
treef36912359cf290a7d5149312c31fab982fdbaa25 /mojo/common
parent671e8513e2e25e20c6189714c3762d6ef3e4a8a8 (diff)
downloadchromium_src-e3da5f90272f3064bb6b440989aba38ea29d35a9.zip
chromium_src-e3da5f90272f3064bb6b440989aba38ea29d35a9.tar.gz
chromium_src-e3da5f90272f3064bb6b440989aba38ea29d35a9.tar.bz2
Mojo: MojoWaitFlags -> MojoHandleSignals.
I still have to rename MOJO_WAIT_... and MojoWaitFlagsState, but I'll do that separately. R=sky@chromium.org Review URL: https://codereview.chromium.org/345463003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278012 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/common')
-rw-r--r--mojo/common/handle_watcher.cc22
-rw-r--r--mojo/common/handle_watcher.h2
-rw-r--r--mojo/common/message_pump_mojo.cc14
-rw-r--r--mojo/common/message_pump_mojo.h6
4 files changed, 22 insertions, 22 deletions
diff --git a/mojo/common/handle_watcher.cc b/mojo/common/handle_watcher.cc
index 4ae86db..a01c220a 100644
--- a/mojo/common/handle_watcher.cc
+++ b/mojo/common/handle_watcher.cc
@@ -46,12 +46,12 @@ base::TimeTicks MojoDeadlineToTimeTicks(MojoDeadline deadline) {
struct WatchData {
WatchData()
: id(0),
- wait_flags(MOJO_WAIT_FLAG_NONE),
+ handle_signals(MOJO_WAIT_FLAG_NONE),
message_loop(NULL) {}
WatcherID id;
Handle handle;
- MojoWaitFlags wait_flags;
+ MojoHandleSignals handle_signals;
base::TimeTicks deadline;
base::Callback<void(MojoResult)> callback;
scoped_refptr<base::MessageLoopProxy> message_loop;
@@ -103,7 +103,7 @@ void WatcherBackend::StartWatching(const WatchData& data) {
handle_to_data_[data.handle] = data;
message_pump_mojo->AddHandler(this, data.handle,
- data.wait_flags,
+ data.handle_signals,
data.deadline);
}
@@ -165,7 +165,7 @@ class WatcherThreadManager {
// on the thread StartWatching() was invoked on.
// This may be invoked on any thread.
WatcherID StartWatching(const Handle& handle,
- MojoWaitFlags wait_flags,
+ MojoHandleSignals handle_signals,
base::TimeTicks deadline,
const base::Callback<void(MojoResult)>& callback);
@@ -196,14 +196,14 @@ WatcherThreadManager* WatcherThreadManager::GetInstance() {
WatcherID WatcherThreadManager::StartWatching(
const Handle& handle,
- MojoWaitFlags wait_flags,
+ MojoHandleSignals handle_signals,
base::TimeTicks deadline,
const base::Callback<void(MojoResult)>& callback) {
WatchData data;
data.id = watcher_id_generator_.GetNext();
data.handle = handle;
data.callback = callback;
- data.wait_flags = wait_flags;
+ data.handle_signals = handle_signals;
data.deadline = deadline;
data.message_loop = base::MessageLoopProxy::current();
DCHECK_NE(static_cast<base::MessageLoopProxy*>(NULL),
@@ -244,7 +244,7 @@ class HandleWatcher::State : public base::MessageLoop::DestructionObserver {
public:
State(HandleWatcher* watcher,
const Handle& handle,
- MojoWaitFlags wait_flags,
+ MojoHandleSignals handle_signals,
MojoDeadline deadline,
const base::Callback<void(MojoResult)>& callback)
: watcher_(watcher),
@@ -254,7 +254,7 @@ class HandleWatcher::State : public base::MessageLoop::DestructionObserver {
watcher_id_ = WatcherThreadManager::GetInstance()->StartWatching(
handle,
- wait_flags,
+ handle_signals,
MojoDeadlineToTimeTicks(deadline),
base::Bind(&State::OnHandleReady, weak_factory_.GetWeakPtr()));
}
@@ -295,13 +295,13 @@ HandleWatcher::~HandleWatcher() {
}
void HandleWatcher::Start(const Handle& handle,
- MojoWaitFlags wait_flags,
+ MojoHandleSignals handle_signals,
MojoDeadline deadline,
const base::Callback<void(MojoResult)>& callback) {
DCHECK(handle.is_valid());
- DCHECK_NE(MOJO_WAIT_FLAG_NONE, wait_flags);
+ DCHECK_NE(MOJO_WAIT_FLAG_NONE, handle_signals);
- state_.reset(new State(this, handle, wait_flags, deadline, callback));
+ state_.reset(new State(this, handle, handle_signals, deadline, callback));
}
void HandleWatcher::Stop() {
diff --git a/mojo/common/handle_watcher.h b/mojo/common/handle_watcher.h
index 0660abb..9fac3f5 100644
--- a/mojo/common/handle_watcher.h
+++ b/mojo/common/handle_watcher.h
@@ -37,7 +37,7 @@ class MOJO_COMMON_EXPORT HandleWatcher {
// before the handle is ready, then |callback| is invoked with a result of
// MOJO_RESULT_ABORTED.
void Start(const Handle& handle,
- MojoWaitFlags wait_flags,
+ MojoHandleSignals handle_signals,
MojoDeadline deadline,
const base::Callback<void(MojoResult)>& callback);
diff --git a/mojo/common/message_pump_mojo.cc b/mojo/common/message_pump_mojo.cc
index 9eee1a0..751d5c0 100644
--- a/mojo/common/message_pump_mojo.cc
+++ b/mojo/common/message_pump_mojo.cc
@@ -20,7 +20,7 @@ namespace common {
// corresponds to that of the control pipe.
struct MessagePumpMojo::WaitState {
std::vector<Handle> handles;
- std::vector<MojoWaitFlags> wait_flags;
+ std::vector<MojoHandleSignals> wait_signals;
};
struct MessagePumpMojo::RunState {
@@ -50,7 +50,7 @@ scoped_ptr<base::MessagePump> MessagePumpMojo::Create() {
void MessagePumpMojo::AddHandler(MessagePumpMojoHandler* handler,
const Handle& handle,
- MojoWaitFlags wait_flags,
+ MojoHandleSignals wait_signals,
base::TimeTicks deadline) {
DCHECK(handler);
DCHECK(handle.is_valid());
@@ -58,7 +58,7 @@ void MessagePumpMojo::AddHandler(MessagePumpMojoHandler* handler,
DCHECK_EQ(0u, handlers_.count(handle));
Handler handler_data;
handler_data.handler = handler;
- handler_data.wait_flags = wait_flags;
+ handler_data.wait_signals = wait_signals;
handler_data.deadline = deadline;
handler_data.id = next_handler_id_++;
handlers_[handle] = handler_data;
@@ -142,7 +142,7 @@ void MessagePumpMojo::DoInternalWork(const RunState& run_state, bool block) {
const MojoDeadline deadline = block ? GetDeadlineForWait(run_state) : 0;
const WaitState wait_state = GetWaitState(run_state);
const MojoResult result =
- WaitMany(wait_state.handles, wait_state.wait_flags, deadline);
+ WaitMany(wait_state.handles, wait_state.wait_signals, deadline);
if (result == 0) {
// Control pipe was written to.
uint32_t num_bytes = 0;
@@ -189,7 +189,7 @@ void MessagePumpMojo::RemoveFirstInvalidHandle(const WaitState& wait_state) {
// TODO(sky): deal with control pipe going bad.
for (size_t i = 1; i < wait_state.handles.size(); ++i) {
const MojoResult result =
- Wait(wait_state.handles[i], wait_state.wait_flags[i], 0);
+ Wait(wait_state.handles[i], wait_state.wait_signals[i], 0);
if (result == MOJO_RESULT_INVALID_ARGUMENT ||
result == MOJO_RESULT_FAILED_PRECONDITION ||
result == MOJO_RESULT_CANCELLED) {
@@ -215,12 +215,12 @@ MessagePumpMojo::WaitState MessagePumpMojo::GetWaitState(
const RunState& run_state) const {
WaitState wait_state;
wait_state.handles.push_back(run_state.read_handle.get());
- wait_state.wait_flags.push_back(MOJO_WAIT_FLAG_READABLE);
+ wait_state.wait_signals.push_back(MOJO_WAIT_FLAG_READABLE);
for (HandleToHandler::const_iterator i = handlers_.begin();
i != handlers_.end(); ++i) {
wait_state.handles.push_back(i->first);
- wait_state.wait_flags.push_back(i->second.wait_flags);
+ wait_state.wait_signals.push_back(i->second.wait_signals);
}
return wait_state;
}
diff --git a/mojo/common/message_pump_mojo.h b/mojo/common/message_pump_mojo.h
index c761106..49d3e9e 100644
--- a/mojo/common/message_pump_mojo.h
+++ b/mojo/common/message_pump_mojo.h
@@ -33,7 +33,7 @@ class MOJO_COMMON_EXPORT MessagePumpMojo : public base::MessagePump {
// handler can be registered for a specified handle.
void AddHandler(MessagePumpMojoHandler* handler,
const Handle& handle,
- MojoWaitFlags wait_flags,
+ MojoHandleSignals wait_signals,
base::TimeTicks deadline);
void RemoveHandler(const Handle& handle);
@@ -51,10 +51,10 @@ class MOJO_COMMON_EXPORT MessagePumpMojo : public base::MessagePump {
// Contains the data needed to track a request to AddHandler().
struct Handler {
- Handler() : handler(NULL), wait_flags(MOJO_WAIT_FLAG_NONE), id(0) {}
+ Handler() : handler(NULL), wait_signals(MOJO_WAIT_FLAG_NONE), id(0) {}
MessagePumpMojoHandler* handler;
- MojoWaitFlags wait_flags;
+ MojoHandleSignals wait_signals;
base::TimeTicks deadline;
// See description of |MessagePumpMojo::next_handler_id_| for details.
int id;
generated by cgit v1.1 at 2025-03-18 05:27:02 +0000