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
try to make Engine::on_config_in_platform_done() useless my better placing Engine...
[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
93d6fc8
..
9291f93
100644
(file)
--- a/
src/msg/instr_msg_task.cpp
+++ b/
src/msg/instr_msg_task.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2010
, 2012-2017
. The SimGrid Team.
+/* Copyright (c) 2010
-2018
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-48,9
+48,9
@@
void TRACE_msg_task_execute_start(msg_task_t task)
{
XBT_DEBUG("EXEC,in %p, %lld, %s", task, task->counter, task->category);
{
XBT_DEBUG("EXEC,in %p, %lld, %s", task, task->counter, task->category);
- if (TRACE_
msg_process
_is_enabled())
+ if (TRACE_
actor
_is_enabled())
simgrid::instr::Container::byName(instr_pid(MSG_process_self()))
simgrid::instr::Container::byName(instr_pid(MSG_process_self()))
- ->getState("
MSG_PROCESS
_STATE")
+ ->getState("
ACTOR
_STATE")
->pushEvent("task_execute");
}
->pushEvent("task_execute");
}
@@
-58,8
+58,8
@@
void TRACE_msg_task_execute_end(msg_task_t task)
{
XBT_DEBUG("EXEC,out %p, %lld, %s", task, task->counter, task->category);
{
XBT_DEBUG("EXEC,out %p, %lld, %s", task, task->counter, task->category);
- if (TRACE_
msg_process
_is_enabled())
- simgrid::instr::Container::byName(instr_pid(MSG_process_self()))->getState("
MSG_PROCESS
_STATE")->popEvent();
+ if (TRACE_
actor
_is_enabled())
+ simgrid::instr::Container::byName(instr_pid(MSG_process_self()))->getState("
ACTOR
_STATE")->popEvent();
}
/* MSG_task_destroy related functions */
}
/* MSG_task_destroy related functions */
@@
-77,45
+77,41
@@
void TRACE_msg_task_get_start()
{
XBT_DEBUG("GET,in");
{
XBT_DEBUG("GET,in");
- if (TRACE_msg_process_is_enabled())
- simgrid::instr::Container::byName(instr_pid(MSG_process_self()))
- ->getState("MSG_PROCESS_STATE")
- ->pushEvent("receive");
+ 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(msg_task_t task)
{
XBT_DEBUG("GET,out %p, %lld, %s", task, task->counter, task->category);
}
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())
{
+ if (TRACE_
actor_is_enabled())
{
container_t process_container = simgrid::instr::Container::byName(instr_pid(MSG_process_self()));
container_t process_container = simgrid::instr::Container::byName(instr_pid(MSG_process_self()));
- process_container->getState("
MSG_PROCESS
_STATE")->popEvent();
+ process_container->getState("
ACTOR
_STATE")->popEvent();
std::string key = std::string("p") + std::to_string(task->counter);
std::string key = std::string("p") + std::to_string(task->counter);
- simgrid::instr::Container::getRoot()->getLink("
MSG_PROCESS
_TASK_LINK")->endEvent(process_container, "SR", key);
+ simgrid::instr::Container::getRoot()->getLink("
ACTOR
_TASK_LINK")->endEvent(process_container, "SR", key);
}
}
/* MSG_task_put related functions */
}
}
/* MSG_task_put related functions */
-
int
TRACE_msg_task_put_start(msg_task_t task)
+
void
TRACE_msg_task_put_start(msg_task_t task)
{
XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->category);
{
XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->category);
- if (TRACE_
msg_process_is_enabled())
{
+ if (TRACE_
actor_is_enabled())
{
container_t process_container = simgrid::instr::Container::byName(instr_pid(MSG_process_self()));
container_t process_container = simgrid::instr::Container::byName(instr_pid(MSG_process_self()));
- process_container->getState("
MSG_PROCESS
_STATE")->pushEvent("send");
+ process_container->getState("
ACTOR
_STATE")->pushEvent("send");
std::string key = std::string("p") + std::to_string(task->counter);
std::string key = std::string("p") + std::to_string(task->counter);
- simgrid::instr::Container::getRoot()->getLink("
MSG_PROCESS
_TASK_LINK")->startEvent(process_container, "SR", key);
+ simgrid::instr::Container::getRoot()->getLink("
ACTOR
_TASK_LINK")->startEvent(process_container, "SR", key);
}
}
-
- return 1;
}
void TRACE_msg_task_put_end()
{
XBT_DEBUG("PUT,out");
}
void TRACE_msg_task_put_end()
{
XBT_DEBUG("PUT,out");
- if (TRACE_
msg_process
_is_enabled())
- simgrid::instr::Container::byName(instr_pid(MSG_process_self()))->getState("
MSG_PROCESS
_STATE")->popEvent();
+ if (TRACE_
actor
_is_enabled())
+ simgrid::instr::Container::byName(instr_pid(MSG_process_self()))->getState("
ACTOR
_STATE")->popEvent();
}
}