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
rename the plugins from the command line, and document it
[simgrid.git]
/
src
/
simgrid
/
sg_config.cpp
diff --git
a/src/simgrid/sg_config.cpp
b/src/simgrid/sg_config.cpp
index
c16b0c6
..
af10da4
100644
(file)
--- a/
src/simgrid/sg_config.cpp
+++ b/
src/simgrid/sg_config.cpp
@@
-6,8
+6,8
@@
/* sg_config: configuration infrastructure for the simulation world */
#include "simgrid/sg_config.hpp"
/* sg_config: configuration infrastructure for the simulation world */
#include "simgrid/sg_config.hpp"
-#include "instr/instr_interface.hpp"
#include "simgrid/instr.h"
#include "simgrid/instr.h"
+#include "src/instr/instr_private.hpp"
#include "src/internal_config.h"
#include "src/kernel/lmm/maxmin.hpp"
#include "src/mc/mc_config.hpp"
#include "src/internal_config.h"
#include "src/kernel/lmm/maxmin.hpp"
#include "src/mc/mc_config.hpp"
@@
-27,9
+27,13
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_config, surf, "About the configuration of S
int _sg_cfg_init_status = 0;
/* instruct the upper layer (simix or simdag) to exit as soon as possible */
int _sg_cfg_init_status = 0;
/* instruct the upper layer (simix or simdag) to exit as soon as possible */
-
int _sg_cfg_exit_asap = 0
;
+
bool _sg_cfg_exit_asap = false
;
-#define sg_cfg_exit_early() do { _sg_cfg_exit_asap = 1; return; } while (0)
+#define sg_cfg_exit_early() \
+ do { \
+ _sg_cfg_exit_asap = true; \
+ return; \
+ } while (0)
/* Parse the command line, looking for options */
static void sg_config_cmd_line(int *argc, char **argv)
/* Parse the command line, looking for options */
static void sg_config_cmd_line(int *argc, char **argv)
@@
-85,7
+89,7
@@
static void sg_config_cmd_line(int *argc, char **argv)
printf("Both network and CPU models have 'Lazy' as default optimization level\n\n");
shall_exit = 1;
} else if (not strcmp(argv[i], "--help-tracing")) {
printf("Both network and CPU models have 'Lazy' as default optimization level\n\n");
shall_exit = 1;
} else if (not strcmp(argv[i], "--help-tracing")) {
- TRACE_help
(1
);
+ TRACE_help
(
);
shall_exit = 1;
} else {
argv[j++] = argv[i];
shall_exit = 1;
} else {
argv[j++] = argv[i];
@@
-441,12
+445,6
@@
void sg_config_init(int *argc, char **argv)
simgrid::config::declare_flag<std::string>("smpi/reduce", "Which collective to use for reduce", "");
#endif // HAVE_SMPI
simgrid::config::declare_flag<std::string>("smpi/reduce", "Which collective to use for reduce", "");
#endif // HAVE_SMPI
- /* Storage */
-
- sg_storage_max_file_descriptors = 1024;
- simgrid::config::bind_flag(sg_storage_max_file_descriptors, "storage/max_file_descriptors",
- "Maximum number of concurrently opened files per host. Default is 1024");
-
/* Others */
simgrid::config::declare_flag<bool>(
/* Others */
simgrid::config::declare_flag<bool>(