XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
-xbt_dict_t defined_types;
-xbt_dict_t created_categories;
-
-extern xbt_dict_t hosts_types;
-extern xbt_dict_t links_types;
-
void TRACE_category(const char *category)
{
TRACE_category_with_color (category, NULL);
void TRACE_category_with_color (const char *category, const char *color)
{
- if (!TRACE_is_active())
+ if (!(TRACE_is_active() && category != NULL))
return;
+ xbt_assert1 (instr_platform_traced(),
+ "%s must be called after environment creation", __FUNCTION__);
+
//check if category is already created
char *created = xbt_dict_get_or_null(created_categories, category);
if (created) return;
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) {
//define the type of this category on top of hosts and links
if (TRACE_categorized ()){
- char new_type[INSTR_DEFAULT_STR_SIZE];
- xbt_dict_cursor_t cursor = NULL;
- char *type;
- void *data;
- xbt_dict_foreach(links_types, cursor, type, data) {
- snprintf (new_type, INSTR_DEFAULT_STR_SIZE, "%s-%s", category, type);
- pajeDefineVariableTypeWithColor(new_type, type, category, final_color);
- }
- cursor = NULL;
- xbt_dict_foreach(hosts_types, cursor, type, data) {
- snprintf (new_type, INSTR_DEFAULT_STR_SIZE, "%s-%s", category, type);
- pajeDefineVariableTypeWithColor(new_type, type, category, final_color);
- }
+ instr_new_user_variable_type (category, final_color);
}
}
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);
+}
+
+
+void TRACE_user_link_variable(double time, const char *resource,
+ const char *variable,
+ double value, const char *what)
+{
+ if (!TRACE_is_active())
+ return;
+
+ xbt_assert1 (instr_platform_traced(),
+ "%s must be called after environment creation", __FUNCTION__);
+
+ char valuestr[100];
+ snprintf(valuestr, 100, "%g", value);
+
+ if (strcmp(what, "declare") == 0) {
+ instr_new_user_link_variable_type (variable, NULL);
+ } else{
+ container_t container = getContainerByName (resource);
+ type_t type = getVariableType (variable, NULL, container->type);
+ if (strcmp(what, "set") == 0) {
+ new_pajeSetVariable(time, container, type, value);
+ } else if (strcmp(what, "add") == 0) {
+ new_pajeAddVariable(time, container, type, value);
+ } else if (strcmp(what, "sub") == 0) {
+ new_pajeSubVariable(time, container, type, value);
+ }
+ }
+}
+
+void TRACE_user_host_variable(double time, const char *variable,
+ double value, const char *what)
+{
+ if (!TRACE_is_active())
+ return;
+
+ xbt_assert1 (instr_platform_traced(),
+ "%s must be called after environment creation", __FUNCTION__);
+
+ char valuestr[100];
+ snprintf(valuestr, 100, "%g", value);
+
+ if (strcmp(what, "declare") == 0) {
+ instr_new_user_host_variable_type (variable, NULL);
+ } else{
+ char *host_name = MSG_host_self()->name;
+ container_t container = getContainerByName(host_name);
+ type_t type = getVariableType (variable, NULL, container->type);
+ if (strcmp(what, "set") == 0) {
+ new_pajeSetVariable(time, container, type, value);
+ } else if (strcmp(what, "add") == 0) {
+ new_pajeAddVariable(time, container, type, value);
+ } else if (strcmp(what, "sub") == 0) {
+ new_pajeSubVariable(time, container, type, value);
+ }
+ }
}
#endif /* HAVE_TRACING */