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
Remove references to undefined log categories.
[simgrid.git]
/
src
/
surf
/
surf.c
diff --git
a/src/surf/surf.c
b/src/surf/surf.c
index
e78088e
..
630dac5
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
@@
-289,7
+296,6
@@
XBT_LOG_EXTERNAL_CATEGORY(surf_maxmin);
XBT_LOG_EXTERNAL_CATEGORY(surf_network);
XBT_LOG_EXTERNAL_CATEGORY(surf_trace);
XBT_LOG_EXTERNAL_CATEGORY(surf_parse);
-XBT_LOG_EXTERNAL_CATEGORY(surf_timer);
XBT_LOG_EXTERNAL_CATEGORY(surf_workstation);
XBT_LOG_EXTERNAL_CATEGORY(surf_config);
XBT_LOG_EXTERNAL_CATEGORY(surf_route);
@@
-298,21
+304,34
@@
XBT_LOG_EXTERNAL_CATEGORY(surf_route);
XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
#endif
-
void surf_init(int *argc, char **argv
)
+
static XBT_INLINE void routing_asr_host_free(void *p
)
{
- 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);
+ network_element_t elm = p;
+ free(elm->name);
+ xbt_free(elm);
+}
- 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);
+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();
+ storage_lib = xbt_lib_new();
+ storage_type_lib = xbt_lib_new();
+
+ XBT_DEBUG("ADD ROUTING LEVEL");
+ ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free);
+ ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_host_free);
+ ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free);
+ ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib,routing_storage_host_free);
+ ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib,routing_storage_type_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);
+ SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_resource_free);
/* Connect our log channels: that must be done manually under windows */
XBT_LOG_CONNECT(surf_cpu, surf);
@@
-323,7
+342,6
@@
void surf_init(int *argc, char **argv)
XBT_LOG_CONNECT(surf_network, surf);
XBT_LOG_CONNECT(surf_trace, surf);
XBT_LOG_CONNECT(surf_parse, surf);
- XBT_LOG_CONNECT(surf_timer, surf);
XBT_LOG_CONNECT(surf_workstation, surf);
XBT_LOG_CONNECT(surf_config, surf);
XBT_LOG_CONNECT(surf_route, surf);
@@
-407,7
+425,8
@@
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);
+ xbt_lib_free(&storage_type_lib);
tmgr_finalize();
surf_parse_lex_destroy();
@@
-579,14
+598,15
@@
XBT_INLINE double surf_get_clock(void)
static void surf_share_resources(surf_model_t model)
{
+ double next_action_end = -1.0;
+ int i = __sync_fetch_and_add(&surf_min_index, 1);
if (strcmp(model->name,"network NS3")) {
XBT_DEBUG("Running for Resource [%s]", model->name);
-
double
next_action_end = model->model_private->share_resources(NOW);
+ next_action_end = model->model_private->share_resources(NOW);
XBT_DEBUG("Resource [%s] : next action end = %f",
model->name, next_action_end);
- int i = __sync_fetch_and_add(&surf_min_index, 1);
- surf_mins[i] = next_action_end;
}
+ surf_mins[i] = next_action_end;
}
static void surf_update_actions_state(surf_model_t model)