From: Martin Quinson Date: Tue, 8 Jan 2019 03:43:16 +0000 (+0100) Subject: allow python actors to be killed X-Git-Tag: v3_22~661 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d84590a56d4bbb4ade4416d4bd7f19acdb7dd621?ds=sidebyside allow python actors to be killed Only works for directly created actors for now, not for the registered ones. I need to do the same kind of things for register_actors, now. The funny thing is that I didn't had to clean the contexts for that. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 8abfa35fb0..6c8585475b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -782,6 +782,8 @@ if(enable_python) set_source_files_properties(src/bindings/python/simgrid_python.cpp PROPERTIES COMPILE_FLAGS -std=c++14) target_link_libraries(simgrid_python PUBLIC simgrid) set_target_properties(simgrid_python PROPERTIES LIBRARY_OUTPUT_NAME simgrid) + set_property(TARGET simgrid_python + APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}") else() message(FATAL_ERROR "Please install pybind11-dev to build the Python bindings (or disable that option).") endif() diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp index 10e2037550..15eae3d7b5 100644 --- a/src/bindings/python/simgrid_python.cpp +++ b/src/bindings/python/simgrid_python.cpp @@ -3,18 +3,19 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include -#include -#include - -#include -#include - +#include "src/kernel/context/Context.hpp" #include #include #include #include +#include +#include + +#include +#include +#include + namespace py = pybind11; using simgrid::s4u::Actor; using simgrid::s4u::ActorPtr; @@ -136,33 +137,41 @@ PYBIND11_MODULE(simgrid, m) }, "Blocking data reception, see :cpp:func:`void* simgrid::s4u::Mailbox::get()`"); /* Class Actor */ + py::object pyStopRequestEx = py::register_exception(m, "ActorKilled"); py::class_(m, "Actor", "An actor is an independent stream of execution in your distributed " "application, see :ref:`class s4u::Actor `") .def("create", - [](py::args args, py::kwargs kwargs) { - xbt_assert(args.size() > 2, - "Creating an actor takes at least 3 parameters: name, host, and main function."); - return simgrid::s4u::Actor::create(args[0].cast(), args[1].cast(), [args]() { - py::tuple funargs(args.size() - 3); - for (size_t i = 3; i < args.size(); i++) - funargs[i - 3] = args[i]; - - PyObject* result = PyObject_CallObject(args[2].ptr(), funargs.ptr()); - if (!result) - throw pybind11::error_already_set(); + [pyStopRequestEx](py::str name, py::object host, py::object fun, py::args args) { + + return simgrid::s4u::Actor::create(name, host.cast(), [fun, args, pyStopRequestEx]() { + + try { + fun(*args); + } catch (py::error_already_set& ex) { + if (ex.matches(pyStopRequestEx)) { + /* The actor was killed. + * Stop here that StopRequest exception which was meant to free the RAII stuff on the stack */ + } else { + throw; + } + } }); }, "Create an actor from a function or an object, see :cpp:func:`simgrid::s4u::Actor::create()`") .def_property("host", &Actor::get_host, &Actor::migrate, "The host on which this actor is located") - .def("daemonize", &Actor::daemonize, "This actor will be automatically terminated when the last non-daemon actor finishes, see :cpp:func:`void simgrid::s4u::Actor::daemonize()`") - .def("join", py::overload_cast(&Actor::join), "Wait for the actor to finish, see :cpp:func:`void simgrid::s4u::Actor::join(double)`", - py::arg("timeout")) - .def("migrate", &Actor::migrate, "Moves that actor to another host, see :cpp:func:`void simgrid::s4u::Actor::migrate()`", - py::arg("dest")) + .def("daemonize", &Actor::daemonize, + "This actor will be automatically terminated when the last non-daemon actor finishes, see :cpp:func:`void " + "simgrid::s4u::Actor::daemonize()`") + .def("join", py::overload_cast(&Actor::join), + "Wait for the actor to finish, see :cpp:func:`void simgrid::s4u::Actor::join(double)`", py::arg("timeout")) + .def("migrate", &Actor::migrate, + "Moves that actor to another host, see :cpp:func:`void simgrid::s4u::Actor::migrate()`", py::arg("dest")) .def("self", &Actor::self, "Retrieves the current actor, see :cpp:func:`void simgrid::s4u::Actor::self()`") - .def("suspend", &Actor::suspend, "Suspend that actor, that is blocked until resume()ed by another actor. See :cpp:func:`void simgrid::s4u::Actor::suspend()`") - .def("resume", &Actor::resume, "Resume that actor, that was previously suspend()ed. See :cpp:func:`void simgrid::s4u::Actor::suspend()`"); - + .def("suspend", &Actor::suspend, + "Suspend that actor, that is blocked until resume()ed by another actor. See :cpp:func:`void " + "simgrid::s4u::Actor::suspend()`") + .def("resume", &Actor::resume, + "Resume that actor, that was previously suspend()ed. See :cpp:func:`void simgrid::s4u::Actor::suspend()`"); } diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp index b16f819291..e2a3e929e0 100644 --- a/src/kernel/context/Context.hpp +++ b/src/kernel/context/Context.hpp @@ -85,10 +85,11 @@ public: */ public: StopRequest() = default; - explicit StopRequest(std::string msg) : msg_(msg) {} + explicit StopRequest(std::string msg) : msg_(std::string("Actor killed (") + msg + std::string(").")) {} + virtual const char* what() const noexcept { return msg_.c_str(); } private: - std::string msg_; + std::string msg_ = std::string("Actor killed."); }; }; diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index f9bc84422e..4b16464033 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -504,7 +504,7 @@ void SIMIX_process_kill(smx_actor_t actor, smx_actor_t issuer) */ if (simgrid::kernel::context::factory_initializer == nullptr) // Only Java sets a factory_initializer, for now - actor->throw_exception(std::make_exception_ptr(simgrid::kernel::context::Context::StopRequest("Host failed"))); + actor->throw_exception(std::make_exception_ptr(simgrid::kernel::context::Context::StopRequest("host failed"))); } /* destroy the blocking synchro if any */