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
namespacify a global function of SIMIX
[simgrid.git]
/
src
/
kernel
/
actor
/
ActorImpl.cpp
diff --git
a/src/kernel/actor/ActorImpl.cpp
b/src/kernel/actor/ActorImpl.cpp
index
c8640b4
..
c943038
100644
(file)
--- a/
src/kernel/actor/ActorImpl.cpp
+++ b/
src/kernel/actor/ActorImpl.cpp
@@
-22,8
+22,6
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)");
-static unsigned long simix_process_maxpid = 0;
-
/**
* @brief Returns the current agent.
*
/**
* @brief Returns the current agent.
*
@@
-53,9
+51,15
@@
namespace simgrid {
namespace kernel {
namespace actor {
namespace kernel {
namespace actor {
+static unsigned long maxpid = 0;
+int get_maxpid()
+{
+ return maxpid;
+}
+
ActorImpl::ActorImpl(const simgrid::xbt::string& name, s4u::Host* host) : host_(host), name_(name), piface_(this)
{
ActorImpl::ActorImpl(const simgrid::xbt::string& name, s4u::Host* host) : host_(host), name_(name), piface_(this)
{
- pid_ =
simix_process_
maxpid++;
+ pid_ = maxpid++;
simcall.issuer = this;
}
simcall.issuer = this;
}
@@
-524,14
+528,14
@@
void create_maestro(const std::function<void()>& code)
} // namespace kernel
} // namespace simgrid
} // namespace kernel
} // namespace simgrid
-void SIMIX_process_detach()
+void SIMIX_process_detach()
// deprecated v3.25
{
simgrid::kernel::actor::ActorImpl::detach();
}
smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname,
std::unordered_map<std::string, std::string>* properties,
{
simgrid::kernel::actor::ActorImpl::detach();
}
smx_actor_t SIMIX_process_attach(const char* name, void* data, const char* hostname,
std::unordered_map<std::string, std::string>* properties,
- smx_actor_t /*parent_process*/)
+ smx_actor_t /*parent_process*/)
// deprecated 3.25
{
return simgrid::kernel::actor::ActorImpl::attach(name, data, sg_host_by_name(hostname), properties).get();
}
{
return simgrid::kernel::actor::ActorImpl::attach(name, data, sg_host_by_name(hostname), properties).get();
}
@@
-550,11
+554,6
@@
void simcall_HANDLER_process_suspend(smx_simcall_t simcall, smx_actor_t actor)
/* If we are suspending ourselves, then just do not finish the simcall now */
}
/* If we are suspending ourselves, then just do not finish the simcall now */
}
-int SIMIX_process_get_maxpid()
-{
- return simix_process_maxpid;
-}
-
int SIMIX_process_count()
{
return simix_global->process_list.size();
int SIMIX_process_count()
{
return simix_global->process_list.size();