#ifdef HAVE_TRACING
-//extern routing_global_t global_routing;
-extern xbt_dict_t hosts_types;
-extern xbt_dict_t links_types;
-
-void TRACE_user_link_variable(double time, const char *src,
- const char *dst, const char *variable,
+void TRACE_user_link_variable(double time, const char *resource,
+ const char *variable,
double value, const char *what)
{
- xbt_die ("deprecated");
-// FIXME
-// if (!TRACE_is_active() || !TRACE_categorized ())
-// return;
-//
-// char valuestr[100];
-// snprintf(valuestr, 100, "%g", value);
-//
-// if (strcmp(what, "declare") == 0) {
-// pajeDefineVariableType(variable, "LINK", variable);
-// return;
-// }
-//
-// if (!global_routing)
-// return;
-//
-// xbt_dynar_t route = global_routing->get_route(src, dst);
-// unsigned int i;
-// void *link_ptr;
-// xbt_dynar_foreach(route, i, link_ptr) {
-// char resource[100];
-// snprintf(resource, 100, "%p", link_ptr);
-//
-// if (strcmp(what, "set") == 0) {
-// pajeSetVariable(time, variable, resource, valuestr);
-// } else if (strcmp(what, "add") == 0) {
-// pajeAddVariable(time, variable, resource, valuestr);
-// } else if (strcmp(what, "sub") == 0) {
-// pajeSubVariable(time, variable, resource, valuestr);
-// }
-// }
+ 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{
+ char *variable_id = instr_variable_type(variable, resource);
+ char *resource_id = instr_resource_type(resource);
+ if (strcmp(what, "set") == 0) {
+ pajeSetVariable(time, variable_id, resource_id, valuestr);
+ } else if (strcmp(what, "add") == 0) {
+ pajeAddVariable(time, variable_id, resource_id, valuestr);
+ } else if (strcmp(what, "sub") == 0) {
+ pajeSubVariable(time, variable_id, resource_id, valuestr);
+ }
+ }
}
void TRACE_user_host_variable(double time, const char *variable,
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) {
- {
- //check if hosts have been created
- xbt_assert1 (hosts_types != NULL && xbt_dict_length(hosts_types) != 0,
- "%s must be called after environment creation", __FUNCTION__);
- }
-
- char new_type[INSTR_DEFAULT_STR_SIZE];
- xbt_dict_cursor_t cursor = NULL;
- char *type;
- void *data;
- xbt_dict_foreach(hosts_types, cursor, type, data) {
- snprintf (new_type, INSTR_DEFAULT_STR_SIZE, "%s-%s", variable, type);
- pajeDefineVariableType (new_type, type, variable);
- }
+ instr_new_user_host_variable_type (variable, NULL);
} else{
char *host_name = MSG_host_self()->name;
- char *host_type = instr_host_type (host_name);
- char variable_type[INSTR_DEFAULT_STR_SIZE];
- snprintf (variable_type, INSTR_DEFAULT_STR_SIZE, "%s-%s", variable, host_type);
-
+ char *variable_id = instr_variable_type(variable, host_name);
+ char *resource_id = instr_resource_type(host_name);
if (strcmp(what, "set") == 0) {
- pajeSetVariable(time, variable_type, host_name, valuestr);
+ pajeSetVariable(time, variable_id, resource_id, valuestr);
} else if (strcmp(what, "add") == 0) {
- pajeAddVariable(time, variable_type, host_name, valuestr);
+ pajeAddVariable(time, variable_id, resource_id, valuestr);
} else if (strcmp(what, "sub") == 0) {
- pajeSubVariable(time, variable_type, host_name, valuestr);
+ pajeSubVariable(time, variable_id, resource_id, valuestr);
}
}
}