Rename Start and DoStart methods to Initialize and DoInitialize
The goal of this patch is to allows us to differentiate the Start/Stop
functionality present in some classes from Initialize/Dispose functionality.
--- a/src/buildings/model/building-list.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/buildings/model/building-list.cc Fri Apr 19 22:39:55 2013 +0200
@@ -126,7 +126,7 @@
{
uint32_t index = m_buildings.size ();
m_buildings.push_back (building);
- Simulator::ScheduleWithContext (index, TimeStep (0), &Building::Start, building);
+ Simulator::ScheduleWithContext (index, TimeStep (0), &Building::Initialize, building);
return index;
}
--- a/src/click/model/ipv4-click-routing.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/click/model/ipv4-click-routing.cc Fri Apr 19 22:39:55 2013 +0200
@@ -76,7 +76,7 @@
}
void
-Ipv4ClickRouting::DoStart ()
+Ipv4ClickRouting::DoInitialize ()
{
uint32_t id = m_ipv4->GetObject<Node> ()->GetId ();
--- a/src/click/model/ipv4-click-routing.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/click/model/ipv4-click-routing.h Fri Apr 19 22:39:55 2013 +0200
@@ -67,7 +67,7 @@
Ptr<UniformRandomVariable> GetRandomVariable (void);
protected:
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
public:
virtual void DoDispose ();
@@ -191,7 +191,7 @@
private:
/**
- * \brief Used internally in DoStart () to Add a mapping to m_clickInstanceFromSimNode mapping
+ * \brief Used internally in DoInitialize () to Add a mapping to m_clickInstanceFromSimNode mapping
*/
void AddSimNodeToClickMapping ();
--- a/src/click/test/ipv4-click-routing-test.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/click/test/ipv4-click-routing-test.cc Fri Apr 19 22:39:55 2013 +0200
@@ -76,7 +76,7 @@
AddNetworkDevice (node, Mac48Address ("00:00:00:00:00:01"), Ipv4Address ("10.1.1.1"), Ipv4Mask ("255.255.255.0"));
Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
Ptr<Ipv4ClickRouting> click = DynamicCast<Ipv4ClickRouting> (ipv4->GetRoutingProtocol ());
- click->DoStart ();
+ click->DoInitialize ();
int ret;
@@ -120,7 +120,7 @@
AddNetworkDevice (node, Mac48Address ("00:00:00:00:00:02"), Ipv4Address ("10.1.1.2"), Ipv4Mask ("255.255.255.0"));
Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
Ptr<Ipv4ClickRouting> click = DynamicCast<Ipv4ClickRouting> (ipv4->GetRoutingProtocol ());
- click->DoStart ();
+ click->DoInitialize ();
char *buf = NULL;
buf = new char [255];
@@ -171,7 +171,7 @@
Ptr<Ipv4> ipv4 = node->GetObject<Ipv4> ();
Ptr<Ipv4ClickRouting> click = DynamicCast<Ipv4ClickRouting> (ipv4->GetRoutingProtocol ());
click->SetNodeName ("myNode");
- click->DoStart ();
+ click->DoInitialize ();
int ret = 0;
char *buf = NULL;
--- a/src/core/model/object.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/core/model/object.cc Fri Apr 19 22:39:55 2013 +0200
@@ -92,7 +92,7 @@
Object::Object ()
: m_tid (Object::GetTypeId ()),
m_disposed (false),
- m_started (false),
+ m_initialized (false),
m_aggregates ((struct Aggregates *) std::malloc (sizeof (struct Aggregates))),
m_getObjectCount (0)
{
@@ -127,7 +127,7 @@
Object::Object (const Object &o)
: m_tid (o.m_tid),
m_disposed (false),
- m_started (false),
+ m_initialized (false),
m_aggregates ((struct Aggregates *) std::malloc (sizeof (struct Aggregates))),
m_getObjectCount (0)
{
@@ -176,12 +176,12 @@
return 0;
}
void
-Object::Start (void)
+Object::Initialize (void)
{
/**
* Note: the code here is a bit tricky because we need to protect ourselves from
- * modifications in the aggregate array while DoStart is called. The user's
- * implementation of the DoStart method could call GetObject (which could
+ * modifications in the aggregate array while DoInitialize is called. The user's
+ * implementation of the DoInitialize method could call GetObject (which could
* reorder the array) and it could call AggregateObject which would add an
* object at the end of the array. To be safe, we restart iteration over the
* array whenever we call some user code, just in case.
@@ -192,10 +192,10 @@
for (uint32_t i = 0; i < n; i++)
{
Object *current = m_aggregates->buffer[i];
- if (!current->m_started)
+ if (!current->m_initialized)
{
- current->DoStart ();
- current->m_started = true;
+ current->DoInitialize ();
+ current->m_initialized = true;
goto restart;
}
}
@@ -339,10 +339,10 @@
}
void
-Object::DoStart (void)
+Object::DoInitialize (void)
{
NS_LOG_FUNCTION (this);
- NS_ASSERT (!m_started);
+ NS_ASSERT (!m_initialized);
}
bool
--- a/src/core/model/object.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/core/model/object.h Fri Apr 19 22:39:55 2013 +0200
@@ -153,14 +153,14 @@
AggregateIterator GetAggregateIterator (void) const;
/**
- * This method calls the virtual DoStart method on all the objects
- * aggregated to this object. DoStart will be called only once over
+ * This method calls the virtual DoInitialize method on all the objects
+ * aggregated to this object. DoInitialize will be called only once over
* the lifetime of an object, just like DoDispose is called only
* once.
*
- * \sa DoStart
+ * \sa DoInitialize
*/
- void Start (void);
+ void Initialize (void);
protected:
/**
@@ -172,15 +172,15 @@
*/
virtual void NotifyNewAggregate (void);
/**
- * This method is called only once by Object::Start. If the user
- * calls Object::Start multiple times, DoStart is called only the
+ * This method is called only once by Object::Initialize. If the user
+ * calls Object::Initialize multiple times, DoInitialize is called only the
* first time.
*
* Subclasses are expected to override this method and _chain up_
* to their parent's implementation once they are done. It is
* safe to call GetObject and AggregateObject from within this method.
*/
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
/**
* This method is called by Object::Dispose or by the object's
* destructor, whichever comes first.
@@ -281,10 +281,10 @@
*/
bool m_disposed;
/**
- * Set to true once the DoStart method has run,
+ * Set to true once the DoInitialize method has run,
* false otherwise
*/
- bool m_started;
+ bool m_initialized;
/**
* a pointer to an array of 'aggregates'. i.e., a pointer to
* each object aggregated to this object is stored in this
--- a/src/energy/helper/energy-source-container.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/energy/helper/energy-source-container.cc Fri Apr 19 22:39:55 2013 +0200
@@ -129,14 +129,14 @@
}
void
-EnergySourceContainer::DoStart (void)
+EnergySourceContainer::DoInitialize (void)
{
// call Object::Start for all EnergySource objects
for (std::vector< Ptr<EnergySource> >::iterator i = m_sources.begin ();
i != m_sources.end (); i++)
{
- (*i)->Start ();
- (*i)->StartDeviceModels ();
+ (*i)->Initialize ();
+ (*i)->InitializeDeviceModels ();
}
}
--- a/src/energy/helper/energy-source-container.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/energy/helper/energy-source-container.h Fri Apr 19 22:39:55 2013 +0200
@@ -170,7 +170,7 @@
/**
* \brief Calls Object::Start () for all EnergySource objects.
*/
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
private:
std::vector< Ptr<EnergySource> > m_sources;
--- a/src/energy/model/basic-energy-source.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/energy/model/basic-energy-source.cc Fri Apr 19 22:39:55 2013 +0200
@@ -169,7 +169,7 @@
*/
void
-BasicEnergySource::DoStart (void)
+BasicEnergySource::DoInitialize (void)
{
NS_LOG_FUNCTION (this);
UpdateEnergySource (); // start periodic update
--- a/src/energy/model/basic-energy-source.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/energy/model/basic-energy-source.h Fri Apr 19 22:39:55 2013 +0200
@@ -105,7 +105,7 @@
private:
/// Defined in ns3::Object
- void DoStart (void);
+ void DoInitialize (void);
/// Defined in ns3::Object
void DoDispose (void);
--- a/src/energy/model/energy-source.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/energy/model/energy-source.cc Fri Apr 19 22:39:55 2013 +0200
@@ -102,7 +102,7 @@
}
void
-EnergySource::StartDeviceModels (void)
+EnergySource::InitializeDeviceModels (void)
{
NS_LOG_FUNCTION (this);
/*
@@ -112,7 +112,7 @@
DeviceEnergyModelContainer::Iterator i;
for (i = m_models.Begin (); i != m_models.End (); i++)
{
- (*i)->Start ();
+ (*i)->Initialize ();
}
}
--- a/src/energy/model/energy-source.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/energy/model/energy-source.h Fri Apr 19 22:39:55 2013 +0200
@@ -150,7 +150,7 @@
* not aggregated to the node, therefore we need to manually start them here.
* Called by EnergySourceContainer, which is aggregated to the node.
*/
- void StartDeviceModels (void);
+ void InitializeDeviceModels (void);
/**
* Calls Dispose () method of the device energy models. Device energy models
--- a/src/energy/model/li-ion-energy-source.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/energy/model/li-ion-energy-source.cc Fri Apr 19 22:39:55 2013 +0200
@@ -236,7 +236,7 @@
* Private functions start here.
*/
void
-LiIonEnergySource::DoStart (void)
+LiIonEnergySource::DoInitialize (void)
{
NS_LOG_FUNCTION (this);
UpdateEnergySource (); // start periodic update
--- a/src/energy/model/li-ion-energy-source.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/energy/model/li-ion-energy-source.h Fri Apr 19 22:39:55 2013 +0200
@@ -151,7 +151,7 @@
*/
Time GetEnergyUpdateInterval (void) const;
private:
- void DoStart (void);
+ void DoInitialize (void);
void DoDispose (void);
/**
--- a/src/energy/model/rv-battery-model.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/energy/model/rv-battery-model.cc Fri Apr 19 22:39:55 2013 +0200
@@ -287,7 +287,7 @@
*/
void
-RvBatteryModel::DoStart (void)
+RvBatteryModel::DoInitialize (void)
{
NS_LOG_FUNCTION (this);
NS_LOG_DEBUG ("RvBatteryModel:Starting battery level update!");
--- a/src/energy/model/rv-battery-model.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/energy/model/rv-battery-model.h Fri Apr 19 22:39:55 2013 +0200
@@ -175,7 +175,7 @@
private:
/// Defined in ns3::Object
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
/// Defined in ns3::Object
virtual void DoDispose (void);
--- a/src/internet/model/ipv4-list-routing.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/internet/model/ipv4-list-routing.cc Fri Apr 19 22:39:55 2013 +0200
@@ -84,15 +84,15 @@
}
void
-Ipv4ListRouting::DoStart (void)
+Ipv4ListRouting::DoInitialize (void)
{
for (Ipv4RoutingProtocolList::iterator rprotoIter = m_routingProtocols.begin ();
rprotoIter != m_routingProtocols.end (); rprotoIter++)
{
Ptr<Ipv4RoutingProtocol> protocol = (*rprotoIter).second;
- protocol->Start ();
+ protocol->Initialize ();
}
- Ipv4RoutingProtocol::DoStart ();
+ Ipv4RoutingProtocol::DoInitialize ();
}
--- a/src/internet/model/ipv4-list-routing.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/internet/model/ipv4-list-routing.h Fri Apr 19 22:39:55 2013 +0200
@@ -90,7 +90,7 @@
protected:
void DoDispose (void);
- void DoStart (void);
+ void DoInitialize (void);
private:
typedef std::pair<int16_t, Ptr<Ipv4RoutingProtocol> > Ipv4RoutingProtocolEntry;
typedef std::list<Ipv4RoutingProtocolEntry> Ipv4RoutingProtocolList;
--- a/src/lte/helper/lte-helper.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/helper/lte-helper.cc Fri Apr 19 22:39:55 2013 +0200
@@ -73,7 +73,7 @@
}
void
-LteHelper::DoStart (void)
+LteHelper::DoInitialize (void)
{
NS_LOG_FUNCTION (this);
m_downlinkChannel = m_channelFactory.Create<SpectrumChannel> ();
@@ -112,7 +112,7 @@
{
Ptr<SpectrumPropagationLossModel> m_fadingModule;
m_fadingModule = m_fadingModelFactory.Create<SpectrumPropagationLossModel> ();
- m_fadingModule->Start ();
+ m_fadingModule->Initialize ();
m_downlinkChannel->AddSpectrumPropagationLossModel (m_fadingModule);
m_uplinkChannel->AddSpectrumPropagationLossModel (m_fadingModule);
}
@@ -120,7 +120,7 @@
m_phyTxStats = CreateObject<PhyTxStatsCalculator> ();
m_phyRxStats = CreateObject<PhyRxStatsCalculator> ();
m_macStats = CreateObject<MacStatsCalculator> ();
- Object::DoStart ();
+ Object::DoInitialize ();
}
@@ -285,7 +285,7 @@
LteHelper::InstallEnbDevice (NodeContainer c)
{
NS_LOG_FUNCTION (this);
- Start (); // will run DoStart () if necessary
+ Initialize (); // will run DoInitialize () if necessary
NetDeviceContainer devices;
for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)
{
@@ -434,7 +434,7 @@
}
- dev->Start ();
+ dev->Initialize ();
m_uplinkChannel->AddRx (ulPhy);
@@ -552,7 +552,7 @@
m_epcHelper->AddUe (dev, dev->GetImsi ());
}
- dev->Start ();
+ dev->Initialize ();
return dev;
}
--- a/src/lte/helper/lte-helper.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/helper/lte-helper.h Fri Apr 19 22:39:55 2013 +0200
@@ -395,7 +395,7 @@
protected:
// inherited from Object
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
private:
Ptr<NetDevice> InstallSingleEnbDevice (Ptr<Node> n);
--- a/src/lte/model/lte-enb-net-device.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-enb-net-device.cc Fri Apr 19 22:39:55 2013 +0200
@@ -246,13 +246,13 @@
void
-LteEnbNetDevice::DoStart (void)
+LteEnbNetDevice::DoInitialize (void)
{
UpdateConfig ();
- m_phy->Start ();
- m_mac->Start ();
- m_rrc->Start ();
+ m_phy->Initialize ();
+ m_mac->Initialize ();
+ m_rrc->Initialize ();
}
--- a/src/lte/model/lte-enb-net-device.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-enb-net-device.h Fri Apr 19 22:39:55 2013 +0200
@@ -123,7 +123,7 @@
protected:
// inherited from Object
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
private:
--- a/src/lte/model/lte-enb-phy.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-enb-phy.cc Fri Apr 19 22:39:55 2013 +0200
@@ -229,12 +229,12 @@
}
void
-LteEnbPhy::DoStart ()
+LteEnbPhy::DoInitialize ()
{
NS_LOG_FUNCTION (this);
Ptr<SpectrumValue> noisePsd = LteSpectrumValueHelper::CreateNoisePowerSpectralDensity (m_ulEarfcn, m_ulBandwidth, m_noiseFigure);
m_uplinkSpectrumPhy->SetNoisePowerSpectralDensity (noisePsd);
- LtePhy::DoStart ();
+ LtePhy::DoInitialize ();
}
--- a/src/lte/model/lte-enb-phy.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-enb-phy.h Fri Apr 19 22:39:55 2013 +0200
@@ -66,7 +66,7 @@
// inherited from Object
static TypeId GetTypeId (void);
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
virtual void DoDispose (void);
--- a/src/lte/model/lte-enb-rrc.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-enb-rrc.cc Fri Apr 19 22:39:55 2013 +0200
@@ -146,7 +146,7 @@
}
void
-UeManager::DoStart ()
+UeManager::DoInitialize ()
{
NS_LOG_FUNCTION (this);
m_drbPdcpSapUser = new LtePdcpSpecificLtePdcpSapUser<UeManager> (this);
@@ -429,10 +429,10 @@
{
std::map <uint8_t, Ptr<LteDataRadioBearerInfo> >::iterator drbIt = m_drbMap.find (*drbIdIt);
NS_ASSERT (drbIt != m_drbMap.end ());
- drbIt->second->m_rlc->Start ();
+ drbIt->second->m_rlc->Initialize ();
if (drbIt->second->m_pdcp)
{
- drbIt->second->m_pdcp->Start ();
+ drbIt->second->m_pdcp->Initialize ();
}
}
m_drbsToBeStarted.clear ();
@@ -1731,7 +1731,7 @@
m_lastAllocatedRnti = rnti;
Ptr<UeManager> ueManager = CreateObject<UeManager> (this, rnti, state);
m_ueMap.insert (std::pair<uint16_t, Ptr<UeManager> > (rnti, ueManager));
- ueManager->Start ();
+ ueManager->Initialize ();
NS_LOG_DEBUG (this << " New UE RNTI " << rnti << " cellId " << m_cellId << " srs CI " << ueManager->GetSrsConfigurationIndex ());
m_newUeContextTrace (m_cellId, rnti);
return rnti;
--- a/src/lte/model/lte-enb-rrc.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-enb-rrc.h Fri Apr 19 22:39:55 2013 +0200
@@ -97,7 +97,7 @@
// inherited from Object
protected:
- virtual void DoStart ();
+ virtual void DoInitialize ();
virtual void DoDispose ();
public:
static TypeId GetTypeId (void);
--- a/src/lte/model/lte-rlc.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-rlc.cc Fri Apr 19 22:39:55 2013 +0200
@@ -190,7 +190,7 @@
}
void
-LteRlcSm::DoStart ()
+LteRlcSm::DoInitialize ()
{
NS_LOG_FUNCTION (this);
ReportBufferStatus ();
--- a/src/lte/model/lte-rlc.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-rlc.h Fri Apr 19 22:39:55 2013 +0200
@@ -149,7 +149,7 @@
LteRlcSm ();
virtual ~LteRlcSm ();
static TypeId GetTypeId (void);
- virtual void DoStart ();
+ virtual void DoInitialize ();
virtual void DoDispose ();
virtual void DoTransmitPdcpPdu (Ptr<Packet> p);
--- a/src/lte/model/lte-ue-net-device.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-ue-net-device.cc Fri Apr 19 22:39:55 2013 +0200
@@ -187,13 +187,13 @@
}
void
-LteUeNetDevice::DoStart (void)
+LteUeNetDevice::DoInitialize (void)
{
NS_LOG_FUNCTION (this);
UpdateConfig ();
- m_phy->Start ();
- m_mac->Start ();
- m_rrc->Start ();
+ m_phy->Initialize ();
+ m_mac->Initialize ();
+ m_rrc->Initialize ();
}
bool
--- a/src/lte/model/lte-ue-net-device.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-ue-net-device.h Fri Apr 19 22:39:55 2013 +0200
@@ -101,7 +101,7 @@
protected:
// inherited from Object
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
private:
--- a/src/lte/model/lte-ue-phy.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-ue-phy.cc Fri Apr 19 22:39:55 2013 +0200
@@ -240,10 +240,10 @@
}
void
-LteUePhy::DoStart ()
+LteUePhy::DoInitialize ()
{
NS_LOG_FUNCTION (this);
- LtePhy::DoStart ();
+ LtePhy::DoInitialize ();
}
void
--- a/src/lte/model/lte-ue-phy.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-ue-phy.h Fri Apr 19 22:39:55 2013 +0200
@@ -68,7 +68,7 @@
// inherited from Object
static TypeId GetTypeId (void);
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
virtual void DoDispose (void);
/**
--- a/src/lte/model/lte-ue-rrc.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-ue-rrc.cc Fri Apr 19 22:39:55 2013 +0200
@@ -342,7 +342,7 @@
void
-LteUeRrc::DoStart (void)
+LteUeRrc::DoInitialize (void)
{
NS_LOG_FUNCTION (this);
@@ -875,7 +875,7 @@
m_cmacSapProvider->AddLc (dtamIt->logicalChannelIdentity,
lcConfig,
rlc->GetLteMacSapUser ());
- rlc->Start ();
+ rlc->Initialize ();
}
else
{
--- a/src/lte/model/lte-ue-rrc.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/lte-ue-rrc.h Fri Apr 19 22:39:55 2013 +0200
@@ -91,7 +91,7 @@
// inherited from Object
private:
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
virtual void DoDispose (void);
public:
static TypeId GetTypeId (void);
--- a/src/lte/model/trace-fading-loss-model.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/trace-fading-loss-model.cc Fri Apr 19 22:39:55 2013 +0200
@@ -103,7 +103,7 @@
}
void
-TraceFadingLossModel::DoStart ()
+TraceFadingLossModel::DoInitialize ()
{
LoadTrace ();
}
--- a/src/lte/model/trace-fading-loss-model.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/model/trace-fading-loss-model.h Fri Apr 19 22:39:55 2013 +0200
@@ -49,7 +49,7 @@
static TypeId GetTypeId ();
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
/**
* \brief The couple of mobility mnode that form a fading channel realization
--- a/src/lte/test/lte-simple-helper.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/test/lte-simple-helper.cc Fri Apr 19 22:39:55 2013 +0200
@@ -45,13 +45,13 @@
}
void
-LteSimpleHelper::DoStart (void)
+LteSimpleHelper::DoInitialize (void)
{
NS_LOG_FUNCTION (this);
m_phyChannel = CreateObject<SimpleChannel> ();
- Object::DoStart ();
+ Object::DoInitialize ();
}
LteSimpleHelper::~LteSimpleHelper (void)
@@ -95,7 +95,7 @@
LteSimpleHelper::InstallEnbDevice (NodeContainer c)
{
NS_LOG_FUNCTION (this);
- Start (); // will run DoStart () if necessary
+ Initialize (); // will run DoInitialize () if necessary
NetDeviceContainer devices;
for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)
{
--- a/src/lte/test/lte-simple-helper.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/test/lte-simple-helper.h Fri Apr 19 22:39:55 2013 +0200
@@ -115,7 +115,7 @@
protected:
// inherited from Object
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
private:
Ptr<NetDevice> InstallSingleEnbDevice (Ptr<Node> n);
--- a/src/lte/test/lte-simple-net-device.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/test/lte-simple-net-device.cc Fri Apr 19 22:39:55 2013 +0200
@@ -70,7 +70,7 @@
void
-LteSimpleNetDevice::DoStart (void)
+LteSimpleNetDevice::DoInitialize (void)
{
NS_LOG_FUNCTION (this);
}
--- a/src/lte/test/lte-simple-net-device.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/lte/test/lte-simple-net-device.h Fri Apr 19 22:39:55 2013 +0200
@@ -54,7 +54,7 @@
protected:
// inherited from Object
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
};
--- a/src/mesh/model/dot11s/hwmp-protocol.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mesh/model/dot11s/hwmp-protocol.cc Fri Apr 19 22:39:55 2013 +0200
@@ -201,7 +201,7 @@
}
void
-HwmpProtocol::DoStart ()
+HwmpProtocol::DoInitialize ()
{
m_coefficient->SetAttribute ("Max", DoubleValue (m_randomStart.GetSeconds ()));
if (m_isRoot)
--- a/src/mesh/model/dot11s/hwmp-protocol.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mesh/model/dot11s/hwmp-protocol.h Fri Apr 19 22:39:55 2013 +0200
@@ -99,7 +99,7 @@
private:
friend class HwmpProtocolMac;
- virtual void DoStart ();
+ virtual void DoInitialize ();
HwmpProtocol& operator= (const HwmpProtocol &);
HwmpProtocol (const HwmpProtocol &);
--- a/src/mesh/model/dot11s/peer-management-protocol.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mesh/model/dot11s/peer-management-protocol.cc Fri Apr 19 22:39:55 2013 +0200
@@ -587,7 +587,7 @@
}
void
-PeerManagementProtocol::DoStart ()
+PeerManagementProtocol::DoInitialize ()
{
// If beacon interval is equal to the neighbor's one and one o more beacons received
// by my neighbor coincide with my beacon - apply random uniformly distributed shift from
--- a/src/mesh/model/dot11s/peer-management-protocol.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mesh/model/dot11s/peer-management-protocol.h Fri Apr 19 22:39:55 2013 +0200
@@ -161,7 +161,7 @@
int64_t AssignStreams (int64_t stream);
private:
- virtual void DoStart ();
+ virtual void DoInitialize ();
/**
* \name Private structures
* \{
--- a/src/mesh/model/mesh-wifi-interface-mac.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mesh/model/mesh-wifi-interface-mac.cc Fri Apr 19 22:39:55 2013 +0200
@@ -127,7 +127,7 @@
RegularWifiMac::DoDispose ();
}
void
-MeshWifiInterfaceMac::DoStart ()
+MeshWifiInterfaceMac::DoInitialize ()
{
m_coefficient->SetAttribute ("Max", DoubleValue (m_randomStart.GetSeconds ()));
if (m_beaconEnable)
--- a/src/mesh/model/mesh-wifi-interface-mac.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mesh/model/mesh-wifi-interface-mac.h Fri Apr 19 22:39:55 2013 +0200
@@ -161,7 +161,7 @@
private:
typedef std::vector<Ptr<MeshWifiInterfaceMacPlugin> > PluginList;
- virtual void DoStart ();
+ virtual void DoInitialize ();
///\name Mesh timing intervals
// \{
--- a/src/mobility/model/random-direction-2d-mobility-model.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mobility/model/random-direction-2d-mobility-model.cc Fri Apr 19 22:39:55 2013 +0200
@@ -69,14 +69,14 @@
MobilityModel::DoDispose ();
}
void
-RandomDirection2dMobilityModel::DoStart (void)
+RandomDirection2dMobilityModel::DoInitialize (void)
{
- DoStartPrivate ();
- MobilityModel::DoStart ();
+ DoInitializePrivate ();
+ MobilityModel::DoInitialize ();
}
void
-RandomDirection2dMobilityModel::DoStartPrivate (void)
+RandomDirection2dMobilityModel::DoInitializePrivate (void)
{
double direction = m_direction->GetValue (0, 2 * PI);
SetDirectionAndSpeed (direction);
@@ -148,7 +148,7 @@
m_helper.SetPosition (position);
Simulator::Remove (m_event);
m_event.Cancel ();
- m_event = Simulator::ScheduleNow (&RandomDirection2dMobilityModel::DoStartPrivate, this);
+ m_event = Simulator::ScheduleNow (&RandomDirection2dMobilityModel::DoInitializePrivate, this);
}
Vector
RandomDirection2dMobilityModel::DoGetVelocity (void) const
--- a/src/mobility/model/random-direction-2d-mobility-model.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mobility/model/random-direction-2d-mobility-model.h Fri Apr 19 22:39:55 2013 +0200
@@ -52,9 +52,9 @@
void BeginPause (void);
void SetDirectionAndSpeed (double direction);
void InitializeDirectionAndSpeed (void);
- void DoStartPrivate (void);
+ void DoInitializePrivate (void);
virtual void DoDispose (void);
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
virtual Vector DoGetPosition (void) const;
virtual void DoSetPosition (const Vector &position);
virtual Vector DoGetVelocity (void) const;
--- a/src/mobility/model/random-walk-2d-mobility-model.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mobility/model/random-walk-2d-mobility-model.cc Fri Apr 19 22:39:55 2013 +0200
@@ -75,14 +75,14 @@
}
void
-RandomWalk2dMobilityModel::DoStart (void)
+RandomWalk2dMobilityModel::DoInitialize (void)
{
- DoStartPrivate ();
- MobilityModel::DoStart ();
+ DoInitializePrivate ();
+ MobilityModel::DoInitialize ();
}
void
-RandomWalk2dMobilityModel::DoStartPrivate (void)
+RandomWalk2dMobilityModel::DoInitializePrivate (void)
{
m_helper.Update ();
double speed = m_speed->GetValue ();
@@ -116,7 +116,7 @@
m_event.Cancel ();
if (m_bounds.IsInside (nextPosition))
{
- m_event = Simulator::Schedule (delayLeft, &RandomWalk2dMobilityModel::DoStartPrivate, this);
+ m_event = Simulator::Schedule (delayLeft, &RandomWalk2dMobilityModel::DoInitializePrivate, this);
}
else
{
@@ -168,7 +168,7 @@
NS_ASSERT (m_bounds.IsInside (position));
m_helper.SetPosition (position);
Simulator::Remove (m_event);
- m_event = Simulator::ScheduleNow (&RandomWalk2dMobilityModel::DoStartPrivate, this);
+ m_event = Simulator::ScheduleNow (&RandomWalk2dMobilityModel::DoInitializePrivate, this);
}
Vector
RandomWalk2dMobilityModel::DoGetVelocity (void) const
--- a/src/mobility/model/random-walk-2d-mobility-model.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mobility/model/random-walk-2d-mobility-model.h Fri Apr 19 22:39:55 2013 +0200
@@ -56,9 +56,9 @@
private:
void Rebound (Time timeLeft);
void DoWalk (Time timeLeft);
- void DoStartPrivate (void);
+ void DoInitializePrivate (void);
virtual void DoDispose (void);
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
virtual Vector DoGetPosition (void) const;
virtual void DoSetPosition (const Vector &position);
virtual Vector DoGetVelocity (void) const;
--- a/src/mobility/model/random-waypoint-mobility-model.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mobility/model/random-waypoint-mobility-model.cc Fri Apr 19 22:39:55 2013 +0200
@@ -73,19 +73,19 @@
Time travelDelay = Seconds (CalculateDistance (destination, m_current) / speed);
m_event.Cancel ();
m_event = Simulator::Schedule (travelDelay,
- &RandomWaypointMobilityModel::DoStartPrivate, this);
+ &RandomWaypointMobilityModel::DoInitializePrivate, this);
NotifyCourseChange ();
}
void
-RandomWaypointMobilityModel::DoStart (void)
+RandomWaypointMobilityModel::DoInitialize (void)
{
- DoStartPrivate ();
- MobilityModel::DoStart ();
+ DoInitializePrivate ();
+ MobilityModel::DoInitialize ();
}
void
-RandomWaypointMobilityModel::DoStartPrivate (void)
+RandomWaypointMobilityModel::DoInitializePrivate (void)
{
m_helper.Update ();
m_helper.Pause ();
@@ -105,7 +105,7 @@
{
m_helper.SetPosition (position);
Simulator::Remove (m_event);
- m_event = Simulator::ScheduleNow (&RandomWaypointMobilityModel::DoStartPrivate, this);
+ m_event = Simulator::ScheduleNow (&RandomWaypointMobilityModel::DoInitializePrivate, this);
}
Vector
RandomWaypointMobilityModel::DoGetVelocity (void) const
--- a/src/mobility/model/random-waypoint-mobility-model.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mobility/model/random-waypoint-mobility-model.h Fri Apr 19 22:39:55 2013 +0200
@@ -54,10 +54,10 @@
public:
static TypeId GetTypeId (void);
protected:
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
private:
void BeginWalk (void);
- void DoStartPrivate (void);
+ void DoInitializePrivate (void);
virtual Vector DoGetPosition (void) const;
virtual void DoSetPosition (const Vector &position);
virtual Vector DoGetVelocity (void) const;
--- a/src/mobility/model/steady-state-random-waypoint-mobility-model.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mobility/model/steady-state-random-waypoint-mobility-model.cc Fri Apr 19 22:39:55 2013 +0200
@@ -93,14 +93,14 @@
}
void
-SteadyStateRandomWaypointMobilityModel::DoStart (void)
+SteadyStateRandomWaypointMobilityModel::DoInitialize (void)
{
- SteadyStateStart ();
- MobilityModel::DoStart ();
+ DoInitializePrivate ();
+ MobilityModel::DoInitialize ();
}
void
-SteadyStateRandomWaypointMobilityModel::SteadyStateStart (void)
+SteadyStateRandomWaypointMobilityModel::DoInitializePrivate (void)
{
alreadyStarted = true;
// Configure random variables based on attributes
--- a/src/mobility/model/steady-state-random-waypoint-mobility-model.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mobility/model/steady-state-random-waypoint-mobility-model.h Fri Apr 19 22:39:55 2013 +0200
@@ -55,9 +55,9 @@
static TypeId GetTypeId (void);
SteadyStateRandomWaypointMobilityModel ();
protected:
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
private:
- void SteadyStateStart (void);
+ void DoInitializePrivate (void);
void SteadyStateBeginWalk (const Vector &destination);
void Start (void);
void BeginWalk (void);
--- a/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc Fri Apr 19 22:39:55 2013 +0200
@@ -78,7 +78,7 @@
// Add this mobility model to the stack.
mobilityStack.push_back (model);
- Simulator::Schedule (Seconds (0.0), &Object::Start, model);
+ Simulator::Schedule (Seconds (0.0), &Object::Initialize, model);
}
Simulator::Schedule (Seconds (0.001), &SteadyStateRandomWaypointTest::DistribCompare, this);
--- a/src/mobility/test/waypoint-mobility-model-test.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/mobility/test/waypoint-mobility-model-test.cc Fri Apr 19 22:39:55 2013 +0200
@@ -77,7 +77,7 @@
// Add this mobility model to the stack.
mobilityStack.push_back (model);
- Simulator::Schedule (Seconds (0.0), &Object::Start, model);
+ Simulator::Schedule (Seconds (0.0), &Object::Initialize, model);
}
Waypoint wpt (Seconds (0.0), Vector (0.0, 0.0, 0.0));
--- a/src/network/model/application.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/network/model/application.cc Fri Apr 19 22:39:55 2013 +0200
@@ -89,7 +89,7 @@
}
void
-Application::DoStart (void)
+Application::DoInitialize (void)
{
NS_LOG_FUNCTION (this);
m_startEvent = Simulator::Schedule (m_startTime, &Application::StartApplication, this);
@@ -97,7 +97,7 @@
{
m_stopEvent = Simulator::Schedule (m_stopTime, &Application::StopApplication, this);
}
- Object::DoStart ();
+ Object::DoInitialize ();
}
Ptr<Node> Application::GetNode () const
--- a/src/network/model/application.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/network/model/application.h Fri Apr 19 22:39:55 2013 +0200
@@ -121,7 +121,7 @@
virtual void StopApplication (void);
protected:
virtual void DoDispose (void);
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
Ptr<Node> m_node;
Time m_startTime;
--- a/src/network/model/node-list.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/network/model/node-list.cc Fri Apr 19 22:39:55 2013 +0200
@@ -129,7 +129,7 @@
NS_LOG_FUNCTION (this << node);
uint32_t index = m_nodes.size ();
m_nodes.push_back (node);
- Simulator::ScheduleWithContext (index, TimeStep (0), &Node::Start, node);
+ Simulator::ScheduleWithContext (index, TimeStep (0), &Node::Initialize, node);
return index;
}
--- a/src/network/model/node.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/network/model/node.cc Fri Apr 19 22:39:55 2013 +0200
@@ -123,7 +123,7 @@
device->SetIfIndex (index);
device->SetReceiveCallback (MakeCallback (&Node::NonPromiscReceiveFromDevice, this));
Simulator::ScheduleWithContext (GetId (), Seconds (0.0),
- &NetDevice::Start, device);
+ &NetDevice::Initialize, device);
NotifyDeviceAdded (device);
return index;
}
@@ -150,7 +150,7 @@
m_applications.push_back (application);
application->SetNode (this);
Simulator::ScheduleWithContext (GetId (), Seconds (0.0),
- &Application::Start, application);
+ &Application::Initialize, application);
return index;
}
Ptr<Application>
@@ -193,23 +193,23 @@
Object::DoDispose ();
}
void
-Node::DoStart (void)
+Node::DoInitialize (void)
{
NS_LOG_FUNCTION (this);
for (std::vector<Ptr<NetDevice> >::iterator i = m_devices.begin ();
i != m_devices.end (); i++)
{
Ptr<NetDevice> device = *i;
- device->Start ();
+ device->Initialize ();
}
for (std::vector<Ptr<Application> >::iterator i = m_applications.begin ();
i != m_applications.end (); i++)
{
Ptr<Application> application = *i;
- application->Start ();
+ application->Initialize ();
}
- Object::DoStart ();
+ Object::DoInitialize ();
}
void
--- a/src/network/model/node.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/network/model/node.h Fri Apr 19 22:39:55 2013 +0200
@@ -202,7 +202,7 @@
* end of their own DoDispose method.
*/
virtual void DoDispose (void);
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
private:
void NotifyDeviceAdded (Ptr<NetDevice> device);
bool NonPromiscReceiveFromDevice (Ptr<NetDevice> device, Ptr<const Packet>, uint16_t protocol, const Address &from);
--- a/src/olsr/model/olsr-routing-protocol.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/olsr/model/olsr-routing-protocol.cc Fri Apr 19 22:39:55 2013 +0200
@@ -273,7 +273,7 @@
m_hnaRoutingTable->PrintRoutingTable (stream);
}
-void RoutingProtocol::DoStart ()
+void RoutingProtocol::DoInitialize ()
{
if (m_mainAddress == Ipv4Address ())
{
--- a/src/olsr/model/olsr-routing-protocol.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/olsr/model/olsr-routing-protocol.h Fri Apr 19 22:39:55 2013 +0200
@@ -133,7 +133,7 @@
void SetRoutingTableAssociation (Ptr<Ipv4StaticRouting> routingTable);
protected:
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
private:
std::map<Ipv4Address, RoutingTableEntry> m_table; ///< Data structure for the routing table.
--- a/src/wifi/model/ap-wifi-mac.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/wifi/model/ap-wifi-mac.cc Fri Apr 19 22:39:55 2013 +0200
@@ -564,15 +564,15 @@
}
void
-ApWifiMac::DoStart (void)
+ApWifiMac::DoInitialize (void)
{
- m_beaconDca->Start ();
+ m_beaconDca->Initialize ();
m_beaconEvent.Cancel ();
if (m_enableBeaconGeneration)
{
m_beaconEvent = Simulator::ScheduleNow (&ApWifiMac::SendOneBeacon, this);
}
- RegularWifiMac::DoStart ();
+ RegularWifiMac::DoInitialize ();
}
} // namespace ns3
--- a/src/wifi/model/ap-wifi-mac.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/wifi/model/ap-wifi-mac.h Fri Apr 19 22:39:55 2013 +0200
@@ -121,7 +121,7 @@
void SetBeaconGeneration (bool enable);
bool GetBeaconGeneration (void) const;
virtual void DoDispose (void);
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
Ptr<DcaTxop> m_beaconDca;
Time m_beaconInterval;
--- a/src/wifi/model/dca-txop.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/wifi/model/dca-txop.cc Fri Apr 19 22:39:55 2013 +0200
@@ -293,11 +293,11 @@
}
void
-DcaTxop::DoStart ()
+DcaTxop::DoInitialize ()
{
m_dcf->ResetCw ();
m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));
- ns3::Dcf::DoStart ();
+ ns3::Dcf::DoInitialize ();
}
bool
DcaTxop::NeedRtsRetransmission (void)
--- a/src/wifi/model/dca-txop.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/wifi/model/dca-txop.h Fri Apr 19 22:39:55 2013 +0200
@@ -130,7 +130,7 @@
// Inherited from ns3::Object
Ptr<MacLow> Low (void);
- void DoStart ();
+ void DoInitialize ();
/* dcf notifications forwarded here */
bool NeedsAccess (void) const;
void NotifyAccessGranted (void);
--- a/src/wifi/model/edca-txop-n.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/wifi/model/edca-txop-n.cc Fri Apr 19 22:39:55 2013 +0200
@@ -1120,10 +1120,10 @@
}
void
-EdcaTxopN::DoStart ()
+EdcaTxopN::DoInitialize ()
{
m_dcf->ResetCw ();
m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));
- ns3::Dcf::DoStart ();
+ ns3::Dcf::DoInitialize ();
}
} // namespace ns3
--- a/src/wifi/model/edca-txop-n.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/wifi/model/edca-txop-n.h Fri Apr 19 22:39:55 2013 +0200
@@ -162,7 +162,7 @@
int64_t AssignStreams (int64_t stream);
private:
- void DoStart ();
+ void DoInitialize ();
/**
* This functions are used only to correctly set addresses in a-msdu subframe.
* If aggregating sta is a STA (in an infrastructured network):
--- a/src/wifi/model/regular-wifi-mac.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/wifi/model/regular-wifi-mac.cc Fri Apr 19 22:39:55 2013 +0200
@@ -75,15 +75,15 @@
}
void
-RegularWifiMac::DoStart ()
+RegularWifiMac::DoInitialize ()
{
NS_LOG_FUNCTION (this);
- m_dca->Start ();
+ m_dca->Initialize ();
for (EdcaQueues::iterator i = m_edca.begin (); i != m_edca.end (); ++i)
{
- i->second->Start ();
+ i->second->Initialize ();
}
}
--- a/src/wifi/model/regular-wifi-mac.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/wifi/model/regular-wifi-mac.h Fri Apr 19 22:39:55 2013 +0200
@@ -211,7 +211,7 @@
virtual Time GetCompressedBlockAckTimeout (void) const;
protected:
- virtual void DoStart ();
+ virtual void DoInitialize ();
virtual void DoDispose ();
MacRxMiddle *m_rxMiddle;
--- a/src/wifi/model/wifi-net-device.cc Fri Apr 19 12:58:25 2013 -0700
+++ b/src/wifi/model/wifi-net-device.cc Fri Apr 19 22:39:55 2013 +0200
@@ -96,12 +96,12 @@
}
void
-WifiNetDevice::DoStart (void)
+WifiNetDevice::DoInitialize (void)
{
- m_phy->Start ();
- m_mac->Start ();
- m_stationManager->Start ();
- NetDevice::DoStart ();
+ m_phy->Initialize ();
+ m_mac->Initialize ();
+ m_stationManager->Initialize ();
+ NetDevice::DoInitialize ();
}
void
--- a/src/wifi/model/wifi-net-device.h Fri Apr 19 12:58:25 2013 -0700
+++ b/src/wifi/model/wifi-net-device.h Fri Apr 19 22:39:55 2013 +0200
@@ -115,7 +115,7 @@
static const uint16_t MAX_MSDU_SIZE = 2304;
virtual void DoDispose (void);
- virtual void DoStart (void);
+ virtual void DoInitialize (void);
void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
void LinkUp (void);
void LinkDown (void);