X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0c9455527c48f9bf981d278f65cb179052ebe9df..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/instr/instr_interface.cpp diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index c5ff45cddf..4b9c0f129e 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -147,7 +147,7 @@ void TRACE_declare_mark(const char *mark_type) } XBT_DEBUG("MARK,declare %s", mark_type); - simgrid::instr::Container::getRoot()->type_->getOrCreateEventType(mark_type); + simgrid::instr::Container::get_root()->type_->by_name_or_create(mark_type); declared_marks.insert(mark_type); } @@ -178,7 +178,7 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar THROWF (tracing_error, 1, "mark_value is nullptr"); simgrid::instr::EventType* type = - static_cast(simgrid::instr::Container::getRoot()->type_->byName(mark_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 { @@ -186,7 +186,7 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar mark_color = "1.0 1.0 1.0" /*white*/; XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color); - type->addEntityValue(mark_value, mark_color); + type->add_entity_value(mark_value, mark_color); } } @@ -234,13 +234,13 @@ void TRACE_mark(const char *mark_type, const char *mark_value) //check if mark_type is already declared simgrid::instr::EventType* type = - static_cast(simgrid::instr::Container::getRoot()->type_->byName(mark_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::getRoot(), type, - type->getEntityValue(mark_value)); + new simgrid::instr::NewEvent(MSG_get_clock(), simgrid::instr::Container::get_root(), type, + type->get_entity_value(mark_value)); } } @@ -275,16 +275,17 @@ static void instr_user_variable(double time, const char* resource, const char* v } }else{ if (created != filter->end()) { // declared, let's work - simgrid::instr::VariableType* variable = simgrid::instr::Container::byName(resource)->getVariable(variable_name); + simgrid::instr::VariableType* variable = + simgrid::instr::Container::by_name(resource)->get_variable(variable_name); switch (what){ case InstrUserVariable::SET: - variable->setEvent(time, value); + variable->set_event(time, value); break; case InstrUserVariable::ADD: - variable->addEvent(time, value); + variable->add_event(time, value); break; case InstrUserVariable::SUB: - variable->subEvent(time, value); + variable->sub_event(time, value); break; default: THROW_IMPOSSIBLE; @@ -305,7 +306,7 @@ static void instr_user_srcdst_variable(double time, const char *src, const char if (not dst_elm) xbt_die("Element '%s' not found!",dst); - std::vector route; + 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->get_cname(), variable, father_type, value, what, nullptr, &user_link_variables); @@ -354,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, InstrUserVariable::DECLARE, nullptr, &user_vm_variables); + instr_user_variable(0, nullptr, variable, "VM", 0, InstrUserVariable::DECLARE, nullptr, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -369,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, InstrUserVariable::DECLARE, color, &user_vm_variables); + instr_user_variable(0, nullptr, variable, "VM", 0, InstrUserVariable::DECLARE, color, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -431,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, InstrUserVariable::SET, nullptr, &user_vm_variables); + instr_user_variable(time, vm, variable, "VM", value, InstrUserVariable::SET, nullptr, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -451,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, InstrUserVariable::ADD, nullptr, &user_vm_variables); + instr_user_variable(time, vm, variable, "VM", value, InstrUserVariable::ADD, nullptr, &user_vm_variables); } /** \ingroup TRACE_user_variables @@ -471,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, InstrUserVariable::SUB, nullptr, &user_vm_variables); + instr_user_variable(time, vm, variable, "VM", value, InstrUserVariable::SUB, nullptr, &user_vm_variables); } /* for host variables */ @@ -930,16 +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_name, const char* value_name) { - simgrid::instr::StateType* state = simgrid::instr::Container::byName(host)->getState(state_name); - state->addEntityValue(value_name); - state->setEvent(value_name); + 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 @@ -948,14 +949,14 @@ void TRACE_host_set_state(const char* host, const char* state_name, const char* * 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_name, const char* value_name) { - simgrid::instr::Container::byName(host)->getState(state_name)->pushEvent(value_name); + simgrid::instr::Container::by_name(host)->get_state(state_name)->push_event(value_name); } /** \ingroup TRACE_user_variables @@ -964,13 +965,13 @@ void TRACE_host_push_state(const char* host, const char* state_name, const char* * 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_name) { - simgrid::instr::Container::byName(host)->getState(state_name)->popEvent(); + simgrid::instr::Container::by_name(host)->get_state(state_name)->pop_event(); } /** \ingroup TRACE_API