X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1dc68fca3f3bd110ddaaf88fb90a8bbb83a584b2..9a36fae38fd6af831308861de666cc06a4fe89da:/src/instr/instr_config.c diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c index 8aad85e6bc..1bd308f42c 100644 --- a/src/instr/instr_config.c +++ b/src/instr/instr_config.c @@ -13,25 +13,53 @@ XBT_LOG_NEW_CATEGORY(instr, "Logging the behavior of the tracing system (used fo XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration"); #define OPT_TRACING "tracing" +#define OPT_TRACING_PLATFORM "tracing/platform" #define OPT_TRACING_SMPI "tracing/smpi" #define OPT_TRACING_SMPI_GROUP "tracing/smpi/group" #define OPT_TRACING_CATEGORIZED "tracing/categorized" #define OPT_TRACING_UNCATEGORIZED "tracing/uncategorized" #define OPT_TRACING_MSG_TASK "tracing/msg/task" #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_TRACING_BUFFER "tracing/buffer" +#define OPT_TRACING_ONELINK_ONLY "tracing/onelink_only" #define OPT_TRIVA_UNCAT_CONF "triva/uncategorized" #define OPT_TRIVA_CAT_CONF "triva/categorized" +static int trace_enabled; +static int trace_platform; +static int trace_smpi_enabled; +static int trace_smpi_grouped; +static int trace_categorized; +static int trace_uncategorized; +static int trace_msg_task_enabled; +static int trace_msg_process_enabled; +static int trace_buffer; +static int trace_onelink_only; + static int trace_configured = 0; static int trace_active = 0; xbt_dict_t created_categories; //declared in instr_interface.c +static void TRACE_getopts(void) +{ + trace_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING); + trace_platform = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_PLATFORM); + trace_smpi_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI); + trace_smpi_grouped = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_GROUP); + trace_categorized = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_CATEGORIZED); + trace_uncategorized = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_UNCATEGORIZED); + trace_msg_task_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK); + trace_msg_process_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS); + trace_buffer = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_BUFFER); + trace_onelink_only = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_ONELINK_ONLY); +} + int TRACE_start() { + TRACE_getopts(); + // tracing system must be: // - enabled (with --cfg=tracing:1) // - already configured (TRACE_global_init already called) @@ -45,7 +73,9 @@ int TRACE_start() TRACE_paje_start(); /* activate trace */ - TRACE_activate (); + xbt_assert (trace_active==0, "Tracing is already active."); + trace_active = 1; + XBT_DEBUG ("Tracing is on"); /* other trace initialization */ created_categories = xbt_dict_new(); @@ -56,7 +86,7 @@ int TRACE_start() int TRACE_end() { - if (!TRACE_is_active()) + if (!trace_active) return 1; /* generate uncategorized graph configuration for triva */ @@ -79,33 +109,31 @@ int TRACE_end() /* close the trace file */ TRACE_paje_end(); - /* activate trace */ - TRACE_desactivate (); + /* de-activate trace */ + trace_active = 0; + XBT_DEBUG ("Tracing is off"); XBT_DEBUG("Tracing system is shutdown"); return 0; } -void TRACE_activate (void) +int TRACE_needs_platform (void) { - xbt_assert (trace_active==0, "Tracing is already active."); - trace_active = 1; - XBT_DEBUG ("Tracing is on"); + return TRACE_msg_process_is_enabled() || + TRACE_msg_task_is_enabled() || + TRACE_categorized() || + TRACE_uncategorized() || + TRACE_platform () || + (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()); } -void TRACE_desactivate (void) +int TRACE_is_enabled(void) { - trace_active = 0; - XBT_DEBUG ("Tracing is off"); + return trace_enabled; } -int TRACE_is_active (void) +int TRACE_platform(void) { - return trace_active; -} - -int TRACE_is_enabled(void) -{ - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING); + return trace_platform; } int TRACE_is_configured(void) @@ -115,51 +143,49 @@ int TRACE_is_configured(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_smpi_is_grouped())&& TRACE_is_enabled(); } int TRACE_smpi_is_grouped(void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_SMPI_GROUP); + return trace_smpi_grouped; } int TRACE_categorized (void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_CATEGORIZED); + return trace_categorized; } int TRACE_uncategorized (void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_UNCATEGORIZED); + return trace_uncategorized; } int TRACE_msg_task_is_enabled(void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_TASK) && - TRACE_is_enabled(); + return trace_msg_task_enabled && TRACE_is_enabled(); } int TRACE_msg_process_is_enabled(void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_PROCESS) && - TRACE_is_enabled(); + return trace_msg_process_enabled && TRACE_is_enabled(); } -int TRACE_msg_volume_is_enabled(void) +int TRACE_buffer (void) { - return xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_MSG_VOLUME) && - TRACE_is_enabled(); + return trace_buffer && TRACE_is_enabled(); } -char *TRACE_get_filename(void) +int TRACE_onelink_only (void) { - return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME); + return trace_onelink_only && TRACE_is_enabled(); } -char *TRACE_get_platform_method(void) +char *TRACE_get_filename(void) { - return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_PLATFORM_METHOD); + return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME); } char *TRACE_get_triva_uncat_conf (void) @@ -188,6 +214,13 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_int, &default_tracing, 0, 1, NULL, NULL); + /* tracing platform*/ + int default_tracing_platform = 0; + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_PLATFORM, + "Enable Tracing Platform.", + xbt_cfgelm_int, &default_tracing_platform, 0, 1, + NULL, NULL); + /* smpi */ int default_tracing_smpi = 0; xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_SMPI, @@ -204,10 +237,10 @@ void TRACE_global_init(int *argc, char **argv) /* platform */ - int default_tracing_platform = 0; + int default_tracing_categorized = 0; xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_CATEGORIZED, "Tracing of categorized platform (host and link) utilization.", - xbt_cfgelm_int, &default_tracing_platform, 0, 1, + xbt_cfgelm_int, &default_tracing_categorized, 0, 1, NULL, NULL); /* tracing uncategorized resource utilization */ @@ -217,13 +250,6 @@ void TRACE_global_init(int *argc, char **argv) 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, @@ -238,11 +264,18 @@ void TRACE_global_init(int *argc, char **argv) xbt_cfgelm_int, &default_tracing_msg_process, 0, 1, NULL, NULL); - /* msg volume (experimental) */ - int default_tracing_msg_volume = 0; - xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_VOLUME, - "Tracing of MSG communication volume (experimental).", - xbt_cfgelm_int, &default_tracing_msg_volume, 0, 1, + /* tracing buffer */ + int default_buffer = 0; + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_BUFFER, + "Buffer trace events to put them in temporal order.", + xbt_cfgelm_int, &default_buffer, 0, 1, + NULL, NULL); + + /* tracing one link only */ + int default_onelink_only = 0; + xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_ONELINK_ONLY, + "Use only routes with one link to trace platform.", + xbt_cfgelm_int, &default_onelink_only, 0, 1, NULL, NULL); /* Triva graph configuration for uncategorized tracing */ @@ -292,18 +325,6 @@ void TRACE_help (int detailed) " 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" @@ -330,9 +351,19 @@ void TRACE_help (int detailed) " behavior of all categorized MSG processes, grouping them by hosts. This option\n" " can be used to track process location if this simulator has process migration.", detailed); - print_line (OPT_TRACING_MSG_VOLUME, "Tracing of communication volume (MSG)", - " This experimental option only has effect if this simulator is MSG-based.\n" - " It traces the communication volume of MSG send/receive.", + print_line (OPT_TRACING_BUFFER, "Buffer events to put them in temporal order", + " This option put some events in a time-ordered buffer using the insertion\n" + " sort algorithm. The process of acquiring and releasing locks to access this\n" + " buffer and the cost of the sorting algorithm make this process slow. The\n" + " simulator performance can be severely impacted if this option is activated,\n" + " but you are sure to get a trace file with events sorted.", + detailed); + print_line (OPT_TRACING_ONELINK_ONLY, "Consider only one link routes to trace platform", + " This option changes the way SimGrid register its platform on the trace file.\n" + " Normally, the tracing considers all routes (no matter their size) on the\n" + " platform file to re-create the resource topology. If this option is activated,\n" + " only the routes with one link are used to register the topology within an AS.\n" + " Routes among AS continue to be traced as usual.", detailed); print_line (OPT_TRIVA_UNCAT_CONF, "Generate graph configuration for Triva", " This option can be used in all types of simulators build with SimGrid\n" @@ -467,6 +498,7 @@ void TRACE_generate_triva_cat_conf (void) } #undef OPT_TRACING +#undef OPT_TRACING_PLATFORM #undef OPT_TRACING_SMPI #undef OPT_TRACING_SMPI_GROUP #undef OPT_TRACING_CATEGORIZED