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
no need for a lib to store the netcards. A dict is easier
[simgrid.git]
/
src
/
instr
/
instr_config.cpp
diff --git
a/src/instr/instr_config.cpp
b/src/instr/instr_config.cpp
index
72cfabd
..
558bb7e
100644
(file)
--- a/
src/instr/instr_config.cpp
+++ b/
src/instr/instr_config.cpp
@@
-7,6
+7,8
@@
#include "src/instr/instr_private.h"
#include "simgrid/sg_config.h"
#include "surf/surf.h"
#include "src/instr/instr_private.h"
#include "simgrid/sg_config.h"
#include "surf/surf.h"
+#include <functional>
+#include <vector>
XBT_LOG_NEW_CATEGORY(instr, "Logging the behavior of the tracing system (used for Visualization/Analysis of simulations)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
XBT_LOG_NEW_CATEGORY(instr, "Logging the behavior of the tracing system (used for Visualization/Analysis of simulations)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
@@
-87,12
+89,11
@@
static void TRACE_getopts()
trace_precision = xbt_cfg_get_int(OPT_TRACING_PRECISION);
}
trace_precision = xbt_cfg_get_int(OPT_TRACING_PRECISION);
}
-static xbt_dynar_t TRACE_start_functions = nullptr;
+static std::vector<std::function<void()>> TRACE_start_functions;
+
void TRACE_add_start_function(void (*func) ())
{
void TRACE_add_start_function(void (*func) ())
{
- if (TRACE_start_functions == nullptr)
- TRACE_start_functions = xbt_dynar_new(sizeof(void (*)()), nullptr);
- xbt_dynar_push(TRACE_start_functions, &func);
+ TRACE_start_functions.push_back(func);
}
int TRACE_start()
}
int TRACE_start()
@@
-107,8
+108,6
@@
int TRACE_start()
XBT_DEBUG("Tracing starts");
/* init the tracing module to generate the right output */
XBT_DEBUG("Tracing starts");
/* init the tracing module to generate the right output */
- /* open internal buffer */
- TRACE_init();
/* open the trace file(s) */
const char* format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
/* open the trace file(s) */
const char* format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
@@
-137,24
+136,17
@@
int TRACE_start()
user_vm_variables = xbt_dict_new_homogeneous(xbt_free_f);
user_link_variables = xbt_dict_new_homogeneous(xbt_free_f);
user_vm_variables = xbt_dict_new_homogeneous(xbt_free_f);
user_link_variables = xbt_dict_new_homogeneous(xbt_free_f);
- if (TRACE_start_functions != nullptr) {
- void (*func) ();
- unsigned int iter;
- xbt_dynar_foreach(TRACE_start_functions, iter, func) {
- func();
- }
- }
+ for (auto func: TRACE_start_functions)
+ func();
}
}
-
xbt_dynar_free(&TRACE_start_functions
);
+
TRACE_start_functions.clear(
);
return 0;
}
return 0;
}
-static
xbt_dynar_t TRACE_end_functions = nullptr
;
+static
std::vector<std::function<void()>> TRACE_end_functions
;
void TRACE_add_end_function(void (*func) (void))
{
void TRACE_add_end_function(void (*func) (void))
{
- if (TRACE_end_functions == nullptr)
- TRACE_end_functions = xbt_dynar_new(sizeof(void (*)(void)), nullptr);
- xbt_dynar_push(TRACE_end_functions, &func);
+ TRACE_end_functions.push_back(func);
}
int TRACE_end()
}
int TRACE_end()
@@
-178,13
+170,9
@@
int TRACE_end()
PJ_container_release();
PJ_type_release();
PJ_container_release();
PJ_type_release();
- if (TRACE_end_functions != nullptr) {
- void (*func) (void);
- unsigned int iter;
- xbt_dynar_foreach(TRACE_end_functions, iter, func) {
- func();
- }
- }
+ for (auto func: TRACE_end_functions)
+ func();
+ TRACE_start_functions.clear();
xbt_dict_free(&user_link_variables);
xbt_dict_free(&user_host_variables);
xbt_dict_free(&user_link_variables);
xbt_dict_free(&user_host_variables);
@@
-202,15
+190,12
@@
int TRACE_end()
}else{
xbt_die("Unknown trace format :%s ", format);
}
}else{
xbt_die("Unknown trace format :%s ", format);
}
- /* close internal buffer */
- TRACE_finalize();
+
/* de-activate trace */
trace_active = 0;
XBT_DEBUG("Tracing is off");
XBT_DEBUG("Tracing system is shutdown");
}
/* de-activate trace */
trace_active = 0;
XBT_DEBUG("Tracing is off");
XBT_DEBUG("Tracing system is shutdown");
}
- xbt_dynar_free(&TRACE_start_functions); /* useful when exiting early */
- xbt_dynar_free(&TRACE_end_functions);
return retval;
}
return retval;
}