-/* $ID$ */
-
/* Copyright (c) 2007 Kayo Fujiwara. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
//Temporary classes for generating GTNetS topology
#include "gtnets_topology.h"
-#ifdef DEBUG0
- #undef DEBUG0
+#ifdef XBT_DEBUG
+ #undef XBT_DEBUG
#endif
#include "xbt/log.h"
#include "xbt/asserts.h"
+#include <stdio.h> //for fflush in print_topology
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network_gtnets_topology, surf_network_gtnets,
"Logging specific to the SURF network GTNetS simulator");
// hostid = network_card_id
int GTNETS_Node::add_host(int hostid){
- xbt_assert0(!(is_router_), "Cannot add a host to a router node");
+ xbt_assert(!(is_router_), "Cannot add a host to a router node");
hosts_.insert(hostid);
return 0;
}
// Add a router. If this node already has a router/host,
// return -1.
int GTNETS_Node::add_router(int routerid){
- xbt_assert0(!(hosts_.size() > 1), "Router node should have only one router");
+ xbt_assert(!(hosts_.size() > 1), "Router node should have only one router");
if (hosts_.size() == 1){
- xbt_assert1((hosts_.find(routerid) != hosts_.end()), "Node %d is a different router", routerid);
+ xbt_assert((hosts_.find(routerid) != hosts_.end()), "Node %d is a different router", routerid);
return 0;
}
is_router_ = true;
void GTNETS_Node::print_hosts(){
set<int>::iterator it;
for (it = hosts_.begin(); it != hosts_.end(); it++){
- DEBUG1("host id %d", *it);
+ XBT_DEBUG("host id %d", *it);
}
}
}
void GTNETS_Link::print_link_status(){
- DEBUG1("****** link id: %d", ID_);
+ XBT_DEBUG("****** link id: %d", ID_);
if (src_node_){
- DEBUG2("[src] id: %d, is it router?: %d",src_node_->id(), src_node_->is_router());
+ XBT_DEBUG("[src] id: %d, is it router?: %d",src_node_->id(), src_node_->is_router());
}
if (dst_node_){
- DEBUG2("[dst] id: %d, is it router?: %d",dst_node_->id(), dst_node_->is_router());
+ XBT_DEBUG("[dst] id: %d, is it router?: %d",dst_node_->id(), dst_node_->is_router());
}
}
// return the peer node id
int GTNETS_Link::peer_node(int cur_id){
- xbt_assert0(((cur_id == src_node_->id())||(cur_id == dst_node_->id())), "Node not found");
+ xbt_assert(((cur_id == src_node_->id())||(cur_id == dst_node_->id())), "Node not found");
if (cur_id == src_node_->id()) return dst_node_->id();
else if (cur_id == dst_node_->id()) return src_node_->id();
int GTNETS_Topology::add_link(int id){
map<int,GTNETS_Link*>::iterator iter = links_.find(id);
- xbt_assert1((iter == links_.end()), "Link %d already exists", id);
+ xbt_assert((iter == links_.end()), "Link %d already exists", id);
if(iter == links_.end()) {
GTNETS_Link* link= new GTNETS_Link(id);
if(iter == routers_.end()){
routers_.insert(id);
}else{
- DEBUG1("Router (#%d) already exists", id);
+ XBT_DEBUG("Router (#%d) already exists", id);
}
return 0;
}
//return the node id of the peer of cur_id by linkid.
int GTNETS_Topology::peer_node_id(int linkid, int cur_id){
GTNETS_Link* link = links_[linkid];
- xbt_assert1((link), "Link %d not found", linkid);
- xbt_assert1(!((cur_id < 0) || (cur_id > nodes_.size()-1)), "Node %d not found", cur_id);
+ xbt_assert((link), "Link %d not found", linkid);
+ xbt_assert(!((cur_id < 0) || (cur_id > nodes_.size()-1)), "Node %d not found", cur_id);
int peer = link->peer_node(nodes_[cur_id]->id());
- xbt_assert0(!(peer < 0), "Peer not found");
+ xbt_assert(!(peer < 0), "Peer not found");
return peer;
}
map<int, GTNETS_Link*>::iterator iter = links_.find(linkid);
- xbt_assert1(!(iter == links_.end()), "Link %d not found", linkid);
+ xbt_assert(!(iter == links_.end()), "Link %d not found", linkid);
link = iter->second;
- DEBUG4("Add onehop route, src (#%d), dst (#%d), linkid %d:(#%d)",src, dst, linkid, link->id());
+ XBT_DEBUG("Add onehop route, src (#%d), dst (#%d), linkid %d:(#%d)",src, dst, linkid, link->id());
GTNETS_Node *src_node, *dst_node;
src_node = link->src_node();
link->add_dst(nodes_[d_node_id]);
}else if (!(src_node && dst_node)){
- xbt_assert0((src_node && dst_node), "Either src or dst is null");
+ xbt_assert((src_node && dst_node), "Either src or dst is null");
}
// case 1: link has two routers
int tmpsrc2 = nodeid_from_hostid(src);
int tmpdst1 = dst_node->id();
int tmpdst2 = nodeid_from_hostid(dst);
- xbt_assert0( (((tmpsrc1 == tmpsrc2) && (tmpdst1 == tmpdst2)) ||
+ xbt_assert( (((tmpsrc1 == tmpsrc2) && (tmpdst1 == tmpdst2)) ||
((tmpsrc1 == tmpdst2) && (tmpdst1 == tmpsrc2))), "Different one hop route defined");
}
// case 2: link has one router and one host
else if (src_node->is_router() && !dst_node->is_router()){
int newsrc, newdst;
- xbt_assert0( ((is_router(src))||(is_router(dst))), "One of nodes should be a router");
+ xbt_assert( ((is_router(src))||(is_router(dst))), "One of nodes should be a router");
if (is_router(src)){
newsrc = src;
newdst = src;
}
- xbt_assert0(!(src_node->id() != nodeid_from_hostid(newsrc)), "The router should be identical");
+ xbt_assert(!(src_node->id() != nodeid_from_hostid(newsrc)), "The router should be identical");
//now, to add dst to dst_node, dst should be a host.
- xbt_assert1(!(is_router(newdst)), "Dst %d is not an endpoint. cannot add it to dst_node", newdst);
+ xbt_assert(!(is_router(newdst)), "Dst %d is not an endpoint. cannot add it to dst_node", newdst);
if (!dst_node->include(newdst)){
dst_node->add_host(newdst);
}
else if (!src_node->is_router() && dst_node->is_router()){
int newsrc, newdst;
- xbt_assert0(((is_router(src))||(is_router(dst))), "One of nodes should be a router");
+ xbt_assert(((is_router(src))||(is_router(dst))), "One of nodes should be a router");
if (is_router(src)){
newsrc = dst;
newdst = dst;
}
- xbt_assert0(!(dst_node->id() != hosts_[newdst]), "The router should be identical");
+ xbt_assert(!(dst_node->id() != hosts_[newdst]), "The router should be identical");
//now, to add dst to src_node, dst should be a host.
- xbt_assert1(!(is_router(newsrc)), "Src %d is not an endpoint. cannot add it to src_node", newsrc);
+ xbt_assert(!(is_router(newsrc)), "Src %d is not an endpoint. cannot add it to src_node", newsrc);
if (!src_node->include(newsrc)){
src_node->add_host(newsrc);
// case 3: link has two hosts
else if (!src_node->is_router() && !dst_node->is_router()){
- xbt_assert0(!(is_router(src) || is_router(dst)), "Cannot add a router to host-host link");
+ xbt_assert(!(is_router(src) || is_router(dst)), "Cannot add a router to host-host link");
//if both are hosts, the order doesn't matter.
if (src_node->include(src)){
}
else{
- xbt_assert0(0, "Shouldn't be here");
+ xbt_die("Shouldn't be here");
}
return 0;
}
void GTNETS_Topology::print_topology(){
- DEBUG0("<<<<<================================>>>>>");
- DEBUG0("Dumping GTNETS topollogy information");
+ XBT_DEBUG("<<<<<================================>>>>>");
+ XBT_DEBUG("Dumping GTNETS topollogy information");
map<int, GTNETS_Link*>::iterator it;
for (it = links_.begin(); it != links_.end(); it++){
it->second->print_link_status();
}
- DEBUG0(">>>>>================================<<<<<");
+ XBT_DEBUG(">>>>>================================<<<<<");
fflush(NULL);
}
