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

Make EventGarbageCollector private to the olsr module; adapt olsr to Timer API changes.

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro
2007-10-11 16:17:27 +01:00
parent ad0241047d
commit f77b8a9137
6 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/simulator/event-garbage-collector.cc → src/routing/olsr/event-garbage-collector.cc
View File

4
src/simulator/event-garbage-collector.h → src/routing/olsr/event-garbage-collector.h
View File

@@ -22,8 +22,8 @@
#define EVENT_GARBAGE_COLLECTOR_H
#include <list>
#include "event-id.h"
#include "simulator.h"
#include "ns3/event-id.h"
#include "ns3/simulator.h"
namespace ns3 {

73
src/routing/olsr/olsr-agent-impl.cc
View File

@@ -151,11 +151,10 @@ NS_DEBUG_COMPONENT_DEFINE ("OlsrAgent");
OlsrAgentImpl::OlsrAgentImpl (Ptr<Node> node)
:
m_events (Timer::GARBAGE_COLLECT),
m_useL2Notifications (false),
m_helloTimer (Timer::CHECK_ON_SCHEDULE, Timer::CANCEL_ON_DESTROY),
m_tcTimer (Timer::CHECK_ON_SCHEDULE, Timer::CANCEL_ON_DESTROY),
m_midTimer (Timer::CHECK_ON_SCHEDULE, Timer::CANCEL_ON_DESTROY)
m_helloTimer (Timer::CANCEL_ON_DESTROY),
m_tcTimer (Timer::CANCEL_ON_DESTROY),
m_midTimer (Timer::CANCEL_ON_DESTROY)
{
m_helloTimer.SetFunction (&OlsrAgentImpl::HelloTimerExpire, this);
m_tcTimer.SetFunction (&OlsrAgentImpl::TcTimerExpire, this);
@@ -891,9 +890,9 @@ OlsrAgentImpl::ProcessTc (const OlsrMessageHeader &msg,
AddTopologyTuple (topologyTuple);
// Schedules topology tuple deletion
m_events.SetFunction (&OlsrAgentImpl::TopologyTupleTimerExpire, this);
m_events.SetArguments (topologyTuple);
m_events.Schedule (DELAY (topologyTuple.expirationTime));
m_events.Track (Simulator::Schedule (DELAY (topologyTuple.expirationTime),
&OlsrAgentImpl::TopologyTupleTimerExpire,
this, topologyTuple));
}
}
}
@@ -1350,9 +1349,8 @@ OlsrAgentImpl::LinkSensing (const OlsrMessageHeader &msg,
// Schedules link tuple deletion
if (created && link_tuple != NULL)
{
m_events.SetFunction (&OlsrAgentImpl::LinkTupleTimerExpire, this);
m_events.SetArguments (*link_tuple);
m_events.Schedule (DELAY (std::min (link_tuple->time, link_tuple->symTime)));
m_events.Track (Simulator::Schedule (DELAY (std::min (link_tuple->time, link_tuple->symTime)),
&OlsrAgentImpl::LinkTupleTimerExpire, this, *link_tuple));
}
}
@@ -1420,9 +1418,9 @@ OlsrAgentImpl::PopulateTwoHopNeighborSet (const OlsrMessageHeader &msg,
now + msg.GetVTime ();
// Schedules nb2hop tuple
// deletion
m_events.SetFunction (&OlsrAgentImpl::Nb2hopTupleTimerExpire, this);
m_events.SetArguments (new_nb2hop_tuple);
m_events.Schedule (DELAY (new_nb2hop_tuple.expirationTime));
m_events.Track (Simulator::Schedule (DELAY (new_nb2hop_tuple.expirationTime),
&OlsrAgentImpl::Nb2hopTupleTimerExpire, this,
new_nb2hop_tuple));
}
else
{
@@ -1488,9 +1486,10 @@ OlsrAgentImpl::PopulateMprSelectorSet (const OlsrMessageHeader &msg,
AddMprSelectorTuple (mprsel_tuple);
// Schedules mpr selector tuple deletion
m_events.SetFunction (&OlsrAgentImpl::MprSelTupleTimerExpire, this);
m_events.SetArguments (mprsel_tuple);
m_events.Schedule (DELAY (mprsel_tuple.expirationTime));
m_events.Track (Simulator::Schedule
(DELAY (mprsel_tuple.expirationTime),
&OlsrAgentImpl::MprSelTupleTimerExpire, this,
mprsel_tuple));
}
else
{
@@ -1928,9 +1927,9 @@ OlsrAgentImpl::DupTupleTimerExpire (DuplicateTuple tuple)
}
else
{
m_events.SetFunction (&OlsrAgentImpl::DupTupleTimerExpire, this);
m_events.SetArguments (tuple);
m_events.Schedule (DELAY (tuple.expirationTime));
m_events.Track (Simulator::Schedule (DELAY (tuple.expirationTime),
&OlsrAgentImpl::DupTupleTimerExpire, this,
tuple));
}
}
@@ -1961,15 +1960,15 @@ OlsrAgentImpl::LinkTupleTimerExpire (LinkTuple tuple)
else
NeighborLoss (tuple);
m_events.SetFunction (&OlsrAgentImpl::LinkTupleTimerExpire, this);
m_events.SetArguments (tuple);
m_events.Schedule (DELAY (tuple.time));
m_events.Track (Simulator::Schedule (DELAY (tuple.time),
&OlsrAgentImpl::LinkTupleTimerExpire, this,
tuple));
}
else
{
m_events.SetFunction (&OlsrAgentImpl::LinkTupleTimerExpire, this);
m_events.SetArguments (tuple);
m_events.Schedule (DELAY (std::min (tuple.time, tuple.symTime)));
m_events.Track (Simulator::Schedule (DELAY (std::min (tuple.time, tuple.symTime)),
&OlsrAgentImpl::LinkTupleTimerExpire, this,
tuple));
}
}
@@ -1989,9 +1988,9 @@ OlsrAgentImpl::Nb2hopTupleTimerExpire (TwoHopNeighborTuple tuple)
}
else
{
m_events.SetFunction (&OlsrAgentImpl::Nb2hopTupleTimerExpire, this);
m_events.SetArguments (tuple);
m_events.Schedule (DELAY (tuple.expirationTime));
m_events.Track (Simulator::Schedule (DELAY (tuple.expirationTime),
&OlsrAgentImpl::Nb2hopTupleTimerExpire,
this, tuple));
}
}
@@ -2011,9 +2010,9 @@ OlsrAgentImpl::MprSelTupleTimerExpire (MprSelectorTuple tuple)
}
else
{
m_events.SetFunction (&OlsrAgentImpl::MprSelTupleTimerExpire, this);
m_events.SetArguments (tuple);
m_events.Schedule (DELAY (tuple.expirationTime));
m_events.Track (Simulator::Schedule (DELAY (tuple.expirationTime),
&OlsrAgentImpl::MprSelTupleTimerExpire,
this, tuple));
}
}
@@ -2033,9 +2032,9 @@ OlsrAgentImpl::TopologyTupleTimerExpire (TopologyTuple tuple)
}
else
{
m_events.SetFunction (&OlsrAgentImpl::TopologyTupleTimerExpire, this);
m_events.SetArguments (tuple);
m_events.Schedule (DELAY (tuple.expirationTime));
m_events.Track (Simulator::Schedule (DELAY (tuple.expirationTime),
&OlsrAgentImpl::TopologyTupleTimerExpire,
this, tuple));
}
}
@@ -2053,9 +2052,9 @@ OlsrAgentImpl::IfaceAssocTupleTimerExpire (IfaceAssocTuple tuple)
}
else
{
m_events.SetFunction (&OlsrAgentImpl::IfaceAssocTupleTimerExpire, this);
m_events.SetArguments (tuple);
m_events.Schedule (DELAY (tuple.time));
m_events.Track (Simulator::Schedule (DELAY (tuple.time),
&OlsrAgentImpl::IfaceAssocTupleTimerExpire,
this, tuple));
}
}

5
src/routing/olsr/olsr-agent-impl.h
View File

@@ -38,8 +38,7 @@
#include "ns3/packet.h"
#include "ns3/node.h"
#include "ns3/socket.h"
//#include "single-event.h"
//#include "event-collector.h"
#include "event-garbage-collector.h"
#include "ns3/timer.h"
@@ -59,7 +58,7 @@ public:
virtual void SetMainInterface (uint32_t interface);
private:
Timer m_events;
EventGarbageCollector m_events;
/// Address of the routing agent.
Ipv4Address m_routingAgentAddr;

1
src/routing/olsr/wscript
View File

@@ -10,6 +10,7 @@ def build(bld):
'olsr-agent.cc',
'olsr-agent-impl.cc',
'olsr.cc',
'event-garbage-collector.cc',
]
headers = bld.create_obj('ns3header')

1
src/simulator/wscript
View File

@@ -61,7 +61,6 @@ def build(bld):
'simulator.cc',
'time-default-value.cc',
'timer.cc',
'event-garbage-collector.cc',
]
headers = bld.create_obj('ns3header')