/* 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 <pybind11/functional.h>
#include <pybind11/pybind11.h> // Must be first
#include <pybind11/stl.h>
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("kill", [](py::int_ pid) { Actor::kill(pid); }, "Kill an actor by pid");
- m2.def("kill_all", &Actor::kill_all, "Kill all actors but the caller.");
-
- m2.def(
- "on_exit",
- [](py::function fun) { simgrid::s4u::this_actor::on_exit([fun](int ignored, void* data) { fun(); }, nullptr); },
- "");
+ 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_<Engine>(m, "Engine", "Simulation Engine, see :ref:`class s4u::Engine <API_s4u_Engine>`")
"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<double>(&Actor::join),
"Wait for the actor to finish, see :cpp:func:`void simgrid::s4u::Actor::join(double)`", py::arg("timeout"))
- .def("kill", [](py::int_ pid) { Actor::kill(pid); }, "Kill an actor by pid")
.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,