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
cleanups and simplifications to our build system
[simgrid.git]
/
src
/
msg
/
msg_process.c
diff --git
a/src/msg/msg_process.c
b/src/msg/msg_process.c
index
927a4a9
..
3a38913
100644
(file)
--- a/
src/msg/msg_process.c
+++ b/
src/msg/msg_process.c
@@
-43,9
+43,7
@@
void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc)
simcall_process_set_data(smx_proc, NULL);
}
simcall_process_set_data(smx_proc, NULL);
}
-#ifdef HAVE_TRACING
TRACE_msg_process_end(smx_proc);
TRACE_msg_process_end(smx_proc);
-#endif
// free the data if a function was provided
if (msg_proc && msg_proc->data && msg_global->process_data_cleanup) {
msg_global->process_data_cleanup(msg_proc->data);
// free the data if a function was provided
if (msg_proc && msg_proc->data && msg_global->process_data_cleanup) {
msg_global->process_data_cleanup(msg_proc->data);
@@
-173,9
+171,7
@@
msg_process_t MSG_process_create_with_environment(const char *name,
simcall_process_create(&process, name, code, simdata, sg_host_name(host), -1,
argc, argv, properties,0);
simcall_process_create(&process, name, code, simdata, sg_host_name(host), -1,
argc, argv, properties,0);
-#ifdef HAVE_TRACING
TRACE_msg_process_create(name, SIMIX_process_get_PID(process), host);
TRACE_msg_process_create(name, SIMIX_process_get_PID(process), host);
-#endif
if (!process) {
/* Undo everything we have just changed */
if (!process) {
/* Undo everything we have just changed */
@@
-183,9
+179,7
@@
msg_process_t MSG_process_create_with_environment(const char *name,
return NULL;
}
else {
return NULL;
}
else {
- #ifdef HAVE_TRACING
simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process);
simcall_process_on_exit(process,(int_f_pvoid_pvoid_t)TRACE_msg_process_kill,process);
- #endif
}
return process;
}
}
return process;
}
@@
-229,10
+223,8
@@
msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host)
{
simdata_process_t simdata = simcall_process_get_data(process);
simdata->m_host = host;
{
simdata_process_t simdata = simcall_process_get_data(process);
simdata->m_host = host;
-#ifdef HAVE_TRACING
msg_host_t now = simdata->m_host;
TRACE_msg_process_change_host(process, now, host);
msg_host_t now = simdata->m_host;
TRACE_msg_process_change_host(process, now, host);
-#endif
simcall_process_change_host(process, host);
return MSG_OK;
}
simcall_process_change_host(process, host);
return MSG_OK;
}
@@
-443,10
+435,7
@@
msg_error_t MSG_process_suspend(msg_process_t process)
{
xbt_assert(process != NULL, "Invalid parameter");
{
xbt_assert(process != NULL, "Invalid parameter");
-#ifdef HAVE_TRACING
TRACE_msg_process_suspend(process);
TRACE_msg_process_suspend(process);
-#endif
-
simcall_process_suspend(process);
MSG_RETURN(MSG_OK);
}
simcall_process_suspend(process);
MSG_RETURN(MSG_OK);
}
@@
-461,10
+450,7
@@
msg_error_t MSG_process_resume(msg_process_t process)
{
xbt_assert(process != NULL, "Invalid parameter");
{
xbt_assert(process != NULL, "Invalid parameter");
-#ifdef HAVE_TRACING
TRACE_msg_process_resume(process);
TRACE_msg_process_resume(process);
-#endif
-
simcall_process_resume(process);
MSG_RETURN(MSG_OK);
}
simcall_process_resume(process);
MSG_RETURN(MSG_OK);
}