* 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/surf/network_interface.hpp"
#include "src/surf/surf_private.hpp"
}
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<simgrid::instr::EventType>(mark_type);
declared_marks.insert(mark_type);
}
THROWF (tracing_error, 1, "mark_value is nullptr");
simgrid::instr::EventType* type =
- static_cast<simgrid::instr::EventType*>(simgrid::instr::Container::getRoot()->type_->byName(mark_type));
+ static_cast<simgrid::instr::EventType*>(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 {
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);
}
}
//check if mark_type is already declared
simgrid::instr::EventType* type =
- static_cast<simgrid::instr::EventType*>(simgrid::instr::Container::getRoot()->type_->byName(mark_type));
+ static_cast<simgrid::instr::EventType*>(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));
}
}
}
}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;
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<simgrid::surf::LinkImpl*> route;
- simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(src_elm, dst_elm, route, nullptr);
+ std::vector<simgrid::kernel::resource::LinkImpl*> 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);
}
*/
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
*/
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
*/
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
*/
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
*/
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 */
* 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
* 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
* 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