X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88ab1886abad7149f3ea3448ab035f1d62e6b63b..cb1f41e17133f75d16ce09edee442cda1ae579b6:/src/bindings/python/simgrid_python.cpp diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp index 9dd112ff3b..2cc272a8a5 100644 --- a/src/bindings/python/simgrid_python.cpp +++ b/src/bindings/python/simgrid_python.cpp @@ -8,10 +8,19 @@ #define _hypot hypot #endif +#if defined(__GNUG__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-value" +#endif + #include #include // Must come before our own stuff #include +#if defined(__GNUG__) +#pragma GCC diagnostic pop +#endif + #include "src/kernel/context/Context.hpp" #include #include @@ -59,7 +68,7 @@ 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 pyForcefulKillEx = py::register_exception(m, "ActorKilled"); + static py::object pyForcefulKillEx(py::register_exception(m, "ActorKilled")); /* this_actor namespace */ void (*sleep_for_fun)(double) = &simgrid::s4u::this_actor::sleep_for; // pick the right overload @@ -74,8 +83,9 @@ PYBIND11_MODULE(simgrid, m) py::arg("flops"), py::arg("priority") = 1); m2.def("exec_init", [](double flops){return simgrid::s4u::this_actor::exec_init(flops);}); m2.def("get_host", &simgrid::s4u::this_actor::get_host, "Retrieves host on which the current actor is located"); - m2.def("migrate", &simgrid::s4u::this_actor::migrate, "Moves the current actor to another host, see :cpp:func:`void simgrid::s4u::this_actor::migrate()`", - py::arg("dest")); + m2.def("set_host", &simgrid::s4u::this_actor::set_host, + "Moves the current actor to another host, see :cpp:func:`void simgrid::s4u::this_actor::set_host()`", + py::arg("dest")); m2.def("sleep_for", sleep_for_fun, "Block the actor sleeping for that amount of seconds, see :cpp:func:`void simgrid::s4u::this_actor::sleep_for`", py::arg("duration")); m2.def("sleep_until", sleep_until_fun, @@ -118,33 +128,30 @@ PYBIND11_MODULE(simgrid, m) ":cpp:func:`simgrid::s4u::Engine::load_deployment()`") .def("run", &Engine::run, "Run the simulation") .def("register_actor", - [pyForcefulKillEx](Engine*, const std::string& name, py::object fun_or_class) { - simgrid::simix::register_function( - name, [pyForcefulKillEx, fun_or_class](std::vector args) -> simgrid::simix::ActorCode { - return [pyForcefulKillEx, 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]); + [](Engine* e, const std::string& name, py::object fun_or_class) { + e->register_actor(name, [fun_or_class](std::vector 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); + 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(pyForcefulKillEx)) { - XBT_VERB("Actor killed"); - /* Stop here that ForcefulKill exception which was meant to free the RAII stuff on the stack */ - } else { - throw; - } - } - }; - }); + /* 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(pyForcefulKillEx)) { + XBT_VERB("Actor killed"); + /* Stop here that ForcefulKill exception which was meant to free the RAII stuff on the stack */ + } else { + throw; + } + } + }); }, - "Registers the main function of an actor, see :cpp:func:`simgrid::s4u::Engine::register_function()`"); + "Registers the main function of an actor, see :cpp:func:`simgrid::s4u::Engine::register_actor()`"); /* Class Host */ py::class_>(m, "Host", "Simulation Engine, see :ref:`class s4u::Host `") @@ -228,9 +235,9 @@ PYBIND11_MODULE(simgrid, m) "application, see :ref:`class s4u::Actor `") .def("create", - [pyForcefulKillEx](py::str name, py::object host, py::object fun, py::args args) { + [](py::str name, py::object host, py::object fun, py::args args) { - return simgrid::s4u::Actor::create(name, host.cast(), [fun, args, pyForcefulKillEx]() { + return simgrid::s4u::Actor::create(name, host.cast(), [fun, args]() { try { fun(*args); @@ -244,20 +251,24 @@ 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") + "Create an actor from a function or an object.") + .def_property("host", &Actor::get_host, &Actor::set_host, "The host on which this actor is located") + .def_property_readonly("name", &Actor::get_cname, "The name of this actor.") .def_property_readonly("pid", &Actor::get_pid, "The PID (unique identifier) of this actor.") + .def_property_readonly("ppid", &Actor::get_ppid, + "The PID (unique identifier) of the actor that created this one.") .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()`") + "This actor will be automatically terminated when the last non-daemon actor finishes (more info in the C++ " + "documentation).") + .def("is_daemon", &Actor::is_daemon, + "Returns True if that actor is a daemon and will be terminated automatically when the last non-daemon actor " + "terminates.") .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")) + "Wait for the actor to finish (more info in the C++ documentation).", 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("self", &Actor::self, "Retrieves the current actor.") .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.");