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
kill another old-fashioned simcall
[simgrid.git]
/
src
/
msg
/
msg_process.cpp
diff --git
a/src/msg/msg_process.cpp
b/src/msg/msg_process.cpp
index
091650e
..
cb1dd50
100644
(file)
--- a/
src/msg/msg_process.cpp
+++ b/
src/msg/msg_process.cpp
@@
-35,7
+35,7
@@
void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_actor)
msg_actor = (simgrid::msg::ActorExt*)SIMIX_process_self_get_data();
SIMIX_process_self_set_data(nullptr);
} else {
msg_actor = (simgrid::msg::ActorExt*)SIMIX_process_self_get_data();
SIMIX_process_self_set_data(nullptr);
} else {
- msg_actor = (simgrid::msg::ActorExt*)smx_actor->data;
+ msg_actor = (simgrid::msg::ActorExt*)smx_actor->
user
data;
simcall_process_set_data(smx_actor, nullptr);
}
simcall_process_set_data(smx_actor, nullptr);
}
@@
-164,7
+164,7
@@
msg_process_t MSG_process_attach(const char *name, void *data, msg_host_t host,
/* Let's create the process: SIMIX may decide to start it right now, even before returning the flow control to us */
smx_actor_t process =
/* Let's create the process: SIMIX may decide to start it right now, even before returning the flow control to us */
smx_actor_t process =
- SIMIX_process_attach(name, new simgrid::msg::ActorExt(data), host->
c
name(), properties, nullptr);
+ SIMIX_process_attach(name, new simgrid::msg::ActorExt(data), host->
getC
name(), properties, nullptr);
if (not process)
xbt_die("Could not attach");
simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process);
if (not process)
xbt_die("Could not attach");
simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process);
@@
-212,7
+212,7
@@
msg_error_t MSG_process_join(msg_process_t process, double timeout){
msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host)
{
TRACE_msg_process_change_host(process, MSG_process_get_host(process), host);
msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host)
{
TRACE_msg_process_change_host(process, MSG_process_get_host(process), host);
-
simcall_process_set_host(process->getImpl(),
host);
+
process->migrate(
host);
return MSG_OK;
}
return MSG_OK;
}
@@
-232,7
+232,7
@@
void* MSG_process_get_data(msg_process_t process)
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
/* get from SIMIX the MSG process data, and then the user data */
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
/* get from SIMIX the MSG process data, and then the user data */
- simgrid::msg::ActorExt* msgExt = (simgrid::msg::ActorExt*)process->getImpl()->data;
+ simgrid::msg::ActorExt* msgExt = (simgrid::msg::ActorExt*)process->getImpl()->
user
data;
if (msgExt)
return msgExt->data;
else
if (msgExt)
return msgExt->data;
else
@@
-248,7
+248,7
@@
msg_error_t MSG_process_set_data(msg_process_t process, void *data)
{
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
{
xbt_assert(process != nullptr, "Invalid parameter: first parameter must not be nullptr!");
- static_cast<simgrid::msg::ActorExt*>(process->getImpl()->data)->data = data;
+ static_cast<simgrid::msg::ActorExt*>(process->getImpl()->
user
data)->data = data;
return MSG_OK;
}
return MSG_OK;
}
@@
-343,7
+343,7
@@
int MSG_process_get_PPID(msg_process_t process)
*/
const char *MSG_process_get_name(msg_process_t process)
{
*/
const char *MSG_process_get_name(msg_process_t process)
{
- return process->
c
name();
+ return process->
getC
name();
}
/** \ingroup m_process_management
}
/** \ingroup m_process_management
@@
-390,6
+390,14
@@
int MSG_process_self_PPID()
return MSG_process_get_PPID(MSG_process_self());
}
return MSG_process_get_PPID(MSG_process_self());
}
+/** \ingroup m_process_management
+ * \brief Return the name of the current process.
+ */
+const char* MSG_process_self_name()
+{
+ return SIMIX_process_self_get_name();
+}
+
/** \ingroup m_process_management
* \brief Return the current process.
*
/** \ingroup m_process_management
* \brief Return the current process.
*
@@
-424,7
+432,7
@@
msg_error_t MSG_process_resume(msg_process_t process)
xbt_assert(process != nullptr, "Invalid parameter: First argument must not be nullptr");
TRACE_msg_process_resume(process);
xbt_assert(process != nullptr, "Invalid parameter: First argument must not be nullptr");
TRACE_msg_process_resume(process);
-
simcall_process_resume(process->getImpl()
);
+
process->resume(
);
return MSG_OK;
}
return MSG_OK;
}
@@
-435,11
+443,11
@@
msg_error_t MSG_process_resume(msg_process_t process)
*/
int MSG_process_is_suspended(msg_process_t process)
{
*/
int MSG_process_is_suspended(msg_process_t process)
{
- return
simcall_process_is_suspended(process->getImpl()
);
+ return
process->isSuspended(
);
}
smx_context_t MSG_process_get_smx_ctx(msg_process_t process) {
}
smx_context_t MSG_process_get_smx_ctx(msg_process_t process) {
- return
SIMIX_process_get_context(process->getImpl())
;
+ return
process->getImpl()->context
;
}
/**
* \ingroup m_process_management
}
/**
* \ingroup m_process_management
@@
-456,7
+464,7
@@
void MSG_process_on_exit(int_f_pvoid_pvoid_t fun, void *data) {
* If the flag is set to 1, the process will be automatically restarted when its host comes back up.
*/
XBT_PUBLIC(void) MSG_process_auto_restart_set(msg_process_t process, int auto_restart) {
* If the flag is set to 1, the process will be automatically restarted when its host comes back up.
*/
XBT_PUBLIC(void) MSG_process_auto_restart_set(msg_process_t process, int auto_restart) {
- sim
call_process_auto_restart_set(process->getImpl(), auto_restart
);
+ sim
grid::simix::kernelImmediate([process, auto_restart]() { process->getImpl()->auto_restart = auto_restart; }
);
}
/**
* \ingroup m_process_management
}
/**
* \ingroup m_process_management
@@
-471,9
+479,7
@@
XBT_PUBLIC(msg_process_t) MSG_process_restart(msg_process_t process) {
*/
XBT_PUBLIC(void) MSG_process_daemonize(msg_process_t process)
{
*/
XBT_PUBLIC(void) MSG_process_daemonize(msg_process_t process)
{
- simgrid::simix::kernelImmediate([process]() {
- process->getImpl()->daemonize();
- });
+ simgrid::simix::kernelImmediate([process]() { process->getImpl()->daemonize(); });
}
/** @ingroup m_process_management
}
/** @ingroup m_process_management