summaryrefslogtreecommitdiff
path: root/src/dev/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/dev/net')
-rw-r--r--src/dev/net/dist_etherlink.hh16
-rw-r--r--src/dev/net/etherlink.cc3
-rw-r--r--src/dev/net/etherlink.hh8
-rw-r--r--src/dev/net/etherswitch.cc3
-rw-r--r--src/dev/net/etherswitch.hh2
-rw-r--r--src/dev/net/i8254xGBe.cc22
-rw-r--r--src/dev/net/i8254xGBe.hh37
-rw-r--r--src/dev/net/ns_gige.cc21
-rw-r--r--src/dev/net/ns_gige.hh28
-rw-r--r--src/dev/net/sinic.cc11
-rw-r--r--src/dev/net/sinic.hh18
11 files changed, 80 insertions, 89 deletions
diff --git a/src/dev/net/dist_etherlink.hh b/src/dev/net/dist_etherlink.hh
index e8218941a..83f28f2b2 100644
--- a/src/dev/net/dist_etherlink.hh
+++ b/src/dev/net/dist_etherlink.hh
@@ -118,15 +118,13 @@ class DistEtherLink : public EtherObject
* Send done callback. Called from doneEvent.
*/
void txDone();
- typedef EventWrapper<TxLink, &TxLink::txDone> DoneEvent;
- friend void DoneEvent::process();
- DoneEvent doneEvent;
+ EventFunctionWrapper doneEvent;
public:
TxLink(const std::string &name, DistEtherLink *p,
double invBW, Tick delay_var, EtherDump *d) :
Link(name, p, d, &doneEvent), ticksPerByte(invBW),
- delayVar(delay_var), doneEvent(this) {}
+ delayVar(delay_var), doneEvent([this]{ txDone(); }, name) {}
~TxLink() {}
/**
@@ -159,16 +157,14 @@ class DistEtherLink : public EtherObject
* Receive done callback method. Called from doneEvent.
*/
void rxDone();
- typedef EventWrapper<RxLink, &RxLink::rxDone> DoneEvent;
- friend void DoneEvent::process();
- DoneEvent _doneEvent;
+ EventFunctionWrapper _doneEvent;
public:
RxLink(const std::string &name, DistEtherLink *p,
Tick delay, EtherDump *d) :
- Link(name, p, d, &_doneEvent),
- linkDelay(delay), _doneEvent(this) {}
+ Link(name, p, d, &_doneEvent), linkDelay(delay),
+ _doneEvent([this]{ rxDone(); }, name) {}
~RxLink() {}
/**
@@ -178,7 +174,7 @@ class DistEtherLink : public EtherObject
/**
* Done events will be scheduled by DistIface (so we need the accessor)
*/
- const DoneEvent *doneEvent() const { return &_doneEvent; }
+ const EventFunctionWrapper *doneEvent() const { return &_doneEvent; }
};
/**
diff --git a/src/dev/net/etherlink.cc b/src/dev/net/etherlink.cc
index 0975ba446..9a11018bb 100644
--- a/src/dev/net/etherlink.cc
+++ b/src/dev/net/etherlink.cc
@@ -116,7 +116,8 @@ EtherLink::Link::Link(const string &name, EtherLink *p, int num,
double rate, Tick delay, Tick delay_var, EtherDump *d)
: objName(name), parent(p), number(num), txint(NULL), rxint(NULL),
ticksPerByte(rate), linkDelay(delay), delayVar(delay_var), dump(d),
- doneEvent(this), txQueueEvent(this)
+ doneEvent([this]{ txDone(); }, name),
+ txQueueEvent([this]{ processTxQueue(); }, name)
{ }
void
diff --git a/src/dev/net/etherlink.hh b/src/dev/net/etherlink.hh
index 1d02dec3b..7a9870817 100644
--- a/src/dev/net/etherlink.hh
+++ b/src/dev/net/etherlink.hh
@@ -92,9 +92,7 @@ class EtherLink : public EtherObject
*/
EthPacketPtr packet;
void txDone();
- typedef EventWrapper<Link, &Link::txDone> DoneEvent;
- friend void DoneEvent::process();
- DoneEvent doneEvent;
+ EventFunctionWrapper doneEvent;
/**
* Maintain a queue of in-flight packets. Assume that the
@@ -104,9 +102,7 @@ class EtherLink : public EtherObject
std::deque<std::pair<Tick, EthPacketPtr>> txQueue;
void processTxQueue();
- typedef EventWrapper<Link, &Link::processTxQueue> TxQueueEvent;
- friend void TxQueueEvent::process();
- TxQueueEvent txQueueEvent;
+ EventFunctionWrapper txQueueEvent;
void txComplete(EthPacketPtr packet);
diff --git a/src/dev/net/etherswitch.cc b/src/dev/net/etherswitch.cc
index 995e29a0c..0e1d6f3ac 100644
--- a/src/dev/net/etherswitch.cc
+++ b/src/dev/net/etherswitch.cc
@@ -131,7 +131,8 @@ EtherSwitch::Interface::Interface(const std::string &name,
Tick delay_var, double rate, unsigned id)
: EtherInt(name), ticksPerByte(rate), switchDelay(delay),
delayVar(delay_var), interfaceId(id), parent(etherSwitch),
- outputFifo(name + ".outputFifo", outputBufferSize), txEvent(this)
+ outputFifo(name + ".outputFifo", outputBufferSize),
+ txEvent([this]{ transmit(); }, name)
{
}
diff --git a/src/dev/net/etherswitch.hh b/src/dev/net/etherswitch.hh
index debe33194..0887d94e5 100644
--- a/src/dev/net/etherswitch.hh
+++ b/src/dev/net/etherswitch.hh
@@ -172,7 +172,7 @@ class EtherSwitch : public EtherObject
*/
PortFifo outputFifo;
void transmit();
- EventWrapper<Interface, &Interface::transmit> txEvent;
+ EventFunctionWrapper txEvent;
};
struct SwitchTableEntry {
diff --git a/src/dev/net/i8254xGBe.cc b/src/dev/net/i8254xGBe.cc
index 74379592a..3dde72ac7 100644
--- a/src/dev/net/i8254xGBe.cc
+++ b/src/dev/net/i8254xGBe.cc
@@ -64,8 +64,12 @@ IGbE::IGbE(const Params *p)
pktOffset(0), fetchDelay(p->fetch_delay), wbDelay(p->wb_delay),
fetchCompDelay(p->fetch_comp_delay), wbCompDelay(p->wb_comp_delay),
rxWriteDelay(p->rx_write_delay), txReadDelay(p->tx_read_delay),
- rdtrEvent(this), radvEvent(this),
- tadvEvent(this), tidvEvent(this), tickEvent(this), interEvent(this),
+ rdtrEvent([this]{ rdtrProcess(); }, name()),
+ radvEvent([this]{ radvProcess(); }, name()),
+ tadvEvent([this]{ tadvProcess(); }, name()),
+ tidvEvent([this]{ tidvProcess(); }, name()),
+ tickEvent([this]{ tick(); }, name()),
+ interEvent([this]{ delayIntEvent(); }, name()),
rxDescCache(this, name()+".RxDesc", p->rx_desc_cache_size),
txDescCache(this, name()+".TxDesc", p->tx_desc_cache_size),
lastInterrupt(0)
@@ -825,8 +829,10 @@ template<class T>
IGbE::DescCache<T>::DescCache(IGbE *i, const std::string n, int s)
: igbe(i), _name(n), cachePnt(0), size(s), curFetching(0),
wbOut(0), moreToWb(false), wbAlignment(0), pktPtr(NULL),
- wbDelayEvent(this), fetchDelayEvent(this), fetchEvent(this),
- wbEvent(this)
+ wbDelayEvent([this]{ writeback1(); }, n),
+ fetchDelayEvent([this]{ fetchDescriptors1(); }, n),
+ fetchEvent([this]{ fetchComplete(); }, n),
+ wbEvent([this]{ wbComplete(); }, n)
{
fetchBuf = new T[size];
wbBuf = new T[size];
@@ -1197,7 +1203,9 @@ IGbE::DescCache<T>::unserialize(CheckpointIn &cp)
IGbE::RxDescCache::RxDescCache(IGbE *i, const std::string n, int s)
: DescCache<RxDesc>(i, n, s), pktDone(false), splitCount(0),
- pktEvent(this), pktHdrEvent(this), pktDataEvent(this)
+ pktEvent([this]{ pktComplete(); }, n),
+ pktHdrEvent([this]{ pktSplitDone(); }, n),
+ pktDataEvent([this]{ pktSplitDone(); }, n)
{
annSmFetch = "RX Desc Fetch";
@@ -1549,7 +1557,9 @@ IGbE::TxDescCache::TxDescCache(IGbE *i, const std::string n, int s)
useTso(false), tsoHeaderLen(0), tsoMss(0), tsoTotalLen(0), tsoUsedLen(0),
tsoPrevSeq(0), tsoPktPayloadBytes(0), tsoLoadedHeader(false),
tsoPktHasHeader(false), tsoDescBytesUsed(0), tsoCopyBytes(0), tsoPkts(0),
- pktEvent(this), headerEvent(this), nullEvent(this)
+ pktEvent([this]{ pktComplete(); }, n),
+ headerEvent([this]{ headerComplete(); }, n),
+ nullEvent([this]{ nullCallback(); }, n)
{
annSmFetch = "TX Desc Fetch";
annSmWb = "TX Desc Writeback";
diff --git a/src/dev/net/i8254xGBe.hh b/src/dev/net/i8254xGBe.hh
index 80e2104a0..402e61d95 100644
--- a/src/dev/net/i8254xGBe.hh
+++ b/src/dev/net/i8254xGBe.hh
@@ -98,8 +98,7 @@ class IGbE : public EtherDevice
postInterrupt(iGbReg::IT_RXT);
}
- //friend class EventWrapper<IGbE, &IGbE::rdtrProcess>;
- EventWrapper<IGbE, &IGbE::rdtrProcess> rdtrEvent;
+ EventFunctionWrapper rdtrEvent;
// Event and function to deal with RADV timer expiring
void radvProcess() {
@@ -109,8 +108,7 @@ class IGbE : public EtherDevice
postInterrupt(iGbReg::IT_RXT);
}
- //friend class EventWrapper<IGbE, &IGbE::radvProcess>;
- EventWrapper<IGbE, &IGbE::radvProcess> radvEvent;
+ EventFunctionWrapper radvEvent;
// Event and function to deal with TADV timer expiring
void tadvProcess() {
@@ -120,8 +118,7 @@ class IGbE : public EtherDevice
postInterrupt(iGbReg::IT_TXDW);
}
- //friend class EventWrapper<IGbE, &IGbE::tadvProcess>;
- EventWrapper<IGbE, &IGbE::tadvProcess> tadvEvent;
+ EventFunctionWrapper tadvEvent;
// Event and function to deal with TIDV timer expiring
void tidvProcess() {
@@ -130,13 +127,11 @@ class IGbE : public EtherDevice
"Posting TXDW interrupt because TIDV timer expired\n");
postInterrupt(iGbReg::IT_TXDW);
}
- //friend class EventWrapper<IGbE, &IGbE::tidvProcess>;
- EventWrapper<IGbE, &IGbE::tidvProcess> tidvEvent;
+ EventFunctionWrapper tidvEvent;
// Main event to tick the device
void tick();
- //friend class EventWrapper<IGbE, &IGbE::tick>;
- EventWrapper<IGbE, &IGbE::tick> tickEvent;
+ EventFunctionWrapper tickEvent;
uint64_t macAddr;
@@ -162,7 +157,7 @@ class IGbE : public EtherDevice
void delayIntEvent();
void cpuPostInt();
// Event to moderate interrupts
- EventWrapper<IGbE, &IGbE::delayIntEvent> interEvent;
+ EventFunctionWrapper interEvent;
/** Clear the interupt line to the cpu
*/
@@ -284,24 +279,24 @@ class IGbE : public EtherDevice
void writeback(Addr aMask);
void writeback1();
- EventWrapper<DescCache, &DescCache::writeback1> wbDelayEvent;
+ EventFunctionWrapper wbDelayEvent;
/** Fetch a chunk of descriptors into the descriptor cache.
* Calls fetchComplete when the memory system returns the data
*/
void fetchDescriptors();
void fetchDescriptors1();
- EventWrapper<DescCache, &DescCache::fetchDescriptors1> fetchDelayEvent;
+ EventFunctionWrapper fetchDelayEvent;
/** Called by event when dma to read descriptors is completed
*/
void fetchComplete();
- EventWrapper<DescCache, &DescCache::fetchComplete> fetchEvent;
+ EventFunctionWrapper fetchEvent;
/** Called by event when dma to writeback descriptors is completed
*/
void wbComplete();
- EventWrapper<DescCache, &DescCache::wbComplete> wbEvent;
+ EventFunctionWrapper wbEvent;
/* Return the number of descriptors left in the ring, so the device has
* a way to figure out if it needs to interrupt.
@@ -384,13 +379,13 @@ class IGbE : public EtherDevice
*/
bool packetDone();
- EventWrapper<RxDescCache, &RxDescCache::pktComplete> pktEvent;
+ EventFunctionWrapper pktEvent;
// Event to handle issuing header and data write at the same time
// and only callking pktComplete() when both are completed
void pktSplitDone();
- EventWrapper<RxDescCache, &RxDescCache::pktSplitDone> pktHdrEvent;
- EventWrapper<RxDescCache, &RxDescCache::pktSplitDone> pktDataEvent;
+ EventFunctionWrapper pktHdrEvent;
+ EventFunctionWrapper pktDataEvent;
bool hasOutstandingEvents() override;
@@ -484,10 +479,10 @@ class IGbE : public EtherDevice
/** Called by event when dma to write packet is completed
*/
void pktComplete();
- EventWrapper<TxDescCache, &TxDescCache::pktComplete> pktEvent;
+ EventFunctionWrapper pktEvent;
void headerComplete();
- EventWrapper<TxDescCache, &TxDescCache::headerComplete> headerEvent;
+ EventFunctionWrapper headerEvent;
void completionWriteback(Addr a, bool enabled) {
@@ -503,7 +498,7 @@ class IGbE : public EtherDevice
void nullCallback() {
DPRINTF(EthernetDesc, "Completion writeback complete\n");
}
- EventWrapper<TxDescCache, &TxDescCache::nullCallback> nullEvent;
+ EventFunctionWrapper nullEvent;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
diff --git a/src/dev/net/ns_gige.cc b/src/dev/net/ns_gige.cc
index 50bb6ed17..dbed29f8b 100644
--- a/src/dev/net/ns_gige.cc
+++ b/src/dev/net/ns_gige.cc
@@ -111,12 +111,18 @@ NSGigE::NSGigE(Params *p)
dmaReadFactor(p->dma_read_factor), dmaWriteFactor(p->dma_write_factor),
rxDmaData(NULL), rxDmaAddr(0), rxDmaLen(0),
txDmaData(NULL), txDmaAddr(0), txDmaLen(0),
- rxDmaReadEvent(this), rxDmaWriteEvent(this),
- txDmaReadEvent(this), txDmaWriteEvent(this),
+ rxDmaReadEvent([this]{ rxDmaReadDone(); }, name()),
+ rxDmaWriteEvent([this]{ rxDmaWriteDone(); }, name()),
+ txDmaReadEvent([this]{ txDmaReadDone(); }, name()),
+ txDmaWriteEvent([this]{ txDmaWriteDone(); }, name()),
dmaDescFree(p->dma_desc_free), dmaDataFree(p->dma_data_free),
txDelay(p->tx_delay), rxDelay(p->rx_delay),
- rxKickTick(0), rxKickEvent(this), txKickTick(0), txKickEvent(this),
- txEvent(this), rxFilterEnable(p->rx_filter),
+ rxKickTick(0),
+ rxKickEvent([this]{ rxKick(); }, name()),
+ txKickTick(0),
+ txKickEvent([this]{ txKick(); }, name()),
+ txEvent([this]{ txEventTransmit(); }, name()),
+ rxFilterEnable(p->rx_filter),
acceptBroadcast(false), acceptMulticast(false), acceptUnicast(false),
acceptPerfect(false), acceptArp(false), multicastHashEnable(false),
intrDelay(p->intr_delay), intrTick(0), cpuPendingIntr(false),
@@ -959,7 +965,9 @@ NSGigE::cpuIntrPost(Tick when)
if (intrEvent)
intrEvent->squash();
- intrEvent = new IntrEvent(this, true);
+
+ intrEvent = new EventFunctionWrapper([this]{ cpuInterrupt(); },
+ name(), true);
schedule(intrEvent, intrTick);
}
@@ -2470,7 +2478,8 @@ NSGigE::unserialize(CheckpointIn &cp)
Tick intrEventTick;
UNSERIALIZE_SCALAR(intrEventTick);
if (intrEventTick) {
- intrEvent = new IntrEvent(this, true);
+ intrEvent = new EventFunctionWrapper([this]{ cpuInterrupt(); },
+ name(), true);
schedule(intrEvent, intrEventTick);
}
}
diff --git a/src/dev/net/ns_gige.hh b/src/dev/net/ns_gige.hh
index 096b2b69e..f9be02890 100644
--- a/src/dev/net/ns_gige.hh
+++ b/src/dev/net/ns_gige.hh
@@ -256,20 +256,16 @@ class NSGigE : public EtherDevBase
bool doTxDmaWrite();
void rxDmaReadDone();
- friend class EventWrapper<NSGigE, &NSGigE::rxDmaReadDone>;
- EventWrapper<NSGigE, &NSGigE::rxDmaReadDone> rxDmaReadEvent;
+ EventFunctionWrapper rxDmaReadEvent;
void rxDmaWriteDone();
- friend class EventWrapper<NSGigE, &NSGigE::rxDmaWriteDone>;
- EventWrapper<NSGigE, &NSGigE::rxDmaWriteDone> rxDmaWriteEvent;
+ EventFunctionWrapper rxDmaWriteEvent;
void txDmaReadDone();
- friend class EventWrapper<NSGigE, &NSGigE::txDmaReadDone>;
- EventWrapper<NSGigE, &NSGigE::txDmaReadDone> txDmaReadEvent;
+ EventFunctionWrapper txDmaReadEvent;
void txDmaWriteDone();
- friend class EventWrapper<NSGigE, &NSGigE::txDmaWriteDone>;
- EventWrapper<NSGigE, &NSGigE::txDmaWriteDone> txDmaWriteEvent;
+ EventFunctionWrapper txDmaWriteEvent;
bool dmaDescFree;
bool dmaDataFree;
@@ -284,15 +280,11 @@ class NSGigE : public EtherDevBase
void rxKick();
Tick rxKickTick;
- typedef EventWrapper<NSGigE, &NSGigE::rxKick> RxKickEvent;
- friend void RxKickEvent::process();
- RxKickEvent rxKickEvent;
+ EventFunctionWrapper rxKickEvent;
void txKick();
Tick txKickTick;
- typedef EventWrapper<NSGigE, &NSGigE::txKick> TxKickEvent;
- friend void TxKickEvent::process();
- TxKickEvent txKickEvent;
+ EventFunctionWrapper txKickEvent;
void eepromKick();
@@ -306,9 +298,7 @@ class NSGigE : public EtherDevBase
if (txState == txFifoBlock)
txKick();
}
- typedef EventWrapper<NSGigE, &NSGigE::txEventTransmit> TxEvent;
- friend void TxEvent::process();
- TxEvent txEvent;
+ EventFunctionWrapper txEvent;
void txDump() const;
void rxDump() const;
@@ -339,9 +329,7 @@ class NSGigE : public EtherDevBase
void cpuInterrupt();
void cpuIntrClear();
- typedef EventWrapper<NSGigE, &NSGigE::cpuInterrupt> IntrEvent;
- friend void IntrEvent::process();
- IntrEvent *intrEvent;
+ EventFunctionWrapper *intrEvent;
NSGigEInt *interface;
public:
diff --git a/src/dev/net/sinic.cc b/src/dev/net/sinic.cc
index e86e1abe2..50341a4d3 100644
--- a/src/dev/net/sinic.cc
+++ b/src/dev/net/sinic.cc
@@ -91,7 +91,9 @@ Device::Device(const Params *p)
virtualRegs(p->virtual_count < 1 ? 1 : p->virtual_count),
rxFifo(p->rx_fifo_size), txFifo(p->tx_fifo_size),
rxKickTick(0), txKickTick(0),
- txEvent(this), rxDmaEvent(this), txDmaEvent(this),
+ txEvent([this]{ txEventTransmit(); }, name()),
+ rxDmaEvent([this]{ rxDmaDone(); }, name()),
+ txDmaEvent([this]{ txDmaDone(); }, name()),
dmaReadDelay(p->dma_read_delay), dmaReadFactor(p->dma_read_factor),
dmaWriteDelay(p->dma_write_delay), dmaWriteFactor(p->dma_write_factor)
{
@@ -535,7 +537,9 @@ Base::cpuIntrPost(Tick when)
if (intrEvent)
intrEvent->squash();
- intrEvent = new IntrEvent(this, true);
+
+ intrEvent = new EventFunctionWrapper([this]{ cpuInterrupt(); },
+ name(), true);
schedule(intrEvent, intrTick);
}
@@ -1297,7 +1301,8 @@ Base::unserialize(CheckpointIn &cp)
Tick intrEventTick;
UNSERIALIZE_SCALAR(intrEventTick);
if (intrEventTick) {
- intrEvent = new IntrEvent(this, true);
+ intrEvent = new EventFunctionWrapper([this]{ cpuInterrupt(); },
+ name(), true);
schedule(intrEvent, intrEventTick);
}
}
diff --git a/src/dev/net/sinic.hh b/src/dev/net/sinic.hh
index b041cb16d..70d22f12d 100644
--- a/src/dev/net/sinic.hh
+++ b/src/dev/net/sinic.hh
@@ -61,9 +61,7 @@ class Base : public EtherDevBase
void cpuInterrupt();
void cpuIntrClear();
- typedef EventWrapper<Base, &Base::cpuInterrupt> IntrEvent;
- friend void IntrEvent::process();
- IntrEvent *intrEvent;
+ EventFunctionWrapper *intrEvent;
Interface *interface;
bool cpuIntrPending() const;
@@ -196,13 +194,9 @@ class Device : public Base
void rxKick();
Tick rxKickTick;
- typedef EventWrapper<Device, &Device::rxKick> RxKickEvent;
- friend void RxKickEvent::process();
void txKick();
Tick txKickTick;
- typedef EventWrapper<Device, &Device::txKick> TxKickEvent;
- friend void TxKickEvent::process();
/**
* Retransmit event
@@ -214,9 +208,7 @@ class Device : public Base
if (txState == txFifoBlock)
txKick();
}
- typedef EventWrapper<Device, &Device::txEventTransmit> TxEvent;
- friend void TxEvent::process();
- TxEvent txEvent;
+ EventFunctionWrapper txEvent;
void txDump() const;
void rxDump() const;
@@ -245,12 +237,10 @@ class Device : public Base
*/
protected:
void rxDmaDone();
- friend class EventWrapper<Device, &Device::rxDmaDone>;
- EventWrapper<Device, &Device::rxDmaDone> rxDmaEvent;
+ EventFunctionWrapper rxDmaEvent;
void txDmaDone();
- friend class EventWrapper<Device, &Device::txDmaDone>;
- EventWrapper<Device, &Device::txDmaDone> txDmaEvent;
+ EventFunctionWrapper txDmaEvent;
Tick dmaReadDelay;
Tick dmaReadFactor;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 08:21:51 +0000