diff options
author | blundell <blundell@chromium.org> | 2015-01-19 09:18:33 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-19 17:19:27 +0000 |
commit | 70fb54767b472a5edfb859e489beeeec7abdb0e4 (patch) | |
tree | 28e534ec774391a9f6571a1770e12a0d63ebf833 /mojo/public/python/src/common.cc | |
parent | ba5f0233fa38f949e24f6274ba891fa652eab640 (diff) | |
download | chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.zip chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.tar.gz chromium_src-70fb54767b472a5edfb859e489beeeec7abdb0e4.tar.bz2 |
Move //mojo/{public, edk} underneath //third_party
This CL move //mojo/public and //mojo/edk to live in the following locations:
- //third_party/mojo/src/mojo/public
- //third_party/mojo/src/mojo/edk
It moves the related gypfiles from //mojo to //third_party/mojo and updates
them as necessary to account for the file moves. It also updates clients of the
mojo SDK and EDK targets in both GYP and GN. (Note that for GN, the mojo SDK
and EDK build systems are maintained in the Mojo repo and designed to be
flexible wrt the location of the SDK/EDK in a client repo, so no changes are
needed.
This CL does not update include paths to the code being moved to limit the
number of moving parts, instead relying on the include_dirs that the SDK and
EDK targets supply to their direct dependents to ensure that include paths
continue to resolve correctly.
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/814543006
Cr-Commit-Position: refs/heads/master@{#312129}
Diffstat (limited to 'mojo/public/python/src/common.cc')
-rw-r--r-- | mojo/public/python/src/common.cc | 173 |
1 files changed, 0 insertions, 173 deletions
diff --git a/mojo/public/python/src/common.cc b/mojo/public/python/src/common.cc deleted file mode 100644 index a80d013..0000000 --- a/mojo/public/python/src/common.cc +++ /dev/null @@ -1,173 +0,0 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "mojo/public/python/src/common.h" - -#include <Python.h> - -#include "mojo/public/c/environment/async_waiter.h" -#include "mojo/public/cpp/bindings/callback.h" -#include "mojo/public/cpp/bindings/lib/shared_ptr.h" -#include "mojo/public/cpp/environment/logging.h" -#include "mojo/public/cpp/system/core.h" -#include "mojo/public/cpp/system/macros.h" -#include "mojo/public/cpp/utility/run_loop.h" - -namespace { - -void AsyncCallbackForwarder(void* closure, MojoResult result) { - mojo::Callback<void(MojoResult)>* callback = - static_cast<mojo::Callback<void(MojoResult)>*>(closure); - // callback will be deleted when it is run. - callback->Run(result); -} - -} // namespace - -namespace mojo { -namespace python { - -ScopedGIL::ScopedGIL() { - state_ = PyGILState_Ensure(); -} - -ScopedGIL::~ScopedGIL() { - PyGILState_Release(state_); -} - -ScopedPyRef::ScopedPyRef(PyObject* object) : object_(object) { -} - -ScopedPyRef::ScopedPyRef(PyObject* object, ScopedPyRefAcquire) - : object_(object) { - Py_XINCREF(object_); -} - -ScopedPyRef::~ScopedPyRef() { - if (object_) { - ScopedGIL acquire_gil; - Py_DECREF(object_); - } -} - -ScopedPyRef::operator PyObject*() const { - return object_; -} - -PythonClosure::PythonClosure(PyObject* callable, const mojo::Closure& quit) - : callable_(callable, kAcquire), quit_(quit) { - MOJO_DCHECK(callable); -} - -PythonClosure::~PythonClosure() {} - -void PythonClosure::Run() const { - ScopedGIL acquire_gil; - ScopedPyRef empty_tuple(PyTuple_New(0)); - if (!empty_tuple) { - quit_.Run(); - return; - } - - ScopedPyRef result(PyObject_CallObject(callable_, empty_tuple)); - if (!result) { - quit_.Run(); - return; - } -} - -Closure::Runnable* NewRunnableFromCallable(PyObject* callable, - const mojo::Closure& quit_closure) { - MOJO_DCHECK(PyCallable_Check(callable)); - - return new PythonClosure(callable, quit_closure); -} - -class PythonAsyncWaiter::AsyncWaiterRunnable - : public mojo::Callback<void(MojoResult)>::Runnable { - public: - AsyncWaiterRunnable(PyObject* callable, - CallbackMap* callbacks, - const mojo::Closure& quit) - : wait_id_(0), - callable_(callable, kAcquire), - callbacks_(callbacks), - quit_(quit) { - MOJO_DCHECK(callable_); - MOJO_DCHECK(callbacks_); - } - - void set_wait_id(MojoAsyncWaitID wait_id) { wait_id_ = wait_id; } - - void Run(MojoResult mojo_result) const override { - MOJO_DCHECK(wait_id_); - - // Remove to reference to this object from PythonAsyncWaiter and ensure this - // object will be destroyed when this method exits. - MOJO_DCHECK(callbacks_->find(wait_id_) != callbacks_->end()); - internal::SharedPtr<mojo::Callback<void(MojoResult)>> self = - (*callbacks_)[wait_id_]; - callbacks_->erase(wait_id_); - - ScopedGIL acquire_gil; - ScopedPyRef args_tuple(Py_BuildValue("(i)", mojo_result)); - if (!args_tuple) { - quit_.Run(); - return; - } - - ScopedPyRef result(PyObject_CallObject(callable_, args_tuple)); - if (!result) { - quit_.Run(); - return; - } - } - - private: - MojoAsyncWaitID wait_id_; - ScopedPyRef callable_; - CallbackMap* callbacks_; - const mojo::Closure quit_; - - MOJO_DISALLOW_COPY_AND_ASSIGN(AsyncWaiterRunnable); -}; - -PythonAsyncWaiter::PythonAsyncWaiter(const mojo::Closure& quit_closure) - : quit_(quit_closure) { - async_waiter_ = Environment::GetDefaultAsyncWaiter(); -} - -PythonAsyncWaiter::~PythonAsyncWaiter() { - for (CallbackMap::const_iterator it = callbacks_.begin(); - it != callbacks_.end(); - ++it) { - async_waiter_->CancelWait(it->first); - } -} - -MojoAsyncWaitID PythonAsyncWaiter::AsyncWait(MojoHandle handle, - MojoHandleSignals signals, - MojoDeadline deadline, - PyObject* callable) { - AsyncWaiterRunnable* runner = - new AsyncWaiterRunnable(callable, &callbacks_, quit_); - internal::SharedPtr<mojo::Callback<void(MojoResult)>> callback( - new mojo::Callback<void(MojoResult)>( - static_cast<mojo::Callback<void(MojoResult)>::Runnable*>(runner))); - MojoAsyncWaitID wait_id = async_waiter_->AsyncWait( - handle, signals, deadline, &AsyncCallbackForwarder, callback.get()); - callbacks_[wait_id] = callback; - runner->set_wait_id(wait_id); - return wait_id; -} - -void PythonAsyncWaiter::CancelWait(MojoAsyncWaitID wait_id) { - if (callbacks_.find(wait_id) != callbacks_.end()) { - async_waiter_->CancelWait(wait_id); - callbacks_.erase(wait_id); - } -} - -} // namespace python -} // namespace mojo |