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
Fixed the pthread context implementation, now it compiles and runs
[simgrid.git]
/
src
/
simdag
/
sd_global.c
diff --git
a/src/simdag/sd_global.c
b/src/simdag/sd_global.c
index
bfcb633
..
c7de5e0
100644
(file)
--- a/
src/simdag/sd_global.c
+++ b/
src/simdag/sd_global.c
@@
-156,7
+156,6
@@
void SD_create_environment(const char *platform_file)
DEBUG0("SD_create_environment");
DEBUG0("SD_create_environment");
- surf_timer_model_init(platform_file);
surf_config_models_setup(platform_file);
parse_platform_file(platform_file);
surf_config_models_setup(platform_file);
parse_platform_file(platform_file);
@@
-167,7
+166,7
@@
void SD_create_environment(const char *platform_file)
__SD_workstation_create(surf_workstation, NULL);
}
__SD_workstation_create(surf_workstation, NULL);
}
- xbt_dict_foreach(
link_set
, cursor, name, surf_link) {
+ xbt_dict_foreach(
surf_model_resource_set(surf_network_model)
, cursor, name, surf_link) {
__SD_link_create(surf_link, NULL);
}
__SD_link_create(surf_link, NULL);
}
@@
-241,9
+240,7
@@
SD_task_t *SD_simulate(double how_long)
/* 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->common_public.states.
- done_action_set))) {
+ while ((action = xbt_swag_extract(model->states.done_action_set))) {
task = action->data;
INFO1("Task '%s' done", SD_task_get_name(task));
DEBUG0("Calling __SD_task_just_done");
task = action->data;
INFO1("Task '%s' done", SD_task_get_name(task));
DEBUG0("Calling __SD_task_just_done");
@@
-272,13
+269,11
@@
SD_task_t *SD_simulate(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->common_public.states.
- failed_action_set))) {
+ while ((action = xbt_swag_extract(model->states.failed_action_set))) {
task = action->data;
INFO1("Task '%s' failed", SD_task_get_name(task));
__SD_task_set_state(task, SD_FAILED);
task = action->data;
INFO1("Task '%s' failed", SD_task_get_name(task));
__SD_task_set_state(task, SD_FAILED);
- surf_workstation_model->
common_public.action_free
(action);
+ surf_workstation_model->
action_unref
(action);
task->surf_action = NULL;
if (!xbt_dynar_member(changed_tasks, &task))
task->surf_action = NULL;
if (!xbt_dynar_member(changed_tasks, &task))