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

Remove logging cout

Browse Source
This commit is contained in:
Tommaso Pecorella
2014-04-08 15:06:52 +02:00
parent 92b2936c5d
commit 1e75a2cb6b
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lr-wpan/model/lr-wpan-phy.cc
View File

@@ -256,8 +256,6 @@ LrWpanPhy::StartRx (Ptr<SpectrumSignalParameters> spectrumRxParams)
NS_LOG_FUNCTION (this << spectrumRxParams);
LrWpanSpectrumValueHelper psdHelper;
std::cout << Simulator::Now () << " StartRx " << this << std::endl;
Ptr<LrWpanSpectrumSignalParameters> lrWpanRxParams = DynamicCast<LrWpanSpectrumSignalParameters> (spectrumRxParams);
NS_ASSERT (lrWpanRxParams != 0);
Ptr<Packet> p = (lrWpanRxParams->packetBurst->GetPackets ()).front ();
@@ -331,8 +329,6 @@ LrWpanPhy::EndRx (Ptr<LrWpanSpectrumSignalParameters> params)
NS_LOG_FUNCTION (this);
NS_ASSERT (params != 0);
std::cout << Simulator::Now () << " EndRx " << this << " " << int(m_trxState) << " - ";
// Calculate whether packet was lost.
LrWpanSpectrumValueHelper psdHelper;
Ptr<LrWpanSpectrumSignalParameters> currentRxParams = m_currentRxPacket.first;
@@ -362,13 +358,8 @@ LrWpanPhy::EndRx (Ptr<LrWpanSpectrumSignalParameters> params)
if (m_random.GetValue () < per)
{
// The packet was destroyed, drop the packet after reception.
std::cout << "discarding " << sinr << " - " << per;
m_currentRxPacket.second = true;
}
else
{
std::cout << "processing " << sinr << " - " << per;
}
}
else
{
@@ -378,8 +369,6 @@ LrWpanPhy::EndRx (Ptr<LrWpanSpectrumSignalParameters> params)
}
}
std::cout << std::endl;
// Update the interference.
m_signal->RemoveSignal (params->psd);
m_rxLastUpdate = Simulator::Now ();
@@ -469,7 +458,6 @@ LrWpanPhy::PdDataRequest (const uint32_t psduLength, Ptr<Packet> p)
Ptr<PacketBurst> pb = CreateObject<PacketBurst> ();
pb->AddPacket (p);
txParams->packetBurst = pb;
std::cout << "** " << Simulator::Now () << " - StartTx " << this << std::endl;
m_channel->StartTx (txParams);
m_pdDataRequest = Simulator::Schedule (txParams->duration, &LrWpanPhy::EndTx, this);
ChangeTrxState (IEEE_802_15_4_PHY_BUSY_TX);
@@ -595,8 +583,6 @@ LrWpanPhy::PlmeSetTRXStateRequest (LrWpanPhyEnumeration state)
{
NS_LOG_FUNCTION (this << state);
// std::cout << Simulator::Now () << " PlmeSetTRXStateRequest " << int (state) << std::endl;
// Check valid states (Table 14)
NS_ABORT_IF ( (state != IEEE_802_15_4_PHY_RX_ON)
&& (state != IEEE_802_15_4_PHY_TRX_OFF)