if (!(TRACE_is_active() && category != NULL))
return;
- xbt_assert1 (instr_platform_traced(),
+ xbt_assert (instr_platform_traced(),
"%s must be called after environment creation", __FUNCTION__);
//check if category is already created
snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%s", color);
}
- DEBUG2("CAT,declare %s, %s", category, final_color);
+ XBT_DEBUG("CAT,declare %s, %s", category, final_color);
//FIXME
// - if (final) {
if (!mark_type)
return;
- DEBUG1("MARK,declare %s", mark_type);
- pajeDefineEventType(mark_type, "0", mark_type);
+ XBT_DEBUG("MARK,declare %s", mark_type);
+ getEventType(mark_type, NULL, getRootType());
}
void TRACE_mark(const char *mark_type, const char *mark_value)
if (!mark_type || !mark_value)
return;
- DEBUG2("MARK %s %s", mark_type, mark_value);
- pajeNewEvent(MSG_get_clock(), mark_type, "0", mark_value);
+ XBT_DEBUG("MARK %s %s", mark_type, mark_value);
+ type_t type = getEventType (mark_type, NULL, getRootContainer()->type);
+ val_t value = getValue (mark_value, NULL, type);
+ new_pajeNewEvent (MSG_get_clock(), getRootContainer(), type, value);
}
if (!TRACE_is_active())
return;
- xbt_assert1 (instr_platform_traced(),
+ xbt_assert (instr_platform_traced(),
"%s must be called after environment creation", __FUNCTION__);
char valuestr[100];
if (strcmp(what, "declare") == 0) {
instr_new_user_link_variable_type (variable, NULL);
} else{
- char *variable_id = instr_variable_type(variable, resource);
- char *resource_id = instr_resource_type(resource);
+ container_t container = getContainerByName (resource);
+ type_t type = getVariableType (variable, NULL, container->type);
if (strcmp(what, "set") == 0) {
- pajeSetVariable(time, variable_id, resource_id, valuestr);
+ new_pajeSetVariable(time, container, type, value);
} else if (strcmp(what, "add") == 0) {
- pajeAddVariable(time, variable_id, resource_id, valuestr);
+ new_pajeAddVariable(time, container, type, value);
} else if (strcmp(what, "sub") == 0) {
- pajeSubVariable(time, variable_id, resource_id, valuestr);
+ new_pajeSubVariable(time, container, type, value);
}
}
}
if (!TRACE_is_active())
return;
- xbt_assert1 (instr_platform_traced(),
+ xbt_assert (instr_platform_traced(),
"%s must be called after environment creation", __FUNCTION__);
char valuestr[100];
instr_new_user_host_variable_type (variable, NULL);
} else{
char *host_name = MSG_host_self()->name;
- char *variable_id = instr_variable_type(variable, host_name);
- char *resource_id = instr_resource_type(host_name);
+ container_t container = getContainerByName(host_name);
+ type_t type = getVariableType (variable, NULL, container->type);
if (strcmp(what, "set") == 0) {
- pajeSetVariable(time, variable_id, resource_id, valuestr);
+ new_pajeSetVariable(time, container, type, value);
} else if (strcmp(what, "add") == 0) {
- pajeAddVariable(time, variable_id, resource_id, valuestr);
+ new_pajeAddVariable(time, container, type, value);
} else if (strcmp(what, "sub") == 0) {
- pajeSubVariable(time, variable_id, resource_id, valuestr);
+ new_pajeSubVariable(time, container, type, value);
}
}
}
+const char *TRACE_node_name (xbt_node_t node)
+{
+ void *data = xbt_graph_node_get_data(node);
+ char *str = (char*)data;
+ return str;
+}
+
+xbt_graph_t TRACE_platform_graph (void)
+{
+ if (!TRACE_is_active())
+ return NULL;
+
+ return instr_routing_platform_graph ();
+}
+
+void TRACE_platform_graph_export_graphviz (xbt_graph_t g, const char *filename)
+{
+ instr_routing_platform_graph_export_graphviz (g, filename);
+}
#endif /* HAVE_TRACING */