std::unordered_map<std::string, std::string> props;
if (args->properties) {
xbt_dict_cursor_t cursor=nullptr;
- char *key,*data;
+ char *key;
+ char* data;
xbt_dict_foreach (args->properties, cursor, key, data)
props[key] = data;
xbt_dict_free(&args->properties);
return netpoint;
}
-void sg_platf_new_link(sg_platf_link_cbarg_t link){
+void sg_platf_new_link(LinkCreationArgs* link)
+{
std::vector<std::string> names;
if (link->policy == SURF_LINK_FULLDUPLEX) {
if (link->properties) {
xbt_dict_cursor_t cursor = nullptr;
- char *key, *data;
+ char* key;
+ char* data;
xbt_dict_foreach (link->properties, cursor, key, data)
l->setProperty(key, data);
xbt_dict_free(&link->properties);
int rankId=0;
- s_sg_platf_link_cbarg_t link;
// What an inventive way of initializing the AS that I have as ancestor :-(
s_sg_platf_AS_cbarg_t AS;
simgrid::kernel::routing::ClusterZone* current_as = static_cast<ClusterZone*>(routing_get_current());
current_as->parse_specific_arguments(cluster);
- if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){
+ if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){
current_as->linkCountPerNode_++;
current_as->hasLoopback_ = 1;
}
- if(cluster->limiter_link!=0){
+ if(cluster->limiter_link > 0){
current_as->linkCountPerNode_++;
current_as->hasLimiter_ = 1;
}
char * host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix);
char * link_id = bprintf("%s_link_%d", cluster->id, i);
- XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, cluster->speed);
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\">", host_id, cluster->speeds.front());
s_sg_platf_host_cbarg_t host;
memset(&host, 0, sizeof(host));
host.id = host_id;
if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) {
xbt_dict_cursor_t cursor=nullptr;
- char *key,*data;
+ char *key;
+ char* data;
host.properties = xbt_dict_new_homogeneous(free);
xbt_dict_foreach(cluster->properties,cursor,key,data) {
}
}
- host.speed_per_pstate.push_back(cluster->speed);
+ host.speed_per_pstate = cluster->speeds;
host.pstate = 0;
host.core_amount = cluster->core_amount;
host.coord = "";
//add a loopback link
simgrid::surf::LinkImpl* linkUp = nullptr;
simgrid::surf::LinkImpl* linkDown = nullptr;
- if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){
+ if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){
char *tmp_link = bprintf("%s_loopback", link_id);
XBT_DEBUG("<loopback\tid=\"%s\"\tbw=\"%f\"/>", tmp_link, cluster->loopback_bw);
- memset(&link, 0, sizeof(link));
+ LinkCreationArgs link;
link.id = tmp_link;
link.bandwidth = cluster->loopback_bw;
link.latency = cluster->loopback_lat;
//add a limiter link (shared link to account for maximal bandwidth of the node)
linkUp = nullptr;
linkDown = nullptr;
- if(cluster->limiter_link!=0){
+ if(cluster->limiter_link > 0){
char *tmp_link = bprintf("%s_limiter", link_id);
XBT_DEBUG("<limiter\tid=\"%s\"\tbw=\"%f\"/>", tmp_link, cluster->limiter_link);
- memset(&link, 0, sizeof(link));
+ LinkCreationArgs link;
link.id = tmp_link;
link.bandwidth = cluster->limiter_link;
link.latency = 0;
}
//Make the backbone
- if ((cluster->bb_bw != 0) || (cluster->bb_lat != 0)) {
+ if ((cluster->bb_bw > 0) || (cluster->bb_lat > 0)) {
- memset(&link, 0, sizeof(link));
+ LinkCreationArgs link;
link.id = std::string(cluster->id)+ "_backbone";
link.bandwidth = cluster->bb_bw;
link.latency = cluster->bb_lat;
host.speed_per_pstate.push_back(cabinet->speed);
sg_platf_new_host(&host);
- s_sg_platf_link_cbarg_t link;
- memset(&link, 0, sizeof(link));
+ LinkCreationArgs link;
link.policy = SURF_LINK_FULLDUPLEX;
link.latency = cabinet->lat;
link.bandwidth = cabinet->bw;
if (storage->properties) {
xbt_dict_cursor_t cursor = nullptr;
- char *key, *data;
+ char *key;
+ char* data;
xbt_dict_foreach (storage->properties, cursor, key, data)
s->setProperty(key, data);
xbt_dict_free(&storage->properties);