X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/963b52e5188334fb68af3cb7a150a259361ac1e7..cdac506670725ae4fe40b3b1a31ceeb9488ce53a:/src/bindings/python/simgrid_python.cpp diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp index 89c6f4c648..211e65053e 100644 --- a/src/bindings/python/simgrid_python.cpp +++ b/src/bindings/python/simgrid_python.cpp @@ -1,17 +1,18 @@ -/* Copyright (c) 2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2018-2019. The SimGrid Team. All rights reserved. */ /* 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 // Must be first +#include + #include "src/kernel/context/Context.hpp" #include #include #include #include -#include -#include - #include #include #include @@ -47,12 +48,16 @@ PYBIND11_MODULE(simgrid, m) m.attr("simgrid_version") = simgrid_version; + // Internal exception used to kill actors and sweep the RAII chimney (free objects living on the stack) + py::object pyStopRequestEx = py::register_exception(m, "ActorKilled"); + /* this_actor namespace */ void (*sleep_for_fun)(double) = &simgrid::s4u::this_actor::sleep_for; // pick the right overload void (*sleep_until_fun)(double) = &simgrid::s4u::this_actor::sleep_until; py::module m2 = m.def_submodule("this_actor", "Bindings of the s4u::this_actor namespace."); m2.def("info", [](char* s) { XBT_INFO("%s", s); }, "Display a logging message of default priority."); + m2.def("error", [](char* s) { XBT_ERROR("%s", s); }, "Display a logging message of 'error' priority."); m2.def("execute", py::overload_cast(&simgrid::s4u::this_actor::execute), "Block the current actor, computing the given amount of flops at the given priority, see :cpp:func:`void " "simgrid::s4u::this_actor::execute(double, double)`", @@ -67,6 +72,21 @@ PYBIND11_MODULE(simgrid, m) m2.def("suspend", &simgrid::s4u::this_actor::suspend, "Suspend the current actor, that is blocked until resume()ed by another actor. see :cpp:func:`void simgrid::s4u::this_actor::suspend`"); m2.def("yield_", &simgrid::s4u::this_actor::yield, "Yield the actor, see :cpp:func:`void simgrid::s4u::this_actor::yield()`"); + m2.def("exit", &simgrid::s4u::this_actor::exit, "kill the current actor"); + m2.def("on_exit", + [](py::object fun) { + ActorPtr act = Actor::self(); + simgrid::s4u::this_actor::on_exit( + [act, fun](int ignored, void* data) { + try { + fun(); + } catch (py::error_already_set& e) { + xbt_die("Error while executing the on_exit lambda: %s", e.what()); + } + }, + nullptr); + }, + ""); /* Class Engine */ py::class_(m, "Engine", "Simulation Engine, see :ref:`class s4u::Engine `") @@ -81,7 +101,7 @@ PYBIND11_MODULE(simgrid, m) return new simgrid::s4u::Engine(&argc, argv.get()); })) .def("get_all_hosts", &Engine::get_all_hosts, "Returns the list of all hosts found in the platform") - .def("get_clock", &Engine::get_clock, "Retrieve the simulation time") + .def("get_clock", &Engine::get_clock, "Retrieve the simulation time (in seconds)") .def("load_platform", &Engine::load_platform, "Load a platform file describing the environment, see :cpp:func:`simgrid::s4u::Engine::load_platform()`") .def("load_deployment", &Engine::load_deployment, @@ -89,20 +109,29 @@ PYBIND11_MODULE(simgrid, m) ":cpp:func:`simgrid::s4u::Engine::load_deployment()`") .def("run", &Engine::run, "Run the simulation") .def("register_actor", - [](Engine*, std::string name, py::object fun_or_class) { + [pyStopRequestEx](Engine*, std::string name, py::object fun_or_class) { simgrid::simix::register_function( - name, [fun_or_class](std::vector args) -> simgrid::simix::ActorCode { - return [fun_or_class, args]() { - /* Convert the std::vector into a py::tuple */ - py::tuple params(args.size() - 1); - for (size_t i = 1; i < args.size(); i++) - params[i - 1] = py::cast(args[i]); - - py::object res = fun_or_class(*params); - - /* If I was passed a class, I just built an instance, so I need to call it now */ - if (py::isinstance(res)) - res(); + name, [pyStopRequestEx, fun_or_class](std::vector args) -> simgrid::simix::ActorCode { + return [pyStopRequestEx, fun_or_class, args]() { + try { + /* Convert the std::vector into a py::tuple */ + py::tuple params(args.size() - 1); + for (size_t i = 1; i < args.size(); i++) + params[i - 1] = py::cast(args[i]); + + py::object res = fun_or_class(*params); + + /* If I was passed a class, I just built an instance, so I need to call it now */ + if (py::isinstance(res)) + res(); + } catch (py::error_already_set& ex) { + if (ex.matches(pyStopRequestEx)) { + XBT_VERB("Actor killed"); + /* Stop here that StopRequest exception which was meant to free the RAII stuff on the stack */ + } else { + throw; + } + } }; }); }, @@ -135,7 +164,6 @@ 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 `") @@ -149,8 +177,8 @@ PYBIND11_MODULE(simgrid, m) 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 */ + XBT_VERB("Actor killed"); + /* Stop here that StopRequest exception which was meant to free the RAII stuff on the stack */ } else { throw; } @@ -159,17 +187,19 @@ PYBIND11_MODULE(simgrid, m) }, "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_property_readonly("pid", &Actor::get_pid, "The PID (unique identifier) of this actor.") + .def("by_pid", &Actor::by_pid, "Retrieve an actor by its PID") .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("kill", [](ActorPtr act) { act->kill(); }, "Kill that actor") + .def("kill_all", &Actor::kill_all, "Kill all actors but the caller.") .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("is_suspended", &Actor::is_suspended, "Returns True if that actor is currently suspended.") + .def("suspend", &Actor::suspend, "Suspend that actor, that is blocked until resume()ed by another actor.") + .def("resume", &Actor::resume, "Resume that actor, that was previously suspend()ed."); }