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 *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));
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) {
+void *s4u::Actor::recv(Mailbox &chan) {
void *res=NULL;
Comm c = Comm::recv_init(this, chan);
c.setDstData(&res,sizeof(res));
c.wait();
- return (char*)res;
+ return res;
}
-void s4u::Actor::sendstr(Mailbox &chan, const char*msg) {
+void s4u::Actor::send(Mailbox &chan, void *payload, size_t simulatedSize) {
Comm c = Comm::send_init(this,chan);
- c.setRemains(strlen(msg));
- c.setSrcData(xbt_strdup(msg),sizeof(char*));
+ 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);
-}