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
make tracing less tightly coupled to MSG
[simgrid.git]
/
src
/
msg
/
instr_msg_task.cpp
diff --git
a/src/msg/instr_msg_task.cpp
b/src/msg/instr_msg_task.cpp
index 4eb14d30fa914e9cc4da9dbab9aa87d16c94b8eb..4a3cd09bd8dfc9b7f46846ad021f99ac5257fa0f 100644
(file)
--- a/
src/msg/instr_msg_task.cpp
+++ b/
src/msg/instr_msg_task.cpp
@@
-48,29
+48,18
@@
void TRACE_msg_task_execute_start(msg_task_t task)
{
XBT_DEBUG("EXEC,in %p, %lld, %s", task, task->counter, task->category);
- if (TRACE_msg_process_is_enabled()){
- int len = INSTR_DEFAULT_STR_SIZE;
- char str[INSTR_DEFAULT_STR_SIZE];
-
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
- simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
- simgrid::instr::Value* val = simgrid::instr::Value::byName("task_execute", type);
- new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
- }
+ if (TRACE_actor_is_enabled())
+ simgrid::instr::Container::byName(instr_pid(MSG_process_self()))
+ ->getState("ACTOR_STATE")
+ ->pushEvent("task_execute");
}
void TRACE_msg_task_execute_end(msg_task_t task)
{
XBT_DEBUG("EXEC,out %p, %lld, %s", task, task->counter, task->category);
- if (TRACE_msg_process_is_enabled()){
- int len = INSTR_DEFAULT_STR_SIZE;
- char str[INSTR_DEFAULT_STR_SIZE];
-
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
- simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
- new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
- }
+ if (TRACE_actor_is_enabled())
+ simgrid::instr::Container::byName(instr_pid(MSG_process_self()))->getState("ACTOR_STATE")->popEvent();
}
/* MSG_task_destroy related functions */
@@
-88,33
+77,20
@@
void TRACE_msg_task_get_start()
{
XBT_DEBUG("GET,in");
- if (TRACE_msg_process_is_enabled()){
- int len = INSTR_DEFAULT_STR_SIZE;
- char str[INSTR_DEFAULT_STR_SIZE];
-
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
- simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
- simgrid::instr::Value* val = simgrid::instr::Value::byName("receive", type);
- new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
- }
+ if (TRACE_actor_is_enabled())
+ simgrid::instr::Container::byName(instr_pid(MSG_process_self()))->getState("ACTOR_STATE")->pushEvent("receive");
}
-void TRACE_msg_task_get_end(
double start_time,
msg_task_t task)
+void TRACE_msg_task_get_end(msg_task_t task)
{
XBT_DEBUG("GET,out %p, %lld, %s", task, task->counter, task->category);
- if (TRACE_
msg_process_is_enabled())
{
-
int len = INSTR_DEFAULT_STR_SIZE
;
-
char str[INSTR_DEFAULT_STR_SIZE]
;
+ if (TRACE_
actor_is_enabled())
{
+
container_t process_container = simgrid::instr::Container::byName(instr_pid(MSG_process_self()))
;
+
process_container->getState("ACTOR_STATE")->popEvent()
;
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
- simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
- new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
-
- char key[INSTR_DEFAULT_STR_SIZE];
- snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter);
- type = simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_TASK_LINK");
- new simgrid::instr::EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
+ std::string key = std::string("p") + std::to_string(task->counter);
+ simgrid::instr::Container::getRoot()->getLink("ACTOR_TASK_LINK")->endEvent(process_container, "SR", key);
}
}
@@
-123,19
+99,12
@@
int TRACE_msg_task_put_start(msg_task_t task)
{
XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->category);
- if (TRACE_msg_process_is_enabled()){
- int len = INSTR_DEFAULT_STR_SIZE;
- char str[INSTR_DEFAULT_STR_SIZE];
-
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
- simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
- simgrid::instr::Value* val = simgrid::instr::Value::byName("send", type);
- new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
+ if (TRACE_actor_is_enabled()) {
+ container_t process_container = simgrid::instr::Container::byName(instr_pid(MSG_process_self()));
+ process_container->getState("ACTOR_STATE")->pushEvent("send");
- char key[INSTR_DEFAULT_STR_SIZE];
- snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter);
- type = simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_TASK_LINK");
- new simgrid::instr::StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
+ std::string key = std::string("p") + std::to_string(task->counter);
+ simgrid::instr::Container::getRoot()->getLink("ACTOR_TASK_LINK")->startEvent(process_container, "SR", key);
}
return 1;
@@
-145,12
+114,6
@@
void TRACE_msg_task_put_end()
{
XBT_DEBUG("PUT,out");
- if (TRACE_msg_process_is_enabled()){
- int len = INSTR_DEFAULT_STR_SIZE;
- char str[INSTR_DEFAULT_STR_SIZE];
-
- container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
- simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
- new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
- }
+ if (TRACE_actor_is_enabled())
+ simgrid::instr::Container::byName(instr_pid(MSG_process_self()))->getState("ACTOR_STATE")->popEvent();
}