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
fix build on weird clangs
[simgrid.git]
/
src
/
instr
/
instr_config.cpp
diff --git
a/src/instr/instr_config.cpp
b/src/instr/instr_config.cpp
index
b0640bb
..
cf20d44
100644
(file)
--- a/
src/instr/instr_config.cpp
+++ b/
src/instr/instr_config.cpp
@@
-138,13
+138,12
@@
int TRACE_end()
TRACE_generate_viva_cat_conf();
/* dump trace buffer */
TRACE_generate_viva_cat_conf();
/* dump trace buffer */
-
simgrid::instr::
TRACE_last_timestamp_to_dump = surf_get_clock();
+ TRACE_last_timestamp_to_dump = surf_get_clock();
TRACE_paje_dump_buffer(1);
/* destroy all data structures of tracing (and free) */
PJ_container_free_all();
TRACE_paje_dump_buffer(1);
/* destroy all data structures of tracing (and free) */
PJ_container_free_all();
- recursiveDestroyType (PJ_type_get_root());
- PJ_container_release();
+ delete PJ_type_get_root();
rootType = nullptr;
/* close the trace files */
rootType = nullptr;
/* close the trace files */
@@
-480,9
+479,9
@@
static void output_types (const char *name, xbt_dynar_t types, FILE *file)
static void output_categories(const char* name, FILE* file)
{
static void output_categories(const char* name, FILE* file)
{
- unsigned int i =
simgrid::instr::
created_categories.size();
+ unsigned int i = created_categories.size();
fprintf (file, " values = (");
fprintf (file, " values = (");
- for (auto const& cat :
simgrid::instr::
created_categories) {
+ for (auto const& cat : created_categories) {
--i;
fprintf(file, "\"%s%s\"", name, cat.c_str());
if (i > 0) {
--i;
fprintf(file, "\"%s%s\"", name, cat.c_str());
if (i > 0) {
@@
-560,7
+559,7
@@
static void generate_cat_configuration (const char *output, const char *name, in
{
if (output && strlen(output) > 0){
//check if we do have categories declared
{
if (output && strlen(output) > 0){
//check if we do have categories declared
- if (
simgrid::instr::
created_categories.empty()) {
+ if (created_categories.empty()) {
XBT_INFO("No categories declared, ignoring generation of %s graph configuration", name);
return;
}
XBT_INFO("No categories declared, ignoring generation of %s graph configuration", name);
return;
}