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
Merge branch 'master' into actor-priority
[simgrid.git]
/
src
/
s4u
/
s4u_actor.cpp
diff --git
a/src/s4u/s4u_actor.cpp
b/src/s4u/s4u_actor.cpp
index
c5fa2f2
..
1553bb9
100644
(file)
--- a/
src/s4u/s4u_actor.cpp
+++ b/
src/s4u/s4u_actor.cpp
@@
-85,14
+85,14
@@
void Actor::daemonize()
simgrid::simix::kernelImmediate([this]() { pimpl_->daemonize(); });
}
simgrid::simix::kernelImmediate([this]() { pimpl_->daemonize(); });
}
-const
char* Actor::getCname()
+const
simgrid::xbt::string& Actor::getName() const
{
{
- return this->pimpl_->
name.c_str
();
+ return this->pimpl_->
getName
();
}
}
-simgrid::xbt::string Actor::getName()
+const char* Actor::getCname() const
{
{
- return this->pimpl_->
name
;
+ return this->pimpl_->
getCname()
;
}
aid_t Actor::getPid()
}
aid_t Actor::getPid()
@@
-227,6
+227,12
@@
void execute(double flops)
simcall_execution_wait(s);
}
simcall_execution_wait(s);
}
+void execute(double flops,double priority)
+{
+ smx_activity_t s = simcall_execution_start(nullptr,flops,1 / priority/*priority*/,0./*bound*/);
+ simcall_execution_wait(s);
+}
+
void* recv(MailboxPtr chan) // deprecated
{
return chan->get();
void* recv(MailboxPtr chan) // deprecated
{
return chan->get();
@@
-269,7
+275,12
@@
aid_t getPpid()
std::string getName()
{
std::string getName()
{
- return SIMIX_process_self()->name;
+ return SIMIX_process_self()->getName();
+}
+
+const char* getCname()
+{
+ return SIMIX_process_self()->getCname();
}
Host* getHost()
}
Host* getHost()