-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
/* Initialize MSG and WKS hosts */
XBT_DEBUG("Initialize MSG and WKS hosts");
xbt_lib_foreach(host_lib, cursor, name, data) {
- if(data[SURF_WKS_LEVEL]){
+ if(data[SURF_HOST_LEVEL]){
XBT_DEBUG("\tSee surf host %s",name);
- SIMIX_host_create(name, data[SURF_WKS_LEVEL], NULL);
- __MSG_host_create((smx_host_t)data[SIMIX_HOST_LEVEL]);
+ SIMIX_host_create(name, NULL);
+ // THIS IS BRAINDEAD. There is no sg_host_t in that level, but a smx_host_priv. So commenting out for now.
+ // Lua is broken anyway. Christian will fix it
+ // __MSG_host_create((sg_host_t)data[SIMIX_HOST_LEVEL]);
}
}
// get power value
lua_pushstring(L, "power");
lua_gettable(L, -2);
- host.power_peak = lua_tonumber(L, -1);
+ host.power_peak = xbt_dynar_new(sizeof(double), NULL);
+ xbt_dynar_push_as(host.power_peak, double, lua_tonumber(L, -1));
lua_pop(L, 1);
// get core
else if(!strcmp(mode,"Floyd")) mode_int = A_surfxml_AS_routing_Floyd;
else if(!strcmp(mode,"Dijkstra")) mode_int = A_surfxml_AS_routing_Dijkstra;
else if(!strcmp(mode,"DijkstraCache")) mode_int = A_surfxml_AS_routing_DijkstraCache;
- else if(!strcmp(mode,"RuleBased")) mode_int = A_surfxml_AS_routing_RuleBased;
else if(!strcmp(mode,"Vivaldi")) mode_int = A_surfxml_AS_routing_Vivaldi;
else if(!strcmp(mode,"Cluster")) mode_int = A_surfxml_AS_routing_Cluster;
else if(!strcmp(mode,"none")) mode_int = A_surfxml_AS_routing_None;