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
Typos.
[simgrid.git]
/
src
/
simdag
/
sd_global.c
diff --git
a/src/simdag/sd_global.c
b/src/simdag/sd_global.c
index
98de7a6
..
e3f62b1
100644
(file)
--- a/
src/simdag/sd_global.c
+++ b/
src/simdag/sd_global.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006
, 2007, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2006
-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-95,6
+95,12
@@
void SD_init(int *argc, char **argv)
XBT_DEBUG("ADD SD LEVELS");
SD_HOST_LEVEL = xbt_lib_add_level(host_lib,__SD_workstation_destroy);
SD_LINK_LEVEL = xbt_lib_add_level(link_lib,__SD_link_destroy);
XBT_DEBUG("ADD SD LEVELS");
SD_HOST_LEVEL = xbt_lib_add_level(host_lib,__SD_workstation_destroy);
SD_LINK_LEVEL = xbt_lib_add_level(link_lib,__SD_link_destroy);
+ SD_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,__SD_storage_destroy);
+
+ if (_sg_cfg_exit_asap) {
+ SD_exit();
+ exit(0);
+ }
}
/** \brief set a configuration variable
}
/** \brief set a configuration variable
@@
-204,10
+210,11
@@
void SD_create_environment(const char *platform_file)
char *name = NULL;
void **surf_workstation = NULL;
void **surf_link = NULL;
char *name = NULL;
void **surf_workstation = NULL;
void **surf_link = NULL;
+ void **surf_storage = NULL;
parse_platform_file(platform_file);
parse_platform_file(platform_file);
- /* now let's create the SD wrappers for workstations and links */
+ /* now let's create the SD wrappers for workstations
, storages
and links */
xbt_lib_foreach(host_lib, cursor, name, surf_workstation){
if(surf_workstation[SURF_WKS_LEVEL])
__SD_workstation_create(surf_workstation[SURF_WKS_LEVEL], NULL);
xbt_lib_foreach(host_lib, cursor, name, surf_workstation){
if(surf_workstation[SURF_WKS_LEVEL])
__SD_workstation_create(surf_workstation[SURF_WKS_LEVEL], NULL);
@@
-218,6
+225,12
@@
void SD_create_environment(const char *platform_file)
__SD_link_create(surf_link[SURF_LINK_LEVEL], NULL);
}
__SD_link_create(surf_link[SURF_LINK_LEVEL], NULL);
}
+ xbt_lib_foreach(storage_lib, cursor, name, surf_storage) {
+ if(surf_storage[SURF_STORAGE_LEVEL])
+ __SD_storage_create(surf_storage[SURF_STORAGE_LEVEL], NULL);
+ }
+
+
XBT_DEBUG("Workstation number: %d, link number: %d",
SD_workstation_get_number(), SD_link_get_number());
#ifdef HAVE_JEDULE
XBT_DEBUG("Workstation number: %d, link number: %d",
SD_workstation_get_number(), SD_link_get_number());
#ifdef HAVE_JEDULE
@@
-297,13
+310,13
@@
xbt_swag_t SD_simulate_swag(double how_long) {
if (elapsed_time > 0.0)
total_time += elapsed_time;
if (elapsed_time > 0.0)
total_time += elapsed_time;
+ /* FIXME: shoud look at model_list or model_list_invoke? */
/* let's see which tasks are done */
xbt_dynar_foreach(model_list, iter, model) {
/* let's see which tasks are done */
xbt_dynar_foreach(model_list, iter, model) {
- while ((action = xbt_swag_extract(model->states.done_action_set))) {
- task = action->data;
- task->start_time =
- surf_workstation_model->
- action_get_start_time(task->surf_action);
+ while ((action = surf_model_extract_done_action_set(model))) {
+ task = surf_action_get_data(action);
+ task->start_time = surf_action_get_start_time(task->surf_action);
+
task->finish_time = surf_get_clock();
XBT_VERB("Task '%s' done", SD_task_get_name(task));
XBT_DEBUG("Calling __SD_task_just_done");
task->finish_time = surf_get_clock();
XBT_VERB("Task '%s' done", SD_task_get_name(task));
XBT_DEBUG("Calling __SD_task_just_done");
@@
-367,15
+380,13
@@
xbt_swag_t SD_simulate_swag(double how_long) {
}
/* let's see which tasks have just failed */
}
/* let's see which tasks have just failed */
- while ((action = xbt_swag_extract(model->states.failed_action_set))) {
- task = action->data;
- task->start_time =
- surf_workstation_model->
- action_get_start_time(task->surf_action);
+ while ((action = surf_model_extract_failed_action_set(model))) {
+ task = surf_action_get_data(action);
+ task->start_time = surf_action_get_start_time(task->surf_action);
task->finish_time = surf_get_clock();
XBT_VERB("Task '%s' failed", SD_task_get_name(task));
__SD_task_set_state(task, SD_FAILED);
task->finish_time = surf_get_clock();
XBT_VERB("Task '%s' failed", SD_task_get_name(task));
__SD_task_set_state(task, SD_FAILED);
- surf_
workstation_model->
action_unref(action);
+ surf_action_unref(action);
task->surf_action = NULL;
xbt_swag_insert(task,sd_global->return_set);
task->surf_action = NULL;
xbt_swag_insert(task,sd_global->return_set);