X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50315369ab3f6921a3c6c6a266cf1d25b9c56b4d..HEAD:/src/bindings/python/simgrid_python.cpp diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp index a89056d97a..d00494965a 100644 --- a/src/bindings/python/simgrid_python.cpp +++ b/src/bindings/python/simgrid_python.cpp @@ -10,8 +10,9 @@ #include "simgrid/kernel/ProfileBuilder.hpp" #include "simgrid/kernel/routing/NetPoint.hpp" +#include "simgrid/plugins/load.h" #include -#include +#include #include #include #include @@ -25,6 +26,7 @@ #include #include #include +#include #include #include @@ -33,30 +35,34 @@ #include namespace py = pybind11; -using simgrid::plugins::CommTask; -using simgrid::plugins::CommTaskPtr; -using simgrid::plugins::ExecTask; -using simgrid::plugins::ExecTaskPtr; -using simgrid::plugins::IoTask; -using simgrid::plugins::IoTaskPtr; -using simgrid::plugins::Task; -using simgrid::plugins::TaskPtr; +using simgrid::s4u::Activity; +using simgrid::s4u::ActivityPtr; +using simgrid::s4u::ActivitySet; +using simgrid::s4u::ActivitySetPtr; using simgrid::s4u::Actor; using simgrid::s4u::ActorPtr; using simgrid::s4u::Barrier; using simgrid::s4u::BarrierPtr; using simgrid::s4u::Comm; using simgrid::s4u::CommPtr; +using simgrid::s4u::CommTask; +using simgrid::s4u::CommTaskPtr; using simgrid::s4u::Disk; using simgrid::s4u::Engine; +using simgrid::s4u::ExecTask; +using simgrid::s4u::ExecTaskPtr; using simgrid::s4u::Host; using simgrid::s4u::Io; +using simgrid::s4u::IoTask; +using simgrid::s4u::IoTaskPtr; using simgrid::s4u::Link; using simgrid::s4u::Mailbox; using simgrid::s4u::Mutex; using simgrid::s4u::MutexPtr; using simgrid::s4u::Semaphore; using simgrid::s4u::SemaphorePtr; +using simgrid::s4u::Task; +using simgrid::s4u::TaskPtr; XBT_LOG_NEW_DEFAULT_CATEGORY(python, "python"); @@ -70,15 +76,6 @@ std::string get_simgrid_version() sg_version_get(&major, &minor, &patch); return simgrid::xbt::string_printf("%i.%i.%i", major, minor, patch); } - -/** @brief Wrap for mailbox::get_async */ -class PyGetAsync { - std::unique_ptr data = std::make_unique(); - -public: - PyObject** get() const { return data.get(); } -}; - } // namespace PYBIND11_DECLARE_HOLDER_TYPE(T, boost::intrusive_ptr) @@ -171,54 +168,16 @@ PYBIND11_MODULE(simgrid, m) return new simgrid::s4u::Engine(&argc, argv.data()); }), "The constructor should take the parameters from the command line, as is ") - .def_static("get_clock", - []() // XBT_ATTRIB_DEPRECATED_v334 - { - PyErr_WarnEx( - PyExc_DeprecationWarning, - "get_clock() is deprecated and will be dropped after v3.33, use `Engine.clock` instead.", 1); - return Engine::get_clock(); - }) .def_property_readonly_static( "clock", [](py::object /* self */) { return Engine::get_clock(); }, "The simulation time, ie the amount of simulated seconds since the simulation start.") .def_property_readonly_static( "instance", [](py::object /* self */) { return Engine::get_instance(); }, "Retrieve the simulation engine") - .def("get_all_hosts", - [](py::object self) // XBT_ATTRIB_DEPRECATED_v334 - { - PyErr_WarnEx(PyExc_DeprecationWarning, - "get_all_hosts() is deprecated and will be dropped after v3.33, use all_hosts instead.", 1); - return self.attr("all_hosts"); - }) .def("host_by_name", &Engine::host_by_name_or_null, "Retrieve a host by its name, or None if it does not exist in the platform.") .def_property_readonly("all_hosts", &Engine::get_all_hosts, "Returns the list of all hosts found in the platform") - .def("get_all_links", - [](py::object self) // XBT_ATTRIB_DEPRECATED_v334 - { - PyErr_WarnEx(PyExc_DeprecationWarning, - "get_all_links() is deprecated and will be dropped after v3.33, use all_links instead.", 1); - return self.attr("all_links"); - }) .def_property_readonly("all_links", &Engine::get_all_links, "Returns the list of all links found in the platform") - .def("get_all_netpoints", - [](py::object self) // XBT_ATTRIB_DEPRECATED_v334 - { - PyErr_WarnEx( - PyExc_DeprecationWarning, - "get_all_netpoints() is deprecated and will be dropped after v3.33, use all_netpoints instead.", 1); - return self.attr("all_netpoints"); - }) .def_property_readonly("all_netpoints", &Engine::get_all_netpoints) - .def("get_netzone_root", - [](py::object self) // XBT_ATTRIB_DEPRECATED_v334 - { - PyErr_WarnEx( - PyExc_DeprecationWarning, - "get_netzone_root() is deprecated and will be dropped after v3.33, use netzone_root instead.", 1); - return self.attr("netzone_root"); - }) .def_property_readonly("netzone_root", &Engine::get_netzone_root, "Retrieve the root netzone, containing all others.") .def("netpoint_by_name", &Engine::netpoint_by_name_or_null) @@ -260,7 +219,8 @@ PYBIND11_MODULE(simgrid, m) } }); }, - "Registers the main function of an actor"); + "Registers the main function of an actor") + .def("set_log_control", [](Engine*, const std::string& settings) { xbt_log_control_set(settings.c_str()); }); /* Class Netzone */ py::class_> netzone( @@ -276,10 +236,21 @@ PYBIND11_MODULE(simgrid, m) .def_static("create_empty_zone", &simgrid::s4u::create_empty_zone, "Creates a zone of type Empty") .def_static("create_wifi_zone", &simgrid::s4u::create_wifi_zone, "Creates a zone of type Wi-Fi") .def("add_route", - py::overload_cast&, bool>(&simgrid::s4u::NetZone::add_route), + "Add a route between 2 hosts") + .def("add_route", + py::overload_cast&>(&simgrid::s4u::NetZone::add_route), + "Add a route between 2 hosts") + .def("add_route", + py::overload_cast&, bool>(&simgrid::s4u::NetZone::add_route), - "Add a route between 2 netpoints") + "Add a route between 2 netzones. The gateway of each zone gets used.") + .def("add_route", + py::overload_cast&>(&simgrid::s4u::NetZone::add_route), + "Add a route between 2 netzones. The gateway of each zone gets used.") .def("create_host", py::overload_cast(&simgrid::s4u::NetZone::create_host), "Creates a host") .def("create_host", @@ -311,13 +282,10 @@ PYBIND11_MODULE(simgrid, m) .def("create_router", &simgrid::s4u::NetZone::create_router, "Create a router") .def("set_parent", &simgrid::s4u::NetZone::set_parent, "Set the parent of this zone") .def("set_property", &simgrid::s4u::NetZone::set_property, "Add a property to this zone") - .def("get_netpoint", - [](py::object self) // XBT_ATTRIB_DEPRECATED_v334 - { - PyErr_WarnEx(PyExc_DeprecationWarning, - "get_netpoint() is deprecated and will be dropped after v3.33, use netpoint instead.", 1); - return self.attr("netpoint"); - }) + .def("set_gateway", py::overload_cast(&simgrid::s4u::NetZone::set_gateway), + "Specify the gateway of this zone, to be used for inter-zone routes") + .def("set_gateway", py::overload_cast(&simgrid::s4u::NetZone::set_gateway), + "Specify the gateway of this zone, to be used for inter-zone routes") .def_property_readonly("netpoint", &simgrid::s4u::NetZone::get_netpoint, "Retrieve the netpoint associated to this zone") .def("seal", &simgrid::s4u::NetZone::seal, "Seal this NetZone") @@ -329,7 +297,7 @@ PYBIND11_MODULE(simgrid, m) /* Class ClusterCallbacks */ py::class_(m, "ClusterCallbacks", "Callbacks used to create cluster zones") - .def(py::init&, + .def(py::init&, const std::function&, const std::function&>()); @@ -392,42 +360,11 @@ PYBIND11_MODULE(simgrid, m) " \"\"\"\n\n" "The second function parameter is the periodicity: the time to wait after the last event to start again over " "the list. Set it to -1 to not loop over.") - .def("get_pstate_count", - [](py::object self) // XBT_ATTRIB_DEPRECATED_v334 - { - PyErr_WarnEx( - PyExc_DeprecationWarning, - "get_pstate_count() is deprecated and will be dropped after v3.33, use pstate_count instead.", 1); - return self.attr("pstate_count"); - }) .def_property_readonly("pstate_count", &Host::get_pstate_count, "Retrieve the count of defined pstate levels") - .def("get_pstate_speed", - [](py::object self, int state) // XBT_ATTRIB_DEPRECATED_v334 - { - PyErr_WarnEx( - PyExc_DeprecationWarning, - "get_pstate_speed() is deprecated and will be dropped after v3.33, use pstate_speed instead.", 1); - return self.attr("pstate_speed")(state); - }) .def("pstate_speed", &Host::get_pstate_speed, "Retrieve the maximal speed at the given pstate") - .def("get_netpoint", - [](py::object self) // XBT_ATTRIB_DEPRECATED_v334 - { - PyErr_WarnEx(PyExc_DeprecationWarning, - "get_netpoint() is deprecated and will be dropped after v3.33, use netpoint instead.", 1); - return self.attr("netpoint"); - }) .def_property_readonly("netpoint", &Host::get_netpoint, "Retrieve the netpoint associated to this zone") .def_property_readonly("disks", &Host::get_disks, "The list of disks on this host (read-only).") .def("get_disks", &Host::get_disks, "Retrieve the list of disks in this host") - .def("set_core_count", - [](py::object self, double count) // XBT_ATTRIB_DEPRECATED_v334 - { - PyErr_WarnEx(PyExc_DeprecationWarning, - "set_core_count() is deprecated and will be dropped after v3.33, use core_count instead.", - 1); - self.attr("core_count")(count); - }) .def_property("core_count", &Host::get_core_count, py::cpp_function(&Host::set_core_count, py::call_guard()), "Manage the number of cores in the CPU") @@ -441,6 +378,8 @@ PYBIND11_MODULE(simgrid, m) py::overload_cast(&Host::create_disk), py::call_guard(), "Create a disk") .def("seal", &Host::seal, py::call_guard(), "Seal this host") + .def("turn_off", &Host::turn_off, py::call_guard(), "Turn off this host") + .def("turn_on", &Host::turn_on, py::call_guard(), "Turn on this host") .def_property("pstate", &Host::get_pstate, py::cpp_function(&Host::set_pstate, py::call_guard()), "The current pstate (read/write property).") @@ -476,12 +415,32 @@ PYBIND11_MODULE(simgrid, m) "") .def( "__repr__", [](const Host* h) { return "Host(" + h->get_name() + ")"; }, - "Textual representation of the Host"); + "Textual representation of the Host."); + + m.def("sg_host_load_plugin_init", [host]() { + sg_host_load_plugin_init(); + + static_cast>>(host) + .def( + "reset_load", [](const Host* h) { sg_host_load_reset(h); }, py::call_guard(), + "Reset counters of the host load plugin for this host.") + .def_property_readonly( + "current_load", [](const Host* h) { return sg_host_get_current_load(h); }, "Current load of the host.") + .def_property_readonly( + "avg_load", [](const Host* h) { return sg_host_get_avg_load(h); }, "Average load of the host.") + .def_property_readonly( + "idle_time", [](const Host* h) { return sg_host_get_idle_time(h); }, "Idle time of the host") + .def_property_readonly( + "total_idle_time", [](const Host* h) { return sg_host_get_total_idle_time(h); }, + "Total idle time of the host.") + .def_property_readonly( + "computed_flops", [](const Host* h) { return sg_host_get_computed_flops(h); }, + "Computed flops of the host."); + }); py::enum_(host, "SharingPolicy") .value("NONLINEAR", simgrid::s4u::Host::SharingPolicy::NONLINEAR) - .value("LINEAR", simgrid::s4u::Host::SharingPolicy::LINEAR) - .export_values(); + .value("LINEAR", simgrid::s4u::Host::SharingPolicy::LINEAR); /* Class Disk */ py::class_> disk( @@ -504,13 +463,11 @@ PYBIND11_MODULE(simgrid, m) "Textual representation of the Disk"); py::enum_(disk, "SharingPolicy") .value("NONLINEAR", simgrid::s4u::Disk::SharingPolicy::NONLINEAR) - .value("LINEAR", simgrid::s4u::Disk::SharingPolicy::LINEAR) - .export_values(); + .value("LINEAR", simgrid::s4u::Disk::SharingPolicy::LINEAR); py::enum_(disk, "Operation") .value("READ", simgrid::s4u::Disk::Operation::READ) .value("WRITE", simgrid::s4u::Disk::Operation::WRITE) - .value("READWRITE", simgrid::s4u::Disk::Operation::READWRITE) - .export_values(); + .value("READWRITE", simgrid::s4u::Disk::Operation::READWRITE); /* Class NetPoint */ py::class_> @@ -602,12 +559,17 @@ PYBIND11_MODULE(simgrid, m) "__repr__", [](const Link* l) { return "Link(" + l->get_name() + ")"; }, "Textual representation of the Link"); py::enum_(link, "SharingPolicy") - .value("NONLINEAR", Link::SharingPolicy::NONLINEAR) - .value("WIFI", Link::SharingPolicy::WIFI) - .value("SPLITDUPLEX", Link::SharingPolicy::SPLITDUPLEX) - .value("SHARED", Link::SharingPolicy::SHARED) - .value("FATPIPE", Link::SharingPolicy::FATPIPE) - .export_values(); + .value("NONLINEAR", Link::SharingPolicy::NONLINEAR, + "This policy takes a callback that specifies the maximal capacity as a function of the number of usage. " + "See the examples with 'degradation' in their name.") + .value("WIFI", Link::SharingPolicy::WIFI, "Pseudo-sharing policy requesting wifi-specific sharing.") + .value("SPLITDUPLEX", Link::SharingPolicy::SPLITDUPLEX, + "Each link is split in 2, UP and DOWN, one per direction. These links are SHARED.") + .value("SHARED", Link::SharingPolicy::SHARED, + "The bandwidth is shared between all comms using that link, regardless of their direction.") + .value("FATPIPE", Link::SharingPolicy::FATPIPE, + "Each comm can use the link fully, with no sharing (only a maximum). This is intended to represent the " + "backbone links that cannot be saturated by concurrent links, but have a maximal bandwidth."); /* Class LinkInRoute */ py::class_ linkinroute(m, "LinkInRoute", "Abstraction to add link in routes"); @@ -616,27 +578,12 @@ PYBIND11_MODULE(simgrid, m) py::enum_(linkinroute, "Direction") .value("UP", simgrid::s4u::LinkInRoute::Direction::UP) .value("DOWN", simgrid::s4u::LinkInRoute::Direction::DOWN) - .value("NONE", simgrid::s4u::LinkInRoute::Direction::NONE) - .export_values(); + .value("NONE", simgrid::s4u::LinkInRoute::Direction::NONE); /* Class Split-Duplex Link */ py::class_>( m, "SplitDuplexLink", "Network split-duplex link") - .def("get_link_up", - [](py::object self) // XBT_ATTRIB_DEPRECATED_v334 - { - PyErr_WarnEx(PyExc_DeprecationWarning, - "get_link_up() is deprecated and will be dropped after v3.33, use link_up instead.", 1); - return self.attr("link_up"); - }) .def_property_readonly("link_up", &simgrid::s4u::SplitDuplexLink::get_link_up, "Get link direction up") - .def("get_link_down", - [](py::object self) // XBT_ATTRIB_DEPRECATED_v334 - { - PyErr_WarnEx(PyExc_DeprecationWarning, - "get_link_down() is deprecated and will be dropped after v3.33, use link_down instead.", 1); - return self.attr("link_down"); - }) .def_property_readonly("link_down", &simgrid::s4u::SplitDuplexLink::get_link_down, "Get link direction down"); /* Class Mailbox */ @@ -686,26 +633,17 @@ PYBIND11_MODULE(simgrid, m) "get", [](Mailbox* self) { return py::reinterpret_steal(self->get()); }, py::call_guard(), "Blocking data reception") .def( - "get_async", - [](Mailbox* self) -> std::tuple { - PyGetAsync wrap; - auto comm = self->get_async(wrap.get()); - return std::make_tuple(std::move(comm), std::move(wrap)); - }, + "get_async", [](Mailbox* self) -> CommPtr { return self->get_async(); }, py::call_guard(), "Non-blocking data reception. Use data.get() to get the python object after the communication has finished") .def("set_receiver", &Mailbox::set_receiver, py::call_guard(), "Sets the actor as permanent receiver"); - /* Class PyGetAsync */ - py::class_(m, "PyGetAsync", "Wrapper for async get communications") - .def(py::init<>()) - .def( - "get", [](const PyGetAsync* self) { return py::reinterpret_steal(*(self->get())); }, - "Get python object after async communication in receiver side"); + /* class Activity */ + py::class_(m, "Activity", "Activity. See the C++ documentation for details."); /* Class Comm */ - py::class_(m, "Comm", "Communication. See the C++ documentation for details.") + py::class_(m, "Comm", "Communication. See the C++ documentation for details.") .def_property_readonly("dst_data_size", &Comm::get_dst_data_size, py::call_guard(), "Retrieve the size of the received data.") .def_property_readonly("mailbox", &Comm::get_mailbox, py::call_guard(), @@ -742,6 +680,11 @@ PYBIND11_MODULE(simgrid, m) "Block until the completion of that communication, or raises TimeoutException after the specified timeout.") .def("wait_until", &Comm::wait_until, py::call_guard(), py::arg("time_limit"), "Block until the completion of that communication, or raises TimeoutException after the specified time.") + .def( + "get_payload", + [](const Comm* self) { return py::reinterpret_steal((PyObject*)self->get_payload()); }, + py::call_guard(), + "Retrieve the message's payload of a get_async. You cannot call this until after the comm termination.") .def("detach", py::overload_cast<>(&Comm::detach), py::return_value_policy::reference_internal, py::call_guard(), "Start the comm, and ignore its result. It can be completely forgotten after that.") @@ -754,37 +697,19 @@ PYBIND11_MODULE(simgrid, m) py::arg("to"), py::arg("simulated_size_in_bytes"), "Do a blocking communication between two arbitrary hosts.\n\nThis initializes a communication that " "completely bypass the mailbox and actors mechanism. There is really no limit on the hosts involved. " - "In particular, the actor does not have to be on one of the involved hosts.") - .def_static("test_any", &Comm::test_any, py::call_guard(), py::arg("comms"), - "take a vector s4u::CommPtr and return the rank of the first finished one (or -1 if none is done)") - .def_static("wait_all", &Comm::wait_all, py::call_guard(), py::arg("comms"), - "Block until the completion of all communications in the list.") - .def_static("wait_all_for", &Comm::wait_all_for, py::call_guard(), py::arg("comms"), - py::arg("timeout"), - "Block until the completion of all communications in the list, or raises TimeoutException after " - "the specified timeout.") - .def_static("wait_any", &Comm::wait_any, py::call_guard(), py::arg("comms"), - "Block until the completion of any communication in the list and return the index of the " - "terminated one.") - .def_static("wait_any_for", &Comm::wait_any_for, py::call_guard(), py::arg("comms"), - py::arg("timeout"), - "Block until the completion of any communication in the list and return the index of the terminated " - "one, or -1 if a timeout occurred."); + "In particular, the actor does not have to be on one of the involved hosts."); /* Class Io */ - py::class_(m, "Io", "I/O activities. See the C++ documentation for details.") + py::class_(m, "Io", + "I/O activities. See the C++ documentation for details.") .def("test", &simgrid::s4u::Io::test, py::call_guard(), "Test whether the I/O is terminated.") .def("wait", &simgrid::s4u::Io::wait, py::call_guard(), - "Block until the completion of that I/O operation") - .def_static( - "wait_any_for", &simgrid::s4u::Io::wait_any_for, py::call_guard(), - "Block until the completion of any I/O in the list (or timeout) and return the index of the terminated one.") - .def_static("wait_any", &simgrid::s4u::Io::wait_any, py::call_guard(), - "Block until the completion of any I/O in the list and return the index of the terminated one."); + "Block until the completion of that I/O operation"); /* Class Exec */ - py::class_(m, "Exec", "Execution. See the C++ documentation for details.") + py::class_(m, "Exec", + "Execution. See the C++ documentation for details.") .def_property_readonly("remaining", &simgrid::s4u::Exec::get_remaining, py::call_guard(), "Amount of flops that remain to be computed until completion (read-only property).") .def_property_readonly("remaining_ratio", &simgrid::s4u::Exec::get_remaining_ratio, @@ -833,7 +758,8 @@ PYBIND11_MODULE(simgrid, m) py::class_(m, "Mutex", "A classical mutex, but blocking in the simulation world." "See the C++ documentation for details.") - .def(py::init<>(&Mutex::create), py::call_guard(), "Mutex constructor.") + .def(py::init<>(&Mutex::create), py::call_guard(), + "Mutex constructor (pass True as a parameter to get a recursive Mutex).", py::arg("recursive") = false) .def("lock", &Mutex::lock, py::call_guard(), "Block until the mutex is acquired.") .def("try_lock", &Mutex::try_lock, py::call_guard(), "Try to acquire the mutex. Return true if the mutex was acquired, false otherwise.") @@ -921,45 +847,49 @@ PYBIND11_MODULE(simgrid, m) /* Class Task */ py::class_(m, "Task", "Task. See the C++ documentation for details.") - .def_static("init", &Task::init) .def_static( "on_start_cb", [](py::object cb) { cb.inc_ref(); // keep alive after return const py::gil_scoped_release gil_release; - Task::on_start_cb([cb](Task* op) { + Task::on_start_cb([cb_p = cb.ptr()](Task* op) { const py::gil_scoped_acquire py_context; // need a new context for callback - py::reinterpret_borrow(cb.ptr())(op); + py::reinterpret_borrow(cb_p)(op); }); }, "Add a callback called when each task starts.") .def_static( - "on_end_cb", + "on_completion_cb", [](py::object cb) { cb.inc_ref(); // keep alive after return const py::gil_scoped_release gil_release; - Task::on_end_cb([cb](Task* op) { + Task::on_completion_cb([cb_p = cb.ptr()](Task* op) { const py::gil_scoped_acquire py_context; // need a new context for callback - py::reinterpret_borrow(cb.ptr())(op); + py::reinterpret_borrow(cb_p)(op); }); }, "Add a callback called when each task ends.") .def_property_readonly("name", &Task::get_name, "The name of this task (read-only).") - .def_property_readonly("count", &Task::get_count, "The execution count of this task (read-only).") .def_property_readonly("successors", &Task::get_successors, "The successors of this task (read-only).") .def_property("amount", &Task::get_amount, &Task::set_amount, "The amount of work to do for this task.") - .def("enqueue_execs", py::overload_cast(&Task::enqueue_execs), py::call_guard(), - py::arg("n"), "Enqueue executions for this task.") + .def( + "get_count", [](const TaskPtr t) { return t->get_count("instance_0"); }, + "The execution count of this task instance_0.") + .def( + "get_count", [](const TaskPtr t, const std::string& instance) { return t->get_count(instance); }, + "The execution count of this task instance.") + .def("enqueue_firings", py::overload_cast(&Task::enqueue_firings), py::call_guard(), + py::arg("n"), "Enqueue firings for this task.") .def("add_successor", py::overload_cast(&Task::add_successor), py::call_guard(), py::arg("op"), "Add a successor to this task.") .def("remove_successor", py::overload_cast(&Task::remove_successor), py::call_guard(), py::arg("op"), "Remove a successor of this task.") .def("remove_all_successors", &Task::remove_all_successors, py::call_guard(), "Remove all successors of this task.") - .def("on_this_start", py::overload_cast&>(&Task::on_this_start), py::arg("func"), - "Add a callback called when this task starts.") - .def("on_this_end", py::overload_cast&>(&Task::on_this_end), py::arg("func"), - "Add a callback called when this task ends.") + .def("on_this_start_cb", py::overload_cast&>(&Task::on_this_start_cb), + py::arg("func"), "Add a callback called when this task starts.") + .def("on_this_completion_cb", py::overload_cast&>(&Task::on_this_completion_cb), + py::arg("func"), "Add a callback called when this task ends.") .def( "__repr__", [](const TaskPtr op) { return "Task(" + op->get_name() + ")"; }, "Textual representation of the Task"); @@ -1005,4 +935,41 @@ PYBIND11_MODULE(simgrid, m) .def( "__repr__", [](const IoTaskPtr io) { return "IoTask(" + io->get_name() + ")"; }, "Textual representation of the IoTask"); + + /* Class ActivitySet */ + py::class_(m, "ActivitySet", "ActivitySet. See the C++ documentation for details.") + .def(py::init([](std::vector activities) { + auto* ret = new ActivitySet(); + for (auto a : activities) + ret->push(a); + return ActivitySetPtr(ret); + }), + "The constructor should take the parameters from the command line, as is ") + .def(py::init([]() { return ActivitySetPtr(new ActivitySet()); }), + "The constructor should take the parameters from the command line, as is ") + + .def("push", &ActivitySet::push, py::call_guard(), py::arg("activity"), + "Add an activity to the set") + .def("erase", &ActivitySet::erase, py::call_guard(), py::arg("activity"), + "Remove that activity from the set") + .def_property_readonly("size", &ActivitySet::size, "Count of activities in the set") + .def("empty", &ActivitySet::empty, "Returns whether the set is empty") + .def("has_failed_activities", &ActivitySet::has_failed_activities, + "Returns whether there is any failed activities") + .def("get_failed_activity", &ActivitySet::get_failed_activity, "Returns a failed activity from the set, or None") + + .def("wait_all_for", &ActivitySet::wait_all_for, py::call_guard(), py::arg("timeout"), + "Wait for the completion of all activities in the set, but not longer than the provided timeout") + .def("wait_all", &ActivitySet::wait_all, py::call_guard(), + "Wait for the completion of all activities in the set, endlessly") + .def("test_any", &ActivitySet::test_any, py::call_guard(), + "Returns the first terminated activity if any, or None if no activity is terminated") + .def("wait_any_for", &ActivitySet::wait_any_for, py::call_guard(), py::arg("timeout"), + "Wait for the completion of one activity in the set, but not longer than the provided timeout") + .def("wait_any", &ActivitySet::wait_any, py::call_guard(), + "Wait for the completion of one activity in the set, endlessly") + + .def( + "__repr__", [](const ActivitySetPtr as) { return "ActivitySet([...])"; }, + "Textual representation of the ActivitySet"); }