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
[smpi args cleanup] internal changes for clean-up
[simgrid.git]
/
src
/
smpi
/
internals
/
instr_smpi.cpp
diff --git
a/src/smpi/internals/instr_smpi.cpp
b/src/smpi/internals/instr_smpi.cpp
index
c5a65d8
..
3051459
100644
(file)
--- a/
src/smpi/internals/instr_smpi.cpp
+++ b/
src/smpi/internals/instr_smpi.cpp
@@
-56,7
+56,6
@@
static std::map<std::string, std::string> smpi_colors = {{"recv", "1 0 0"},
{"put", "0.3 1 0"},
{"get", "0 1 0.3"},
{"accumulate", "1 0.3 0"},
- {"migration", "0.2 0.5 0.2"},
{"rput", "0.3 1 0"},
{"rget", "0 1 0.3"},
{"raccumulate", "1 0.3 0"},
@@
-136,25
+135,25
@@
static std::string TRACE_smpi_get_key(int src, int dst, int tag, int send)
static std::unordered_map<smx_actor_t, std::string> process_category;
-void TRACE_internal_smpi_set_category
(const char *
category)
+void TRACE_internal_smpi_set_category
(std::string
category)
{
if (not TRACE_smpi_is_enabled())
return;
//declare category
- TRACE_category
(category
);
+ TRACE_category
(category.c_str()
);
- if (
category != nullptr
)
+ if (
not category.empty()
)
process_category[SIMIX_process_self()] = category;
}
-
const char *TRACE_internal_smpi_get_category
()
+
std::string TRACE_internal_smpi_get_category
()
{
if (not TRACE_smpi_is_enabled())
- return
nullptr
;
+ return
""
;
auto it = process_category.find(SIMIX_process_self());
- return (it == process_category.end()) ?
nullptr
: it->second.c_str();
+ return (it == process_category.end()) ?
""
: it->second.c_str();
}
void TRACE_smpi_setup_container(int rank, sg_host_t host)
@@
-278,25
+277,9
@@
void TRACE_smpi_recv(int src, int dst, int tag)
}
/**************** Functions to trace the migration of tasks. *****************/
-void TRACE_smpi_send_process_data_in(int rank)
-{
- if (not TRACE_smpi_is_enabled()) return;
-
- smpi_container(rank)->get_state("MIGRATE_STATE")->add_entity_value("migration", instr_find_color("migration"));
- smpi_container(rank)->get_state("MIGRATE_STATE")->push_event("migration");
-}
-
-void TRACE_smpi_send_process_data_out(int rank)
-{
- if (not TRACE_smpi_is_enabled()) return;
-
- /* Clean the process state. */
- smpi_container(rank)->get_state("MIGRATE_STATE")->pop_event();
-}
-
void TRACE_smpi_process_change_host(int rank, sg_host_t new_host)
{
- if (
!
TRACE_smpi_is_enabled()) return;
+ if (
not
TRACE_smpi_is_enabled()) return;
/** The key is (most likely) used to match the events in the trace */
static long long int counter = 0;