X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2e12d9e96a253599c90799b5537c7a0f1a07f6e0..fe0f39b4adfddf308e204c533ede55e74920919e:/src/bindings/python/simgrid_python.cpp diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp index 38b0287738..ca377e66bc 100644 --- a/src/bindings/python/simgrid_python.cpp +++ b/src/bindings/python/simgrid_python.cpp @@ -3,26 +3,18 @@ /* 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 #include -#include -#include -#include - #include #include #include #include -#include - namespace py = pybind11; using simgrid::s4u::Actor; using simgrid::s4u::ActorPtr; @@ -55,12 +47,23 @@ PYBIND11_MODULE(simgrid, m) m.attr("simgrid_version") = simgrid_version; /* 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("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)`", py::arg("flops"), py::arg("priority") = 1); + m2.def("get_host", &simgrid::s4u::this_actor::get_host, "Retrives 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("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, + "Block the actor sleeping until the specified timestamp, see :cpp:func:`void simgrid::s4u::this_actor::sleep_until`", py::arg("duration")); + 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()`"); @@ -76,6 +79,8 @@ PYBIND11_MODULE(simgrid, m) // Currently this can be dangling, we should wrap this somehow. 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("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, @@ -105,20 +110,19 @@ PYBIND11_MODULE(simgrid, m) ; /* Class Host */ - auto get_name = [](const Host* self) { - return self->get_name(); - }; py::class_>(m, "Host", "Simulation Engine, see :ref:`class s4u::Host `") - .def("by_name", &Host::by_name, "Retrieve a host from its name, or die") - .def("get_name", &Host::get_name, "Retrieve the name of this host") - .def_property_readonly("name", get_name, "Retrieve the name of this host") + .def("by_name", &Host::by_name, "Retrieves a host from its name, or die") + .def("current", &Host::current, "Retrieves the host on which the running actor is located, see :cpp:func:`simgrid::s4u::Host::current()`") + .def_property_readonly("name", [](Host* self) -> const std::string { + return static_cast(self->get_name()); + }, "Retrieve the name of this host") .def_property_readonly("speed", &Host::get_speed, "Get the peak computing speed in flops/s at the current pstate, taking the external load into account, see :cpp:func:`simgrid::s4u::Host::get_speed()`"); /* Class Mailbox */ py::class_>(m, "Mailbox", "Mailbox, see :ref:`class s4u::Mailbox `") .def("by_name", &Mailbox::by_name, "Retrieve a Mailbox from its name, see :cpp:func:`simgrid::s4u::Mailbox::by_name()`") - .def("get_name", &Mailbox::get_name, "Retrieves the name of that host, see :cpp:func:`simgrid::s4u::Mailbox::get_name()`") + .def_property_readonly("name", &Mailbox::get_name, "Retrieves the name of that mailbox, see :cpp:func:`simgrid::s4u::Mailbox::get_name()`") .def("put", [](Mailbox self, py::object data, int size) { data.inc_ref(); self.put(data.ptr(), size); @@ -149,5 +153,13 @@ PYBIND11_MODULE(simgrid, m) throw pybind11::error_already_set(); }); }, - "Create an actor from a function or an object, see :cpp:func:`simgrid::s4u::Actor::create()`"); + "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("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("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()`"); + }