X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ae2fd01d8cc55bf83654e29f294335e3cb1f022..b3a756fa6fe08c4f377ce22d205ef5c1b28bd250:/src/instr/instr_interface.cpp diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index b8b28ef313..43c2b18589 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -5,10 +5,11 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid_config.h" -#include "src/surf/network_interface.hpp" #include "src/instr/instr_private.h" -#include "surf/surf.h" +#include "src/kernel/routing/NetPoint.hpp" +#include "src/surf/network_interface.hpp" #include "src/surf/surf_private.h" +#include "surf/surf.h" typedef enum { INSTR_US_DECLARE, @@ -29,9 +30,7 @@ extern xbt_dict_t trivaEdgeTypes; static xbt_dynar_t instr_dict_to_dynar (xbt_dict_t filter) { - if (!TRACE_is_enabled()) - return nullptr; - if (!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,26 +80,22 @@ void TRACE_category(const char *category) */ void TRACE_category_with_color (const char *category, const char *color) { - /* safe switch */ - if (!TRACE_is_enabled()) - return; - - if (!(TRACE_categorized() && category != nullptr)) + /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with categories */ + if (not TRACE_is_enabled() || not TRACE_needs_platform()) return; - /* if platform is not traced, we can't deal with categories */ - if (!TRACE_needs_platform()) + if (not(TRACE_categorized() && category != nullptr)) return; //check if category is already created - char *created = static_cast(xbt_dict_get_or_null(created_categories, category)); - if (created) + if (xbt_dict_get_or_null(created_categories, category) != nullptr) return; + xbt_dict_set (created_categories, category, xbt_strdup("1"), nullptr); //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(); @@ -130,9 +125,7 @@ void TRACE_category_with_color (const char *category, const char *color) */ xbt_dynar_t TRACE_get_categories () { - if (!TRACE_is_enabled()) - return nullptr; - if (!TRACE_categorized()) + if (not TRACE_is_enabled() || not TRACE_categorized()) return nullptr; return instr_dict_to_dynar (created_categories); @@ -150,20 +143,15 @@ xbt_dynar_t TRACE_get_categories () */ void TRACE_declare_mark(const char *mark_type) { - /* safe switch */ - if (!TRACE_is_enabled()) + /* safe switchs. tracing has to be activated and if platform is not traced, we can't deal with marks */ + if (not TRACE_is_enabled() || not TRACE_needs_platform()) return; - /* if platform is not traced, we don't allow marks */ - if (!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 - char *created = static_cast(xbt_dict_get_or_null(declared_marks, mark_type)); - if (created) { + if (xbt_dict_get_or_null(declared_marks, mark_type) != nullptr) { THROWF (tracing_error, 1, "mark_type with name (%s) is already declared", mark_type); } @@ -189,26 +177,22 @@ 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 switch */ - if (!TRACE_is_enabled()) + /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with marks */ + if (not TRACE_is_enabled() || not TRACE_needs_platform()) return; - /* if platform is not traced, we don't allow marks */ - if (!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); @@ -248,28 +232,24 @@ 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 switch */ - if (!TRACE_is_enabled()) - return; - - /* if platform is not traced, we don't allow marks */ - if (!TRACE_needs_platform()) + /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with marks */ + 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); } val_t value = PJ_value_get (mark_value, type); XBT_DEBUG("MARK %s %s", mark_type, mark_value); - new_pajeNewEvent (MSG_get_clock(), PJ_container_get_root(), type, value); + new NewEvent (MSG_get_clock(), PJ_container_get_root(), type, value); } /** \ingroup TRACE_mark @@ -279,9 +259,9 @@ void TRACE_mark(const char *mark_type, const char *mark_value) * * \return A dynar with the declared marks, must be freed with xbt_dynar_free. */ -xbt_dynar_t TRACE_get_marks (void) +xbt_dynar_t TRACE_get_marks () { - if (!TRACE_is_enabled()) + if (not TRACE_is_enabled()) return nullptr; return instr_dict_to_dynar (declared_marks); @@ -290,40 +270,32 @@ xbt_dynar_t TRACE_get_marks (void) 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) { - /* safe switch */ - if (!TRACE_is_enabled()) - return; - - /* if platform is not traced, we don't allow user variables */ - if (!TRACE_needs_platform()) + /* 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); if (what == INSTR_US_DECLARE){ - if (created){//already declared - return; - }else{ + if (not created) { // not declared yet xbt_dict_set (filter, variable, xbt_strdup("1"), nullptr); instr_new_user_variable_type (father_type, variable, color); } }else{ - if (!created){//not declared, ignore - return; - } else { + if (created) { // 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); switch (what){ case INSTR_US_SET: - new_pajeSetVariable(time, container, type, value); + new SetVariableEvent(time, container, type, value); break; case INSTR_US_ADD: - new_pajeAddVariable(time, container, type, value); + new AddVariableEvent(time, container, type, value); break; case INSTR_US_SUB: - new_pajeSubVariable(time, container, type, value); + new SubVariableEvent(time, container, type, value); break; default: THROW_IMPOSSIBLE; @@ -336,19 +308,18 @@ static void instr_user_variable(double time, const char *resource, const char *v static void instr_user_srcdst_variable(double time, const char *src, const char *dst, const char *variable, const char *father_type, double value, InstrUserVariable what) { - sg_netcard_t src_elm = sg_netcard_by_name_or_null(src); - if(!src_elm) + sg_netpoint_t src_elm = sg_netpoint_by_name_or_null(src); + if (not src_elm) xbt_die("Element '%s' not found!",src); - sg_netcard_t dst_elm = sg_netcard_by_name_or_null(dst); - if(!dst_elm) + sg_netpoint_t dst_elm = sg_netpoint_by_name_or_null(dst); + if (not dst_elm) xbt_die("Element '%s' not found!",dst); - std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency (src_elm, dst_elm, route,nullptr); - for (auto link : *route) - instr_user_variable (time, link->getName(), variable, father_type, value, what, nullptr, user_link_variables); - delete route; + 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); } /** \ingroup TRACE_API @@ -365,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) @@ -514,19 +485,6 @@ void TRACE_vm_variable_sub_with_time (double time, const char *vm, const char *v 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 (void) -{ - return instr_dict_to_dynar (user_vm_variables); -} - /* for host variables */ /** \ingroup TRACE_user_variables * \brief Declare a new user variable associated to hosts. @@ -669,7 +627,7 @@ void TRACE_host_variable_sub_with_time (double time, const char *host, const cha * * \return A dynar with the declared host variables, must be freed with xbt_dynar_free. */ -xbt_dynar_t TRACE_get_host_variables (void) +xbt_dynar_t TRACE_get_host_variables () { return instr_dict_to_dynar (user_host_variables); } @@ -940,7 +898,7 @@ void TRACE_link_srcdst_variable_sub_with_time (double time, const char *src, con * * \return A dynar with the declared link variables, must be freed with xbt_dynar_free. */ -xbt_dynar_t TRACE_get_link_variables (void) +xbt_dynar_t TRACE_get_link_variables () { return instr_dict_to_dynar (user_link_variables); } @@ -993,7 +951,7 @@ void TRACE_host_set_state (const char *host, const char *state, const char *valu 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_pajeSetState(MSG_get_clock(), container, type, val); + new SetStateEvent(MSG_get_clock(), container, type, val); } /** \ingroup TRACE_user_variables @@ -1012,7 +970,7 @@ void TRACE_host_push_state (const char *host, const char *state, const char *val 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_pajePushState(MSG_get_clock(), container, type, val); + new PushStateEvent(MSG_get_clock(), container, type, val); } /** \ingroup TRACE_user_variables @@ -1029,24 +987,7 @@ 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_pajePopState(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_pajeResetState(MSG_get_clock(), container, type); + new PopStateEvent(MSG_get_clock(), container, type); } /** \ingroup TRACE_API @@ -1074,21 +1015,3 @@ 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(); -}