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
Fix error message.
[simgrid.git]
/
src
/
xbt
/
config.c
diff --git
a/src/xbt/config.c
b/src/xbt/config.c
index
b71e69c
..
0e53230
100644
(file)
--- a/
src/xbt/config.c
+++ b/
src/xbt/config.c
@@
-18,7
+18,12
@@
#include "xbt/peer.h"
#include "xbt/config.h" /* prototypes of this module */
#include "xbt/peer.h"
#include "xbt/config.h" /* prototypes of this module */
-#include "surf/surf.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
+#include "surf/surf_routing.h" /* COORD_HOST_LEVEL and COORD_ASR_LEVEL */
+
+xbt_lib_t host_lib;
+int COORD_HOST_LEVEL; //Coordinates level
+xbt_lib_t as_router_lib;
+int COORD_ASR_LEVEL; //Coordinates level
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_cfg, xbt, "configuration support");
@@
-663,21
+668,21
@@
void xbt_cfg_set_parse(xbt_cfg_t cfg, const char *options)
xbt_die("Setting CMD prop coordinates must be \"yes\"");
}
xbt_die("Setting CMD prop coordinates must be \"yes\"");
}
- if (str
cmp(name,"contexts/factory"
))
+ if (str
ncmp(name, "contexts/", strlen("contexts/")
))
XBT_INFO("Configuration change: Set '%s' to '%s'", name, val);
TRY {
variable = xbt_dict_get((xbt_dict_t) cfg, name);
}
CATCH(e) {
XBT_INFO("Configuration change: Set '%s' to '%s'", name, val);
TRY {
variable = xbt_dict_get((xbt_dict_t) cfg, name);
}
CATCH(e) {
- /* put it back on what won't get freed, ie within "options" and out of "optionlist_cpy" */
- name = (char *) (optionlist_cpy - name + options);
- free(optionlist_cpy);
if (e.category == not_found_error) {
xbt_ex_free(e);
if (e.category == not_found_error) {
xbt_ex_free(e);
+ name = xbt_strdup(name);
+ free(optionlist_cpy);
THROWF(not_found_error, 0,
"No registered variable corresponding to '%s'.", name);
}
THROWF(not_found_error, 0,
"No registered variable corresponding to '%s'.", name);
}
+ free(optionlist_cpy);
RETHROW;
}
RETHROW;
}