Merge remote-tracking branch 'fastclick/main' into PRhirt

tbarbette · Oct 1, 2024 · f9fca54 · f9fca54
2 parents 30cd637 + 9f0af7e
commit f9fca54
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 27 deletions.
diff --git a/elements/analysis/numberpacket.cc b/elements/analysis/numberpacket.cc
@@ -44,7 +44,7 @@ int NumberPacket::configure(Vector<String> &conf, ErrorHandler *errh) {
     return 0;
 }
 
-inline Packet* NumberPacket::smaction(Packet *p) {
+inline Packet* NumberPacket::simple_action(Packet *p) {
     WritablePacket *wp = nullptr;
     if (p->length() >= (unsigned)_offset + _size_of_number) {
         wp = p->uniqueify();
@@ -67,22 +67,6 @@ inline Packet* NumberPacket::smaction(Packet *p) {
     return wp;
 }
 
-Packet*
-NumberPacket::simple_action(Packet *p) {
-    return smaction(p);
-}
-
-#if HAVE_BATCH
-PacketBatch*
-NumberPacket::simple_action_batch(PacketBatch *batch) {
-    FOR_EACH_PACKET_SAFE(batch,p) {
-        p = smaction(p);
-    }
-    return batch;
-}
-#endif
-
-
 String
 NumberPacket::read_handler(Element *e, void *thunk)
 {

diff --git a/elements/analysis/numberpacket.hh b/elements/analysis/numberpacket.hh
@@ -30,7 +30,7 @@ acounting for this format. Defaults to false.
 
 RecordTimestamp, TimestampDiff */
 
-class NumberPacket : public BatchElement {
+class NumberPacket : public SimpleElement<NumberPacket> {
 public:
     NumberPacket() CLICK_COLD;
     ~NumberPacket() CLICK_COLD;
@@ -43,9 +43,6 @@ public:
     int configure(Vector<String> &, ErrorHandler *) CLICK_COLD;
 
     Packet *simple_action(Packet *) override;
-#if HAVE_BATCH
-    PacketBatch *simple_action_batch(PacketBatch *) override;
-#endif
 
     static inline uint64_t read_number_of_packet(
             const Packet *p, int offset, bool net_order = false) {

diff --git a/elements/userlevel/fromdevice.cc b/elements/userlevel/fromdevice.cc
@@ -44,7 +44,7 @@
 #include <click/standard/scheduleinfo.hh>
 #include <click/userutils.hh>
 #include <netinet/if_ether.h>
-#ifndef define
+#ifndef _LINUX_IF_ETHER_H
 # define _LINUX_IF_ETHER_H 1
 #endif
 #ifdef HAVE_LINUX_ETHTOOL_H

diff --git a/lib/packet.cc b/lib/packet.cc
@@ -1063,8 +1063,14 @@ Packet::clone(bool fast)
         return duplicate(0,0);
     }
 # endif
-    Packet* p = reinterpret_cast<Packet *>(
-    rte_pktmbuf_clone(mb(), DPDKDevice::get_mpool(rte_socket_id())));
+    auto pool = DPDKDevice::get_mpool(rte_socket_id());
+    rte_mbuf* m = rte_pktmbuf_alloc(pool);
+    if (unlikely(!m))
+        return 0;
+    rte_pktmbuf_attach(m,mb());
+    m->nb_segs = 1;
+    m->pkt_len = mb()->pkt_len;
+    Packet* p = reinterpret_cast<Packet*>(m);
     p->copy_annotations(this,true);
     p->copy_headers(this);
     return p;
@@ -1422,9 +1428,6 @@ Packet::expensive_push(uint32_t nbytes)
 WritablePacket *
 Packet::expensive_put(uint32_t nbytes)
 {
-#if CLICK_PACKET_USE_DPDK
-    assert(false);
-#endif
   static int chatter = 0;
   if (tailroom() < nbytes && chatter < 5) {
     click_chatter("expensive Packet::put; have %d wanted %d",