F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge with HEAD

Browse Source
This commit is contained in:
Mathieu Lacage
2009-11-19 20:52:09 +01:00
parent fe86ae64d8 38a472a5a0
commit 0ea2db33c8
2 changed files with 143 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bindings/python/ns3modulescan.py
View File

@@ -8,7 +8,7 @@ from pybindgen.gccxmlparser import ModuleParser, PygenClassifier, PygenSection,
from pybindgen.typehandlers.codesink import FileCodeSink
from pygccxml.declarations import templates
from pygccxml.declarations.class_declaration import class_t
from pygccxml.declarations.calldef import free_function_t, member_function_t, constructor_t
from pygccxml.declarations.calldef import free_function_t, member_function_t, constructor_t, calldef_t
## we need the smart pointer type transformation to be active even
@@ -161,6 +161,13 @@ def pre_scan_hook(dummy_module_parser,
and pygccxml_definition.name == 'Run':
global_annotations['ignore'] = True
## http://www.gccxml.org/Bug/view.php?id=9915
if isinstance(pygccxml_definition, calldef_t):
for arg in pygccxml_definition.arguments:
if arg.default_value is None:
continue
if "ns3::MilliSeconds( )" == arg.default_value:
arg.default_value = "ns3::MilliSeconds(0)"
## classes
if isinstance(pygccxml_definition, class_t):

256
src/routing/olsr/olsr-routing-protocol.cc
View File

@@ -464,6 +464,37 @@ RoutingProtocol::Degree (NeighborTuple const &tuple)
return degree;
}
namespace {
///
/// \brief Remove all covered 2-hop neighbors from N2 set. This is a helper function used by MprComputation algorithm.
///
void
CoverTwoHopNeighbors (Ipv4Address neighborMainAddr, TwoHopNeighborSet & N2)
{
// first gather all 2-hop neighbors to be removed
std::set<Ipv4Address> toRemove;
for (TwoHopNeighborSet::iterator twoHopNeigh = N2.begin (); twoHopNeigh != N2.end (); twoHopNeigh ++)
{
if (twoHopNeigh->neighborMainAddr == neighborMainAddr)
{
toRemove.insert (twoHopNeigh->twoHopNeighborAddr);
}
}
// Now remove all matching records from N2
for (TwoHopNeighborSet::iterator twoHopNeigh = N2.begin (); twoHopNeigh != N2.end (); )
{
if (toRemove.find (twoHopNeigh->twoHopNeighborAddr) != toRemove.end ())
{
twoHopNeigh = N2.erase (twoHopNeigh);
}
else
{
twoHopNeigh ++;
}
}
}
} // anonymous namespace
///
/// \brief Computates MPR set of a node following RFC 3626 hints.
///
@@ -577,18 +608,7 @@ RoutingProtocol::MprComputation()
mprSet.insert (neighbor->neighborMainAddr);
// (not in RFC but I think is needed: remove the 2-hop
// neighbors reachable by the MPR from N2)
for (TwoHopNeighborSet::iterator twoHopNeigh = N2.begin ();
twoHopNeigh != N2.end (); )
{
if (twoHopNeigh->neighborMainAddr == neighbor->neighborMainAddr)
{
twoHopNeigh = N2.erase (twoHopNeigh);
}
else
{
twoHopNeigh++;
}
}
CoverTwoHopNeighbors (neighbor->neighborMainAddr, N2);
}
}
@@ -637,6 +657,8 @@ RoutingProtocol::MprComputation()
{
if (coveredTwoHopNeighbors.find (twoHopNeigh->twoHopNeighborAddr) != coveredTwoHopNeighbors.end ())
{
// This works correctly only because it is known that twoHopNeigh is reachable by exactly one neighbor,
// so only one record in N2 exists for each of them. This record is erased here.
NS_LOG_LOGIC ("2-hop neigh. " << twoHopNeigh->twoHopNeighborAddr << " is already covered by an MPR.");
twoHopNeigh = N2.erase (twoHopNeigh);
}
@@ -714,10 +736,6 @@ RoutingProtocol::MprComputation()
if (max == NULL || nb_tuple->willingness > max->willingness)
{
max = nb_tuple;
for (TwoHopNeighborSet::iterator newCovered = N2.begin (); newCovered != N2.end (); newCovered++)
{
coveredTwoHopNeighbors.insert (newCovered->twoHopNeighborAddr);
}
max_r = r;
}
else if (nb_tuple->willingness == max->willingness)
@@ -742,19 +760,8 @@ RoutingProtocol::MprComputation()
if (max != NULL)
{
mprSet.insert (max->neighborMainAddr);
// Remove the nodes from N2 which are now covered by a node in the MPR set.
for (TwoHopNeighborSet::iterator twoHopNeigh = N2.begin (); twoHopNeigh != N2.end (); )
{
if (coveredTwoHopNeighbors.find (twoHopNeigh->twoHopNeighborAddr) != coveredTwoHopNeighbors.end ())
{
NS_LOG_LOGIC ("2-hop neigh. " << twoHopNeigh->twoHopNeighborAddr << " is already covered by an MPR.");
twoHopNeigh = N2.erase (twoHopNeigh);
}
else
{
twoHopNeigh++;
}
}
CoverTwoHopNeighbors (max->neighborMainAddr, N2);
NS_LOG_LOGIC (N2.size () << " 2-hop neighbors left to cover!");
}
}
@@ -2793,104 +2800,111 @@ OlsrMprTestCase::~OlsrMprTestCase ()
bool
OlsrMprTestCase::DoRun ()
{
Ptr<RoutingProtocol> protocol = CreateObject<RoutingProtocol> ();
protocol->m_mainAddress = Ipv4Address ("10.0.0.1");
OlsrState & state = protocol->m_state;
/*
* Create a 3x3 grid like the following:
* 3---6---9
* |\ /|\ /|
* | X | X |
* |/ \|/ \|
* 2---5---8
* |\ /|\ /|
* | X | X |
* |/ \|/ \|
* 1---4---7
* PrepareTopology fills all 2-hop neighbors of station 1 and creates a routing protocol
* We are the station number 2. Obvious, that an only MPR in this case is 5
* 1 -- 2
* | |
* 3 -- 4
*
* Node 1 must select only one MPR (2 or 3, doesn't matter)
*/
Ptr<RoutingProtocol> m_protocol = CreateObject<RoutingProtocol> ();
m_protocol->m_mainAddress = Ipv4Address ("10.0.0.2");
// we fill all possible 2-hop neighborhood
TwoHopNeighborTuple tuple;
tuple.expirationTime = Seconds (3600);
// All neighbor stations which are seen from station 5
tuple.neighborMainAddr = Ipv4Address ("10.0.0.5");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.1");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.3");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.4");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.6");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.7");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.8");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.9");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
// All neighbor stations which are seen from station 4
tuple.neighborMainAddr = Ipv4Address ("10.0.0.4");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.1");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.8");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.7");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
// All neighbor stations which are seen from station 6
tuple.neighborMainAddr = Ipv4Address ("10.0.0.6");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.3");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.8");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.9");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
// All neighbor stations which are seen from station 1
tuple.neighborMainAddr = Ipv4Address ("10.0.0.1");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.4");
// All neighbor stations which are seen from station 3
tuple.neighborMainAddr = Ipv4Address ("10.0.0.3");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.2");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
m_protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.6");
// First, we fill all neighbors
// If neighbors willingness = OLSR_WILL_DEFAULT, an only station number 5 will be an MPR
NeighborTuple neigbor;
neigbor.status = NeighborTuple::STATUS_SYM;
neigbor.willingness = OLSR_WILL_DEFAULT;
neigbor.neighborMainAddr = Ipv4Address ("10.0.0.2");
protocol->m_state.InsertNeighborTuple (neigbor);
neigbor.neighborMainAddr = Ipv4Address ("10.0.0.3");
m_protocol->m_state.InsertNeighborTuple (neigbor);
neigbor.neighborMainAddr = Ipv4Address ("10.0.0.6");
m_protocol->m_state.InsertNeighborTuple (neigbor);
neigbor.neighborMainAddr = Ipv4Address ("10.0.0.5");
m_protocol->m_state.InsertNeighborTuple (neigbor);
neigbor.neighborMainAddr = Ipv4Address ("10.0.0.4");
m_protocol->m_state.InsertNeighborTuple (neigbor);
neigbor.neighborMainAddr = Ipv4Address ("10.0.0.1");
m_protocol->m_state.InsertNeighborTuple (neigbor);
//Now, calculateMPR
m_protocol->MprComputation ();
//Check results
NS_TEST_ASSERT_MSG_EQ (m_protocol->m_state.FindMprAddress (Ipv4Address ("10.0.0.5")), true, "MPR is incorrect!");
NS_TEST_ASSERT_MSG_EQ (m_protocol->m_state.GetMprSet ().size (), 1 , "An only address must be chosen!\n");
protocol->m_state.InsertNeighborTuple (neigbor);
TwoHopNeighborTuple tuple;
tuple.expirationTime = Seconds (3600);
tuple.neighborMainAddr = Ipv4Address ("10.0.0.2");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.4");
protocol->m_state.InsertTwoHopNeighborTuple (tuple);
tuple.neighborMainAddr = Ipv4Address ("10.0.0.3");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.4");
protocol->m_state.InsertTwoHopNeighborTuple (tuple);
protocol->MprComputation ();
NS_TEST_EXPECT_MSG_EQ (state.GetMprSet ().size (), 1 , "An only address must be chosen.");
/*
* 1 -- 2 -- 5
* | |
* 3 -- 4
*
* Node 1 must select node 2 as MPR.
*/
tuple.neighborMainAddr = Ipv4Address ("10.0.0.2");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.5");
protocol->m_state.InsertTwoHopNeighborTuple (tuple);
protocol->MprComputation ();
MprSet mpr = state.GetMprSet ();
NS_TEST_EXPECT_MSG_EQ (mpr.size (), 1 , "An only address must be chosen.");
NS_TEST_EXPECT_MSG_EQ ((mpr.find ("10.0.0.2") != mpr.end ()), true, "Node 1 must select node 2 as MPR");
/*
* 1 -- 2 -- 5
* | |
* 3 -- 4
* |
* 6
*
* Node 1 must select nodes 2 and 3 as MPRs.
*/
tuple.neighborMainAddr = Ipv4Address ("10.0.0.3");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.6");
protocol->m_state.InsertTwoHopNeighborTuple (tuple);
protocol->MprComputation ();
mpr = state.GetMprSet ();
NS_TEST_EXPECT_MSG_EQ (mpr.size (), 2 , "An only address must be chosen.");
NS_TEST_EXPECT_MSG_EQ ((mpr.find ("10.0.0.2") != mpr.end ()), true, "Node 1 must select node 2 as MPR");
NS_TEST_EXPECT_MSG_EQ ((mpr.find ("10.0.0.3") != mpr.end ()), true, "Node 1 must select node 3 as MPR");
/*
* 7 (OLSR_WILL_ALWAYS)
* |
* 1 -- 2 -- 5
* | |
* 3 -- 4
* |
* 6
*
* Node 1 must select nodes 2, 3 and 7 (since it is WILL_ALWAYS) as MPRs.
*/
neigbor.willingness = OLSR_WILL_ALWAYS;
neigbor.neighborMainAddr = Ipv4Address ("10.0.0.7");
protocol->m_state.InsertNeighborTuple (neigbor);
protocol->MprComputation ();
mpr = state.GetMprSet ();
NS_TEST_EXPECT_MSG_EQ (mpr.size (), 3 , "An only address must be chosen.");
NS_TEST_EXPECT_MSG_EQ ((mpr.find ("10.0.0.7") != mpr.end ()), true, "Node 1 must select node 7 as MPR");
/*
* 7 <- WILL_ALWAYS
* |
* 9 -- 8 -- 1 -- 2 -- 5
* | |
* ^ 3 -- 4
* | |
* WILL_NEVER 6
*
* Node 1 must select nodes 2, 3 and 7 (since it is WILL_ALWAYS) as MPRs.
* Node 1 must NOT select node 8 as MPR since it is WILL_NEVER
*/
neigbor.willingness = OLSR_WILL_NEVER;
neigbor.neighborMainAddr = Ipv4Address ("10.0.0.8");
protocol->m_state.InsertNeighborTuple (neigbor);
tuple.neighborMainAddr = Ipv4Address ("10.0.0.8");
tuple.twoHopNeighborAddr = Ipv4Address ("10.0.0.9");
protocol->m_state.InsertTwoHopNeighborTuple (tuple);
protocol->MprComputation ();
mpr = state.GetMprSet ();
NS_TEST_EXPECT_MSG_EQ (mpr.size (), 3 , "An only address must be chosen.");
NS_TEST_EXPECT_MSG_EQ ((mpr.find ("10.0.0.9") == mpr.end ()), true, "Node 1 must NOT select node 8 as MPR");
return false;
}