X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba769a2169c81556edfaf0ee68089fa3a4bad77b..5b2ffa67d0e82b06951b2619815db43bacfdb1f3:/src/surf/surf_routing_cluster_fat_tree.cpp diff --git a/src/surf/surf_routing_cluster_fat_tree.cpp b/src/surf/surf_routing_cluster_fat_tree.cpp index 0829ce624a..b2697d103d 100644 --- a/src/surf/surf_routing_cluster_fat_tree.cpp +++ b/src/surf/surf_routing_cluster_fat_tree.cpp @@ -59,12 +59,11 @@ void AsClusterFatTree::getRouteAndLatency(RoutingEdgePtr src, source = tempIter->second; tempIter = this->computeNodes.find(dst->getId()); if (tempIter == this->computeNodes.end()) { - xbt_die("Could not find the destination %s [%d] in the fat tree", src->getName(), src->getId()); + xbt_die("Could not find the destination %s [%d] in the fat tree", dst->getName(), dst->getId()); } destination = tempIter->second; - XBT_DEBUG("%d %d", src->getId(), source->id); XBT_DEBUG("Get route and latency from '%s' [%d] to '%s' [%d] in a fat tree", src->getName(), src->getId(), dst->getName(), dst->getId()); @@ -127,7 +126,7 @@ void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster){ for (unsigned int i = 1 ; i <= this->levels ; i++) { msgBuffer << ", " << this->nodesByLevel[i] << " switches at level " << i; } - XBT_DEBUG(msgBuffer.str().c_str()); + XBT_DEBUG("%s", msgBuffer.str().c_str()); msgBuffer.str(""); msgBuffer << "Nodes are : "; @@ -135,7 +134,7 @@ void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster){ msgBuffer << this->nodes[i]->id << "(" << this->nodes[i]->level << "," << this->nodes[i]->position << ") "; } - XBT_DEBUG(msgBuffer.str().c_str()); + XBT_DEBUG("%s", msgBuffer.str().c_str()); } @@ -157,7 +156,7 @@ void AsClusterFatTree::create_links(sg_platf_cluster_cbarg_t cluster){ msgBuffer << "(" << this->links[i]->upNode->id << "," << this->links[i]->downNode->id << ") "; } - XBT_DEBUG(msgBuffer.str().c_str()); + XBT_DEBUG("%s", msgBuffer.str().c_str()); } @@ -210,7 +209,7 @@ bool AsClusterFatTree::areRelated(FatTreeNode *parent, FatTreeNode *child) { } msgBuffer << ">"; msgBuffer << " related ? "; - XBT_DEBUG(msgBuffer.str().c_str()); + XBT_DEBUG("%s", msgBuffer.str().c_str()); } if (parent->level != child->level + 1) { @@ -306,7 +305,7 @@ void AsClusterFatTree::generateLabels() { } msgBuffer << "> to " << k << " (" << i << "," << j <<")"; - XBT_DEBUG(bprintf(msgBuffer.str().c_str())); + XBT_DEBUG("%s", msgBuffer.str().c_str()); } this->nodes[k]->label.assign(currentLabel.begin(), currentLabel.end());