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
[mc] Replace the override word with MC_OVERRIDE
[simgrid.git]
/
src
/
msg
/
msg_process.c
diff --git
a/src/msg/msg_process.c
b/src/msg/msg_process.c
index
a14e882
..
d78beb5
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);
@@
-53,6
+51,7
@@
void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc)
// free the MSG process
xbt_free(msg_proc);
// free the MSG process
xbt_free(msg_proc);
+ SIMIX_process_cleanup(smx_proc);
}
/* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */
}
/* This function creates a MSG process. It has the prototype enforced by SIMIX_function_register_process_create */
@@
-154,7
+153,7
@@
msg_process_t MSG_process_create_with_environment(const char *name,
int argc, char **argv,
xbt_dict_t properties)
{
int argc, char **argv,
xbt_dict_t properties)
{
- xbt_assert(code != NULL && host != NULL, "Invalid parameters");
+ xbt_assert(code != NULL && host != NULL, "Invalid parameters
: host and code params must not be NULL
");
simdata_process_t simdata = xbt_new0(s_simdata_process_t, 1);
msg_process_t process;
simdata_process_t simdata = xbt_new0(s_simdata_process_t, 1);
msg_process_t process;
@@
-172,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 */
@@
-182,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;
}
@@
-228,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;
}
@@
-244,7
+237,7
@@
msg_error_t MSG_process_migrate(msg_process_t process, msg_host_t host)
*/
void* MSG_process_get_data(msg_process_t process)
{
*/
void* MSG_process_get_data(msg_process_t process)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter
: first parameter must not be NULL!
");
/* get from SIMIX the MSG process data, and then the user data */
simdata_process_t simdata = simcall_process_get_data(process);
/* get from SIMIX the MSG process data, and then the user data */
simdata_process_t simdata = simcall_process_get_data(process);
@@
-259,7
+252,7
@@
void* MSG_process_get_data(msg_process_t process)
*/
msg_error_t MSG_process_set_data(msg_process_t process, void *data)
{
*/
msg_error_t MSG_process_set_data(msg_process_t process, void *data)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter
: first parameter must not be NULL!
");
simdata_process_t simdata = simcall_process_get_data(process);
simdata->data = data;
simdata_process_t simdata = simcall_process_get_data(process);
simdata->data = data;
@@
-293,7
+286,7
@@
msg_host_t MSG_process_get_host(msg_process_t process)
else {
simdata = simcall_process_get_data(process);
}
else {
simdata = simcall_process_get_data(process);
}
- return simdata
->m_host
;
+ return simdata
? simdata->m_host : NULL
;
}
/** \ingroup m_process_management
}
/** \ingroup m_process_management
@@
-357,7
+350,7
@@
int MSG_process_get_PID(msg_process_t process)
*/
int MSG_process_get_PPID(msg_process_t process)
{
*/
int MSG_process_get_PPID(msg_process_t process)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter
: First argument must not be NULL
");
return simcall_process_get_PPID(process);
}
return simcall_process_get_PPID(process);
}
@@
-370,7
+363,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)
{
- xbt_assert(process
, "Invalid parameter
");
+ xbt_assert(process
!= NULL, "Invalid parameter: First argument must not be NULL
");
return simcall_process_get_name(process);
}
return simcall_process_get_name(process);
}
@@
-395,7
+388,7
@@
const char *MSG_process_get_property_value(msg_process_t process,
*/
xbt_dict_t MSG_process_get_properties(msg_process_t process)
{
*/
xbt_dict_t MSG_process_get_properties(msg_process_t process)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter
: First argument must not be NULL
");
return simcall_process_get_properties(process);
return simcall_process_get_properties(process);
@@
-440,12
+433,9
@@
msg_process_t MSG_process_self(void)
*/
msg_error_t MSG_process_suspend(msg_process_t process)
{
*/
msg_error_t MSG_process_suspend(msg_process_t process)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter
: First argument must not be NULL
");
-#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);
}
@@
-458,12
+448,9
@@
msg_error_t MSG_process_suspend(msg_process_t process)
*/
msg_error_t MSG_process_resume(msg_process_t process)
{
*/
msg_error_t MSG_process_resume(msg_process_t process)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter
: First argument must not be NULL
");
-#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);
}
@@
-476,7
+463,7
@@
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)
{
- xbt_assert(process != NULL, "Invalid parameter");
+ xbt_assert(process != NULL, "Invalid parameter
: First argument must not be NULL
");
return simcall_process_is_suspended(process);
}
return simcall_process_is_suspended(process);
}