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' of github.com:simgrid/simgrid
[simgrid.git]
/
src
/
msg
/
instr_msg_process.cpp
diff --git
a/src/msg/instr_msg_process.cpp
b/src/msg/instr_msg_process.cpp
index
d200f1e
..
b0ad430
100644
(file)
--- a/
src/msg/instr_msg_process.cpp
+++ b/
src/msg/instr_msg_process.cpp
@@
-12,7
+12,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
char *instr_process_id (msg_process_t proc, char *str, int len)
{
char *instr_process_id (msg_process_t proc, char *str, int len)
{
- return instr_process_id_2
(proc->cname(), proc->p
id(), str, len);
+ return instr_process_id_2
(proc->getCname(), proc->getP
id(), str, len);
}
char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len)
}
char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len)
@@
-24,7
+24,7
@@
char *instr_process_id_2 (const char *process_name, int process_pid, char *str,
/*
* Instrumentation functions to trace MSG processes (msg_process_t)
*/
/*
* Instrumentation functions to trace MSG processes (msg_process_t)
*/
-void TRACE_msg_process_change_host(msg_process_t process, msg_host_t
old_host, msg_host_t
new_host)
+void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host)
{
if (TRACE_msg_process_is_enabled()){
static long long int counter = 0;
{
if (TRACE_msg_process_is_enabled()){
static long long int counter = 0;
@@
-38,7
+38,7
@@
void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, m
//start link
container_t msg = PJ_container_get (instr_process_id(process, str, len));
type_t type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root());
//start link
container_t msg = PJ_container_get (instr_process_id(process, str, len));
type_t type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root());
- new
_pajeStartLink
(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
+ new
StartLinkEvent
(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
//destroy existing container of this process
TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process));
//destroy existing container of this process
TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process));
@@
-49,7
+49,7
@@
void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, m
//end link
msg = PJ_container_get(instr_process_id(process, str, len));
type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root());
//end link
msg = PJ_container_get(instr_process_id(process, str, len));
type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root());
- new
_pajeEndLink
(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
+ new
EndLinkEvent
(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
}
}
}
}
@@
-59,7
+59,7
@@
void TRACE_msg_process_create (const char *process_name, int process_pid, msg_ho
int len = INSTR_DEFAULT_STR_SIZE;
char str[INSTR_DEFAULT_STR_SIZE];
int len = INSTR_DEFAULT_STR_SIZE;
char str[INSTR_DEFAULT_STR_SIZE];
- container_t host_container = PJ_container_get(host->
c
name());
+ container_t host_container = PJ_container_get(host->
getC
name());
PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
}
}
PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
}
}
@@
-82,7
+82,7
@@
void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t proc
{
if (TRACE_msg_process_is_enabled() && status==SMX_EXIT_FAILURE){
//kill means that this process no longer exists, let's destroy it
{
if (TRACE_msg_process_is_enabled() && status==SMX_EXIT_FAILURE){
//kill means that this process no longer exists, let's destroy it
- TRACE_msg_process_destroy(process->
cname(), process->p
id());
+ TRACE_msg_process_destroy(process->
getCname(), process->getP
id());
}
}
}
}
@@
-94,8
+94,8
@@
void TRACE_msg_process_suspend(msg_process_t process)
container_t process_container = PJ_container_get (instr_process_id(process, str, len));
type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
container_t process_container = PJ_container_get (instr_process_id(process, str, len));
type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- val_t value = PJ_value_get ("suspend", type);
- new
_pajePushState
(MSG_get_clock(), process_container, type, value);
+ val_t value =
s_val::
PJ_value_get ("suspend", type);
+ new
PushStateEvent
(MSG_get_clock(), process_container, type, value);
}
}
}
}
@@
-107,7
+107,7
@@
void TRACE_msg_process_resume(msg_process_t process)
container_t process_container = PJ_container_get (instr_process_id(process, str, len));
type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
container_t process_container = PJ_container_get (instr_process_id(process, str, len));
type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- new
_pajePopState
(MSG_get_clock(), process_container, type);
+ new
PopStateEvent
(MSG_get_clock(), process_container, type);
}
}
}
}
@@
-119,8
+119,8
@@
void TRACE_msg_process_sleep_in(msg_process_t process)
container_t process_container = PJ_container_get (instr_process_id(process, str, len));
type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
container_t process_container = PJ_container_get (instr_process_id(process, str, len));
type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- val_t value = PJ_value_get ("sleep", type);
- new
_pajePushState
(MSG_get_clock(), process_container, type, value);
+ val_t value =
s_val::
PJ_value_get ("sleep", type);
+ new
PushStateEvent
(MSG_get_clock(), process_container, type, value);
}
}
}
}
@@
-132,6
+132,6
@@
void TRACE_msg_process_sleep_out(msg_process_t process)
container_t process_container = PJ_container_get (instr_process_id(process, str, len));
type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
container_t process_container = PJ_container_get (instr_process_id(process, str, len));
type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- new
_pajePopState
(MSG_get_clock(), process_container, type);
+ new
PopStateEvent
(MSG_get_clock(), process_container, type);
}
}
}
}