try to speed up the refcounting madness by using std::move

[simgrid.git] / src / s4u / s4u_actor.cpp

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 6b036dd3492409d775e53768665d2e0959b2624f..3b27ed84735cd4081a08e4cbc32e917dbada8ff3 100644 (file)
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -11,6 +11,8 @@
 #include "simgrid/s4u/Mailbox.hpp"
 
 #include "src/kernel/context/Context.hpp"
+#include "src/simix/smx_private.h"
+
 #include <sstream>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors");
@@ -42,6 +44,17 @@ ActorPtr Actor::createActor(const char* name, s4u::Host* host, const char* funct
   return actor->iface();
 }
 
+void intrusive_ptr_add_ref(Actor* actor)
+{
+  xbt_assert(actor != nullptr);
+  intrusive_ptr_add_ref(actor->pimpl_);
+}
+void intrusive_ptr_release(Actor* actor)
+{
+  xbt_assert(actor != nullptr);
+  intrusive_ptr_release(actor->pimpl_);
+}
+
 // ***** Actor methods *****
 
 void Actor::join() {
@@ -168,6 +181,21 @@ void Actor::setProperty(const char* key, const char* value)
 
 namespace this_actor {
 
+/** Returns true if run from the kernel mode, and false if run from a real actor
+ *
+ * Everything that is run out of any actor (simulation setup before the engine is run,
+ * computing the model evolutions as a result to the actors' action, etc) is run in
+ * kernel mode, just as in any operating systems.
+ *
+ * In SimGrid, the actor in charge of doing the stuff in kernel mode is called Maestro,
+ * because it is the one scheduling when the others should move or wait.
+ */
+bool isMaestro()
+{
+  smx_actor_t process = SIMIX_process_self();
+  return process == nullptr || process == simix_global->maestro_process;
+}
+
 void sleep_for(double duration)
 {
   if (duration > 0)
@@ -194,6 +222,15 @@ void* recv(MailboxPtr chan) {
   return res;
 }
 
+void* recv(MailboxPtr chan, double timeout)
+{
+  void* res = nullptr;
+  CommPtr c = Comm::recv_init(chan);
+  c->setDstData(&res, sizeof(res));
+  c->wait(timeout);
+  return res;
+}
+
 void send(MailboxPtr chan, void* payload, double simulatedSize)
 {
   CommPtr c = Comm::send_init(chan);