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
Save information from routing corresponding to storage.
[simgrid.git]
/
src
/
surf
/
surf.c
diff --git
a/src/surf/surf.c
b/src/surf/surf.c
index
2b5121a
..
95cfaaf
100644
(file)
--- a/
src/surf/surf.c
+++ b/
src/surf/surf.c
@@
-180,6
+180,13
@@
s_surf_model_description_t surf_optimization_mode_description[] = {
{NULL, NULL, NULL} /* this array must be NULL terminated */
};
+s_surf_model_description_t surf_storage_model_description[] = {
+ {"default",
+ "Simplistic storage model.",
+ surf_storage_model_init_default},
+ {NULL, NULL, NULL} /* this array must be NULL terminated */
+};
+
#ifdef CONTEXT_THREADS
static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
#endif
@@
-300,19
+307,23
@@
XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
void surf_init(int *argc, char **argv)
{
- XBT_DEBUG("Create all Libs");
- host_lib = xbt_lib_new();
- link_lib = xbt_lib_new();
- as_router_lib = xbt_lib_new();
-
- XBT_DEBUG("ADD ROUTING LEVEL");
- ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_free);
- ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_free);
-
- XBT_DEBUG("ADD SURF LEVELS");
- SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
- SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
- SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free);
+ XBT_DEBUG("Create all Libs");
+ host_lib = xbt_lib_new();
+ link_lib = xbt_lib_new();
+ as_router_lib = xbt_lib_new();
+ storage_lib = xbt_lib_new();
+
+ XBT_DEBUG("ADD ROUTING LEVEL");
+ ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_free);
+ ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_free);
+ ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free);
+ ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_lib,routing_storage_type_free);
+ ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib,routing_storage_host_free);
+
+ XBT_DEBUG("ADD SURF LEVELS");
+ SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
+ SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
+ SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free);
/* Connect our log channels: that must be done manually under windows */
XBT_LOG_CONNECT(surf_cpu, surf);
@@
-407,7
+418,7
@@
void surf_exit(void)
xbt_lib_free(&host_lib);
xbt_lib_free(&link_lib);
xbt_lib_free(&as_router_lib);
-
+ xbt_lib_free(&storage_lib);
tmgr_finalize();
surf_parse_lex_destroy();
@@
-465,9
+476,12
@@
double surf_solve(double max_date)
}
surf_min_index = 0;
+
if (surf_get_nthreads() > 1) {
/* parallel version */
+#ifdef CONTEXT_THREADS
xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_share_resources, model_list);
+#endif
}
else {
/* sequential version */
@@
-551,7
+565,9
@@
double surf_solve(double max_date)
if (surf_get_nthreads() > 1) {
/* parallel version */
+#ifdef CONTEXT_THREADS
xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_update_actions_state, model_list);
+#endif
}
else {
/* sequential version */