X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e2b455e834089e4512c6311872052ba441b487ec..1366b293e8c700b12567e45076cf0e6b7a25478f:/src/instr/instr_interface.cpp diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index 43c2b18589..dfe6eb196e 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -176,7 +176,7 @@ void TRACE_declare_mark(const char *mark_type) * \see TRACE_mark */ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mark_value, const char *mark_color) -{ +{ paje_value pj_value; /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with marks */ if (not TRACE_is_enabled() || not TRACE_needs_platform()) return; @@ -196,7 +196,7 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar mark_color = white; XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color); - PJ_value_new (mark_value, mark_color, type); + s_val rett(mark_value, mark_color, type); } /** \ingroup TRACE_mark @@ -231,7 +231,7 @@ void TRACE_declare_mark_value (const char *mark_type, const char *mark_value) * \see TRACE_declare_mark */ void TRACE_mark(const char *mark_type, const char *mark_value) -{ +{ paje_value pj_value; /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with marks */ if (not TRACE_is_enabled() || not TRACE_needs_platform()) return; @@ -247,7 +247,7 @@ void TRACE_mark(const char *mark_type, const char *mark_value) THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type); } - val_t value = PJ_value_get (mark_value, type); + val_t value = pj_value.PJ_value_get (mark_value, type); XBT_DEBUG("MARK %s %s", mark_type, mark_value); new NewEvent (MSG_get_clock(), PJ_container_get_root(), type, value); } @@ -947,10 +947,10 @@ void TRACE_host_state_declare_value (const char *state, const char *value, const * \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) -{ +{ paje_value pj_value; 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 */ + val_t val = pj_value.PJ_value_get_or_new (value, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */ new SetStateEvent(MSG_get_clock(), container, type, val); } @@ -966,10 +966,10 @@ void TRACE_host_set_state (const char *host, const char *state, const char *valu * \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) -{ +{ paje_value pj_value; 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 */ + val_t val = pj_value.PJ_value_get_or_new (value, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */ new PushStateEvent(MSG_get_clock(), container, type, val); }