#define OPT_TRACING_MSG_PROCESS "tracing/msg/process"
#define OPT_TRACING_MSG_VOLUME "tracing/msg/volume"
#define OPT_TRACING_FILENAME "tracing/filename"
-#define OPT_TRACING_PLATFORM_METHOD "tracing/platform/method"
#define OPT_TRIVA_UNCAT_CONF "triva/uncategorized"
#define OPT_TRIVA_CAT_CONF "triva/categorized"
return 0;
}
- DEBUG0("Tracing starts");
+ XBT_DEBUG("Tracing starts");
/* open the trace file */
TRACE_paje_start();
}
/* dump trace buffer */
- TRACE_paje_dump_buffer();
+ TRACE_last_timestamp_to_dump = surf_get_clock();
+ TRACE_paje_dump_buffer(1);
/* destroy all data structures of tracing (and free) */
destroyAllContainers();
/* 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)
int TRACE_smpi_is_enabled(void)
{
- return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI);
+ return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI) &&
+ TRACE_is_enabled();
}
int TRACE_smpi_is_grouped(void)
int TRACE_msg_task_is_enabled(void)
{
- return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK);
+ return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK) &&
+ TRACE_is_enabled();
}
int TRACE_msg_process_is_enabled(void)
{
- return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS);
+ return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS) &&
+ TRACE_is_enabled();
}
int TRACE_msg_volume_is_enabled(void)
{
- return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VOLUME);
+ return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VOLUME) &&
+ TRACE_is_enabled();
}
char *TRACE_get_filename(void)
return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME);
}
-char *TRACE_get_platform_method(void)
-{
- return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_PLATFORM_METHOD);
-}
-
char *TRACE_get_triva_uncat_conf (void)
{
return xbt_cfg_get_string(_surf_cfg_set, OPT_TRIVA_UNCAT_CONF);
xbt_cfgelm_int, &default_tracing_uncategorized, 0, 1,
NULL, NULL);
- /* platform method */
- char *default_tracing_platform_method = xbt_strdup("a");
- xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM_METHOD,
- "Tracing method used to register categorized resource behavior.",
- xbt_cfgelm_string, &default_tracing_platform_method, 1,
- 1, NULL, NULL);
-
/* msg task */
int default_tracing_msg_task = 0;
xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_TASK,
" this simulator do not use tracing categories and resource use have to be\n"
" traced.",
detailed);
- print_line (OPT_TRACING_PLATFORM_METHOD, "Change the resource utilization tracing method",
- " It changes the way resource utilization (categorized or not) is traced\n"
- " inside the simulation core. Method 'a' (default) traces all updates defined\n"
- " by the CPU/network model of a given resource. Depending on the interface used\n"
- " by this simulator (MSG, SMPI, SimDAG), the default method can generate large\n"
- " trace files. Method 'b' tries to make smaller tracefiles using clever updates,\n"
- " without losing details of resource utilization. Method 'c' generates even\n"
- " smaller files by doing time integration during the simulation, but it loses\n"
- " precision. If this last method is used, the smallest timeslice used in the\n"
- " tracefile analysis must be bigger than the smaller resource utilization. If\n"
- " unsure, do not change this option.",
- detailed);
print_line (OPT_TRACING_FILENAME, "Filename to register traces",
" A file with this name will be created to register the simulation. The file\n"
" is in the Paje format and can be analyzed using Triva or Paje visualization\n"
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);
