INSTR_US_DECLARE,
INSTR_US_SET,
INSTR_US_ADD,
- INSTR_US_SUB,
+ INSTR_US_SUB
} InstrUserVariable;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API");
//check if category is already created
char *created = xbt_dict_get_or_null(created_categories, category);
if (created) return;
- xbt_dict_set (created_categories, category, xbt_strdup("1"), xbt_free);
+ xbt_dict_set (created_categories, category, xbt_strdup("1"), NULL);
//define final_color
char final_color[INSTR_DEFAULT_STR_SIZE];
if (!mark_type) return;
XBT_DEBUG("MARK,declare %s", mark_type);
- getEventType(mark_type, NULL, getRootType());
+ PJ_type_event_new(mark_type, NULL, PJ_type_get_root());
}
void TRACE_mark(const char *mark_type, const char *mark_value)
if (!mark_type || !mark_value) return;
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);
+ type_t type = PJ_type_get (mark_type, PJ_type_get_root());
+ if (type == NULL){
+ THROWF (tracing_error, 1, "mark_type with name (%s) not declared before", mark_type);
+ }
+ val_t value = PJ_value_get (mark_value, type);
+ if (value == NULL){
+ value = PJ_value_new (mark_value, NULL, type);
+ }
+ new_pajeNewEvent (MSG_get_clock(), PJ_container_get_root(), type, value);
}
static void instr_user_variable(double time,
const char *variable,
const char *father_type,
double value,
- InstrUserVariable what)
+ InstrUserVariable what,
+ const char *color)
{
/* safe switch */
if (!TRACE_is_enabled()) return;
switch (what){
case INSTR_US_DECLARE:
- instr_new_user_variable_type (father_type, variable, NULL);
+ instr_new_user_variable_type (father_type, variable, color);
break;
case INSTR_US_SET:
{
- container_t container = getContainerByName(resource);
- type_t type = getVariableType (variable, NULL, container->type);
+ container_t container = PJ_container_get(resource);
+ type_t type = PJ_type_get (variable, container->type);
new_pajeSetVariable(time, container, type, value);
break;
}
case INSTR_US_ADD:
{
- container_t container = getContainerByName(resource);
- type_t type = getVariableType (variable, NULL, container->type);
+ container_t container = PJ_container_get(resource);
+ type_t type = PJ_type_get (variable, container->type);
new_pajeAddVariable(time, container, type, value);
break;
}
case INSTR_US_SUB:
{
- container_t container = getContainerByName(resource);
- type_t type = getVariableType (variable, NULL, container->type);
+ container_t container = PJ_container_get(resource);
+ type_t type = PJ_type_get (variable, container->type);
new_pajeSubVariable(time, container, type, value);
break;
}
double value,
InstrUserVariable what)
{
- xbt_dynar_t route = global_routing->get_route (src, dst);
+ xbt_dynar_t route=NULL;
+ network_element_t src_elm = xbt_lib_get_or_null(host_lib,src,ROUTING_HOST_LEVEL);
+ if(!src_elm) src_elm = xbt_lib_get_or_null(as_router_lib,src,ROUTING_ASR_LEVEL);
+ if(!src_elm) xbt_die("Element '%s' not found!",src);
+
+ network_element_t dst_elm = xbt_lib_get_or_null(host_lib,dst,ROUTING_HOST_LEVEL);
+ if(!dst_elm) dst_elm = xbt_lib_get_or_null(as_router_lib,dst,ROUTING_ASR_LEVEL);
+ if(!dst_elm) xbt_die("Element '%s' not found!",dst);
+
+ routing_get_route_and_latency (src_elm, dst_elm, &route,NULL);
unsigned int i;
void *link;
xbt_dynar_foreach (route, i, link) {
char *link_name = ((link_CM02_t)link)->lmm_resource.generic_resource.name;
- instr_user_variable (time, link_name, variable, father_type, value, what);
+ instr_user_variable (time, link_name, variable, father_type, value, what, NULL);
}
}
-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)
{
/* for host variables */
void TRACE_host_variable_declare (const char *var)
{
- instr_user_variable(0, NULL, var, "HOST", 0, INSTR_US_DECLARE);
+ instr_user_variable(0, NULL, var, "HOST", 0, INSTR_US_DECLARE, NULL);
+}
+
+void TRACE_host_variable_declare_with_color (const char *var, const char *color)
+{
+ instr_user_variable(0, NULL, var, "HOST", 0, INSTR_US_DECLARE, color);
}
void TRACE_host_variable_set (const char *host, const char *variable, double value)
void TRACE_host_variable_set_with_time (double time, const char *host, const char *variable, double value)
{
- instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SET);
+ instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SET, NULL);
}
void TRACE_host_variable_add_with_time (double time, const char *host, const char *variable, double value)
{
- instr_user_variable(time, host, variable, "HOST", value, INSTR_US_ADD);
+ instr_user_variable(time, host, variable, "HOST", value, INSTR_US_ADD, NULL);
}
void TRACE_host_variable_sub_with_time (double time, const char *host, const char *variable, double value)
{
- instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SUB);
+ instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SUB, NULL);
}
/* for link variables */
void TRACE_link_variable_declare (const char *var)
{
- instr_user_variable (0, NULL, var, "LINK", 0, INSTR_US_DECLARE);
+ instr_user_variable (0, NULL, var, "LINK", 0, INSTR_US_DECLARE, NULL);
+}
+
+void TRACE_link_variable_declare_with_color (const char *var, const char *color)
+{
+ instr_user_variable (0, NULL, var, "LINK", 0, INSTR_US_DECLARE, color);
}
void TRACE_link_variable_set (const char *link, const char *variable, double value)
void TRACE_link_variable_set_with_time (double time, const char *link, const char *variable, double value)
{
- instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SET);
+ instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SET, NULL);
}
void TRACE_link_variable_add_with_time (double time, const char *link, const char *variable, double value)
{
- instr_user_variable (time, link, variable, "LINK", value, INSTR_US_ADD);
+ instr_user_variable (time, link, variable, "LINK", value, INSTR_US_ADD, NULL);
}
void TRACE_link_variable_sub_with_time (double time, const char *link, const char *variable, double value)
{
- instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SUB);
+ instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SUB, NULL);
}
/* for link variables, but with src and dst used for get_route */