X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d1275c70614a349e58457b74fe39372038484092..ad598fb7eb2cdb42f2dab8b99a9a8572bae1f47b:/src/instr/instr_interface.cpp diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index 246fce46eb..24b187f70a 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -10,6 +10,7 @@ #include "src/surf/network_interface.hpp" #include "src/surf/surf_private.h" #include "surf/surf.h" +#include typedef enum { INSTR_US_DECLARE, @@ -20,26 +21,23 @@ typedef enum { XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API"); -xbt_dict_t created_categories = nullptr; -xbt_dict_t declared_marks = nullptr; -xbt_dict_t user_host_variables = nullptr; -xbt_dict_t user_vm_variables = nullptr; -xbt_dict_t user_link_variables = nullptr; -extern xbt_dict_t trivaNodeTypes; -extern xbt_dict_t trivaEdgeTypes; +std::set created_categories; +std::set declared_marks; +std::set user_host_variables; +std::set user_vm_variables; +std::set user_link_variables; +extern std::set trivaNodeTypes; +extern std::set trivaEdgeTypes; -static xbt_dynar_t instr_dict_to_dynar (xbt_dict_t filter) +static xbt_dynar_t instr_set_to_dynar(std::set* filter) { if (not TRACE_is_enabled() || not TRACE_needs_platform()) return nullptr; xbt_dynar_t ret = xbt_dynar_new (sizeof(char*), &xbt_free_ref); - xbt_dict_cursor_t cursor = nullptr; - char *name; - char *value; - xbt_dict_foreach(filter, cursor, name, value) { - xbt_dynar_push_as (ret, char*, xbt_strdup(name)); - } + for (auto name : *filter) + xbt_dynar_push_as(ret, char*, xbt_strdup(name.c_str())); + return ret; } @@ -88,10 +86,10 @@ void TRACE_category_with_color (const char *category, const char *color) return; //check if category is already created - if (xbt_dict_get_or_null(created_categories, category) != nullptr) + if (created_categories.find(category) != created_categories.end()) return; - - xbt_dict_set (created_categories, category, xbt_strdup("1"), nullptr); + else + created_categories.insert(category); //define final_color char final_color[INSTR_DEFAULT_STR_SIZE]; @@ -127,8 +125,7 @@ xbt_dynar_t TRACE_get_categories () { if (not TRACE_is_enabled() || not TRACE_categorized()) return nullptr; - - return instr_dict_to_dynar (created_categories); + return instr_set_to_dynar(&created_categories); } /** \ingroup TRACE_mark @@ -151,13 +148,13 @@ void TRACE_declare_mark(const char *mark_type) THROWF (tracing_error, 1, "mark_type is nullptr"); //check if mark_type is already declared - if (xbt_dict_get_or_null(declared_marks, mark_type) != nullptr) { + if (declared_marks.find(mark_type) != declared_marks.end()) { THROWF (tracing_error, 1, "mark_type with name (%s) is already declared", mark_type); } XBT_DEBUG("MARK,declare %s", mark_type); PJ_type_event_new(mark_type, PJ_type_get_root()); - xbt_dict_set (declared_marks, mark_type, xbt_strdup("1"), nullptr); + declared_marks.insert(mark_type); } /** \ingroup TRACE_mark @@ -196,7 +193,7 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar mark_color = white; XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color); - PJ_value_new (mark_value, mark_color, type); + value rett(mark_value, mark_color, type); } /** \ingroup TRACE_mark @@ -247,9 +244,8 @@ void TRACE_mark(const char *mark_type, const char *mark_value) THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type); } - val_t value = PJ_value_get (mark_value, type); XBT_DEBUG("MARK %s %s", mark_type, mark_value); - new NewEvent (MSG_get_clock(), PJ_container_get_root(), type, value); + new NewEvent(MSG_get_clock(), PJ_container_get_root(), type, value::get(mark_value, type)); } /** \ingroup TRACE_mark @@ -264,25 +260,25 @@ xbt_dynar_t TRACE_get_marks () if (not TRACE_is_enabled()) return nullptr; - return instr_dict_to_dynar (declared_marks); + return instr_set_to_dynar(&declared_marks); } -static void instr_user_variable(double time, const char *resource, const char *variable, const char *father_type, - double value, InstrUserVariable what, const char *color, xbt_dict_t filter) +static void instr_user_variable(double time, const char* resource, const char* variable, const char* father_type, + double value, InstrUserVariable what, const char* color, std::set* filter) { /* safe switches. tracing has to be activated and if platform is not traced, we don't allow user variables */ 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); + auto created = filter->find(variable); if (what == INSTR_US_DECLARE){ - if (not created) { // not declared yet - xbt_dict_set (filter, variable, xbt_strdup("1"), nullptr); + if (created == filter->end()) { // not declared yet + filter->insert(variable); instr_new_user_variable_type (father_type, variable, color); } }else{ - if (created) { // declared, let's work + if (created != filter->end()) { // declared, let's work char valuestr[100]; snprintf(valuestr, 100, "%g", value); container_t container = PJ_container_get(resource); @@ -319,7 +315,7 @@ static void instr_user_srcdst_variable(double time, const char *src, const char std::vector route; simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(src_elm, dst_elm, &route, nullptr); for (auto link : route) - instr_user_variable(time, link->cname(), variable, father_type, value, what, nullptr, user_link_variables); + instr_user_variable(time, link->cname(), variable, father_type, value, what, nullptr, &user_link_variables); } /** \ingroup TRACE_API @@ -365,7 +361,7 @@ int TRACE_platform_graph_export_graphviz (const char *filename) */ void TRACE_vm_variable_declare (const char *variable) { - instr_user_variable(0, nullptr, variable, "MSG_VM", 0, INSTR_US_DECLARE, nullptr, user_vm_variables); + instr_user_variable(0, nullptr, variable, "MSG_VM", 0, INSTR_US_DECLARE, nullptr, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -380,7 +376,7 @@ void TRACE_vm_variable_declare (const char *variable) */ void TRACE_vm_variable_declare_with_color (const char *variable, const char *color) { - instr_user_variable(0, nullptr, variable, "MSG_VM", 0, INSTR_US_DECLARE, color, user_vm_variables); + instr_user_variable(0, nullptr, variable, "MSG_VM", 0, INSTR_US_DECLARE, color, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -442,7 +438,7 @@ void TRACE_vm_variable_sub (const char *vm, const char *variable, double value) */ void TRACE_vm_variable_set_with_time (double time, const char *vm, const char *variable, double value) { - instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_SET, nullptr, user_vm_variables); + instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_SET, nullptr, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -462,7 +458,7 @@ void TRACE_vm_variable_set_with_time (double time, const char *vm, const char *v */ void TRACE_vm_variable_add_with_time (double time, const char *vm, const char *variable, double value) { - instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_ADD, nullptr, user_vm_variables); + instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_ADD, nullptr, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -482,7 +478,7 @@ void TRACE_vm_variable_add_with_time (double time, const char *vm, const char *v */ void TRACE_vm_variable_sub_with_time (double time, const char *vm, const char *variable, double value) { - instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_SUB, nullptr, user_vm_variables); + instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_SUB, nullptr, &user_vm_variables); } /* for host variables */ @@ -499,7 +495,7 @@ void TRACE_vm_variable_sub_with_time (double time, const char *vm, const char *v */ void TRACE_host_variable_declare (const char *variable) { - instr_user_variable(0, nullptr, variable, "HOST", 0, INSTR_US_DECLARE, nullptr, user_host_variables); + instr_user_variable(0, nullptr, variable, "HOST", 0, INSTR_US_DECLARE, nullptr, &user_host_variables); } /** \ingroup TRACE_user_variables @@ -514,7 +510,7 @@ void TRACE_host_variable_declare (const char *variable) */ void TRACE_host_variable_declare_with_color (const char *variable, const char *color) { - instr_user_variable(0, nullptr, variable, "HOST", 0, INSTR_US_DECLARE, color, user_host_variables); + instr_user_variable(0, nullptr, variable, "HOST", 0, INSTR_US_DECLARE, color, &user_host_variables); } /** \ingroup TRACE_user_variables @@ -576,7 +572,7 @@ void TRACE_host_variable_sub (const char *host, const char *variable, double val */ void TRACE_host_variable_set_with_time (double time, const char *host, const char *variable, double value) { - instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SET, nullptr, user_host_variables); + instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SET, nullptr, &user_host_variables); } /** \ingroup TRACE_user_variables @@ -596,7 +592,7 @@ void TRACE_host_variable_set_with_time (double time, const char *host, const cha */ void TRACE_host_variable_add_with_time (double time, const char *host, const char *variable, double value) { - instr_user_variable(time, host, variable, "HOST", value, INSTR_US_ADD, nullptr, user_host_variables); + instr_user_variable(time, host, variable, "HOST", value, INSTR_US_ADD, nullptr, &user_host_variables); } /** \ingroup TRACE_user_variables @@ -616,7 +612,7 @@ void TRACE_host_variable_add_with_time (double time, const char *host, const cha */ void TRACE_host_variable_sub_with_time (double time, const char *host, const char *variable, double value) { - instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SUB, nullptr, user_host_variables); + instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SUB, nullptr, &user_host_variables); } /** \ingroup TRACE_user_variables @@ -629,7 +625,7 @@ void TRACE_host_variable_sub_with_time (double time, const char *host, const cha */ xbt_dynar_t TRACE_get_host_variables () { - return instr_dict_to_dynar (user_host_variables); + return instr_set_to_dynar(&user_host_variables); } /* for link variables */ @@ -646,7 +642,7 @@ xbt_dynar_t TRACE_get_host_variables () */ void TRACE_link_variable_declare (const char *variable) { - instr_user_variable (0, nullptr, variable, "LINK", 0, INSTR_US_DECLARE, nullptr, user_link_variables); + instr_user_variable(0, nullptr, variable, "LINK", 0, INSTR_US_DECLARE, nullptr, &user_link_variables); } /** \ingroup TRACE_user_variables @@ -661,7 +657,7 @@ void TRACE_link_variable_declare (const char *variable) */ void TRACE_link_variable_declare_with_color (const char *variable, const char *color) { - instr_user_variable (0, nullptr, variable, "LINK", 0, INSTR_US_DECLARE, color, user_link_variables); + instr_user_variable(0, nullptr, variable, "LINK", 0, INSTR_US_DECLARE, color, &user_link_variables); } /** \ingroup TRACE_user_variables @@ -723,7 +719,7 @@ void TRACE_link_variable_sub (const char *link, const char *variable, double val */ void TRACE_link_variable_set_with_time (double time, const char *link, const char *variable, double value) { - instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SET, nullptr, user_link_variables); + instr_user_variable(time, link, variable, "LINK", value, INSTR_US_SET, nullptr, &user_link_variables); } /** \ingroup TRACE_user_variables @@ -743,7 +739,7 @@ void TRACE_link_variable_set_with_time (double time, const char *link, const cha */ void TRACE_link_variable_add_with_time (double time, const char *link, const char *variable, double value) { - instr_user_variable (time, link, variable, "LINK", value, INSTR_US_ADD, nullptr, user_link_variables); + instr_user_variable(time, link, variable, "LINK", value, INSTR_US_ADD, nullptr, &user_link_variables); } /** \ingroup TRACE_user_variables @@ -763,7 +759,7 @@ void TRACE_link_variable_add_with_time (double time, const char *link, const cha */ void TRACE_link_variable_sub_with_time (double time, const char *link, const char *variable, double value) { - instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SUB, nullptr, user_link_variables); + instr_user_variable(time, link, variable, "LINK", value, INSTR_US_SUB, nullptr, &user_link_variables); } /* for link variables, but with src and dst used for get_route */ @@ -900,7 +896,7 @@ void TRACE_link_srcdst_variable_sub_with_time (double time, const char *src, con */ xbt_dynar_t TRACE_get_link_variables () { - return instr_dict_to_dynar (user_link_variables); + return instr_set_to_dynar(&user_link_variables); } /** \ingroup TRACE_user_variables @@ -946,11 +942,12 @@ void TRACE_host_state_declare_value (const char *state, const char *value, const * * \see TRACE_host_state_declare, TRACE_host_push_state, TRACE_host_pop_state, TRACE_host_reset_state */ -void TRACE_host_set_state (const char *host, const char *state, const char *value) +void TRACE_host_set_state(const char* host, const char* state, const char* value_str) { container_t container = PJ_container_get(host); type_t type = PJ_type_get (state, container->type); - val_t val = PJ_value_get_or_new (value, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */ + value* val = + value::get_or_new(value_str, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */ new SetStateEvent(MSG_get_clock(), container, type, val); } @@ -965,11 +962,12 @@ void TRACE_host_set_state (const char *host, const char *state, const char *valu * * \see TRACE_host_state_declare, TRACE_host_set_state, TRACE_host_pop_state, TRACE_host_reset_state */ -void TRACE_host_push_state (const char *host, const char *state, const char *value) +void TRACE_host_push_state(const char* host, const char* state, const char* value_str) { container_t container = PJ_container_get(host); type_t type = PJ_type_get (state, container->type); - val_t val = PJ_value_get_or_new (value, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */ + value* val = + value::get_or_new(value_str, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */ new PushStateEvent(MSG_get_clock(), container, type, val); } @@ -1000,7 +998,7 @@ void TRACE_host_pop_state (const char *host, const char *state) */ xbt_dynar_t TRACE_get_node_types () { - return instr_dict_to_dynar (trivaNodeTypes); + return instr_set_to_dynar(&trivaNodeTypes); } /** \ingroup TRACE_API @@ -1013,23 +1011,5 @@ xbt_dynar_t TRACE_get_node_types () */ xbt_dynar_t TRACE_get_edge_types () { - return instr_dict_to_dynar (trivaEdgeTypes); -} - -/** \ingroup TRACE_API - * \brief Pauses all tracing activities. - * \see TRACE_resume - */ -void TRACE_pause () -{ - instr_pause_tracing(); -} - -/** \ingroup TRACE_API - * \brief Resumes all tracing activities. - * \see TRACE_pause - */ -void TRACE_resume () -{ - instr_resume_tracing(); + return instr_set_to_dynar(&trivaEdgeTypes); }