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

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 8d4f299385..40a9c30519 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -4,96 +4,99 @@
 /* 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 "../../include/simgrid/s4u/actor.hpp"
-#include "../../include/simgrid/s4u/mailbox.hpp"
 #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"
 #include "simgrid/s4u/host.hpp"
+#include "simgrid/s4u/mailbox.hpp"
 
 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;
+static int s4u_actor_runner(int argc, char **argv)
+{
+  // Move the callback from the heap to the stack:
+  std::unique_ptr<std::function<int()>> code2 =
+    std::unique_ptr<std::function<int()>>(
+      static_cast<std::function<int()>*>(
+        SIMIX_process_self_get_data()));
+  std::function<int()> code = std::move(*code2);
+  code2 = nullptr;
+  // Call it:
+  // TODO, handle exceptions
+  return code();
 }
 
-
-
 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<int()> code)
+{
+  std::function<int()>* code2 = new std::function<int()>(std::move(code));
+  this->pimpl_ = simcall_process_create(
+    name, s4u_actor_runner, code2, host->name().c_str(),
+    killTime, 0, NULL, 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) {
-	char *res=NULL;
-	size_t res_size=sizeof(res);
-
-	simcall_comm_recv(chan.getInferior(),&res,&res_size,NULL,NULL,NULL,-1 /* timeout */,-1 /*rate*/);
+void s4u::Actor::sleep(double duration) {
+  simcall_process_sleep(duration);
+}
 
-    return res;
+e_smx_state_t s4u::Actor::execute(double flops) {
+  smx_synchro_t s = simcall_execution_start(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
+  return simcall_execution_wait(s);
 }
-void s4u::Actor::sendstr(Mailbox &chan, const char*msg) {
-	char *msg_cpy=xbt_strdup(msg);
-	smx_synchro_t comm = simcall_comm_isend(p_smx_process, chan.getInferior(), strlen(msg),
-			-1/*rate*/, msg_cpy, sizeof(void *),
-			NULL, NULL, NULL,NULL/*data*/, 0);
-	simcall_comm_wait(comm, -1/*timeout*/);
+
+void *s4u::Actor::recv(Mailbox &chan) {
+  void *res = NULL;
+  Comm c = Comm::recv_init(chan);
+  c.setDstData(&res,sizeof(res));
+  c.wait();
+  return res;
 }
 
+void s4u::Actor::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();
+}