A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[trace] fix, free memory even if user requests the non-destruction of containers
[simgrid.git]
/
src
/
instr
/
instr_config.c
diff --git
a/src/instr/instr_config.c
b/src/instr/instr_config.c
index
a82ba46
..
fa2569b
100644
(file)
--- a/
src/instr/instr_config.c
+++ b/
src/instr/instr_config.c
@@
-13,6
+13,7
@@
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"
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_SMPI "tracing/smpi"
#define OPT_TRACING_SMPI_GROUP "tracing/smpi/group"
#define OPT_TRACING_CATEGORIZED "tracing/categorized"
@@
-22,10
+23,12
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
#define OPT_TRACING_FILENAME "tracing/filename"
#define OPT_TRACING_BUFFER "tracing/buffer"
#define OPT_TRACING_ONELINK_ONLY "tracing/onelink_only"
#define OPT_TRACING_FILENAME "tracing/filename"
#define OPT_TRACING_BUFFER "tracing/buffer"
#define OPT_TRACING_ONELINK_ONLY "tracing/onelink_only"
+#define OPT_TRACING_DISABLE_DESTROY "tracing/disable_destroy"
#define OPT_TRIVA_UNCAT_CONF "triva/uncategorized"
#define OPT_TRIVA_CAT_CONF "triva/categorized"
static int trace_enabled;
#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_smpi_enabled;
static int trace_smpi_grouped;
static int trace_categorized;
@@
-34,6
+37,7
@@
static int trace_msg_task_enabled;
static int trace_msg_process_enabled;
static int trace_buffer;
static int trace_onelink_only;
static int trace_msg_process_enabled;
static int trace_buffer;
static int trace_onelink_only;
+static int trace_disable_destroy;
static int trace_configured = 0;
static int trace_active = 0;
static int trace_configured = 0;
static int trace_active = 0;
@@
-43,6
+47,7
@@
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);
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_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);
@@
-51,6
+56,7
@@
static void TRACE_getopts(void)
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);
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);
+ trace_disable_destroy = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING_DISABLE_DESTROY);
}
int TRACE_start()
}
int TRACE_start()
@@
-70,7
+76,9
@@
int TRACE_start()
TRACE_paje_start();
/* activate trace */
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();
/* other trace initialization */
created_categories = xbt_dict_new();
@@
-81,7
+89,7
@@
int TRACE_start()
int TRACE_end()
{
int TRACE_end()
{
- if (!
TRACE_is_active()
)
+ if (!
trace_active
)
return 1;
/* generate uncategorized graph configuration for triva */
return 1;
/* generate uncategorized graph configuration for triva */
@@
-104,28
+112,11
@@
int TRACE_end()
/* close the trace file */
TRACE_paje_end();
/* close the trace file */
TRACE_paje_end();
- /* activate trace */
- TRACE_desactivate ();
- XBT_DEBUG("Tracing system is shutdown");
- return 0;
-}
-
-void TRACE_activate (void)
-{
- xbt_assert (trace_active==0, "Tracing is already active.");
- trace_active = 1;
- XBT_DEBUG ("Tracing is on");
-}
-
-void TRACE_desactivate (void)
-{
+ /* de-activate trace */
trace_active = 0;
XBT_DEBUG ("Tracing is off");
trace_active = 0;
XBT_DEBUG ("Tracing is off");
-}
-
-int TRACE_is_active (void)
-{
- return trace_active;
+ XBT_DEBUG("Tracing system is shutdown");
+ return 0;
}
int TRACE_needs_platform (void)
}
int TRACE_needs_platform (void)
@@
-134,6
+125,7
@@
int TRACE_needs_platform (void)
TRACE_msg_task_is_enabled() ||
TRACE_categorized() ||
TRACE_uncategorized() ||
TRACE_msg_task_is_enabled() ||
TRACE_categorized() ||
TRACE_uncategorized() ||
+ TRACE_platform () ||
(TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped());
}
(TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped());
}
@@
-142,6
+134,11
@@
int TRACE_is_enabled(void)
return trace_enabled;
}
return trace_enabled;
}
+int TRACE_platform(void)
+{
+ return trace_platform;
+}
+
int TRACE_is_configured(void)
{
return trace_configured;
int TRACE_is_configured(void)
{
return trace_configured;
@@
-189,6
+186,11
@@
int TRACE_onelink_only (void)
return trace_onelink_only && TRACE_is_enabled();
}
return trace_onelink_only && TRACE_is_enabled();
}
+int TRACE_disable_destroy (void)
+{
+ return trace_disable_destroy && TRACE_is_enabled();
+}
+
char *TRACE_get_filename(void)
{
return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME);
char *TRACE_get_filename(void)
{
return xbt_cfg_get_string(_surf_cfg_set, OPT_TRACING_FILENAME);
@@
-220,6
+222,13
@@
void TRACE_global_init(int *argc, char **argv)
xbt_cfgelm_int, &default_tracing, 0, 1,
NULL, NULL);
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,
/* smpi */
int default_tracing_smpi = 0;
xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_SMPI,
@@
-236,10
+245,10
@@
void TRACE_global_init(int *argc, char **argv)
/* platform */
/* 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_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 */
NULL, NULL);
/* tracing uncategorized resource utilization */
@@
-277,6
+286,13
@@
void TRACE_global_init(int *argc, char **argv)
xbt_cfgelm_int, &default_onelink_only, 0, 1,
NULL, NULL);
xbt_cfgelm_int, &default_onelink_only, 0, 1,
NULL, NULL);
+ /* disable destroy */
+ int default_disable_destroy = 0;
+ xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_DISABLE_DESTROY,
+ "Disable platform containers destruction.",
+ xbt_cfgelm_int, &default_disable_destroy, 0, 1,
+ NULL, NULL);
+
/* Triva graph configuration for uncategorized tracing */
char *default_triva_uncat_conf_file = xbt_strdup ("");
xbt_cfg_register(&_surf_cfg_set, OPT_TRIVA_UNCAT_CONF,
/* Triva graph configuration for uncategorized tracing */
char *default_triva_uncat_conf_file = xbt_strdup ("");
xbt_cfg_register(&_surf_cfg_set, OPT_TRIVA_UNCAT_CONF,
@@
-364,6
+380,11
@@
void TRACE_help (int detailed)
" 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);
" 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_TRACING_DISABLE_DESTROY, "Disable platform containers destruction",
+ " Disable the destruction of containers at the end of simulation. This can be"
+ " used with simulators that have a different notion of time (different from"
+ " the simulated time).",
+ 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"
" to generate a uncategorized resource utilization graph to be used as\n"
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"
" to generate a uncategorized resource utilization graph to be used as\n"
@@
-497,15
+518,17
@@
void TRACE_generate_triva_cat_conf (void)
}
#undef OPT_TRACING
}
#undef OPT_TRACING
+#undef OPT_TRACING_PLATFORM
#undef OPT_TRACING_SMPI
#undef OPT_TRACING_SMPI_GROUP
#undef OPT_TRACING_CATEGORIZED
#undef OPT_TRACING_UNCATEGORIZED
#undef OPT_TRACING_MSG_TASK
#undef OPT_TRACING_MSG_PROCESS
#undef OPT_TRACING_SMPI
#undef OPT_TRACING_SMPI_GROUP
#undef OPT_TRACING_CATEGORIZED
#undef OPT_TRACING_UNCATEGORIZED
#undef OPT_TRACING_MSG_TASK
#undef OPT_TRACING_MSG_PROCESS
-#undef OPT_TRACING_MSG_VOLUME
#undef OPT_TRACING_FILENAME
#undef OPT_TRACING_FILENAME
-#undef OPT_TRACING_PLATFORM_METHOD
+#undef OPT_TRACING_BUFFER
+#undef OPT_TRACING_ONELINK_ONLY
+#undef OPT_TRACING_DISABLE_DESTROY
#undef OPT_TRIVA_UNCAT_CONF
#undef OPT_TRIVA_CAT_CONF
#undef OPT_TRIVA_UNCAT_CONF
#undef OPT_TRIVA_CAT_CONF