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

diff --git a/src/s4u/s4u_actor.cpp b/src/s4u/s4u_actor.cpp
index 8d4f299385..a919d84ff5 100644
--- a/src/s4u/s4u_actor.cpp
+++ b/src/s4u/s4u_actor.cpp
@@ -4,13 +4,14 @@
 /* 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 "src/msg/msg_mailbox.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");
 
@@ -27,20 +28,30 @@ static int s4u_actor_runner(int argc, char **argv) {
 
 using namespace simgrid;
 
+s4u::Actor::Actor(smx_process_t smx_proc) {
+	p_smx_process = smx_proc;
+}
 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);
+	p_smx_process = simcall_process_create(name, s4u_actor_runner, this, host->name(), 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);
 }
 
+int s4u::Actor::main(int argc, char **argv) {
+	fprintf(stderr,"Error: You should override the method main(int, char**) in Actor class %s\n",getName());
+	return 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);
+	simgrid::s4u::Actor* res = (simgrid::s4u::Actor*) SIMIX_process_self_get_data(smx_proc);
+	if (res == NULL) // The smx_process was not created by S4U (but by deployment?). Embed it in a S4U object
+		res = new Actor(smx_proc);
+	return res;
 }
 s4u::Actor *s4u::Actor::byPid(int pid) {
 	return (simgrid::s4u::Actor*) SIMIX_process_self_get_data(SIMIX_process_from_PID(pid));
@@ -77,23 +88,24 @@ void s4u::Actor::sleep(double duration) {
 	simcall_process_sleep(duration);
 }
 
-void s4u::Actor::execute(double flops) {
-	simcall_process_execute(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
+e_smx_state_t s4u::Actor::execute(double flops) {
+	smx_synchro_t s = simcall_process_execute(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
+    return simcall_process_execution_wait(s);
 }
 
-char *s4u::Actor::recvstr(Mailbox &chan) {
-	char *res=NULL;
-	size_t res_size=sizeof(res);
+void *s4u::Actor::recv(Mailbox &chan) {
+	void *res=NULL;
 
-	simcall_comm_recv(chan.getInferior(),&res,&res_size,NULL,NULL,NULL,-1 /* timeout */,-1 /*rate*/);
+	Comm c = Comm::recv_init(this, chan);
+	c.setDstData(&res,sizeof(res));
+	c.wait();
 
     return res;
 }
-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::send(Mailbox &chan, void *payload, size_t simulatedSize) {
+	Comm c = Comm::send_init(this,chan);
+	c.setRemains(simulatedSize);
+	c.setSrcData(payload);
+	// c.start() is optional.
+	c.wait();
 }
-