-/* Copyright (c) 2006-2014. The SimGrid Team.
+/* Copyright (c) 2006-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "xbt/dynar.h"
#include "surf/surf.h"
#include "simgrid/sg_config.h"
+#include "simgrid/host.h"
#include "xbt/ex.h"
#include "xbt/log.h"
#include "xbt/str.h"
{
xbt_lib_cursor_t cursor = NULL;
char *name = NULL;
- void **surf_workstation = NULL;
void **surf_storage = NULL;
parse_platform_file(platform_file);
/* 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_HOST_LEVEL])
- __SD_workstation_create(surf_workstation[SURF_HOST_LEVEL], NULL);
+ {
+ xbt_dict_cursor_t cursor = NULL;
+ simgrid_Host* host = NULL;
+ xbt_dict_foreach(host_list, cursor, name, host){
+ surf_Host* surf_host = (surf_Host*) sg_host_get_facet(host, SURF_HOST_LEVEL);
+ if (surf_host != NULL)
+ __SD_workstation_create(surf_host, NULL);
+ }
}
xbt_lib_foreach(storage_lib, cursor, name, surf_storage) {
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) {
+ xbt_dynar_foreach(all_existing_models, iter, model) {
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);