-/* 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 <algorithm>
-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_DEBUG("MARK,declare %s", mark_type);
- Type::eventNew(mark_type, PJ_type_get_root());
+ simgrid::instr::Type::getRootType()->getOrCreateEventType(mark_type);
declared_marks.insert(mark_type);
}
if (not mark_value)
THROWF (tracing_error, 1, "mark_value is nullptr");
- Type* type = PJ_type_get (mark_type, PJ_type_get_root());
+ 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 (not mark_color)
- mark_color = white;
+ mark_color = "1.0 1.0 1.0" /*white*/;
XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color);
- value rett(mark_value, mark_color, type);
+ type->addEntityValue(mark_value, mark_color);
}
/** \ingroup TRACE_mark
THROWF (tracing_error, 1, "mark_value is nullptr");
//check if mark_type is already declared
- Type* type = PJ_type_get (mark_type, PJ_type_get_root());
+ 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);
}
XBT_DEBUG("MARK %s %s", mark_type, mark_value);
- new NewEvent(MSG_get_clock(), PJ_container_get_root(), type, value::get(mark_value, type));
+ new simgrid::instr::NewEvent(MSG_get_clock(), PJ_container_get_root(), type, type->getEntityValue(mark_value));
}
/** \ingroup TRACE_mark
if (created != filter->end()) { // declared, let's work
char valuestr[100];
snprintf(valuestr, 100, "%g", value);
- container_t container = PJ_container_get(resource);
- Type* 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;
std::vector<simgrid::surf::LinkImpl*> route;
simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(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->getCname(), variable, father_type, value, what, nullptr, &user_link_variables);
}
/** \ingroup TRACE_API
*
* \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);
- Type* type = PJ_type_get (state, container->type);
- value* val =
- value::get_or_new(value_str, 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* state = container->type_->byName(state_name);
+ state->addEntityValue(value_name);
+ new simgrid::instr::SetStateEvent(MSG_get_clock(), container, state, state->getEntityValue(value_name));
}
/** \ingroup TRACE_user_variables
*
* \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);
- Type* type = PJ_type_get (state, container->type);
- value* val =
- value::get_or_new(value_str, 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* state = container->type_->byName(state_name);
+ state->addEntityValue(value_name);
+ new simgrid::instr::PushStateEvent(MSG_get_clock(), container, state, state->getEntityValue(value_name));
}
/** \ingroup TRACE_user_variables
*/
void TRACE_host_pop_state (const char *host, const char *state)
{
- container_t container = PJ_container_get(host);
- Type* type = PJ_type_get (state, container->type);
- new PopStateEvent(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