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
more stringification/privatization
[simgrid.git]
/
src
/
instr
/
instr_interface.cpp
diff --git
a/src/instr/instr_interface.cpp
b/src/instr/instr_interface.cpp
index
71762f4
..
76fd855
100644
(file)
--- a/
src/instr/instr_interface.cpp
+++ b/
src/instr/instr_interface.cpp
@@
-12,12
+12,7
@@
#include "surf/surf.h"
#include <algorithm>
#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_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
@@
-193,7
+188,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);
-
new simgrid::instr::Valu
e(mark_value, mark_color, type);
+
simgrid::instr::Value::byNameOrCreat
e(mark_value, mark_color, type);
}
/** \ingroup TRACE_mark
}
/** \ingroup TRACE_mark
@@
-246,7
+241,7
@@
void TRACE_mark(const char *mark_type, const char *mark_value)
XBT_DEBUG("MARK %s %s", mark_type, mark_value);
new simgrid::instr::NewEvent(MSG_get_clock(), PJ_container_get_root(), type,
XBT_DEBUG("MARK %s %s", mark_type, mark_value);
new simgrid::instr::NewEvent(MSG_get_clock(), PJ_container_get_root(), type,
- simgrid::instr::Value::
get
(mark_value, type));
+ simgrid::instr::Value::
byName
(mark_value, type));
}
/** \ingroup TRACE_mark
}
/** \ingroup TRACE_mark
@@
-282,7
+277,7
@@
static void instr_user_variable(double time, const char* resource, const char* v
if (created != filter->end()) { // declared, let's work
char valuestr[100];
snprintf(valuestr, 100, "%g", value);
if (created != filter->end()) { // declared, let's work
char valuestr[100];
snprintf(valuestr, 100, "%g", value);
- container_t container
= PJ_container_get
(resource);
+ container_t container
= simgrid::instr::Container::byName
(resource);
simgrid::instr::Type* type = container->type_->getChild(variable);
switch (what){
case INSTR_US_SET:
simgrid::instr::Type* type = container->type_->getChild(variable);
switch (what){
case INSTR_US_SET:
@@
-945,10
+940,10
@@
void TRACE_host_state_declare_value (const char *state, const char *value, const
*/
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, const char* value_str)
{
- container_t container
= PJ_container_get
(host);
+ container_t container
= simgrid::instr::Container::byName
(host);
simgrid::instr::Type* type = container->type_->getChild(state);
simgrid::instr::Type* type = container->type_->getChild(state);
- simgrid::instr::Value* val = simgrid::instr::Value::
get_or_new
(
- value_str,
nullptr, type); /* if user didn't declare a value with a color, use nullptr
color */
+ simgrid::instr::Value* val = simgrid::instr::Value::
byNameOrCreate
(
+ value_str,
"", type); /* if user didn't declare a value with a color, use no
color */
new simgrid::instr::SetStateEvent(MSG_get_clock(), container, type, val);
}
new simgrid::instr::SetStateEvent(MSG_get_clock(), container, type, val);
}
@@
-965,10
+960,10
@@
void TRACE_host_set_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)
{
*/
void TRACE_host_push_state(const char* host, const char* state, const char* value_str)
{
- container_t container
= PJ_container_get
(host);
+ container_t container
= simgrid::instr::Container::byName
(host);
simgrid::instr::Type* type = container->type_->getChild(state);
simgrid::instr::Type* type = container->type_->getChild(state);
- simgrid::instr::Value* val = simgrid::instr::Value::
get_or_new
(
- value_str,
nullptr, type); /* if user didn't declare a value with a color, use nullptr
color */
+ simgrid::instr::Value* val = simgrid::instr::Value::
byNameOrCreate
(
+ value_str,
"", type); /* if user didn't declare a value with a color, use no
color */
new simgrid::instr::PushStateEvent(MSG_get_clock(), container, type, val);
}
new simgrid::instr::PushStateEvent(MSG_get_clock(), container, type, val);
}
@@
-984,7
+979,7
@@
void TRACE_host_push_state(const char* host, const char* state, const char* valu
*/
void TRACE_host_pop_state (const char *host, const char *state)
{
*/
void TRACE_host_pop_state (const char *host, const char *state)
{
- container_t container
= PJ_container_get
(host);
+ container_t container
= simgrid::instr::Container::byName
(host);
simgrid::instr::Type* type = container->type_->getChild(state);
new simgrid::instr::PopStateEvent(MSG_get_clock(), container, type);
}
simgrid::instr::Type* type = container->type_->getChild(state);
new simgrid::instr::PopStateEvent(MSG_get_clock(), container, type);
}