allow python actors to be killed

Only works for directly created actors for now, not for the registered
ones. I need to do the same kind of things for register_actors, now.

The funny thing is that I didn't had to clean the contexts for that.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8abfa35..6c85854 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -782,6 +782,8 @@ if(enable_python)
     set_source_files_properties(src/bindings/python/simgrid_python.cpp PROPERTIES COMPILE_FLAGS -std=c++14)
     target_link_libraries(simgrid_python PUBLIC simgrid)
     set_target_properties(simgrid_python PROPERTIES LIBRARY_OUTPUT_NAME simgrid)
     set_source_files_properties(src/bindings/python/simgrid_python.cpp PROPERTIES COMPILE_FLAGS -std=c++14)
     target_link_libraries(simgrid_python PUBLIC simgrid)
     set_target_properties(simgrid_python PROPERTIES LIBRARY_OUTPUT_NAME simgrid)

+    set_property(TARGET simgrid_python
+                 APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}")

   else()
     message(FATAL_ERROR "Please install pybind11-dev to build the Python bindings (or disable that option).")
   endif()
   else()
     message(FATAL_ERROR "Please install pybind11-dev to build the Python bindings (or disable that option).")
   endif()

diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp
index 10e2037..15eae3d 100644 (file)
--- a/src/bindings/python/simgrid_python.cpp
+++ b/src/bindings/python/simgrid_python.cpp
@@ -3,18 +3,19 @@
 /* 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. */
 
 /* 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 <memory>
-#include <string>
-#include <vector>
-
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
+#include "src/kernel/context/Context.hpp"

 #include <simgrid/s4u/Actor.hpp>
 #include <simgrid/s4u/Engine.hpp>
 #include <simgrid/s4u/Host.hpp>
 #include <simgrid/s4u/Mailbox.hpp>
 
 #include <simgrid/s4u/Actor.hpp>
 #include <simgrid/s4u/Engine.hpp>
 #include <simgrid/s4u/Host.hpp>
 #include <simgrid/s4u/Mailbox.hpp>
 

+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
+#include <memory>
+#include <string>
+#include <vector>
+

 namespace py = pybind11;
 using simgrid::s4u::Actor;
 using simgrid::s4u::ActorPtr;
 namespace py = pybind11;
 using simgrid::s4u::Actor;
 using simgrid::s4u::ActorPtr;


@@ -136,33 +137,41 @@ PYBIND11_MODULE(simgrid, m)
       }, "Blocking data reception, see :cpp:func:`void* simgrid::s4u::Mailbox::get()`");
 
   /* Class Actor */
       }, "Blocking data reception, see :cpp:func:`void* simgrid::s4u::Mailbox::get()`");
 
   /* Class Actor */

+  py::object pyStopRequestEx = py::register_exception<simgrid::kernel::context::Context::StopRequest>(m, "ActorKilled");

   py::class_<simgrid::s4u::Actor, ActorPtr>(m, "Actor",
                                             "An actor is an independent stream of execution in your distributed "
                                             "application, see :ref:`class s4u::Actor <API_s4u_Actor>`")
 
       .def("create",
   py::class_<simgrid::s4u::Actor, ActorPtr>(m, "Actor",
                                             "An actor is an independent stream of execution in your distributed "
                                             "application, see :ref:`class s4u::Actor <API_s4u_Actor>`")
 
       .def("create",

-           [](py::args args, py::kwargs kwargs) {
-             xbt_assert(args.size() > 2,
-                        "Creating an actor takes at least 3 parameters: name, host, and main function.");
-             return simgrid::s4u::Actor::create(args[0].cast<std::string>(), args[1].cast<Host*>(), [args]() {
-               py::tuple funargs(args.size() - 3);
-               for (size_t i = 3; i < args.size(); i++)
-                 funargs[i - 3] = args[i];
-
-               PyObject* result = PyObject_CallObject(args[2].ptr(), funargs.ptr());
-               if (!result)
-                 throw pybind11::error_already_set();
+           [pyStopRequestEx](py::str name, py::object host, py::object fun, py::args args) {
+
+             return simgrid::s4u::Actor::create(name, host.cast<Host*>(), [fun, args, pyStopRequestEx]() {
+
+               try {
+                 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 */
+                 } else {
+                   throw;
+                 }
+               }

              });
            },
            "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, see :cpp:func:`simgrid::s4u::Actor::create()`")
       .def_property("host", &Actor::get_host, &Actor::migrate, "The host on which this actor is located")

-      .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("migrate", &Actor::migrate, "Moves that actor to another host, see :cpp:func:`void simgrid::s4u::Actor::migrate()`",
-          py::arg("dest"))
+      .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("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, 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("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()`");

 }
 }

diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index b16f819..e2a3e92 100644 (file)
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -85,10 +85,11 @@ public:
      */
   public:
     StopRequest() = default;
      */
   public:
     StopRequest() = default;

-    explicit StopRequest(std::string msg) : msg_(msg) {}
+    explicit StopRequest(std::string msg) : msg_(std::string("Actor killed (") + msg + std::string(").")) {}
+    virtual const char* what() const noexcept { return msg_.c_str(); }

 
   private:
 
   private:

-    std::string msg_;
+    std::string msg_ = std::string("Actor killed.");

   };
 };
 
   };
 };
 

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index f9bc844..4b16464 100644 (file)
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -504,7 +504,7 @@ void SIMIX_process_kill(smx_actor_t actor, smx_actor_t issuer)
      */
 
     if (simgrid::kernel::context::factory_initializer == nullptr) // Only Java sets a factory_initializer, for now
      */
 
     if (simgrid::kernel::context::factory_initializer == nullptr) // Only Java sets a factory_initializer, for now

-      actor->throw_exception(std::make_exception_ptr(simgrid::kernel::context::Context::StopRequest("Host failed")));
+      actor->throw_exception(std::make_exception_ptr(simgrid::kernel::context::Context::StopRequest("host failed")));

   }
 
   /* destroy the blocking synchro if any */
   }
 
   /* destroy the blocking synchro if any */