X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9cca09ad88fcaeb49f2637de97df519c3920aaa4..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/instr/instr_interface.cpp diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index 61b1891b93..4b9c0f129e 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -1,18 +1,17 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2010-2018. 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/kernel/routing/NetPoint.hpp" #include "simgrid_config.h" #include "src/instr/instr_private.hpp" -#include "src/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" #include "src/surf/surf_private.hpp" -#include "surf/surf.h" +#include "surf/surf.hpp" #include -enum InstrUserVariable { INSTR_US_DECLARE, INSTR_US_SET, INSTR_US_ADD, INSTR_US_SUB }; +enum class InstrUserVariable { DECLARE, SET, ADD, SUB }; XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API"); @@ -87,18 +86,18 @@ void TRACE_category_with_color (const char *category, const char *color) created_categories.insert(category); //define final_color - char final_color[INSTR_DEFAULT_STR_SIZE]; + std::string final_color; if (not color) { //generate a random color double red = drand48(); double green = drand48(); double blue = drand48(); - snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%f %f %f", red, green, blue); + final_color = std::to_string(red) + " " + std::to_string(green) + " " + std::to_string(blue); }else{ - snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%s", color); + final_color = std::string(color); } - XBT_DEBUG("CAT,declare %s, \"%s\" \"%s\"", category, color, final_color); + XBT_DEBUG("CAT,declare %s, \"%s\" \"%s\"", category, color, final_color.c_str()); //define the type of this category on top of hosts and links instr_new_variable_type (category, final_color); @@ -148,7 +147,7 @@ void TRACE_declare_mark(const char *mark_type) } XBT_DEBUG("MARK,declare %s", mark_type); - simgrid::instr::Type::eventNew(mark_type, PJ_type_get_root()); + simgrid::instr::Container::get_root()->type_->by_name_or_create(mark_type); declared_marks.insert(mark_type); } @@ -178,17 +177,17 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar if (not mark_value) THROWF (tracing_error, 1, "mark_value is nullptr"); - simgrid::instr::Type* type = PJ_type_get_root()->getChild(mark_type); + simgrid::instr::EventType* type = + static_cast(simgrid::instr::Container::get_root()->type_->by_name(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 (not mark_color) - mark_color = white; + } else { + 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); - simgrid::instr::Value::byNameOrCreate(mark_value, mark_color, type); + XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color); + type->add_entity_value(mark_value, mark_color); + } } /** \ingroup TRACE_mark @@ -234,14 +233,15 @@ void TRACE_mark(const char *mark_type, const char *mark_value) THROWF (tracing_error, 1, "mark_value is nullptr"); //check if mark_type is already declared - simgrid::instr::Type* type = PJ_type_get_root()->getChild(mark_type); + simgrid::instr::EventType* type = + static_cast(simgrid::instr::Container::get_root()->type_->by_name(mark_type)); if (not type) { THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type); + } else { + XBT_DEBUG("MARK %s %s", mark_type, mark_value); + new simgrid::instr::NewEvent(MSG_get_clock(), simgrid::instr::Container::get_root(), type, + type->get_entity_value(mark_value)); } - - XBT_DEBUG("MARK %s %s", mark_type, mark_value); - new simgrid::instr::NewEvent(MSG_get_clock(), PJ_container_get_root(), type, - simgrid::instr::Value::byName(mark_value, type)); } /** \ingroup TRACE_mark @@ -259,7 +259,7 @@ xbt_dynar_t TRACE_get_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, +static void instr_user_variable(double time, const char* resource, const char* variable_name, 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 */ @@ -267,31 +267,29 @@ static void instr_user_variable(double time, const char* resource, const char* v return; //check if variable is already declared - auto created = filter->find(variable); - if (what == INSTR_US_DECLARE){ + auto created = filter->find(variable_name); + if (what == InstrUserVariable::DECLARE) { if (created == filter->end()) { // not declared yet - filter->insert(variable); - instr_new_user_variable_type (father_type, variable, color); + filter->insert(variable_name); + instr_new_user_variable_type(father_type, variable_name, color == nullptr ? "" : color); } }else{ if (created != filter->end()) { // declared, let's work - char valuestr[100]; - snprintf(valuestr, 100, "%g", value); - container_t container = PJ_container_get(resource); - simgrid::instr::Type* type = container->type_->getChild(variable); + simgrid::instr::VariableType* variable = + simgrid::instr::Container::by_name(resource)->get_variable(variable_name); switch (what){ - case INSTR_US_SET: - new simgrid::instr::SetVariableEvent(time, container, type, value); - break; - case INSTR_US_ADD: - new simgrid::instr::AddVariableEvent(time, container, type, value); - break; - case INSTR_US_SUB: - new simgrid::instr::SubVariableEvent(time, container, type, value); - break; - default: - THROW_IMPOSSIBLE; - break; + case InstrUserVariable::SET: + variable->set_event(time, value); + break; + case InstrUserVariable::ADD: + variable->add_event(time, value); + break; + case InstrUserVariable::SUB: + variable->sub_event(time, value); + break; + default: + THROW_IMPOSSIBLE; + break; } } } @@ -300,18 +298,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_netpoint_t src_elm = sg_netpoint_by_name_or_null(src); + simgrid::kernel::routing::NetPoint* src_elm = sg_netpoint_by_name_or_null(src); if (not src_elm) xbt_die("Element '%s' not found!",src); - sg_netpoint_t dst_elm = sg_netpoint_by_name_or_null(dst); + simgrid::kernel::routing::NetPoint* dst_elm = sg_netpoint_by_name_or_null(dst); 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); + std::vector route; + simgrid::kernel::routing::NetZoneImpl::get_global_route(src_elm, dst_elm, route, nullptr); for (auto const& link : route) - instr_user_variable(time, link->cname(), variable, father_type, value, what, nullptr, &user_link_variables); + instr_user_variable(time, link->get_cname(), variable, father_type, value, what, nullptr, &user_link_variables); } /** \ingroup TRACE_API @@ -357,7 +355,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, "VM", 0, InstrUserVariable::DECLARE, nullptr, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -372,7 +370,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, "VM", 0, InstrUserVariable::DECLARE, color, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -434,7 +432,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, "VM", value, InstrUserVariable::SET, nullptr, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -454,7 +452,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, "VM", value, InstrUserVariable::ADD, nullptr, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -474,7 +472,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, "VM", value, InstrUserVariable::SUB, nullptr, &user_vm_variables); } /* for host variables */ @@ -491,7 +489,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, InstrUserVariable::DECLARE, nullptr, &user_host_variables); } /** \ingroup TRACE_user_variables @@ -506,7 +504,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, InstrUserVariable::DECLARE, color, &user_host_variables); } /** \ingroup TRACE_user_variables @@ -568,7 +566,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, InstrUserVariable::SET, nullptr, &user_host_variables); } /** \ingroup TRACE_user_variables @@ -588,7 +586,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, InstrUserVariable::ADD, nullptr, &user_host_variables); } /** \ingroup TRACE_user_variables @@ -608,7 +606,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, InstrUserVariable::SUB, nullptr, &user_host_variables); } /** \ingroup TRACE_user_variables @@ -638,7 +636,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, InstrUserVariable::DECLARE, nullptr, &user_link_variables); } /** \ingroup TRACE_user_variables @@ -653,7 +651,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, InstrUserVariable::DECLARE, color, &user_link_variables); } /** \ingroup TRACE_user_variables @@ -715,7 +713,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, InstrUserVariable::SET, nullptr, &user_link_variables); } /** \ingroup TRACE_user_variables @@ -735,7 +733,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, InstrUserVariable::ADD, nullptr, &user_link_variables); } /** \ingroup TRACE_user_variables @@ -755,7 +753,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, InstrUserVariable::SUB, nullptr, &user_link_variables); } /* for link variables, but with src and dst used for get_route */ @@ -835,7 +833,7 @@ void TRACE_link_srcdst_variable_sub (const char *src, const char *dst, const cha void TRACE_link_srcdst_variable_set_with_time (double time, const char *src, const char *dst, const char *variable, double value) { - instr_user_srcdst_variable (time, src, dst, variable, "LINK", value, INSTR_US_SET); + instr_user_srcdst_variable(time, src, dst, variable, "LINK", value, InstrUserVariable::SET); } /** \ingroup TRACE_user_variables @@ -857,7 +855,7 @@ void TRACE_link_srcdst_variable_set_with_time (double time, const char *src, con void TRACE_link_srcdst_variable_add_with_time (double time, const char *src, const char *dst, const char *variable, double value) { - instr_user_srcdst_variable (time, src, dst, variable, "LINK", value, INSTR_US_ADD); + instr_user_srcdst_variable(time, src, dst, variable, "LINK", value, InstrUserVariable::ADD); } /** \ingroup TRACE_user_variables @@ -879,7 +877,7 @@ void TRACE_link_srcdst_variable_add_with_time (double time, const char *src, con void TRACE_link_srcdst_variable_sub_with_time (double time, const char *src, const char *dst, const char *variable, double value) { - instr_user_srcdst_variable (time, src, dst, variable, "LINK", value, INSTR_US_SUB); + instr_user_srcdst_variable(time, src, dst, variable, "LINK", value, InstrUserVariable::SUB); } /** \ingroup TRACE_user_variables @@ -933,18 +931,16 @@ void TRACE_host_state_declare_value (const char *state, const char *value, const * Change a user state previously declared to the given value. * * \param host The name of the host to be considered. - * \param state The name of the state previously declared. - * \param value The new value of the state. + * \param state_name The name of the state previously declared. + * \param value_name The new value of the state. * * \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_str) +void TRACE_host_set_state(const char* host, const char* state_name, const char* value_name) { - container_t container = PJ_container_get(host); - simgrid::instr::Type* type = container->type_->getChild(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); + simgrid::instr::StateType* state = simgrid::instr::Container::by_name(host)->get_state(state_name); + state->add_entity_value(value_name); + state->set_event(value_name); } /** \ingroup TRACE_user_variables @@ -953,18 +949,14 @@ void TRACE_host_set_state(const char* host, const char* state, const char* value * Change a user state previously declared by pushing the new value to the state. * * \param host The name of the host to be considered. - * \param state The name of the state previously declared. - * \param value The value to be pushed. + * \param state_name The name of the state previously declared. + * \param value_name The value to be pushed. * * \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_str) +void TRACE_host_push_state(const char* host, const char* state_name, const char* value_name) { - container_t container = PJ_container_get(host); - simgrid::instr::Type* type = container->type_->getChild(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); + simgrid::instr::Container::by_name(host)->get_state(state_name)->push_event(value_name); } /** \ingroup TRACE_user_variables @@ -973,15 +965,13 @@ void TRACE_host_push_state(const char* host, const char* state, const char* valu * Change a user state previously declared by removing the last value of the state. * * \param host The name of the host to be considered. - * \param state The name of the state to be popped. + * \param state_name The name of the state to be popped. * * \see TRACE_host_state_declare, TRACE_host_set_state, TRACE_host_push_state, TRACE_host_reset_state */ -void TRACE_host_pop_state (const char *host, const char *state) +void TRACE_host_pop_state(const char* host, const char* state_name) { - container_t container = PJ_container_get(host); - simgrid::instr::Type* type = container->type_->getChild(state); - new simgrid::instr::PopStateEvent(MSG_get_clock(), container, type); + simgrid::instr::Container::by_name(host)->get_state(state_name)->pop_event(); } /** \ingroup TRACE_API