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
stringify (a lot)
[simgrid.git]
/
src
/
instr
/
instr_config.cpp
diff --git
a/src/instr/instr_config.cpp
b/src/instr/instr_config.cpp
index
eb86e1d
..
41b7c85
100644
(file)
--- a/
src/instr/instr_config.cpp
+++ b/
src/instr/instr_config.cpp
@@
-3,6
+3,7
@@
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "include/xbt/config.hpp"
#include "src/instr/instr_private.hpp"
#include "surf/surf.h"
#include <string>
#include "src/instr/instr_private.hpp"
#include "surf/surf.h"
#include <string>
@@
-63,8
+64,6
@@
static int trace_precision;
static bool trace_configured = false;
static bool trace_active = false;
static bool trace_configured = false;
static bool trace_active = false;
-static simgrid::instr::Type* rootType = nullptr; /* the root type */
-
instr_fmt_type_t instr_fmt_type = instr_fmt_paje;
static void TRACE_getopts()
instr_fmt_type_t instr_fmt_type = instr_fmt_paje;
static void TRACE_getopts()
@@
-105,15
+104,15
@@
int TRACE_start()
/* init the tracing module to generate the right output */
/* open the trace file(s) */
/* init the tracing module to generate the right output */
/* open the trace file(s) */
-
const char*
format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
- XBT_DEBUG("Tracing format %s\n", format);
- if (
not strcmp(format, "Paje")
) {
+
std::string
format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
+ XBT_DEBUG("Tracing format %s\n", format
.c_str()
);
+ if (
format == "Paje"
) {
TRACE_paje_start();
TRACE_paje_start();
- } else if (
not strcmp(format, "TI")
) {
+ } else if (
format == "TI"
) {
instr_fmt_type = instr_fmt_TI;
TRACE_TI_start();
}else{
instr_fmt_type = instr_fmt_TI;
TRACE_TI_start();
}else{
- xbt_die("Unknown trace format :%s ", format);
+ xbt_die("Unknown trace format :%s ", format
.c_str()
);
}
/* activate trace */
}
/* activate trace */
@@
-141,20
+140,20
@@
int TRACE_end()
TRACE_last_timestamp_to_dump = surf_get_clock();
TRACE_paje_dump_buffer(true);
TRACE_last_timestamp_to_dump = surf_get_clock();
TRACE_paje_dump_buffer(true);
+ simgrid::instr::Type* root_type = simgrid::instr::Container::getRoot()->type_;
/* destroy all data structures of tracing (and free) */
/* destroy all data structures of tracing (and free) */
- delete PJ_container_get_root();
- delete simgrid::instr::Type::getRootType();
- rootType = nullptr;
+ delete simgrid::instr::Container::getRoot();
+ delete root_type;
/* close the trace files */
/* close the trace files */
-
const char*
format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
- XBT_DEBUG("Tracing format %s\n", format);
- if (
not strcmp(format, "Paje")
) {
+
std::string
format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
+ XBT_DEBUG("Tracing format %s\n", format
.c_str()
);
+ if (
format == "Paje"
) {
TRACE_paje_end();
TRACE_paje_end();
- } else if (
not strcmp(format, "TI")
) {
+ } else if (
format == "TI"
) {
TRACE_TI_end();
}else{
TRACE_TI_end();
}else{
- xbt_die("Unknown trace format :%s ", format);
+ xbt_die("Unknown trace format :%s ", format
.c_str()
);
}
/* de-activate trace */
}
/* de-activate trace */
@@
-271,12
+270,12
@@
bool TRACE_display_sizes ()
return trace_display_sizes && trace_smpi_enabled && TRACE_is_enabled();
}
return trace_display_sizes && trace_smpi_enabled && TRACE_is_enabled();
}
-
char *TRACE_get_comment
()
+
std::string TRACE_get_comment
()
{
return xbt_cfg_get_string(OPT_TRACING_COMMENT);
}
{
return xbt_cfg_get_string(OPT_TRACING_COMMENT);
}
-
char *TRACE_get_comment_file
()
+
std::string TRACE_get_comment_file
()
{
return xbt_cfg_get_string(OPT_TRACING_COMMENT_FILE);
}
{
return xbt_cfg_get_string(OPT_TRACING_COMMENT_FILE);
}
@@
-286,17
+285,17
@@
int TRACE_precision ()
return xbt_cfg_get_int(OPT_TRACING_PRECISION);
}
return xbt_cfg_get_int(OPT_TRACING_PRECISION);
}
-
char *
TRACE_get_filename()
+
std::string
TRACE_get_filename()
{
return xbt_cfg_get_string(OPT_TRACING_FILENAME);
}
{
return xbt_cfg_get_string(OPT_TRACING_FILENAME);
}
-
char *TRACE_get_viva_uncat_conf
()
+
std::string TRACE_get_viva_uncat_conf
()
{
return xbt_cfg_get_string(OPT_VIVA_UNCAT_CONF);
}
{
return xbt_cfg_get_string(OPT_VIVA_UNCAT_CONF);
}
-
char *TRACE_get_viva_cat_conf
()
+
std::string TRACE_get_viva_cat_conf
()
{
return xbt_cfg_get_string(OPT_VIVA_CAT_CONF);
}
{
return xbt_cfg_get_string(OPT_VIVA_CAT_CONF);
}
@@
-356,11
+355,10
@@
void TRACE_global_init()
static void print_line (const char *option, const char *desc, const char *longdesc, int detailed)
{
static void print_line (const char *option, const char *desc, const char *longdesc, int detailed)
{
- char str[INSTR_DEFAULT_STR_SIZE];
- snprintf (str, INSTR_DEFAULT_STR_SIZE, "--cfg=%s ", option);
+ std::string str = std::string("--cfg=") + option + " ";
- int len = str
len (str
);
- printf
("%s%*.*s %s\n", str, 30-len, 30-
len, "", desc);
+ int len = str
.size(
);
+ printf
("%s%*.*s %s\n", str.c_str(), 30 - len, 30 -
len, "", desc);
if (longdesc != nullptr && detailed){
printf ("%s\n\n", longdesc);
}
if (longdesc != nullptr && detailed){
printf ("%s\n\n", longdesc);
}
@@
-579,12
+577,12
@@
static void generate_cat_configuration (const char *output, const char *name, in
void TRACE_generate_viva_uncat_conf ()
{
void TRACE_generate_viva_uncat_conf ()
{
- generate_uncat_configuration
(TRACE_get_viva_uncat_conf
(), "viva", 0);
+ generate_uncat_configuration
(TRACE_get_viva_uncat_conf().c_str
(), "viva", 0);
}
void TRACE_generate_viva_cat_conf ()
{
}
void TRACE_generate_viva_cat_conf ()
{
- generate_cat_configuration
(TRACE_get_viva_cat_conf
(), "viva", 0);
+ generate_cat_configuration
(TRACE_get_viva_cat_conf().c_str
(), "viva", 0);
}
static int previous_trace_state = -1;
}
static int previous_trace_state = -1;