From 28e93f9be6d33b5432aa5952614b82a5c54a40db Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Mon, 28 Sep 2020 12:37:05 -0700 Subject: [PATCH] fd-net-device: Change time-based attribute to TimeValue type --- src/fd-net-device/model/dpdk-net-device.cc | 12 +++++------- src/fd-net-device/model/dpdk-net-device.h | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/fd-net-device/model/dpdk-net-device.cc b/src/fd-net-device/model/dpdk-net-device.cc index c65c89c19..b00dab84d 100644 --- a/src/fd-net-device/model/dpdk-net-device.cc +++ b/src/fd-net-device/model/dpdk-net-device.cc @@ -62,10 +62,10 @@ DpdkNetDevice::GetTypeId (void) .SetGroupName ("FdNetDevice") .AddConstructor () .AddAttribute ("TxTimeout", - "The time to wait before transmitting burst from Tx Buffer (in us).", - UintegerValue (2000), - MakeUintegerAccessor (&DpdkNetDevice::m_txTimeout), - MakeUintegerChecker ()) + "The time to wait before transmitting burst from Tx buffer.", + TimeValue (MicroSeconds (2000)), + MakeTimeAccessor (&DpdkNetDevice::m_txTimeout), + MakeTimeChecker ()) .AddAttribute ("MaxRxBurst", "Size of Rx Burst.", UintegerValue (64), @@ -467,9 +467,7 @@ DpdkNetDevice::Write (uint8_t *buffer, size_t length) { // If this is a first packet in buffer, schedule a tx. Simulator::Cancel (m_txEvent); - m_txEvent = - Simulator::Schedule ( Time ( MicroSeconds (m_txTimeout) ), - &DpdkNetDevice::HandleTx, this); + m_txEvent = Simulator::Schedule (m_txTimeout, &DpdkNetDevice::HandleTx, this); } return length; diff --git a/src/fd-net-device/model/dpdk-net-device.h b/src/fd-net-device/model/dpdk-net-device.h index bf87e4167..0ed9ca77c 100644 --- a/src/fd-net-device/model/dpdk-net-device.h +++ b/src/fd-net-device/model/dpdk-net-device.h @@ -172,9 +172,9 @@ private: EventId m_txEvent; /** - * Timeout for stale packet transmission + * The time to wait before transmitting burst from Tx buffer */ - uint64_t m_txTimeout; + Time m_txTimeout; /** * Size of Rx burst