* 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"
: 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().c_str(), 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);
}
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(p_smx_process)));
}
const char* s4u::Actor::getName() {
return simcall_process_get_name(p_smx_process);
}
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);
+ smx_synchro_t s = simcall_execution_start(NULL,flops,1.0/*priority*/,0./*bound*/, 0L/*affinity*/);
+ return simcall_execution_wait(s);
}
void *s4u::Actor::recv(Mailbox &chan) {