X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45ae0195c6ad8232415288c5da07b4bdc23a31b4..dceed88b84f4c8dccf94f8031cc9ba635eaf75da:/src/s4u/s4u_actor.cpp

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 010a9d801d..342bfb5aad 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -11,6 +11,9 @@
 #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");
 
@@ -41,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() {
@@ -58,7 +72,7 @@ void Actor::onExit(int_f_pvoid_pvoid_t fun, void* data)
 
 void Actor::migrate(Host* new_host)
 {
-  simcall_process_set_host(pimpl_, new_host);
+  simgrid::simix::kernelImmediate([this, new_host]() { pimpl_->new_host = new_host; });
 }
 
 s4u::Host* Actor::host()
@@ -66,6 +80,11 @@ s4u::Host* Actor::host()
   return this->pimpl_->host;
 }
 
+void Actor::daemonize()
+{
+  simgrid::simix::kernelImmediate([this]() { pimpl_->daemonize(); });
+}
+
 const char* Actor::cname()
 {
   return this->pimpl_->name.c_str();
@@ -98,7 +117,7 @@ void Actor::resume()
 
 int Actor::isSuspended()
 {
-  return simcall_process_is_suspended(pimpl_);
+  return simgrid::simix::kernelImmediate([this]() { return pimpl_->suspended; });
 }
 
 void Actor::setKillTime(double time) {
@@ -167,6 +186,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)
@@ -186,43 +220,32 @@ e_smx_state_t execute(double flops) {
 }
 
 void* recv(MailboxPtr chan) {
-  void *res = nullptr;
-  CommPtr c = Comm::recv_init(chan);
-  c->setDstData(&res, sizeof(res));
-  c->wait();
-  return res;
+  return chan->get();
+}
+
+void* recv(MailboxPtr chan, double timeout)
+{
+  return chan->get(timeout);
 }
 
 void send(MailboxPtr chan, void* payload, double simulatedSize)
 {
-  CommPtr c = Comm::send_init(chan);
-  c->setRemains(simulatedSize);
-  c->setSrcData(payload);
-  // c->start() is optional.
-  c->wait();
+  chan->put(payload, simulatedSize);
 }
 
 void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout)
 {
-  CommPtr c = Comm::send_init(chan);
-  c->setRemains(simulatedSize);
-  c->setSrcData(payload);
-  // c->start() is optional.
-  c->wait(timeout);
+  chan->put(payload, simulatedSize, timeout);
 }
 
 CommPtr isend(MailboxPtr chan, void* payload, double simulatedSize)
 {
-  return Comm::send_async(chan, payload, simulatedSize);
-}
-void dsend(MailboxPtr chan, void* payload, double simulatedSize)
-{
-  Comm::send_detached(chan, payload, simulatedSize);
+  return chan->put_async(payload, simulatedSize);
 }
 
 CommPtr irecv(MailboxPtr chan, void** data)
 {
-  return Comm::recv_async(chan, data);
+  return chan->get_async(data);
 }
 
 aid_t pid()
@@ -255,9 +278,10 @@ void resume()
   simcall_process_resume(SIMIX_process_self());
 }
 
-int isSuspended()
+bool isSuspended()
 {
-  return simcall_process_is_suspended(SIMIX_process_self());
+  smx_actor_t process = SIMIX_process_self();
+  return simgrid::simix::kernelImmediate([process] { return process->suspended; });
 }
 
 void kill()
@@ -272,7 +296,8 @@ void onExit(int_f_pvoid_pvoid_t fun, void* data)
 
 void migrate(Host* new_host)
 {
-  simcall_process_set_host(SIMIX_process_self(), new_host);
+  smx_actor_t process = SIMIX_process_self();
+  simgrid::simix::kernelImmediate([process, new_host] { process->new_host = new_host; });
 }
 }
 }