X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3a3c36e5310194dd4a519f115eaf377a044c20dd..a15797ea55151ddfdbae48147e74159efe01b411:/src/s4u/s4u_actor.cpp

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 74264b5533..a220c8ce69 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -5,8 +5,7 @@
  * 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 "src/msg/msg_private.h"
 
 #include "simgrid/s4u/actor.hpp"
 #include "simgrid/s4u/comm.hpp"
@@ -15,89 +14,85 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
 
-/* C main function of a actor, running this->main */
-static int s4u_actor_runner(int argc, char **argv) {
-
-	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;
-}
-
-
-
 using namespace simgrid;
 
-s4u::Actor::Actor(const char *name, s4u::Host *host, int argc, char **argv)
-    : s4u::Actor::Actor(name,host, argc,argv, -1) {
-}
-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);
+s4u::Actor::Actor(smx_process_t smx_proc) : pimpl_(smx_proc) {}
 
-	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);
+s4u::Actor::Actor(const char* name, s4u::Host *host, double killTime, std::function<void()> code)
+{
+  // TODO, when autorestart is used, the std::function is copied so the new
+  // instance will get a fresh (reinitialized) state. Is this what we want?
+  this->pimpl_ = simcall_process_create(
+    name, std::move(code), nullptr, host->name().c_str(),
+    killTime, NULL, 0);
 }
 
-s4u::Actor *s4u::Actor::current() {
-	smx_process_t smx_proc = SIMIX_process_self();
-	return (simgrid::s4u::Actor*) SIMIX_process_self_get_data(smx_proc);
-}
-s4u::Actor *s4u::Actor::byPid(int pid) {
-	return (simgrid::s4u::Actor*) SIMIX_process_self_get_data(SIMIX_process_from_PID(pid));
-}
+s4u::Actor::~Actor() {}
 
 void s4u::Actor::setAutoRestart(bool autorestart) {
-	simcall_process_auto_restart_set(p_smx_process,autorestart);
+  simcall_process_auto_restart_set(pimpl_,autorestart);
 }
 
 s4u::Host *s4u::Actor::getHost() {
-	return s4u::Host::byName(sg_host_name(simcall_process_get_host(p_smx_process)));
+  return s4u::Host::by_name(sg_host_get_name(simcall_process_get_host(pimpl_)));
 }
+
 const char* s4u::Actor::getName() {
-	return simcall_process_get_name(p_smx_process);
+  return simcall_process_get_name(pimpl_);
 }
+
 int s4u::Actor::getPid(){
-	return simcall_process_get_PID(p_smx_process);
+  return simcall_process_get_PID(pimpl_);
 }
 
 void s4u::Actor::setKillTime(double time) {
-	simcall_process_set_kill_time(p_smx_process,time);
+  simcall_process_set_kill_time(pimpl_,time);
 }
+
 double s4u::Actor::getKillTime() {
-	return simcall_process_get_kill_time(p_smx_process);
-}
-void s4u::Actor::killAll() {
-	simcall_process_killall(1);
+  return simcall_process_get_kill_time(pimpl_);
 }
+
 void s4u::Actor::kill() {
-	simcall_process_kill(p_smx_process);
+  simcall_process_kill(pimpl_);
 }
 
-void s4u::Actor::sleep(double duration) {
-	simcall_process_sleep(duration);
-}
+// static stuff:
 
-void s4u::Actor::execute(double flops) {
-	simcall_process_execute(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
+void s4u::Actor::killAll() {
+  simcall_process_killall(1);
 }
 
-char *s4u::Actor::recvstr(Mailbox &chan) {
-	void *res=NULL;
 
-	Comm c = Comm::recv_init(chan);
-	c.setDstData(&res,sizeof(res));
-	c.wait();
+namespace simgrid {
+namespace s4u {
+namespace this_actor {
 
-    return (char*)res;
+void sleep(double duration) {
+  simcall_process_sleep(duration);
 }
-void s4u::Actor::sendstr(Mailbox &chan, const char*msg) {
-	Comm c = Comm::send_init(this,chan);
-	c.setRemains(strlen(msg));
-	c.setSrcData(xbt_strdup(msg),sizeof(char*));
-	c.wait();
+
+e_smx_state_t execute(double flops) {
+  smx_synchro_t s = simcall_execution_start(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
+  return simcall_execution_wait(s);
 }
 
-s4u::Comm &s4u::Actor::send_init(Mailbox &chan) {
-	return s4u::Comm::send_init(this, chan);
+void* recv(Mailbox &chan) {
+  void *res = NULL;
+  Comm c = Comm::recv_init(chan);
+  c.setDstData(&res,sizeof(res));
+  c.wait();
+  return res;
+}
+
+void send(Mailbox &chan, void *payload, size_t simulatedSize) {
+  Comm c = Comm::send_init(chan);
+  c.setRemains(simulatedSize);
+  c.setSrcData(payload);
+  // c.start() is optional.
+  c.wait();
+}
+
+}
+}
 }