this_actor::exit() is a better name than this_actor::kill()

diff --git a/examples/s4u/actor-kill/s4u-actor-kill.cpp b/examples/s4u/actor-kill/s4u-actor-kill.cpp
index a8547d4..1a000f3 100644 (file)
--- a/examples/s4u/actor-kill/s4u-actor-kill.cpp
+++ b/examples/s4u/actor-kill/s4u-actor-kill.cpp
@@ -57,7 +57,7 @@ static void killer()
   simgrid::s4u::Actor::kill_all();
 
   XBT_INFO("OK, goodbye now. I commit a suicide.");
-  simgrid::s4u::this_actor::kill();
+  simgrid::s4u::this_actor::exit();
 
   XBT_INFO("This line will never get displayed: I'm already dead since the previous line.");
 }

diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp
index e3a0f6b..182289a 100644 (file)
--- a/include/simgrid/s4u/Actor.hpp
+++ b/include/simgrid/s4u/Actor.hpp
@@ -414,7 +414,7 @@ XBT_PUBLIC void resume();
 XBT_PUBLIC bool is_suspended();
 
 /** @brief kill the actor. */
-XBT_PUBLIC void kill();
+XBT_PUBLIC void exit();
 
 /** @brief Add a function to the list of "on_exit" functions. */
 XBT_ATTRIB_DEPRECATED_v323("Please use std::function<void(int, void*)> for first parameter.") XBT_PUBLIC
@@ -432,6 +432,7 @@ XBT_ATTRIB_DEPRECATED_v323("Please use this_actor::get_ppid()") XBT_PUBLIC aid_t
 XBT_ATTRIB_DEPRECATED_v323("Please use this_actor::get_host()") XBT_PUBLIC Host* getHost();
 XBT_ATTRIB_DEPRECATED_v323("Please use this_actor::is_suspended()") XBT_PUBLIC bool isSuspended();
 XBT_ATTRIB_DEPRECATED_v323("Please use this_actor::on_exit()") XBT_PUBLIC void onExit(int_f_pvoid_pvoid_t fun, void* data);
+XBT_ATTRIB_DEPRECATED_v324("Please use this_actor::exit()") XBT_PUBLIC void kill();
 }
 
 /** @} */

diff --git a/src/s4u/s4u_Actor.cpp b/src/s4u/s4u_Actor.cpp
index 8c45ca0..42fae54 100644 (file)
--- a/src/s4u/s4u_Actor.cpp
+++ b/src/s4u/s4u_Actor.cpp
@@ -367,7 +367,7 @@ bool is_suspended()
   return simgrid::simix::simcall([process] { return process->suspended_; });
 }
 
-void kill()
+void exit()
 {
   smx_actor_t process = SIMIX_process_self();
   simgrid::simix::simcall([process] { SIMIX_process_kill(process, process); });
@@ -423,6 +423,10 @@ void onExit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */
 {
   on_exit([fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
 }
+void kill() /* deprecated */
+{
+  exit();
+}
 
 } // namespace this_actor
 } // namespace s4u