From 35dd4121018e3122bff5ae2b111da429a9740049 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Fri, 13 Oct 2017 12:48:44 +0200 Subject: [PATCH] use bools and true/false --- src/instr/instr_config.cpp | 18 +++++++++--------- src/instr/instr_interface.cpp | 3 +-- src/instr/instr_paje_containers.cpp | 2 +- src/instr/instr_paje_header.cpp | 20 ++++++++++---------- src/instr/instr_paje_trace.cpp | 2 +- src/instr/instr_private.hpp | 5 ++--- src/surf/instr_routing.cpp | 2 +- src/surf/surf_c_bindings.cpp | 2 +- 8 files changed, 26 insertions(+), 28 deletions(-) diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index e6f06de5cb..598aa403cb 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -117,10 +117,10 @@ int TRACE_start() } /* activate trace */ - if (trace_active == 1) { + if (trace_active) { THROWF(tracing_error, 0, "Tracing is already active"); } - trace_active = 1; + trace_active = true; XBT_DEBUG("Tracing is on"); } return 0; @@ -139,7 +139,7 @@ int TRACE_end() /* dump trace buffer */ TRACE_last_timestamp_to_dump = surf_get_clock(); - TRACE_paje_dump_buffer(1); + TRACE_paje_dump_buffer(true); /* destroy all data structures of tracing (and free) */ delete PJ_container_get_root(); @@ -158,7 +158,7 @@ int TRACE_end() } /* de-activate trace */ - trace_active = 0; + trace_active = false; XBT_DEBUG("Tracing is off"); XBT_DEBUG("Tracing system is shutdown"); } @@ -303,11 +303,11 @@ char *TRACE_get_viva_cat_conf () void TRACE_global_init() { - static int is_initialised = 0; + static bool is_initialised = false; if (is_initialised) return; - is_initialised = 1; + is_initialised = true; /* name of the tracefile */ xbt_cfg_register_string (OPT_TRACING_FILENAME, "simgrid.trace", nullptr, "Trace file created by the instrumented SimGrid."); xbt_cfg_register_boolean(OPT_TRACING, "no", nullptr, "Enable Tracing."); @@ -351,7 +351,7 @@ void TRACE_global_init() xbt_cfg_register_alias(OPT_TRACING_ONELINK_ONLY, "tracing/onelink_only"); /* instrumentation can be considered configured now */ - trace_configured = 1; + trace_configured = true; } static void print_line (const char *option, const char *desc, const char *longdesc, int detailed) @@ -597,7 +597,7 @@ void instr_pause_tracing () }else{ XBT_DEBUG ("Tracing is being paused."); } - trace_enabled = 0; + trace_enabled = false; XBT_DEBUG ("Tracing is paused."); } @@ -612,7 +612,7 @@ void instr_resume_tracing () if (previous_trace_state != -1){ trace_enabled = previous_trace_state; }else{ - trace_enabled = 1; + trace_enabled = true; } XBT_DEBUG ("Tracing is resumed."); previous_trace_state = -1; diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index 43c3aa40ad..c047099ae7 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -183,9 +183,8 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type); } - char white[INSTR_DEFAULT_STR_SIZE] = "1.0 1.0 1.0"; if (not mark_color) - mark_color = white; + mark_color = "1.0 1.0 1.0" /*white*/; XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color); simgrid::instr::Value::byNameOrCreate(mark_value, mark_color, type); diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index abf732b4ad..f87bfa72f2 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -123,7 +123,7 @@ Container::~Container() // obligation to dump previous events because they might reference the container that is about to be destroyed TRACE_last_timestamp_to_dump = surf_get_clock(); - TRACE_paje_dump_buffer(1); + TRACE_paje_dump_buffer(true); // trace my destruction if (not TRACE_disable_destroy() && this != PJ_container_get_root()) { diff --git a/src/instr/instr_paje_header.cpp b/src/instr/instr_paje_header.cpp index 0e3338ce72..76d7967580 100644 --- a/src/instr/instr_paje_header.cpp +++ b/src/instr/instr_paje_header.cpp @@ -11,7 +11,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_paje_header, instr, "Paje tracing event sy extern FILE *tracing_file; -static void TRACE_header_PajeDefineContainerType(int basic) +static void TRACE_header_PajeDefineContainerType(bool basic) { fprintf(tracing_file, "%%EventDef PajeDefineContainerType %d\n", simgrid::instr::PAJE_DefineContainerType); fprintf(tracing_file, "%% Alias string\n"); @@ -24,7 +24,7 @@ static void TRACE_header_PajeDefineContainerType(int basic) fprintf(tracing_file, "%%EndEventDef\n"); } -static void TRACE_header_PajeDefineVariableType(int basic) +static void TRACE_header_PajeDefineVariableType(bool basic) { fprintf(tracing_file, "%%EventDef PajeDefineVariableType %d\n", simgrid::instr::PAJE_DefineVariableType); fprintf(tracing_file, "%% Alias string\n"); @@ -38,7 +38,7 @@ static void TRACE_header_PajeDefineVariableType(int basic) fprintf(tracing_file, "%%EndEventDef\n"); } -static void TRACE_header_PajeDefineStateType(int basic) +static void TRACE_header_PajeDefineStateType(bool basic) { fprintf(tracing_file, "%%EventDef PajeDefineStateType %d\n", simgrid::instr::PAJE_DefineStateType); fprintf(tracing_file, "%% Alias string\n"); @@ -51,7 +51,7 @@ static void TRACE_header_PajeDefineStateType(int basic) fprintf(tracing_file, "%%EndEventDef\n"); } -static void TRACE_header_PajeDefineEventType(int basic) +static void TRACE_header_PajeDefineEventType(bool basic) { fprintf(tracing_file, "%%EventDef PajeDefineEventType %d\n", simgrid::instr::PAJE_DefineEventType); fprintf(tracing_file, "%% Alias string\n"); @@ -64,7 +64,7 @@ static void TRACE_header_PajeDefineEventType(int basic) fprintf(tracing_file, "%%EndEventDef\n"); } -static void TRACE_header_PajeDefineLinkType(int basic) +static void TRACE_header_PajeDefineLinkType(bool basic) { fprintf(tracing_file, "%%EventDef PajeDefineLinkType %d\n", simgrid::instr::PAJE_DefineLinkType); fprintf(tracing_file, "%% Alias string\n"); @@ -81,7 +81,7 @@ static void TRACE_header_PajeDefineLinkType(int basic) fprintf(tracing_file, "%%EndEventDef\n"); } -static void TRACE_header_PajeDefineEntityValue(int basic) +static void TRACE_header_PajeDefineEntityValue(bool basic) { fprintf(tracing_file, "%%EventDef PajeDefineEntityValue %d\n", simgrid::instr::PAJE_DefineEntityValue); fprintf(tracing_file, "%% Alias string\n"); @@ -185,7 +185,7 @@ static void TRACE_header_PajePopState() fprintf(tracing_file, "%%EndEventDef\n"); } -static void TRACE_header_PajeResetState(int basic) +static void TRACE_header_PajeResetState(bool basic) { if (basic) return; @@ -197,7 +197,7 @@ static void TRACE_header_PajeResetState(int basic) fprintf(tracing_file, "%%EndEventDef\n"); } -static void TRACE_header_PajeStartLink (int basic, int size) +static void TRACE_header_PajeStartLink(bool basic, int size) { fprintf(tracing_file, "%%EventDef PajeStartLink %d\n", simgrid::instr::PAJE_StartLink); fprintf(tracing_file, "%% Time date\n"); @@ -214,7 +214,7 @@ static void TRACE_header_PajeStartLink (int basic, int size) fprintf(tracing_file, "%%EndEventDef\n"); } -static void TRACE_header_PajeEndLink(int basic) +static void TRACE_header_PajeEndLink(bool basic) { fprintf(tracing_file, "%%EventDef PajeEndLink %d\n", simgrid::instr::PAJE_EndLink); fprintf(tracing_file, "%% Time date\n"); @@ -240,7 +240,7 @@ static void TRACE_header_PajeNewEvent() fprintf(tracing_file, "%%EndEventDef\n"); } -void TRACE_header(int basic, int size) +void TRACE_header(bool basic, int size) { XBT_DEBUG ("Define paje header"); TRACE_header_PajeDefineContainerType(basic); diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp index e077289654..bcc695e9ce 100644 --- a/src/instr/instr_paje_trace.cpp +++ b/src/instr/instr_paje_trace.cpp @@ -53,7 +53,7 @@ void dump_comment_file (const char *filename) double TRACE_last_timestamp_to_dump = 0; //dumps the trace file until the timestamp TRACE_last_timestamp_to_dump -void TRACE_paje_dump_buffer (int force) +void TRACE_paje_dump_buffer(bool force) { if (not TRACE_is_enabled()) return; diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index 9f535fa50b..23ee0773f8 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -270,12 +270,11 @@ extern XBT_PRIVATE std::set user_link_variables; extern XBT_PRIVATE double TRACE_last_timestamp_to_dump; /* instr_paje_header.c */ -XBT_PRIVATE void TRACE_header(int basic, int size); +XBT_PRIVATE void TRACE_header(bool basic, int size); /* from paje.c */ XBT_PRIVATE void TRACE_paje_start(); XBT_PRIVATE void TRACE_paje_end(); -XBT_PRIVATE void TRACE_paje_dump_buffer(int force); /* from instr_config.c */ XBT_PRIVATE bool TRACE_needs_platform(); @@ -333,7 +332,7 @@ XBT_PUBLIC(simgrid::instr::Type*) PJ_type_get_root(); XBT_PRIVATE void TRACE_TI_start(); XBT_PRIVATE void TRACE_TI_end(); -XBT_PRIVATE void TRACE_paje_dump_buffer(int force); +XBT_PRIVATE void TRACE_paje_dump_buffer(bool force); XBT_PRIVATE void dump_comment_file(const char* filename); XBT_PRIVATE void dump_comment(const char* comment); diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index 6881fbde33..de787accef 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -301,7 +301,7 @@ static void instr_routing_parse_end_platform () XBT_DEBUG ("Graph extraction finished."); delete filter; platform_created = 1; - TRACE_paje_dump_buffer(1); + TRACE_paje_dump_buffer(true); } void instr_routing_define_callbacks () diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp index f2a1505049..9000a5ef67 100644 --- a/src/surf/surf_c_bindings.cpp +++ b/src/surf/surf_c_bindings.cpp @@ -134,7 +134,7 @@ double surf_solve(double max_date) } simgrid::s4u::onTimeAdvance(time_delta); - TRACE_paje_dump_buffer (0); + TRACE_paje_dump_buffer(false); return time_delta; } -- 2.20.1