A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid costly exceptions when looking into a map.
[simgrid.git]
/
src
/
instr
/
instr_interface.cpp
diff --git
a/src/instr/instr_interface.cpp
b/src/instr/instr_interface.cpp
index
7c17b84
..
726b68a
100644
(file)
--- a/
src/instr/instr_interface.cpp
+++ b/
src/instr/instr_interface.cpp
@@
-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);
mark_color = white;
XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color);
-
s_val
rett(mark_value, mark_color, type);
+
value
rett(mark_value, mark_color, type);
}
/** \ingroup TRACE_mark
}
/** \ingroup TRACE_mark
@@
-247,9
+247,8
@@
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);
}
THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type);
}
- val_t value = s_val::PJ_value_get (mark_value, type);
XBT_DEBUG("MARK %s %s", mark_type, mark_value);
XBT_DEBUG("MARK %s %s", mark_type, mark_value);
- new NewEvent
(MSG_get_clock(), PJ_container_get_root(), type, value
);
+ new NewEvent
(MSG_get_clock(), PJ_container_get_root(), type, value::get(mark_value, type)
);
}
/** \ingroup TRACE_mark
}
/** \ingroup TRACE_mark
@@
-946,11
+945,12
@@
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
*/
*
* \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
)
+void TRACE_host_set_state
(const char* host, const char* state, const char* value_str
)
{
container_t container = PJ_container_get(host);
type_t type = PJ_type_get (state, container->type);
{
container_t container = PJ_container_get(host);
type_t type = PJ_type_get (state, container->type);
- val_t val = s_val::PJ_value_get_or_new (value, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */
+ 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);
}
new SetStateEvent(MSG_get_clock(), container, type, val);
}
@@
-965,11
+965,12
@@
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
*/
*
* \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
)
+void TRACE_host_push_state
(const char* host, const char* state, const char* value_str
)
{
container_t container = PJ_container_get(host);
type_t type = PJ_type_get (state, container->type);
{
container_t container = PJ_container_get(host);
type_t type = PJ_type_get (state, container->type);
- val_t val = s_val::PJ_value_get_or_new (value, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */
+ 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);
}
new PushStateEvent(MSG_get_clock(), container, type, val);
}