-/* Copyright (c) 2009-2010, 2012-2014. The SimGrid Team.
+/* Copyright (c) 2009-2010, 2012-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "instr/instr_interface.h"
#include "simgrid/simix.h"
#include "simgrid/sg_config.h"
+#ifdef HAVE_SMPI
#include "smpi/smpi_interface.h"
+#endif
#include "mc/mc.h"
-#include "instr/instr.h"
+#include "src/mc/mc_record.h"
+#include "simgrid/instr.h"
+#include "src/mc/mc_replay.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
- "About the configuration of simgrid");
+ "About the configuration of SimGrid");
xbt_cfg_t _sg_cfg_set = NULL;
"to the command line.\n"
"\n"
"You can also use --help-models to see the details of all models known by this simulator.\n"
-#ifdef HAVE_TRACING
"\n"
"You can also use --help-tracing to see the details of all tracing options known by this simulator.\n"
-#endif
"\n"
"You can also use --help-logs and --help-log-categories to see the details of logging output.\n"
"\n"
} else if (!strcmp(argv[i], "--help-models")) {
int k;
- model_help("workstation", surf_workstation_model_description);
+ model_help("host", surf_host_model_description);
printf("\n");
model_help("CPU", surf_cpu_model_description);
printf("\n");
surf_optimization_mode_description[k].description);
printf("Both network and CPU models have 'Lazy' as default optimization level\n\n");
shall_exit = 1;
-#ifdef HAVE_TRACING
} else if (!strcmp(argv[i], "--help-tracing")) {
TRACE_help (1);
shall_exit = 1;
-#endif
} else {
argv[j++] = argv[i];
}
surf_plugin_description[plugin_id].model_init_preparse();
}
-/* callback of the workstation/model variable */
-static void _sg_cfg_cb__workstation_model(const char *name, int pos)
+/* callback of the host/model variable */
+static void _sg_cfg_cb__host_model(const char *name, int pos)
{
char *val;
val = xbt_cfg_get_string(_sg_cfg_set, name);
if (!strcmp(val, "help")) {
- model_help("workstation", surf_workstation_model_description);
+ model_help("host", surf_host_model_description);
sg_cfg_exit_early();
}
/* Make sure that the model exists */
- find_model_description(surf_workstation_model_description, val);
+ find_model_description(surf_host_model_description, val);
}
-/* callback of the vm_workstation/model variable */
-static void _sg_cfg_cb__vm_workstation_model(const char *name, int pos)
+/* callback of the vm/model variable */
+static void _sg_cfg_cb__vm_model(const char *name, int pos)
{
char *val;
val = xbt_cfg_get_string(_sg_cfg_set, name);
if (!strcmp(val, "help")) {
- model_help("vm_workstation", surf_vm_workstation_model_description);
+ model_help("vm", surf_vm_model_description);
sg_cfg_exit_early();
}
/* Make sure that the model exists */
- find_model_description(surf_vm_workstation_model_description, val);
+ find_model_description(surf_vm_model_description, val);
}
/* callback of the cpu/model variable */
find_model_description(surf_storage_model_description, val);
}
-/* callback of the workstation_model variable */
+/* callback of the network_model variable */
static void _sg_cfg_cb__network_model(const char *name, int pos)
{
char *val;
sg_maxmin_precision = xbt_cfg_get_double(_sg_cfg_set, name);
}
+static void _sg_cfg_cb__surf_precision(const char* name, int pos)
+{
+ sg_surf_precision = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
static void _sg_cfg_cb__sender_gap(const char* name, int pos)
{
sg_sender_gap = xbt_cfg_get_double(_sg_cfg_set, name);
}
/* New Module missing */
- find_coll_description(table, val);
+ find_coll_description(table, val, category);
}
static void _sg_cfg_cb__coll_gather(const char *name, int pos){
_sg_cfg_cb__coll("gather", mpi_coll_gather_description, name, pos);
static void _sg_cfg_cb__coll_barrier(const char *name, int pos){
_sg_cfg_cb__coll("barrier", mpi_coll_barrier_description, name, pos);
}
+
+static void _sg_cfg_cb__wtime_sleep(const char *name, int pos){
+ smpi_wtime_sleep = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
+static void _sg_cfg_cb__iprobe_sleep(const char *name, int pos){
+ smpi_iprobe_sleep = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
+static void _sg_cfg_cb__test_sleep(const char *name, int pos){
+ smpi_test_sleep = xbt_cfg_get_double(_sg_cfg_set, name);
+}
+
+
+
#endif
/* callback of the inclusion path */
}
/* callback to decide if we want to use the model-checking */
-#include "xbt_modinter.h"
+#include "src/xbt_modinter.h"
+
#ifdef HAVE_MC
extern int _sg_do_model_check; /* this variable lives in xbt_main until I find a right location for it */
+extern int _sg_do_model_check_record;
#endif
-static void _sg_cfg_cb_model_check(const char *name, int pos)
-{
+static void _sg_cfg_cb_model_check_replay(const char *name, int pos) {
+ MC_record_path = xbt_cfg_get_string(_sg_cfg_set, name);
+}
+
#ifdef HAVE_MC
- _sg_do_model_check = xbt_cfg_get_boolean(_sg_cfg_set, name);
-#else
- if (xbt_cfg_get_boolean(_sg_cfg_set, name)) {
- xbt_die("You tried to activate the model-checking from the command line, but it was not compiled in. Change your settings in cmake, recompile and try again");
- }
-#endif
+static void _sg_cfg_cb_model_check_record(const char *name, int pos) {
+ _sg_do_model_check_record = xbt_cfg_get_boolean(_sg_cfg_set, name);
}
+#endif
extern int _sg_do_verbose_exit;
smx_context_stack_size = xbt_cfg_get_int(_sg_cfg_set, name) * 1024;
}
+static void _sg_cfg_cb_context_guard_size(const char *name, int pos)
+{
+ smx_context_guard_size_was_set = 1;
+ smx_context_guard_size = xbt_cfg_get_int(_sg_cfg_set, name) * xbt_pagesize;
+}
+
static void _sg_cfg_cb_contexts_nthreads(const char *name, int pos)
{
SIMIX_context_set_nthreads(xbt_cfg_get_int(_sg_cfg_set, name));
static void _sg_cfg_cb__surf_network_coordinates(const char *name,
int pos)
{
+ static int already_set = 0;
int val = xbt_cfg_get_boolean(_sg_cfg_set, name);
if (val) {
- if (!COORD_HOST_LEVEL) {
- COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_dynar_free_voidp);
+ if (!already_set) {
+ COORD_HOST_LEVEL = sg_host_extension_create(xbt_dynar_free_voidp);
COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_dynar_free_voidp);
}
+ already_set = 1;
} else
- if (COORD_HOST_LEVEL)
+ if (already_set)
xbt_die("Setting of whether to use coordinate cannot be disabled once set.");
}
sg_network_crosstraffic = xbt_cfg_get_boolean(_sg_cfg_set, name);
}
-#ifdef HAVE_GTNETS
-static void _sg_cfg_cb__gtnets_jitter(const char *name, int pos)
-{
- sg_gtnets_jitter = xbt_cfg_get_double(_sg_cfg_set, name);
-}
-
-static void _sg_cfg_cb__gtnets_jitter_seed(const char *name, int pos)
-{
- sg_gtnets_jitter_seed = xbt_cfg_get_int(_sg_cfg_set, name);
-}
-#endif
-
/* build description line with possible values */
static void describe_model(char *result,
const s_surf_model_description_t model_description[],
xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__optimization_mode, NULL);
xbt_cfg_setdefault_string(_sg_cfg_set, "network/optim", "Lazy");
- describe_model(description, surf_workstation_model_description,
- "model", "The model to use for the workstation");
- xbt_cfg_register(&_sg_cfg_set, "workstation/model", description,
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__workstation_model, NULL);
- xbt_cfg_setdefault_string(_sg_cfg_set, "workstation/model", "default");
+ describe_model(description, surf_host_model_description,
+ "model", "The model to use for the host");
+ xbt_cfg_register(&_sg_cfg_set, "host/model", description,
+ xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__host_model, NULL);
+ xbt_cfg_setdefault_string(_sg_cfg_set, "host/model", "default");
- describe_model(description, surf_vm_workstation_model_description,
- "model", "The model to use for the vm workstation");
- xbt_cfg_register(&_sg_cfg_set, "vm_workstation/model", description,
- xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__vm_workstation_model, NULL);
- xbt_cfg_setdefault_string(_sg_cfg_set, "vm_workstation/model", "default");
+ describe_model(description, surf_vm_model_description,
+ "model", "The model to use for the vm");
+ xbt_cfg_register(&_sg_cfg_set, "vm/model", description,
+ xbt_cfgelm_string, 1, 1, &_sg_cfg_cb__vm_model, NULL);
+ xbt_cfg_setdefault_string(_sg_cfg_set, "vm/model", "default");
xbt_cfg_register(&_sg_cfg_set, "network/TCP_gamma",
"Size of the biggest TCP window (cat /proc/sys/net/ipv4/tcp_[rw]mem for recv/send window; Use the last given value, which is the max window size)",
xbt_cfgelm_double, 1, 1, _sg_cfg_cb__tcp_gamma, NULL);
xbt_cfg_setdefault_double(_sg_cfg_set, "network/TCP_gamma", 4194304.0);
+ xbt_cfg_register(&_sg_cfg_set, "surf/precision",
+ "Numerical precision used when updating simulation times (hence this value is expressed in seconds)",
+ xbt_cfgelm_double, 1, 1, _sg_cfg_cb__surf_precision, NULL);
+ xbt_cfg_setdefault_double(_sg_cfg_set, "surf/precision", 0.00001);
+
xbt_cfg_register(&_sg_cfg_set, "maxmin/precision",
- "Numerical precision used when updating simulation models (epsilon in double comparisons)",
+ "Numerical precision used when computing resource sharing (hence this value is expressed in ops/sec or bytes/sec)",
xbt_cfgelm_double, 1, 1, _sg_cfg_cb__maxmin_precision, NULL);
xbt_cfg_setdefault_double(_sg_cfg_set, "maxmin/precision", 0.00001);
xbt_cfgelm_boolean, 1, 1, NULL, NULL);
xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/maxmin_selective_update", "no");
+ /* Replay (this part is enabled even if MC it disabled) */
+ xbt_cfg_register(&_sg_cfg_set, "model-check/replay",
+ "Uenable replay mode with the given path",
+ xbt_cfgelm_string, 0, 1, _sg_cfg_cb_model_check_replay, NULL);
+
#ifdef HAVE_MC
- /* do model-checking */
- xbt_cfg_register(&_sg_cfg_set, "model-check",
- "Verify the system through model-checking instead of simulating it (EXPERIMENTAL)",
- xbt_cfgelm_boolean, 1, 1, _sg_cfg_cb_model_check, NULL);
- xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check", "no");
+ /* do model-checking-record */
+ xbt_cfg_register(&_sg_cfg_set, "model-check/record",
+ "Record the model-checking paths",
+ xbt_cfgelm_boolean, 1, 1, _sg_cfg_cb_model_check_record, NULL);
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/record", "no");
/* do stateful model-checking */
xbt_cfg_register(&_sg_cfg_set, "model-check/checkpoint",
xbt_cfgelm_int, 1, 1, _mc_cfg_cb_checkpoint, NULL);
xbt_cfg_setdefault_int(_sg_cfg_set, "model-check/checkpoint", 0);
+ /* do stateful model-checking */
+ xbt_cfg_register(&_sg_cfg_set, "model-check/sparse-checkpoint",
+ "Use sparse per-page snapshots.",
+ xbt_cfgelm_boolean, 1, 1, _mc_cfg_cb_sparse_checkpoint, NULL);
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/sparse-checkpoint", "no");
+
+ /* do stateful model-checking */
+ xbt_cfg_register(&_sg_cfg_set, "model-check/soft-dirty",
+ "Use sparse per-page snapshots.",
+ xbt_cfgelm_boolean, 1, 1, _mc_cfg_cb_soft_dirty, NULL);
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/soft-dirty", "no");
+
+ xbt_cfg_register(&_sg_cfg_set, "model-check/ksm",
+ "Kernel same-page merging",
+ xbt_cfgelm_boolean, 1, 1, _mc_cfg_cb_ksm, NULL);
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/ksm", "no");
+
/* do liveness model-checking */
xbt_cfg_register(&_sg_cfg_set, "model-check/property",
"Specify the name of the file containing the property. It must be the result of the ltl2ba program.",
xbt_cfgelm_string, 1, 1, _mc_cfg_cb_property, NULL);
xbt_cfg_setdefault_string(_sg_cfg_set, "model-check/property", "");
+ /* do communications determinism model-checking */
+ xbt_cfg_register(&_sg_cfg_set, "model-check/communications_determinism",
+ "Enable/disable the detection of determinism in the communications schemes",
+ xbt_cfgelm_boolean, 1, 1, _mc_cfg_cb_comms_determinism, NULL);
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/communications_determinism", "no");
+
+ /* do send determinism model-checking */
+ xbt_cfg_register(&_sg_cfg_set, "model-check/send_determinism",
+ "Enable/disable the detection of send-determinism in the communications schemes",
+ xbt_cfgelm_boolean, 1, 1, _mc_cfg_cb_send_determinism, NULL);
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/send_determinism", "no");
+
/* Specify the kind of model-checking reduction */
xbt_cfg_register(&_sg_cfg_set, "model-check/reduction",
"Specify the kind of exploration reduction (either none or DPOR)",
xbt_cfgelm_boolean, 1, 1, _mc_cfg_cb_timeout, NULL);
xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/timeout", "no");
+ /* Enable/disable global hash computation with model-checking */
+ xbt_cfg_register(&_sg_cfg_set, "model-check/hash",
+ "Enable/Disable state hash for state comparison (exprimental)",
+ xbt_cfgelm_boolean, 1, 1, _mc_cfg_cb_hash, NULL);
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/hash", "no");
+
+ /* Set max depth exploration */
+ /* Currently, this option cannot be used. */
+ xbt_cfg_register(&_sg_cfg_set, "model-check/snapshot_fds",
+ "Whether file descriptors must be snapshoted",
+ xbt_cfgelm_boolean, 1, 1, _mc_cfg_cb_snapshot_fds, NULL);
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/snapshot_fds", "no");
+
/* Set max depth exploration */
xbt_cfg_register(&_sg_cfg_set, "model-check/max_depth",
"Specify the max depth of exploration (default : 1000)",
"Specify the name of dot file corresponding to graph state",
xbt_cfgelm_string, 1, 1, _mc_cfg_cb_dot_output, NULL);
xbt_cfg_setdefault_string(_sg_cfg_set, "model-check/dot_output", "");
+
+ /* Enable/disable non progressive cycles detection with model-checking */
+ xbt_cfg_register(&_sg_cfg_set, "model-check/termination",
+ "Enable/Disable non progressive cycle detection",
+ xbt_cfgelm_boolean, 1, 1, _mc_cfg_cb_termination, NULL);
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "model-check/termination", "no");
#endif
/* do verbose-exit */
xbt_cfgelm_string, 1, 1, _sg_cfg_cb_context_factory, NULL);
xbt_cfg_setdefault_string(_sg_cfg_set, "contexts/factory", dflt_ctx_fact);
- /* stack size of contexts in Ko */
+ /* stack size of contexts in KiB */
xbt_cfg_register(&_sg_cfg_set, "contexts/stack_size",
- "Stack size of contexts in Kib",
+ "Stack size of contexts in KiB",
xbt_cfgelm_int, 1, 1, _sg_cfg_cb_context_stack_size, NULL);
- xbt_cfg_setdefault_int(_sg_cfg_set, "contexts/stack_size", 128);
+ xbt_cfg_setdefault_int(_sg_cfg_set, "contexts/stack_size", 8*1024);
/* No, it was not set yet (the above setdefault() changed this to 1). */
smx_context_stack_size_was_set = 0;
+ /* guard size for contexts stacks in memory pages */
+ xbt_cfg_register(&_sg_cfg_set, "contexts/guard_size",
+ "Guard size for contexts stacks in memory pages",
+ xbt_cfgelm_int, 1, 1, _sg_cfg_cb_context_guard_size, NULL);
+#if defined(_XBT_WIN32) || (PTH_STACKGROWTH != -1)
+ xbt_cfg_setdefault_int(_sg_cfg_set, "contexts/guard_size", 0);
+#else
+ xbt_cfg_setdefault_int(_sg_cfg_set, "contexts/guard_size", 1);
+#endif
+ /* No, it was not set yet (the above setdefault() changed this to 1). */
+ smx_context_guard_size_was_set = 0;
+
/* number of parallel threads for user processes */
xbt_cfg_register(&_sg_cfg_set, "contexts/nthreads",
"Number of parallel threads used to execute user contexts",
xbt_cfgelm_boolean, 1, 1, _sg_cfg_cb__surf_network_crosstraffic, NULL);
xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "no");
-#ifdef HAVE_GTNETS
- xbt_cfg_register(&_sg_cfg_set, "gtnets/jitter",
- "Double value to oscillate the link latency, uniformly in random interval [-latency*gtnets_jitter,latency*gtnets_jitter)",
- xbt_cfgelm_double, 1, 1, _sg_cfg_cb__gtnets_jitter, NULL);
- xbt_cfg_setdefault_double(_sg_cfg_set, "gtnets/jitter", 0.0);
-
- xbt_cfg_register(&_sg_cfg_set, "gtnets/jitter_seed",
- "Use a positive seed to reproduce jitted results, value must be in [1,1e8], default is 10",
- xbt_cfgelm_int, 0, 1, _sg_cfg_cb__gtnets_jitter_seed, NULL);
- xbt_cfg_setdefault_int(_sg_cfg_set, "gtnets/jitter_seed", 10);
-#endif
#ifdef HAVE_NS3
xbt_cfg_register(&_sg_cfg_set, "ns3/TcpModel",
"The ns3 tcp model can be : NewReno or Reno or Tahoe",
xbt_cfg_setdefault_string(_sg_cfg_set, "ns3/TcpModel", "default");
#endif
+ //For smpi/bw_factor and smpi/lat_factor
+ //Default value have to be "threshold0:value0;threshold1:value1;...;thresholdN:valueN"
+ //test is if( size >= thresholdN ) return valueN;
+ //Values can be modified with command line --cfg=smpi/bw_factor:"threshold0:value0;threshold1:value1;...;thresholdN:valueN"
+ // or with tag config put line <prop id="smpi/bw_factor" value="threshold0:value0;threshold1:value1;...;thresholdN:valueN"></prop>
+ // SMPI model can be used without enable_smpi, so keep this the ifdef.
+ xbt_cfg_register(&_sg_cfg_set, "smpi/bw_factor",
+ "Bandwidth factors for smpi.",
+ xbt_cfgelm_string, 1, 1, NULL, NULL);
+ xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/bw_factor", "65472:0.940694;15424:0.697866;9376:0.58729;5776:1.08739;3484:0.77493;1426:0.608902;732:0.341987;257:0.338112;0:0.812084");
+
+ xbt_cfg_register(&_sg_cfg_set, "smpi/lat_factor",
+ "Latency factors for smpi.",
+ xbt_cfgelm_string, 1, 1, NULL, NULL);
+ xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/lat_factor", "65472:11.6436;15424:3.48845;9376:2.59299;5776:2.18796;3484:1.88101;1426:1.61075;732:1.9503;257:1.95341;0:2.01467");
+
+ xbt_cfg_register(&_sg_cfg_set, "smpi/IB_penalty_factors",
+ "Correction factor to communications using Infiniband model with contention (default value based on Stampede cluster profiling)",
+ xbt_cfgelm_string, 1, 1, NULL, NULL);
+ xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/IB_penalty_factors", "0.965;0.925;1.35");
+
#ifdef HAVE_SMPI
xbt_cfg_register(&_sg_cfg_set, "smpi/running_power",
"Power of the host running the simulation (in flop/s). Used to bench the operations.",
xbt_cfgelm_boolean, 1, 1, NULL, NULL);
xbt_cfg_setdefault_boolean(_sg_cfg_set, "smpi/display_timing", "no");
+ xbt_cfg_register(&_sg_cfg_set, "smpi/simulate_computation",
+ "Boolean indicating whether the computational part of the simulated application should be simulated.",
+ xbt_cfgelm_boolean, 1, 1, NULL, NULL);
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "smpi/simulate_computation", "yes");
+
xbt_cfg_register(&_sg_cfg_set, "smpi/use_shared_malloc",
"Boolean indicating whether we should use shared memory when using SMPI_SHARED_MALLOC. Allows user to disable it for debug purposes.",
xbt_cfgelm_boolean, 1, 1, NULL, NULL);
xbt_cfgelm_double, 1, 1, NULL, NULL);
xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/cpu_threshold", 1e-6);
- xbt_cfg_register(&_sg_cfg_set, "smpi/async_small_thres",
+ xbt_cfg_register(&_sg_cfg_set, "smpi/async_small_thresh",
"Maximal size of messages that are to be sent asynchronously, without waiting for the receiver",
xbt_cfgelm_int, 1, 1, NULL, NULL);
- xbt_cfg_setdefault_int(_sg_cfg_set, "smpi/async_small_thres", 0);
+ xbt_cfg_setdefault_int(_sg_cfg_set, "smpi/async_small_thresh", 0);
xbt_cfg_register(&_sg_cfg_set, "smpi/send_is_detached_thres",
"Threshold of message size where MPI_Send stops behaving like MPI_Isend and becomes MPI_Ssend",
xbt_cfgelm_int, 1, 1, NULL, NULL);
xbt_cfg_setdefault_int(_sg_cfg_set, "smpi/send_is_detached_thres", 65536);
- //For smpi/bw_factor and smpi/lat_factor
- //Default value have to be "threshold0:value0;threshold1:value1;...;thresholdN:valueN"
- //test is if( size >= thresholdN ) return valueN;
- //Values can be modified with command line --cfg=smpi/bw_factor:"threshold0:value0;threshold1:value1;...;thresholdN:valueN"
- // or with tag config put line <prop id="smpi/bw_factor" value="threshold0:value0;threshold1:value1;...;thresholdN:valueN"></prop>
- xbt_cfg_register(&_sg_cfg_set, "smpi/bw_factor",
- "Bandwidth factors for smpi.",
- xbt_cfgelm_string, 1, 1, NULL, NULL);
- xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/bw_factor", "65472:0.940694;15424:0.697866;9376:0.58729;5776:1.08739;3484:0.77493;1426:0.608902;732:0.341987;257:0.338112;0:0.812084");
-
- xbt_cfg_register(&_sg_cfg_set, "smpi/lat_factor",
- "Latency factors for smpi.",
- xbt_cfgelm_string, 1, 1, NULL, NULL);
- xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/lat_factor", "65472:11.6436;15424:3.48845;9376:2.59299;5776:2.18796;3484:1.88101;1426:1.61075;732:1.9503;257:1.95341;0:2.01467");
+ xbt_cfg_register(&_sg_cfg_set, "smpi/privatize_global_variables",
+ "Boolean indicating whether we should privatize global variable at runtime.",
+ xbt_cfgelm_boolean, 1, 1, NULL, NULL);
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "smpi/privatize_global_variables", "no");
xbt_cfg_register(&_sg_cfg_set, "smpi/os",
"Small messages timings (MPI_Send minimum time for small messages)",
"Small messages timings (MPI_Recv minimum time for small messages)",
xbt_cfgelm_string, 1, 1, NULL, NULL);
xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/or", "1:0:0:0:0");
+
xbt_cfg_register(&_sg_cfg_set, "smpi/iprobe",
"Minimum time to inject inside a call to MPI_Iprobe",
- xbt_cfgelm_double, 1, 1, NULL, NULL);
+ xbt_cfgelm_double, 1, 1, _sg_cfg_cb__iprobe_sleep, NULL);
xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/iprobe", 1e-4);
+
+ xbt_cfg_register(&_sg_cfg_set, "smpi/test",
+ "Minimum time to inject inside a call to MPI_Test",
+ xbt_cfgelm_double, 1, 1, _sg_cfg_cb__test_sleep, NULL);
+ xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/test", 1e-4);
+
+ xbt_cfg_register(&_sg_cfg_set, "smpi/wtime",
+ "Minimum time to inject inside a call to MPI_Wtime",
+ xbt_cfgelm_double, 1, 1, _sg_cfg_cb__wtime_sleep, NULL);
+ xbt_cfg_setdefault_double(_sg_cfg_set, "smpi/wtime", 0.0);
+
xbt_cfg_register(&_sg_cfg_set, "smpi/coll_selector",
"Which collective selector to use",
xbt_cfgelm_string, 1, 1, NULL, NULL);
xbt_cfgelm_string, 0, 1, &_sg_cfg_cb__coll_reduce, NULL);
#endif // HAVE_SMPI
+ xbt_cfg_register(&_sg_cfg_set, "exception/cutpath",
+ "\"yes\" or \"no\". \"yes\" will cut all path information from call traces, used e.g. in exceptions.",
+ xbt_cfgelm_boolean, 1, 1, NULL, NULL);
+ xbt_cfg_setdefault_boolean(_sg_cfg_set, "exception/cutpath", "no");
+
xbt_cfg_register(&_sg_cfg_set, "clean_atexit",
"\"yes\" or \"no\". \"yes\" enables all the cleanups of SimGrid (XBT,SIMIX,MSG) to be registered with atexit. \"no\" may be useful if your code segfaults when calling the exit function.",
xbt_cfgelm_boolean, 1, 1, _sg_cfg_cb_clean_atexit, NULL);
/* retrieves the current directory of the current process */
const char *initial_path = __surf_get_initial_path();
xbt_assert((initial_path),
- "__surf_get_initial_path() failed! Can't resolves current Windows directory");
+ "__surf_get_initial_path() failed! Can't resolve current Windows directory");
surf_path = xbt_dynar_new(sizeof(char *), NULL);
xbt_cfg_setdefault_string(_sg_cfg_set, "path", initial_path);
_sg_cfg_init_status = 0;
}
-/* Pick the right models for CPU, net and workstation, and call their model_init_preparse */
+/* Pick the right models for CPU, net and host, and call their model_init_preparse */
void surf_config_models_setup()
{
- const char *workstation_model_name;
- const char *vm_workstation_model_name;
- int workstation_id = -1;
- int vm_workstation_id = -1;
+ const char *host_model_name;
+ const char *vm_model_name;
+ int host_id = -1;
+ int vm_id = -1;
char *network_model_name = NULL;
char *cpu_model_name = NULL;
int storage_id = -1;
char *storage_model_name = NULL;
- workstation_model_name =
- xbt_cfg_get_string(_sg_cfg_set, "workstation/model");
- vm_workstation_model_name =
- xbt_cfg_get_string(_sg_cfg_set, "vm_workstation/model");
+ host_model_name = xbt_cfg_get_string(_sg_cfg_set, "host/model");
+ vm_model_name = xbt_cfg_get_string(_sg_cfg_set, "vm/model");
network_model_name = xbt_cfg_get_string(_sg_cfg_set, "network/model");
cpu_model_name = xbt_cfg_get_string(_sg_cfg_set, "cpu/model");
storage_model_name = xbt_cfg_get_string(_sg_cfg_set, "storage/model");
/* Check whether we use a net/cpu model differing from the default ones, in which case
- * we should switch to the "compound" workstation model to correctly dispatch stuff to
+ * we should switch to the "compound" host model to correctly dispatch stuff to
* the right net/cpu models.
*/
if ((!xbt_cfg_is_default_value(_sg_cfg_set, "network/model") ||
!xbt_cfg_is_default_value(_sg_cfg_set, "cpu/model")) &&
- xbt_cfg_is_default_value(_sg_cfg_set, "workstation/model")) {
- XBT_INFO("Switching workstation model to compound since you changed the network and/or cpu model(s)");
- workstation_model_name = "compound";
- xbt_cfg_set_string(_sg_cfg_set, "workstation/model", workstation_model_name);
+ xbt_cfg_is_default_value(_sg_cfg_set, "host/model")) {
+ host_model_name = "compound";
+ xbt_cfg_set_string(_sg_cfg_set, "host/model", host_model_name);
}
- XBT_DEBUG("Workstation model: %s", workstation_model_name);
- workstation_id =
- find_model_description(surf_workstation_model_description,
- workstation_model_name);
- if (!strcmp(workstation_model_name, "compound")) {
+ XBT_DEBUG("host model: %s", host_model_name);
+ host_id = find_model_description(surf_host_model_description, host_model_name);
+ if (!strcmp(host_model_name, "compound")) {
int network_id = -1;
int cpu_id = -1;
xbt_assert(cpu_model_name,
- "Set a cpu model to use with the 'compound' workstation model");
+ "Set a cpu model to use with the 'compound' host model");
xbt_assert(network_model_name,
- "Set a network model to use with the 'compound' workstation model");
+ "Set a network model to use with the 'compound' host model");
+
+ if(surf_cpu_model_init_preparse){
+ surf_cpu_model_init_preparse();
+ } else {
+ cpu_id =
+ find_model_description(surf_cpu_model_description, cpu_model_name);
+ surf_cpu_model_description[cpu_id].model_init_preparse();
+ }
network_id =
find_model_description(surf_network_model_description,
network_model_name);
- cpu_id =
- find_model_description(surf_cpu_model_description, cpu_model_name);
-
- surf_cpu_model_description[cpu_id].model_init_preparse();
surf_network_model_description[network_id].model_init_preparse();
}
- XBT_DEBUG("Call workstation_model_init");
- surf_workstation_model_description[workstation_id].model_init_preparse();
+ XBT_DEBUG("Call host_model_init");
+ surf_host_model_description[host_id].model_init_preparse();
- XBT_DEBUG("Call vm_workstation_model_init");
- vm_workstation_id = find_model_description(surf_vm_workstation_model_description,
- vm_workstation_model_name);
- surf_vm_workstation_model_description[vm_workstation_id].model_init_preparse();
+ XBT_DEBUG("Call vm_model_init");
+ vm_id = find_model_description(surf_vm_model_description, vm_model_name);
+ surf_vm_model_description[vm_id].model_init_preparse();
XBT_DEBUG("Call storage_model_init");
storage_id = find_model_description(surf_storage_model_description, storage_model_name);
