X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b83ad9c88af4715987015ddc91ac93ad749df428..a619bfb1b9a3769e775975828e35541111290665:/src/instr/instr_interface.cpp diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index 7946c2be86..79dc5d33dc 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -30,7 +30,7 @@ extern xbt_dict_t trivaEdgeTypes; static xbt_dynar_t instr_dict_to_dynar (xbt_dict_t filter) { - if (!TRACE_is_enabled() || !TRACE_needs_platform()) + if (not TRACE_is_enabled() || not TRACE_needs_platform()) return nullptr; xbt_dynar_t ret = xbt_dynar_new (sizeof(char*), &xbt_free_ref); @@ -81,10 +81,10 @@ void TRACE_category(const char *category) void TRACE_category_with_color (const char *category, const char *color) { /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with categories */ - if (!TRACE_is_enabled() || !TRACE_needs_platform()) + if (not TRACE_is_enabled() || not TRACE_needs_platform()) return; - if (!(TRACE_categorized() && category != nullptr)) + if (not(TRACE_categorized() && category != nullptr)) return; //check if category is already created @@ -95,7 +95,7 @@ void TRACE_category_with_color (const char *category, const char *color) //define final_color char final_color[INSTR_DEFAULT_STR_SIZE]; - if (!color){ + if (not color) { //generate a random color double red = drand48(); double green = drand48(); @@ -125,7 +125,7 @@ void TRACE_category_with_color (const char *category, const char *color) */ xbt_dynar_t TRACE_get_categories () { - if (!TRACE_is_enabled() || !TRACE_categorized()) + if (not TRACE_is_enabled() || not TRACE_categorized()) return nullptr; return instr_dict_to_dynar (created_categories); @@ -144,10 +144,10 @@ xbt_dynar_t TRACE_get_categories () void TRACE_declare_mark(const char *mark_type) { /* safe switchs. tracing has to be activated and if platform is not traced, we can't deal with marks */ - if (!TRACE_is_enabled() || !TRACE_needs_platform()) + if (not TRACE_is_enabled() || not TRACE_needs_platform()) return; - if (!mark_type) + if (not mark_type) THROWF (tracing_error, 1, "mark_type is nullptr"); //check if mark_type is already declared @@ -178,21 +178,21 @@ void TRACE_declare_mark(const char *mark_type) void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mark_value, const char *mark_color) { /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with marks */ - if (!TRACE_is_enabled() || !TRACE_needs_platform()) + if (not TRACE_is_enabled() || not TRACE_needs_platform()) return; - if (!mark_type) + if (not mark_type) THROWF (tracing_error, 1, "mark_type is nullptr"); - if (!mark_value) + if (not mark_value) THROWF (tracing_error, 1, "mark_value is nullptr"); type_t type = PJ_type_get (mark_type, PJ_type_get_root()); - if (!type){ + if (not type) { 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 (!mark_color) + if (not mark_color) mark_color = white; XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color); @@ -233,17 +233,17 @@ void TRACE_declare_mark_value (const char *mark_type, const char *mark_value) void TRACE_mark(const char *mark_type, const char *mark_value) { /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with marks */ - if (!TRACE_is_enabled() || !TRACE_needs_platform()) + if (not TRACE_is_enabled() || not TRACE_needs_platform()) return; - if (!mark_type) + if (not mark_type) THROWF (tracing_error, 1, "mark_type is nullptr"); - if (!mark_value) + if (not mark_value) THROWF (tracing_error, 1, "mark_value is nullptr"); //check if mark_type is already declared type_t type = PJ_type_get (mark_type, PJ_type_get_root()); - if (!type){ + if (not type) { THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type); } @@ -261,7 +261,7 @@ void TRACE_mark(const char *mark_type, const char *mark_value) */ xbt_dynar_t TRACE_get_marks () { - if (!TRACE_is_enabled()) + if (not TRACE_is_enabled()) return nullptr; return instr_dict_to_dynar (declared_marks); @@ -271,13 +271,13 @@ static void instr_user_variable(double time, const char *resource, const char *v double value, InstrUserVariable what, const char *color, xbt_dict_t filter) { /* safe switches. tracing has to be activated and if platform is not traced, we don't allow user variables */ - if (!TRACE_is_enabled() || !TRACE_needs_platform()) + if (not TRACE_is_enabled() || not TRACE_needs_platform()) return; //check if variable is already declared char *created = (char*)xbt_dict_get_or_null(filter, variable); if (what == INSTR_US_DECLARE){ - if (!created) { // not declared yet + if (not created) { // not declared yet xbt_dict_set (filter, variable, xbt_strdup("1"), nullptr); instr_new_user_variable_type (father_type, variable, color); } @@ -309,11 +309,11 @@ static void instr_user_srcdst_variable(double time, const char *src, const char const char *father_type, double value, InstrUserVariable what) { sg_netpoint_t src_elm = sg_netpoint_by_name_or_null(src); - if(!src_elm) + if (not src_elm) xbt_die("Element '%s' not found!",src); sg_netpoint_t dst_elm = sg_netpoint_by_name_or_null(dst); - if(!dst_elm) + if (not dst_elm) xbt_die("Element '%s' not found!",dst); std::vector route; @@ -336,7 +336,7 @@ static void instr_user_srcdst_variable(double time, const char *src, const char int TRACE_platform_graph_export_graphviz (const char *filename) { /* returns 1 if successful, 0 otherwise */ - if (!TRACE_is_enabled()) + if (not TRACE_is_enabled()) return 0; xbt_graph_t g = instr_routing_platform_graph(); if (g == nullptr)