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
ActivityImplPtr are not part of any C struct, only C++ classes
[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
a02687e
..
9d695b5
100644
(file)
--- a/
src/msg/instr_msg_process.cpp
+++ b/
src/msg/instr_msg_process.cpp
@@
-1,17
+1,18
@@
-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010, 2012-2017. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "msg_private.h"
-#include "src/simix/smx_process_private.h"
+#include "simgrid/s4u/Host.hpp"
+#include "src/instr/instr_private.h"
+#include "src/msg/msg_private.h"
+#include "src/simix/ActorImpl.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
char *instr_process_id (msg_process_t proc, char *str, int len)
{
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
char *instr_process_id (msg_process_t proc, char *str, int len)
{
- return instr_process_id_2 (proc->
name, proc->pid, str, len);//MSG_process_get_name(proc), MSG_process_get_PID(proc
), str, len);
+ return instr_process_id_2 (proc->
cname(), proc->pid(
), 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)
@@
-37,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));
@@
-48,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);
}
}
}
}
@@
-58,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
(SIMIX_host_get_name(host
));
+ container_t host_container = PJ_container_get
(host->cname(
));
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);
}
}
@@
-81,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->
name, process->pid
);
+ TRACE_msg_process_destroy(process->
cname(), process->pid()
);
}
}
}
}
@@
-94,7
+95,7
@@
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);
val_t value = PJ_value_get ("suspend", 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);
+ new
PushStateEvent
(MSG_get_clock(), process_container, type, value);
}
}
}
}
@@
-106,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,7
+120,7
@@
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);
val_t value = PJ_value_get ("sleep", 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);
+ new
PushStateEvent
(MSG_get_clock(), process_container, type, value);
}
}
}
}
@@
-131,13
+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);
- }
-}
-
-void TRACE_msg_process_end(msg_process_t process)
-{
- if (TRACE_msg_process_is_enabled()) {
- TRACE_msg_process_destroy(process->name, process->pid);
+ new PopStateEvent (MSG_get_clock(), process_container, type);
}
}
}
}