Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Reduce the amount of implicit include directories
[simgrid.git] / src / s4u / s4u_actor.cpp
index 8a5dd1c..a919d84 100644 (file)
@@ -5,8 +5,8 @@
  * 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 "src/msg/msg_mailbox.h"
 
 #include "simgrid/s4u/actor.hpp"
 #include "simgrid/s4u/comm.hpp"
@@ -35,13 +35,17 @@ 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();
        simgrid::s4u::Actor* res = (simgrid::s4u::Actor*) SIMIX_process_self_get_data(smx_proc);
@@ -102,9 +106,6 @@ 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();
 }
-
-s4u::Comm &s4u::Actor::send_init(Mailbox &chan) {
-       return s4u::Comm::send_init(this, chan);
-}