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
jedule: obey our coding standards
[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
4a3cd09
..
e455118
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
@@
-49,9
+49,9
@@
void TRACE_msg_task_execute_start(msg_task_t task)
XBT_DEBUG("EXEC,in %p, %lld, %s", task, task->counter, task->category);
if (TRACE_actor_is_enabled())
XBT_DEBUG("EXEC,in %p, %lld, %s", task, task->counter, task->category);
if (TRACE_actor_is_enabled())
- simgrid::instr::Container::by
N
ame(instr_pid(MSG_process_self()))
- ->get
S
tate("ACTOR_STATE")
- ->push
E
vent("task_execute");
+ simgrid::instr::Container::by
_n
ame(instr_pid(MSG_process_self()))
+ ->get
_s
tate("ACTOR_STATE")
+ ->push
_e
vent("task_execute");
}
void TRACE_msg_task_execute_end(msg_task_t task)
}
void TRACE_msg_task_execute_end(msg_task_t task)
@@
-59,7
+59,7
@@
void TRACE_msg_task_execute_end(msg_task_t task)
XBT_DEBUG("EXEC,out %p, %lld, %s", task, task->counter, task->category);
if (TRACE_actor_is_enabled())
XBT_DEBUG("EXEC,out %p, %lld, %s", task, task->counter, task->category);
if (TRACE_actor_is_enabled())
- simgrid::instr::Container::by
Name(instr_pid(MSG_process_self()))->getState("ACTOR_STATE")->popE
vent();
+ simgrid::instr::Container::by
_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->pop_e
vent();
}
/* MSG_task_destroy related functions */
}
/* MSG_task_destroy related functions */
@@
-78,7
+78,7
@@
void TRACE_msg_task_get_start()
XBT_DEBUG("GET,in");
if (TRACE_actor_is_enabled())
XBT_DEBUG("GET,in");
if (TRACE_actor_is_enabled())
- simgrid::instr::Container::by
Name(instr_pid(MSG_process_self()))->getState("ACTOR_STATE")->pushE
vent("receive");
+ simgrid::instr::Container::by
_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->push_e
vent("receive");
}
void TRACE_msg_task_get_end(msg_task_t task)
}
void TRACE_msg_task_get_end(msg_task_t task)
@@
-86,28
+86,26
@@
void TRACE_msg_task_get_end(msg_task_t task)
XBT_DEBUG("GET,out %p, %lld, %s", task, task->counter, task->category);
if (TRACE_actor_is_enabled()) {
XBT_DEBUG("GET,out %p, %lld, %s", task, task->counter, task->category);
if (TRACE_actor_is_enabled()) {
- container_t process_container = simgrid::instr::Container::by
N
ame(instr_pid(MSG_process_self()));
- process_container->get
State("ACTOR_STATE")->popE
vent();
+ container_t process_container = simgrid::instr::Container::by
_n
ame(instr_pid(MSG_process_self()));
+ process_container->get
_state("ACTOR_STATE")->pop_e
vent();
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::get
Root()->getLink("ACTOR_TASK_LINK")->endE
vent(process_container, "SR", key);
+ simgrid::instr::Container::get
_root()->get_link("ACTOR_TASK_LINK")->end_e
vent(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);
if (TRACE_actor_is_enabled()) {
{
XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->category);
if (TRACE_actor_is_enabled()) {
- container_t process_container = simgrid::instr::Container::by
N
ame(instr_pid(MSG_process_self()));
- process_container->get
State("ACTOR_STATE")->pushE
vent("send");
+ container_t process_container = simgrid::instr::Container::by
_n
ame(instr_pid(MSG_process_self()));
+ process_container->get
_state("ACTOR_STATE")->push_e
vent("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::get
Root()->getLink("ACTOR_TASK_LINK")->startE
vent(process_container, "SR", key);
+ simgrid::instr::Container::get
_root()->get_link("ACTOR_TASK_LINK")->start_e
vent(process_container, "SR", key);
}
}
-
- return 1;
}
void TRACE_msg_task_put_end()
}
void TRACE_msg_task_put_end()
@@
-115,5
+113,5
@@
void TRACE_msg_task_put_end()
XBT_DEBUG("PUT,out");
if (TRACE_actor_is_enabled())
XBT_DEBUG("PUT,out");
if (TRACE_actor_is_enabled())
- simgrid::instr::Container::by
Name(instr_pid(MSG_process_self()))->getState("ACTOR_STATE")->popE
vent();
+ simgrid::instr::Container::by
_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->pop_e
vent();
}
}