return 0;
}
- DEBUG0("Tracing starts");
+ XBT_DEBUG("Tracing starts");
/* open the trace file */
TRACE_paje_start();
/* activate trace */
TRACE_desactivate ();
- DEBUG0("Tracing system is shutdown");
+ XBT_DEBUG("Tracing system is shutdown");
return 0;
}
void TRACE_activate (void)
{
- xbt_assert0 (trace_active==0, "Tracing is already active.");
+ xbt_assert (trace_active==0, "Tracing is already active.");
trace_active = 1;
- DEBUG0 ("Tracing is on");
+ XBT_DEBUG ("Tracing is on");
}
void TRACE_desactivate (void)
{
trace_active = 0;
- DEBUG0 ("Tracing is off");
+ XBT_DEBUG ("Tracing is off");
}
int TRACE_is_active (void)
char *name, *value;
FILE *file = fopen (output, "w");
- xbt_assert1 (file != NULL,
+ xbt_assert (file != NULL,
"Unable to open file (%s) for writing triva graph "
"configuration (uncategorized).", output);
");\n"
"\n");
- //register each NODE type layout
- xbt_dict_foreach(trivaNodeTypes, cursor, name, value) {
- fprintf (file, " %s = {\n", name);
- if (strcmp (name, "HOST") == 0){
- fprintf (file,
- " type = node;\n"
- " size = power;\n"
- " host_sep = {\n"
- " type = separation;\n"
- " size = power;\n"
- " values = (power_used);\n"
- " };\n");
- }else if (strcmp (name, "ROUTER") == 0){
- fprintf (file,
- " type = node;\n"
- " size = 10;\n");
- }else if (strcmp (name, "LINK") == 0){
- fprintf (file,
- " type = edge;\n"
- " size = bandwidth;\n"
- " scale = global;\n"
- " link_sep = {\n"
- " type = separation;\n"
- " size = bandwidth;\n"
- " values = (bandwidth_used);\n"
- " };\n");
- }
- fprintf (file, " };\n\n");
- }
-
- //EDGE configuration
- xbt_dict_foreach(trivaEdgeTypes, cursor, name, value) {
- fprintf (file, " %s = { size = 1; };\n", name);
- }
-
- //graphviz configuration
- fprintf (file, "\n");
- fprintf (file, " graphviz-algorithm = neato;\n");
-
+ //configuration for all nodes
+ fprintf (file,
+ " host = {\n"
+ " type = square;\n"
+ " size = power;\n"
+ " values = (power_used);\n"
+ " };\n"
+ " link = {\n"
+ " type = rhombus;\n"
+ " size = bandwidth;\n"
+ " values = (bandwidth_used);\n"
+ " };\n");
//close
fprintf (file, "}\n");
fclose (file);
//check if we do have categories declared
if (xbt_dict_length(created_categories) == 0){
- INFO0("No categories declared, ignoring generation of triva graph configuration");
+ XBT_INFO("No categories declared, ignoring generation of triva graph configuration");
return;
}
FILE *file = fopen (output, "w");
- xbt_assert1 (file != NULL,
+ xbt_assert (file != NULL,
"Unable to open file (%s) for writing triva graph "
"configuration (categorized).", output);
");\n"
"\n");
- //register each NODE type layout
- xbt_dict_foreach(trivaNodeTypes, cursor, name, value) {
- fprintf (file, " %s = {\n", name);
- if (strcmp (name, "HOST") == 0){
- fprintf (file,
- " type = node;\n"
- " size = power;\n"
- " host_sep = {\n"
- " type = separation;\n"
- " size = power;\n"
- " values = (");
- xbt_dict_foreach(created_categories,cursor2,name2,value2) {
- fprintf (file, "%s, ", name2);
- }
- fprintf (file,
- ");\n"
- " };\n");
- }else if (strcmp (name, "ROUTER") == 0){
- fprintf (file,
- " type = node;\n"
- " size = 10;\n");
- }else if (strcmp (name, "LINK") == 0){
- fprintf (file,
- " type = edge;\n"
- " size = bandwidth;\n"
- " scale = global;\n"
- " link_sep = {\n"
- " type = separation;\n"
- " size = bandwidth;\n"
- " values = (");
- xbt_dict_foreach(created_categories,cursor2,name2,value2) {
- fprintf (file, "%s, ", name2);
- }
- fprintf (file,
- ");\n"
- " };\n");
- }
- fprintf (file, " };\n\n");
+ //configuration for all nodes
+ fprintf (file,
+ " host = {\n"
+ " type = square;\n"
+ " size = power;\n"
+ " values = (");
+ xbt_dict_foreach(created_categories,cursor2,name2,value2) {
+ fprintf (file, "p%s, ", name2);
}
-
- //EDGE configuration
- xbt_dict_foreach(trivaEdgeTypes, cursor, name, value) {
- fprintf (file, " %s = { size = 1; };\n", name);
+ fprintf (file,
+ ");\n"
+ " };\n"
+ " link = {\n"
+ " type = rhombus;\n"
+ " size = bandwidth;\n"
+ " values = (");
+ xbt_dict_foreach(created_categories,cursor2,name2,value2) {
+ fprintf (file, "b%s, ", name2);
}
-
- //graphviz configuration
- fprintf (file, "\n");
- fprintf (file, " graphviz-algorithm = neato;\n");
-
+ fprintf (file,
+ ");\n"
+ " };\n");
//close
fprintf (file, "}\n");
fclose (file);