A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Populate the kernel::context namespace and continue separating concerns out of simix
[simgrid.git]
/
src
/
s4u
/
s4u_actor.cpp
diff --git
a/src/s4u/s4u_actor.cpp
b/src/s4u/s4u_actor.cpp
index
016e38e
..
6eb6716
100644
(file)
--- a/
src/s4u/s4u_actor.cpp
+++ b/
src/s4u/s4u_actor.cpp
@@
-7,11
+7,12
@@
#include "xbt/log.h"
#include "src/msg/msg_private.h"
#include "xbt/log.h"
#include "src/msg/msg_private.h"
-#include "simgrid/s4u/
a
ctor.hpp"
+#include "simgrid/s4u/
A
ctor.hpp"
#include "simgrid/s4u/comm.hpp"
#include "simgrid/s4u/host.hpp"
#include "simgrid/s4u/mailbox.hpp"
#include "simgrid/s4u/comm.hpp"
#include "simgrid/s4u/host.hpp"
#include "simgrid/s4u/mailbox.hpp"
+#include "src/kernel/context/Context.hpp"
#include "src/simix/smx_private.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
#include "src/simix/smx_private.h"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_actor,"S4U actors");
@@
-20,6
+21,15
@@
namespace simgrid {
namespace s4u {
// ***** Actor creation *****
namespace s4u {
// ***** Actor creation *****
+ActorPtr Actor::self()
+{
+ smx_context_t self_context = SIMIX_context_self();
+ if (self_context == nullptr)
+ return simgrid::s4u::ActorPtr();
+
+ return simgrid::s4u::ActorPtr(&self_context->process()->getIface());
+}
+
ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime, std::function<void()> code)
{
ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime, std::function<void()> code)
{
@@
-28,7
+38,7
@@
ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
smx_process_t process = simcall_process_create(
name, std::move(code), nullptr, host->name().c_str(),
killTime, nullptr, 0);
smx_process_t process = simcall_process_create(
name, std::move(code), nullptr, host->name().c_str(),
killTime, nullptr, 0);
- return Ptr(&process->
actor
());
+ return Ptr(&process->
getIface
());
}
ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
}
ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
@@
-39,7
+49,7
@@
ActorPtr Actor::createActor(const char* name, s4u::Host *host, double killTime,
smx_process_t process = simcall_process_create(
name, std::move(code), nullptr, host->name().c_str(),
killTime, nullptr, 0);
smx_process_t process = simcall_process_create(
name, std::move(code), nullptr, host->name().c_str(),
killTime, nullptr, 0);
- return ActorPtr(&process->
actor
());
+ return ActorPtr(&process->
getIface
());
}
// ***** Actor methods *****
}
// ***** Actor methods *****
@@
-53,15
+63,15
@@
void Actor::setAutoRestart(bool autorestart) {
}
s4u::Host *Actor::getHost() {
}
s4u::Host *Actor::getHost() {
- return
s4u::Host::by_name(sg_host_get_name(simcall_process_get_host(pimpl_)))
;
+ return
pimpl_->host
;
}
}
-
const char*
Actor::getName() {
- return
simcall_process_get_name(pimpl_)
;
+
simgrid::xbt::string
Actor::getName() {
+ return
pimpl_->name
;
}
int Actor::getPid(){
}
int Actor::getPid(){
- return
simcall_process_get_PID(pimpl_)
;
+ return
pimpl_->pid
;
}
void Actor::setKillTime(double time) {
}
void Actor::setKillTime(double time) {
@@
-83,7
+93,7
@@
void Actor::kill(int pid) {
}
}
}
}
-smx_process_t Actor::getI
nferior
() {
+smx_process_t Actor::getI
mpl
() {
return pimpl_;
}
return pimpl_;
}
@@
-97,7
+107,7
@@
ActorPtr Actor::forPid(int pid)
{
smx_process_t process = SIMIX_process_from_PID(pid);
if (process != nullptr)
{
smx_process_t process = SIMIX_process_from_PID(pid);
if (process != nullptr)
- return ActorPtr(&process->
actor
());
+ return ActorPtr(&process->
getIface
());
else
return nullptr;
}
else
return nullptr;
}
@@
-110,8
+120,17
@@
void Actor::killAll() {
namespace this_actor {
namespace this_actor {
-void sleep(double duration) {
- simcall_process_sleep(duration);
+void sleep_for(double duration)
+{
+ if (duration > 0)
+ simcall_process_sleep(duration);
+}
+
+XBT_PUBLIC(void) sleep_until(double timeout)
+{
+ double now = SIMIX_get_clock();
+ if (timeout > now)
+ simcall_process_sleep(timeout - now);
}
e_smx_state_t execute(double flops) {
}
e_smx_state_t execute(double flops) {
@@
-121,14
+140,14
@@
e_smx_state_t execute(double flops) {
void* recv(Mailbox &chan) {
void *res = nullptr;
void* recv(Mailbox &chan) {
void *res = nullptr;
- Comm c = Comm::recv_init(chan);
+ Comm
&
c = Comm::recv_init(chan);
c.setDstData(&res,sizeof(res));
c.wait();
return res;
}
void send(Mailbox &chan, void *payload, size_t simulatedSize) {
c.setDstData(&res,sizeof(res));
c.wait();
return res;
}
void send(Mailbox &chan, void *payload, size_t simulatedSize) {
- Comm c = Comm::send_init(chan);
+ Comm
&
c = Comm::send_init(chan);
c.setRemains(simulatedSize);
c.setSrcData(payload);
// c.start() is optional.
c.setRemains(simulatedSize);
c.setSrcData(payload);
// c.start() is optional.
@@
-136,7
+155,7
@@
void send(Mailbox &chan, void *payload, size_t simulatedSize) {
}
int getPid() {
}
int getPid() {
- return
simcall_process_get_PID(SIMIX_process_self())
;
+ return
SIMIX_process_self()->pid
;
}
}
}
}