X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/38d7ddd9ebe710d47e5736787a0969f229d2f1b1..c0b8dc9ae897f80d33a06914a4c0e14d20c7fe36:/src/s4u/s4u_actor.cpp

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 04544a099e..80f0c11c78 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -1,103 +1,320 @@
-/* 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. */
 
 #include "xbt/log.h"
-#include "msg/msg_private.h"
-#include "msg/msg_mailbox.h"
 
-#include "simgrid/s4u/actor.hpp"
-#include "simgrid/s4u/comm.hpp"
-#include "simgrid/s4u/host.hpp"
-#include "simgrid/s4u/mailbox.hpp"
+#include "simgrid/s4u/Actor.hpp"
+#include "simgrid/s4u/Comm.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
+#include "src/kernel/context/Context.hpp"
+#include "src/simix/smx_private.hpp"
 
-/* C main function of a actor, running this->main */
-static int s4u_actor_runner(int argc, char **argv) {
+#include <sstream>
 
-	smx_process_t smx_proc = SIMIX_process_self();
-	simgrid::s4u::Actor *actor = (simgrid::s4u::Actor*) SIMIX_process_self_get_data(smx_proc);
-	int res = actor->main(argc,argv);
-	return res;
+XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor, "S4U actors");
+
+namespace simgrid {
+namespace s4u {
+
+// ***** Actor creation *****
+ActorPtr Actor::self()
+{
+  smx_context_t self_context = SIMIX_context_self();
+  if (self_context == nullptr)
+    return simgrid::s4u::ActorPtr();
+
+  return self_context->process()->iface();
+}
+
+ActorPtr Actor::createActor(const char* name, s4u::Host* host, std::function<void()> code)
+{
+  simgrid::simix::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
+  return actor->iface();
+}
+
+ActorPtr Actor::createActor(const char* name, s4u::Host* host, const char* function, std::vector<std::string> args)
+{
+  simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
+  simgrid::simix::ActorCode code = factory(std::move(args));
+  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() {
+  simcall_process_join(this->pimpl_, -1);
+}
+
+void Actor::setAutoRestart(bool autorestart) {
+  simgrid::simix::kernelImmediate([this, autorestart]() { pimpl_->auto_restart = autorestart; });
+}
+
+void Actor::onExit(int_f_pvoid_pvoid_t fun, void* data)
+{
+  simcall_process_on_exit(pimpl_, fun, data);
+}
+
+void Actor::migrate(Host* new_host)
+{
+  simgrid::simix::kernelImmediate([this, new_host]() { pimpl_->new_host = new_host; });
 }
 
+s4u::Host* Actor::getHost()
+{
+  return this->pimpl_->host;
+}
 
+void Actor::daemonize()
+{
+  simgrid::simix::kernelImmediate([this]() { pimpl_->daemonize(); });
+}
 
-using namespace simgrid;
+const simgrid::xbt::string& Actor::getName() const
+{
+  return this->pimpl_->getName();
+}
 
-s4u::Actor::Actor(const char *name, s4u::Host *host, int argc, char **argv)
-    : s4u::Actor::Actor(name,host, argc,argv, -1) {
+const char* Actor::getCname() const
+{
+  return this->pimpl_->getCname();
 }
-s4u::Actor::Actor(const char *name, s4u::Host *host, int argc, char **argv, double killTime) {
-	p_smx_process = simcall_process_create(name, s4u_actor_runner, this, host->getName(), killTime, argc, argv, NULL/*properties*/,0);
 
-	xbt_assert(p_smx_process,"Cannot create the actor");
-//	TRACE_msg_process_create(procname, simcall_process_get_PID(p_smx_process), host->getInferior());
-//	simcall_process_on_exit(p_smx_process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,p_smx_process);
+aid_t Actor::getPid()
+{
+  return this->pimpl_->pid;
 }
 
-s4u::Actor *s4u::Actor::current() {
-	smx_process_t smx_proc = SIMIX_process_self();
-	return (simgrid::s4u::Actor*) SIMIX_process_self_get_data(smx_proc);
+aid_t Actor::getPpid()
+{
+  return this->pimpl_->ppid;
 }
-s4u::Actor *s4u::Actor::byPid(int pid) {
-	return (simgrid::s4u::Actor*) SIMIX_process_self_get_data(SIMIX_process_from_PID(pid));
+
+void Actor::suspend()
+{
+  simcall_process_suspend(pimpl_);
 }
 
-void s4u::Actor::setAutoRestart(bool autorestart) {
-	simcall_process_auto_restart_set(p_smx_process,autorestart);
+void Actor::resume()
+{
+  simgrid::simix::kernelImmediate([this] { pimpl_->resume(); });
 }
 
-s4u::Host *s4u::Actor::getHost() {
-	return s4u::Host::byName(sg_host_name(simcall_process_get_host(p_smx_process)));
+int Actor::isSuspended()
+{
+  return simgrid::simix::kernelImmediate([this] { return pimpl_->suspended; });
 }
-const char* s4u::Actor::getName() {
-	return simcall_process_get_name(p_smx_process);
+
+void Actor::setKillTime(double time) {
+  simcall_process_set_kill_time(pimpl_,time);
 }
-int s4u::Actor::getPid(){
-	return simcall_process_get_PID(p_smx_process);
+
+/** \brief Get the kill time of an actor(or 0 if unset). */
+double Actor::getKillTime()
+{
+  return SIMIX_timer_get_date(pimpl_->kill_timer);
 }
 
-void s4u::Actor::setKillTime(double time) {
-	simcall_process_set_kill_time(p_smx_process,time);
+void Actor::kill(aid_t pid)
+{
+  smx_actor_t process = SIMIX_process_from_PID(pid);
+  if(process != nullptr) {
+    simgrid::simix::kernelImmediate([process] { SIMIX_process_kill(process, process); });
+  } else {
+    std::ostringstream oss;
+    oss << "kill: ("<< pid <<") - No such process" << std::endl;
+    throw std::runtime_error(oss.str());
+  }
 }
-double s4u::Actor::getKillTime() {
-	return simcall_process_get_kill_time(p_smx_process);
+
+smx_actor_t Actor::getImpl() {
+  return pimpl_;
 }
-void s4u::Actor::killAll() {
-	simcall_process_killall(1);
+
+void Actor::kill() {
+  smx_actor_t process = SIMIX_process_self();
+  simgrid::simix::kernelImmediate(
+      [this, process] { SIMIX_process_kill(pimpl_, (pimpl_ == simix_global->maestro_process) ? pimpl_ : process); });
 }
-void s4u::Actor::kill() {
-	simcall_process_kill(p_smx_process);
+
+// ***** Static functions *****
+
+ActorPtr Actor::byPid(aid_t pid)
+{
+  smx_actor_t process = SIMIX_process_from_PID(pid);
+  if (process != nullptr)
+    return process->iface();
+  else
+    return ActorPtr();
 }
 
-void s4u::Actor::sleep(double duration) {
-	simcall_process_sleep(duration);
+void Actor::killAll()
+{
+  simcall_process_killall(1);
 }
 
-void s4u::Actor::execute(double flops) {
-	simcall_process_execute(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
+void Actor::killAll(int resetPid)
+{
+  simcall_process_killall(resetPid);
 }
 
-void *s4u::Actor::recv(Mailbox &chan) {
-	void *res=NULL;
+/** 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); });
+}
 
-	Comm c = Comm::recv_init(this, chan);
-	c.setDstData(&res,sizeof(res));
-	c.wait();
+void Actor::setProperty(const char* key, const char* value)
+{
+  simgrid::simix::kernelImmediate([this, key, value] { pimpl_->setProperty(key, value); });
+}
 
-    return res;
+Actor* Actor::restart()
+{
+  return simgrid::simix::kernelImmediate([this]() { return pimpl_->restart(); });
 }
-void s4u::Actor::send(Mailbox &chan, void *payload, size_t simulatedSize) {
-	Comm c = Comm::send_init(this,chan);
-	c.setRemains(simulatedSize);
-	c.setSrcData(payload);
-	c.wait();
+
+// ***** 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)
+    simcall_process_sleep(duration);
+}
+
+XBT_PUBLIC(void) sleep_until(double timeout)
+{
+  double now = SIMIX_get_clock();
+  if (timeout > now)
+    simcall_process_sleep(timeout - now);
 }
 
-s4u::Comm &s4u::Actor::send_init(Mailbox &chan) {
-	return s4u::Comm::send_init(this, chan);
+void execute(double flops)
+{
+  smx_activity_t s = simcall_execution_start(nullptr,flops,1.0/*priority*/,0./*bound*/);
+  simcall_execution_wait(s);
+}
+
+void* recv(MailboxPtr chan) // deprecated
+{
+  return chan->get();
+}
+
+void* recv(MailboxPtr chan, double timeout) // deprecated
+{
+  return chan->get(timeout);
+}
+
+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;
+}
+
+aid_t getPpid()
+{
+  return SIMIX_process_self()->ppid;
+}
+
+std::string getName()
+{
+  return SIMIX_process_self()->getName();
+}
+
+const char* getCname()
+{
+  return SIMIX_process_self()->getCname();
+}
+
+Host* getHost()
+{
+  return SIMIX_process_self()->host;
+}
+
+void suspend()
+{
+  simcall_process_suspend(SIMIX_process_self());
+}
+
+void resume()
+{
+  smx_actor_t process = SIMIX_process_self();
+  simgrid::simix::kernelImmediate([process] { process->resume(); });
+}
+
+bool isSuspended()
+{
+  smx_actor_t process = SIMIX_process_self();
+  return simgrid::simix::kernelImmediate([process] { return process->suspended; });
+}
+
+void kill()
+{
+  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)
+{
+  simcall_process_on_exit(SIMIX_process_self(), fun, data);
+}
+
+void migrate(Host* new_host)
+{
+  smx_actor_t process = SIMIX_process_self();
+  simgrid::simix::kernelImmediate([process, new_host] { process->new_host = new_host; });
+}
+}
+}
 }