-/* Copyright (c) 2006-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
/* 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 "xbt/log.h"
#include "simgrid/s4u/Actor.hpp"
-#include "simgrid/s4u/comm.hpp"
-#include "simgrid/s4u/host.hpp"
+#include "simgrid/s4u/Comm.hpp"
+#include "simgrid/s4u/Host.hpp"
#include "simgrid/s4u/Mailbox.hpp"
#include "src/kernel/context/Context.hpp"
ActorPtr Actor::createActor(const char* name, s4u::Host* host, std::function<void()> code)
{
- smx_actor_t actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
+ simgrid::simix::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
return actor->iface();
}
{
simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
simgrid::simix::ActorCode code = factory(std::move(args));
- smx_actor_t actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
+ simgrid::simix::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
return actor->iface();
}
return this->pimpl_->name;
}
-int Actor::pid()
+aid_t Actor::pid()
{
return this->pimpl_->pid;
}
-int Actor::ppid()
+aid_t Actor::ppid()
{
return this->pimpl_->ppid;
}
return simcall_process_get_kill_time(pimpl_);
}
-void Actor::kill(int pid) {
+void Actor::kill(aid_t pid)
+{
smx_actor_t process = SIMIX_process_from_PID(pid);
if(process != nullptr) {
simcall_process_kill(process);
// ***** Static functions *****
-ActorPtr Actor::byPid(int pid)
+ActorPtr Actor::byPid(aid_t pid)
{
smx_actor_t process = SIMIX_process_from_PID(pid);
if (process != nullptr)
simcall_process_killall(resetPid);
}
+/** Retrieve the property value (or nullptr if not set) */
+const char* Actor::property(const char* key)
+{
+ return (char*)xbt_dict_get_or_null(simcall_process_get_properties(pimpl_), key);
+}
+void Actor::setProperty(const char* key, const char* value)
+{
+ simgrid::simix::kernelImmediate([this, key, value] {
+ xbt_dict_set(simcall_process_get_properties(pimpl_), key, (char*)value, (void_f_pvoid_t) nullptr);
+ });
+}
+
// ***** this_actor *****
namespace this_actor {
void* recv(MailboxPtr chan) {
void *res = nullptr;
- Comm& c = Comm::recv_init(chan);
- c.setDstData(&res,sizeof(res));
- c.wait();
+ CommPtr c = Comm::recv_init(chan);
+ c->setDstData(&res, sizeof(res));
+ c->wait();
return res;
}
void send(MailboxPtr chan, void* payload, double simulatedSize)
{
- Comm& c = Comm::send_init(chan);
- c.setRemains(simulatedSize);
- c.setSrcData(payload);
- // c.start() is optional.
- c.wait();
+ CommPtr c = Comm::send_init(chan);
+ c->setRemains(simulatedSize);
+ c->setSrcData(payload);
+ // c->start() is optional.
+ c->wait();
+}
+
+void send(MailboxPtr chan, void* payload, double simulatedSize, double timeout)
+{
+ CommPtr c = Comm::send_init(chan);
+ c->setRemains(simulatedSize);
+ c->setSrcData(payload);
+ // c->start() is optional.
+ c->wait(timeout);
}
-Comm& isend(MailboxPtr chan, void* payload, double simulatedSize)
+CommPtr isend(MailboxPtr chan, void* payload, double simulatedSize)
{
return Comm::send_async(chan, payload, simulatedSize);
}
+void dsend(MailboxPtr chan, void* payload, double simulatedSize)
+{
+ Comm::send_detached(chan, payload, simulatedSize);
+}
+
+CommPtr irecv(MailboxPtr chan, void** data)
+{
+ return Comm::recv_async(chan, data);
+}
-int pid()
+aid_t pid()
{
return SIMIX_process_self()->pid;
}
-int ppid()
+aid_t ppid()
{
return SIMIX_process_self()->ppid;
}