#include "xbt/log.h"
#include "xbt/mallocator.h"
#include "xbt/str.h"
-#include "surf/surf_private.h"
-#include "surf/surf_routing.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
+#include "xbt/lib.h"
+#include "xbt/sysdep.h"
+#include "surf/surf.h"
+#include "surf/maxmin.h"
+#include "instr/instr_interface.h"
#include "simgrid/simix.h"
#include "simgrid/sg_config.h"
-#include "mc/mc.h"
+#include "smpi/smpi_interface.h"
+#include "mc/mc.h"
+#include "instr/instr.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf,
"About the configuration of simgrid");
xbt_cfg_t _sg_cfg_set = NULL;
-int _sg_do_model_check = 0;
-int _surf_mc_checkpoint=0;
-char* _surf_mc_property_file=NULL;
-int _surf_mc_timeout=0;
-int _surf_mc_max_depth=1000;
-int _surf_mc_visited=0;
-
int _sg_init_status = 0; /* 0: beginning of time (config cannot be changed yet);
1: initialized: cfg_set created (config can now be changed);
2: configured: command line parsed and config part of platform file was integrated also, platform construction ongoing or done.
}
}
-
/* callback of the workstation/model variable */
static void _sg_cfg_cb__workstation_model(const char *name, int pos)
{
/* callback to decide if we want to use the model-checking */
#include "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 */
+#endif
static void _sg_cfg_cb_model_check(const char *name, int pos)
{
+#ifdef HAVE_MC
_sg_do_model_check = xbt_cfg_get_int(_sg_cfg_set, name);
-
-#ifndef HAVE_MC
- if (_sg_do_model_check) {
+#else
+ if (xbt_cfg_get_int(_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_surf_nthreads(const char *name, int pos)
-{
- surf_set_nthreads(xbt_cfg_get_int(_sg_cfg_set, name));
-}
-
static void _sg_cfg_cb__surf_network_coordinates(const char *name,
int pos)
{
}
}
+static void _sg_cfg_cb_surf_nthreads(const char *name, int pos)
+{
+ surf_set_nthreads(xbt_cfg_get_int(_sg_cfg_set, name));
+}
+
static void _sg_cfg_cb__surf_network_crosstraffic(const char *name,
int pos)
{
xbt_cfg_register(&_sg_cfg_set, "maxmin/precision",
"Numerical precision used when updating simulation models (epsilon in double comparisons)",
xbt_cfgelm_double, NULL, 1, 1, _sg_cfg_cb__maxmin_precision, NULL);
- xbt_cfg_setdefault_double(_sg_cfg_set, "maxmin/precision", 0.00001); // FIXME use setdefault everywhere here!
+ xbt_cfg_setdefault_double(_sg_cfg_set, "maxmin/precision", 0.00001);
/* The parameters of network models */
- double_default_value = 0.0;
xbt_cfg_register(&_sg_cfg_set, "network/sender_gap",
"Minimum gap between two overlapping sends",
- xbt_cfgelm_double, &double_default_value, 1, 1,
+ xbt_cfgelm_double, NULL, 1, 1, /* default is set in network.c */
_sg_cfg_cb__sender_gap, NULL);
- double_default_value = 1.0;
+ double_default_value = 1.0; // FIXME use setdefault everywhere here!
xbt_cfg_register(&_sg_cfg_set, "network/latency_factor",
"Correction factor to apply to the provided latency (default value set by network model)",
xbt_cfgelm_double, &double_default_value, 1, 1,
"Correction factor to apply to the provided bandwidth (default value set by network model)",
xbt_cfgelm_double, &double_default_value, 1, 1,
_sg_cfg_cb__bandwidth_factor, NULL);
- double_default_value = 0.0;
+
xbt_cfg_register(&_sg_cfg_set, "network/weight_S",
"Correction factor to apply to the weight of competing streams(default value set by network model)",
- xbt_cfgelm_double, &double_default_value, 1, 1,
+ xbt_cfgelm_double, NULL, 1, 1, /* default is set in network.c */
_sg_cfg_cb__weight_S, NULL);
/* Inclusion path */
xbt_cfgelm_string, NULL, 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");
-//END SMPI
+
+ xbt_cfg_register(&_sg_cfg_set, "smpi/os",
+ "Small messages timings (MPI_Isend/Send minimum time for small messages)",
+ xbt_cfgelm_string, NULL, 1, 1, NULL,
+ NULL);
+ xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/os", "1:0:0:0:0");
+
+ xbt_cfg_register(&_sg_cfg_set, "smpi/or",
+ "Small messages timings (MPI_Recv minimum time for small messages)",
+ xbt_cfgelm_string, NULL, 1, 1, NULL,
+ NULL);
+ xbt_cfg_setdefault_string(_sg_cfg_set, "smpi/or", "1:0:0:0:0");
+
+
+ //END SMPI
if (!surf_path) {
