X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19b3962253112b19308537bc2400de141c119d99..0ff40b115c4a7f131b2ffab880faf600e96cfc06:/src/instr/instr_interface.cpp diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index 7946c2be86..a0899f63f1 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -1,45 +1,38 @@ -/* Copyright (c) 2010-2015. The SimGrid Team. +/* Copyright (c) 2010-2017. The SimGrid Team. * All rights reserved. */ /* 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 "simgrid_config.h" -#include "src/instr/instr_private.h" +#include "src/instr/instr_private.hpp" #include "src/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" -#include "src/surf/surf_private.h" +#include "src/surf/surf_private.hpp" #include "surf/surf.h" +#include -typedef enum { - INSTR_US_DECLARE, - INSTR_US_SET, - INSTR_US_ADD, - INSTR_US_SUB -} InstrUserVariable; +enum InstrUserVariable { INSTR_US_DECLARE, INSTR_US_SET, INSTR_US_ADD, INSTR_US_SUB }; 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 (!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); - 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 const& name : *filter) + xbt_dynar_push_as(ret, char*, xbt_strdup(name.c_str())); + return ret; } @@ -81,21 +74,21 @@ 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 - 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]; - if (!color){ + if (not color) { //generate a random color double red = drand48(); double green = drand48(); @@ -125,10 +118,9 @@ 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); + return instr_set_to_dynar(&created_categories); } /** \ingroup TRACE_mark @@ -144,20 +136,20 @@ 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 - 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); + simgrid::instr::Type::getRootType()->getOrCreateEventType(mark_type); + declared_marks.insert(mark_type); } /** \ingroup TRACE_mark @@ -178,25 +170,24 @@ 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){ + simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName(mark_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) - mark_color = white; + if (not mark_color) + mark_color = "1.0 1.0 1.0" /*white*/; XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color); - PJ_value_new (mark_value, mark_color, type); + simgrid::instr::Value::byNameOrCreate(mark_value, mark_color, type); } /** \ingroup TRACE_mark @@ -233,23 +224,23 @@ 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){ + simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName(mark_type); + if (not type) { 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 simgrid::instr::NewEvent(MSG_get_clock(), PJ_container_get_root(), type, + simgrid::instr::Value::byName(mark_value, type)); } /** \ingroup TRACE_mark @@ -261,41 +252,41 @@ 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); + 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 (!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); + auto created = filter->find(variable); if (what == INSTR_US_DECLARE){ - if (!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); - type_t type = PJ_type_get (variable, container->type); + container_t container = simgrid::instr::Container::byName(resource); + simgrid::instr::Type* type = container->type_->byName(variable); switch (what){ case INSTR_US_SET: - new SetVariableEvent(time, container, type, value); + new simgrid::instr::SetVariableEvent(time, container, type, value); break; case INSTR_US_ADD: - new AddVariableEvent(time, container, type, value); + new simgrid::instr::AddVariableEvent(time, container, type, value); break; case INSTR_US_SUB: - new SubVariableEvent(time, container, type, value); + new simgrid::instr::SubVariableEvent(time, container, type, value); break; default: THROW_IMPOSSIBLE; @@ -309,17 +300,17 @@ 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; 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); + for (auto const& link : route) + instr_user_variable(time, link->getCname(), variable, father_type, value, what, nullptr, &user_link_variables); } /** \ingroup TRACE_API @@ -336,7 +327,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) @@ -365,7 +356,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 +371,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 +433,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 +453,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,20 +473,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); -} - -/** \ingroup TRACE_user_variables - * \brief Get declared user vm variables - * - * This function should be used to get VM variables that were already declared with #TRACE_vm_variable_declare or with - * #TRACE_vm_variable_declare_with_color. - * - * \return A dynar with the declared host variables, must be freed with xbt_dynar_free. - */ -xbt_dynar_t TRACE_get_vm_variables () -{ - return instr_dict_to_dynar (user_vm_variables); + instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_SUB, nullptr, &user_vm_variables); } /* for host variables */ @@ -512,7 +490,7 @@ xbt_dynar_t TRACE_get_vm_variables () */ 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 @@ -527,7 +505,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 @@ -589,7 +567,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 @@ -609,7 +587,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 @@ -629,7 +607,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 @@ -642,7 +620,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 */ @@ -659,7 +637,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 @@ -674,7 +652,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 @@ -736,7 +714,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 @@ -756,7 +734,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 @@ -776,7 +754,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 */ @@ -913,7 +891,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 @@ -959,12 +937,13 @@ 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 */ - new SetStateEvent(MSG_get_clock(), container, type, val); + container_t container = simgrid::instr::Container::byName(host); + simgrid::instr::Type* type = container->type_->byName(state); + simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate( + value_str, "", type); /* if user didn't declare a value with a color, use no color */ + new simgrid::instr::SetStateEvent(MSG_get_clock(), container, type, val); } /** \ingroup TRACE_user_variables @@ -978,12 +957,13 @@ 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 */ - new PushStateEvent(MSG_get_clock(), container, type, val); + container_t container = simgrid::instr::Container::byName(host); + simgrid::instr::Type* type = container->type_->byName(state); + simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate( + value_str, "", type); /* if user didn't declare a value with a color, use no color */ + new simgrid::instr::PushStateEvent(MSG_get_clock(), container, type, val); } /** \ingroup TRACE_user_variables @@ -998,26 +978,9 @@ void TRACE_host_push_state (const char *host, const char *state, const char *val */ void TRACE_host_pop_state (const char *host, const char *state) { - container_t container = PJ_container_get(host); - type_t type = PJ_type_get (state, container->type); - new PopStateEvent(MSG_get_clock(), container, type); -} - -/** \ingroup TRACE_user_variables - * \brief Reset the state of a given host. - * - * Clear all previous values of a user state. - * - * \param host The name of the host to be considered. - * \param state The name of the state to be cleared. - * - * \see TRACE_host_state_declare, TRACE_host_set_state, TRACE_host_push_state, TRACE_host_pop_state - */ -void TRACE_host_reset_state (const char *host, const char *state) -{ - container_t container = PJ_container_get(host); - type_t type = PJ_type_get (state, container->type); - new ResetStateEvent(MSG_get_clock(), container, type); + container_t container = simgrid::instr::Container::byName(host); + simgrid::instr::Type* type = container->type_->byName(state); + new simgrid::instr::PopStateEvent(MSG_get_clock(), container, type); } /** \ingroup TRACE_API @@ -1030,7 +993,7 @@ void TRACE_host_reset_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 @@ -1043,23 +1006,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); }