X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fb81c8bcd9bf351c3a575908adfa783b0b375e10..595e59c568ff5f8510de201bfd800951cdc2adcb:/src/instr/instr_interface.cpp diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index d1881f7516..7946c2be86 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -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 @@ -284,19 +284,18 @@ static void instr_user_variable(double time, const char *resource, const char *v }else{ if (created) { // declared, let's work char valuestr[100]; - s_subVariable n; 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: - n.new_pajeSubVariable(time, container, type, value); + new SubVariableEvent(time, container, type, value); break; default: THROW_IMPOSSIBLE; @@ -965,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 @@ -984,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 @@ -1001,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 @@ -1018,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