X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/83f9c73b8685ea0f92712b9f05dc4c8431950358..b83ad9c88af4715987015ddc91ac93ad749df428:/src/instr/instr_interface.cpp
diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp
index 78a41cfe66..7946c2be86 100644
--- a/src/instr/instr_interface.cpp
+++ b/src/instr/instr_interface.cpp
@@ -6,7 +6,7 @@
#include "simgrid_config.h"
#include "src/instr/instr_private.h"
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/surf_private.h"
#include "surf/surf.h"
@@ -249,7 +249,7 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
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
@@ -277,29 +277,25 @@ static void instr_user_variable(double time, const char *resource, const char *v
//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 (!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;
@@ -312,18 +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);
+ sg_netpoint_t src_elm = sg_netpoint_by_name_or_null(src);
if(!src_elm)
xbt_die("Element '%s' not found!",src);
- sg_netcard_t dst_elm = sg_netcard_by_name_or_null(dst);
+ sg_netpoint_t dst_elm = sg_netpoint_by_name_or_null(dst);
if(!dst_elm)
xbt_die("Element '%s' not found!",dst);
- std::vector route;
+ std::vector route;
simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(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);
+ instr_user_variable(time, link->cname(), variable, father_type, value, what, nullptr, user_link_variables);
}
/** \ingroup TRACE_API
@@ -968,7 +964,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
@@ -987,7 +983,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
@@ -1004,7 +1000,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);
+ new PopStateEvent(MSG_get_clock(), container, type);
}
/** \ingroup TRACE_user_variables
@@ -1021,7 +1017,7 @@ 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 ResetStateEvent(MSG_get_clock(), container, type);
}
/** \ingroup TRACE_API