X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9ea179ce187f56df358fc6f69c3e721b330df272..22e6546d2c6f14864cc93c4ed1470d8e8c1e2d95:/src/s4u/s4u_actor.cpp

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index f16cabf607..1553bb9313 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2006-2014. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -7,11 +6,14 @@
 #include "xbt/log.h"
 
 #include "simgrid/s4u/Actor.hpp"
-#include "simgrid/s4u/comm.hpp"
-#include "simgrid/s4u/host.hpp"
+#include "simgrid/s4u/Comm.hpp"
+#include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/Mailbox.hpp"
 
 #include "src/kernel/context/Context.hpp"
+#include "src/simix/smx_private.hpp"
+
+#include <sstream>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors");
 
@@ -30,7 +32,7 @@ ActorPtr Actor::self()
 
 ActorPtr Actor::createActor(const char* name, s4u::Host* host, std::function<void()> code)
 {
-  smx_actor_t actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
+  simgrid::simix::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
   return actor->iface();
 }
 
@@ -38,10 +40,21 @@ ActorPtr Actor::createActor(const char* name, s4u::Host* host, const char* funct
 {
   simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
   simgrid::simix::ActorCode code = factory(std::move(args));
-  smx_actor_t actor                         = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
+  simgrid::simix::ActorImpl* actor          = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
   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() {
@@ -49,7 +62,7 @@ void Actor::join() {
 }
 
 void Actor::setAutoRestart(bool autorestart) {
-  simcall_process_auto_restart_set(pimpl_,autorestart);
+  simgrid::simix::kernelImmediate([this, autorestart]() { pimpl_->auto_restart = autorestart; });
 }
 
 void Actor::onExit(int_f_pvoid_pvoid_t fun, void* data)
@@ -59,30 +72,35 @@ 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()
+s4u::Host* Actor::getHost()
 {
   return this->pimpl_->host;
 }
 
-const char* Actor::cname()
+void Actor::daemonize()
 {
-  return this->pimpl_->name.c_str();
+  simgrid::simix::kernelImmediate([this]() { pimpl_->daemonize(); });
 }
 
-simgrid::xbt::string Actor::name()
+const simgrid::xbt::string& Actor::getName() const
 {
-  return this->pimpl_->name;
+  return this->pimpl_->getName();
 }
 
-int Actor::pid()
+const char* Actor::getCname() const
+{
+  return this->pimpl_->getCname();
+}
+
+aid_t Actor::getPid()
 {
   return this->pimpl_->pid;
 }
 
-int Actor::ppid()
+aid_t Actor::getPpid()
 {
   return this->pimpl_->ppid;
 }
@@ -94,27 +112,29 @@ void Actor::suspend()
 
 void Actor::resume()
 {
-  simcall_process_resume(pimpl_);
+  simgrid::simix::kernelImmediate([this] { pimpl_->resume(); });
 }
 
 int Actor::isSuspended()
 {
-  return simcall_process_is_suspended(pimpl_);
+  return simgrid::simix::kernelImmediate([this] { return pimpl_->suspended; });
 }
 
 void Actor::setKillTime(double time) {
   simcall_process_set_kill_time(pimpl_,time);
 }
 
-double Actor::killTime()
+/** \brief Get the kill time of an actor(or 0 if unset). */
+double Actor::getKillTime()
 {
-  return simcall_process_get_kill_time(pimpl_);
+  return SIMIX_timer_get_date(pimpl_->kill_timer);
 }
 
-void Actor::kill(int pid) {
+void Actor::kill(aid_t pid)
+{
   smx_actor_t process = SIMIX_process_from_PID(pid);
   if(process != nullptr) {
-    simcall_process_kill(process);
+    simgrid::simix::kernelImmediate([process] { SIMIX_process_kill(process, process); });
   } else {
     std::ostringstream oss;
     oss << "kill: ("<< pid <<") - No such process" << std::endl;
@@ -127,12 +147,14 @@ smx_actor_t Actor::getImpl() {
 }
 
 void Actor::kill() {
-  simcall_process_kill(pimpl_);
+  smx_actor_t process = SIMIX_process_self();
+  simgrid::simix::kernelImmediate(
+      [this, process] { SIMIX_process_kill(pimpl_, (pimpl_ == simix_global->maestro_process) ? pimpl_ : process); });
 }
 
 // ***** Static functions *****
 
-ActorPtr Actor::byPid(int pid)
+ActorPtr Actor::byPid(aid_t pid)
 {
   smx_actor_t process = SIMIX_process_from_PID(pid);
   if (process != nullptr)
@@ -151,10 +173,41 @@ void Actor::killAll(int resetPid)
   simcall_process_killall(resetPid);
 }
 
+/** Retrieve the property value (or nullptr if not set) */
+const char* Actor::getProperty(const char* key)
+{
+  return simgrid::simix::kernelImmediate([this, key] { return pimpl_->getProperty(key); });
+}
+
+void Actor::setProperty(const char* key, const char* value)
+{
+  simgrid::simix::kernelImmediate([this, key, value] { pimpl_->setProperty(key, value); });
+}
+
+Actor* Actor::restart()
+{
+  return simgrid::simix::kernelImmediate([this]() { return pimpl_->restart(); });
+}
+
 // ***** this_actor *****
 
 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)
@@ -168,44 +221,69 @@ XBT_PUBLIC(void) sleep_until(double timeout)
     simcall_process_sleep(timeout - now);
 }
 
-e_smx_state_t execute(double flops) {
+void execute(double flops)
+{
   smx_activity_t s = simcall_execution_start(nullptr,flops,1.0/*priority*/,0./*bound*/);
-  return simcall_execution_wait(s);
+  simcall_execution_wait(s);
+}
+
+void execute(double flops,double priority)
+{
+  smx_activity_t s = simcall_execution_start(nullptr,flops,1 / priority/*priority*/,0./*bound*/);
+  simcall_execution_wait(s);
 }
 
-void* recv(MailboxPtr chan) {
-  void *res = nullptr;
-  Comm& c = Comm::recv_init(chan);
-  c.setDstData(&res,sizeof(res));
-  c.wait();
-  return res;
+void* recv(MailboxPtr chan) // deprecated
+{
+  return chan->get();
 }
 
-void send(MailboxPtr chan, void* payload, double simulatedSize)
+void* recv(MailboxPtr chan, double timeout) // deprecated
 {
-  Comm& c = Comm::send_init(chan);
-  c.setRemains(simulatedSize);
-  c.setSrcData(payload);
-  // c.start() is optional.
-  c.wait();
+  return chan->get(timeout);
 }
 
-int pid()
+void send(MailboxPtr chan, void* payload, double simulatedSize) // deprecated
+{
+  chan->put(payload, simulatedSize);
+}
+
+void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout) // deprecated
+{
+  chan->put(payload, simulatedSize, timeout);
+}
+
+CommPtr isend(MailboxPtr chan, void* payload, double simulatedSize) // deprecated
+{
+  return chan->put_async(payload, simulatedSize);
+}
+
+CommPtr irecv(MailboxPtr chan, void** data) // deprecated
+{
+  return chan->get_async(data);
+}
+
+aid_t getPid()
 {
   return SIMIX_process_self()->pid;
 }
 
-int ppid()
+aid_t getPpid()
 {
   return SIMIX_process_self()->ppid;
 }
 
-std::string name()
+std::string getName()
+{
+  return SIMIX_process_self()->getName();
+}
+
+const char* getCname()
 {
-  return SIMIX_process_self()->name;
+  return SIMIX_process_self()->getCname();
 }
 
-Host* host()
+Host* getHost()
 {
   return SIMIX_process_self()->host;
 }
@@ -217,17 +295,20 @@ void suspend()
 
 void resume()
 {
-  simcall_process_resume(SIMIX_process_self());
+  smx_actor_t process = SIMIX_process_self();
+  simgrid::simix::kernelImmediate([process] { process->resume(); });
 }
 
-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()
 {
-  simcall_process_kill(SIMIX_process_self());
+  smx_actor_t process = SIMIX_process_self();
+  simgrid::simix::kernelImmediate([process] { SIMIX_process_kill(process, process); });
 }
 
 void onExit(int_f_pvoid_pvoid_t fun, void* data)
@@ -237,7 +318,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; });
 }
 }
 }