diff --git a/src/csma/examples/csma-raw-ip-socket.cc b/src/csma/examples/csma-raw-ip-socket.cc index 39e3b2d45..a6cbae2e2 100644 --- a/src/csma/examples/csma-raw-ip-socket.cc +++ b/src/csma/examples/csma-raw-ip-socket.cc @@ -46,7 +46,7 @@ static void SinkRx (Ptr p, const Address &ad) { // Enable the below line to see the packet contents printed out at the // receive sink - //std::cout << Simulator::Now().GetSeconds () << " " << *p << std::endl; + //std::cout << Simulator::Now().As (Time::S) << " " << *p << std::endl; } int diff --git a/src/csma/model/csma-channel.cc b/src/csma/model/csma-channel.cc index 70f0a1a49..eeb5a4249 100644 --- a/src/csma/model/csma-channel.cc +++ b/src/csma/model/csma-channel.cc @@ -217,7 +217,7 @@ CsmaChannel::TransmitEnd () retVal = false; } - NS_LOG_LOGIC ("Schedule event in " << m_delay.GetSeconds () << " sec"); + NS_LOG_LOGIC ("Schedule event in " << m_delay.As (Time::S)); NS_LOG_LOGIC ("Receive"); diff --git a/src/csma/model/csma-net-device.cc b/src/csma/model/csma-net-device.cc index d7969a98f..9913e48b3 100644 --- a/src/csma/model/csma-net-device.cc +++ b/src/csma/model/csma-net-device.cc @@ -495,7 +495,7 @@ CsmaNetDevice::TransmitStart (void) m_backoff.IncrNumRetries (); Time backoffTime = m_backoff.GetBackoffTime (); - NS_LOG_LOGIC ("Channel busy, backing off for " << backoffTime.GetSeconds () << " sec"); + NS_LOG_LOGIC ("Channel busy, backing off for " << backoffTime.As (Time::S)); Simulator::Schedule (backoffTime, &CsmaNetDevice::TransmitStart, this); } @@ -523,7 +523,7 @@ CsmaNetDevice::TransmitStart (void) m_txMachineState = BUSY; Time tEvent = m_bps.CalculateBytesTxTime (m_currentPkt->GetSize ()); - NS_LOG_LOGIC ("Schedule TransmitCompleteEvent in " << tEvent.GetSeconds () << "sec"); + NS_LOG_LOGIC ("Schedule TransmitCompleteEvent in " << tEvent.As (Time::S)); Simulator::Schedule (tEvent, &CsmaNetDevice::TransmitCompleteEvent, this); } } @@ -601,7 +601,7 @@ CsmaNetDevice::TransmitCompleteEvent (void) m_phyTxEndTrace (m_currentPkt); m_currentPkt = 0; - NS_LOG_LOGIC ("Schedule TransmitReadyEvent in " << m_tInterframeGap.GetSeconds () << "sec"); + NS_LOG_LOGIC ("Schedule TransmitReadyEvent in " << m_tInterframeGap.As (Time::S)); Simulator::Schedule (m_tInterframeGap, &CsmaNetDevice::TransmitReadyEvent, this); }