From d09b123992f990a6c219dd47707cc703fe9055b5 Mon Sep 17 00:00:00 2001
From: imarom <imarom@cisco.com>
Date: Tue, 8 Nov 2016 19:29:05 +0200
Subject: RX queue - ARP request working

Signed-off-by: imarom <imarom@cisco.com>
---
 src/stateless/cp/trex_stateless_port.cpp             |  4 ++--
 src/stateless/cp/trex_stateless_port.h               |  4 ++--
 src/stateless/messaging/trex_stateless_messaging.cpp | 10 +++-------
 src/stateless/messaging/trex_stateless_messaging.h   |  6 ++++--
 src/stateless/rx/trex_stateless_rx_core.h            |  2 +-
 5 files changed, 12 insertions(+), 14 deletions(-)

(limited to 'src/stateless')

diff --git a/src/stateless/cp/trex_stateless_port.cpp b/src/stateless/cp/trex_stateless_port.cpp
index 691185cd..ff83087c 100644
--- a/src/stateless/cp/trex_stateless_port.cpp
+++ b/src/stateless/cp/trex_stateless_port.cpp
@@ -978,12 +978,12 @@ TrexStatelessPort::stop_rx_queue() {
 
 
 RxPacketBuffer *
-TrexStatelessPort::get_rx_sw_pkts() {
+TrexStatelessPort::get_rx_queue_pkts() {
 
     /* ask RX core for the pkt queue */
     TrexStatelessMsgReply<RxPacketBuffer *> msg_reply;
 
-    TrexStatelessCpToRxMsgBase *msg = new TrexStatelessRxSwGetPkts(m_port_id, msg_reply);
+    TrexStatelessCpToRxMsgBase *msg = new TrexStatelessRxQueueGetPkts(m_port_id, msg_reply);
     send_message_to_rx(msg);
 
     RxPacketBuffer *pkt_buffer = msg_reply.wait_for_reply();
diff --git a/src/stateless/cp/trex_stateless_port.h b/src/stateless/cp/trex_stateless_port.h
index 36f17659..d71ba932 100644
--- a/src/stateless/cp/trex_stateless_port.h
+++ b/src/stateless/cp/trex_stateless_port.h
@@ -408,10 +408,10 @@ public:
     }
 
     /**
-     * fetch the RX software packets from the queue
+     * fetch the RX queue packets from the queue
      * 
      */
-    RxPacketBuffer *get_rx_sw_pkts();
+    RxPacketBuffer *get_rx_queue_pkts();
 
 private:
 
diff --git a/src/stateless/messaging/trex_stateless_messaging.cpp b/src/stateless/messaging/trex_stateless_messaging.cpp
index 95168c4d..c2182f3c 100644
--- a/src/stateless/messaging/trex_stateless_messaging.cpp
+++ b/src/stateless/messaging/trex_stateless_messaging.cpp
@@ -257,11 +257,6 @@ bool TrexStatelessRxQuit::handle (CRxCoreStateless *rx_core) {
 }
 
 
-TrexStatelessRxSwGetPkts::TrexStatelessRxSwGetPkts(uint8_t port_id, TrexStatelessMsgReply<RxPacketBuffer *> &reply) :  m_reply(reply) {
-    m_port_id = port_id;
-}
-
-
 bool
 TrexStatelessRxStartCapture::handle(CRxCoreStateless *rx_core) {
     rx_core->start_capture(m_port_id, m_pcap_filename, m_limit, m_shared_counter);
@@ -291,8 +286,9 @@ TrexStatelessRxStopQueue::handle(CRxCoreStateless *rx_core) {
 }
 
 
-bool TrexStatelessRxSwGetPkts::handle(CRxCoreStateless *rx_core) {
-    RxPacketBuffer *pkt_buffer = rx_core->get_rx_sw_pkt_buffer(m_port_id);
+
+bool TrexStatelessRxQueueGetPkts::handle(CRxCoreStateless *rx_core) {
+    RxPacketBuffer *pkt_buffer = rx_core->get_rx_queue_pkts(m_port_id);
     assert(pkt_buffer);
     m_reply.set(pkt_buffer);
 
diff --git a/src/stateless/messaging/trex_stateless_messaging.h b/src/stateless/messaging/trex_stateless_messaging.h
index b598a6d6..52b1662e 100644
--- a/src/stateless/messaging/trex_stateless_messaging.h
+++ b/src/stateless/messaging/trex_stateless_messaging.h
@@ -521,10 +521,12 @@ private:
 
 
 
-class TrexStatelessRxSwGetPkts : public TrexStatelessCpToRxMsgBase {
+class TrexStatelessRxQueueGetPkts : public TrexStatelessCpToRxMsgBase {
 public:
 
-    TrexStatelessRxSwGetPkts(uint8_t port_id, TrexStatelessMsgReply<RxPacketBuffer *> &reply);
+    TrexStatelessRxQueueGetPkts(uint8_t port_id, TrexStatelessMsgReply<RxPacketBuffer *> &reply) : m_reply(reply) {
+        m_port_id = port_id;
+    }
 
     /**
      * virtual function to handle a message
diff --git a/src/stateless/rx/trex_stateless_rx_core.h b/src/stateless/rx/trex_stateless_rx_core.h
index b5844583..519724d8 100644
--- a/src/stateless/rx/trex_stateless_rx_core.h
+++ b/src/stateless/rx/trex_stateless_rx_core.h
@@ -111,7 +111,7 @@ class CRxCoreStateless {
     double get_cpu_util();
     void update_cpu_util();
 
-    RxPacketBuffer *get_rx_sw_pkt_buffer(uint8_t port_id) {
+    RxPacketBuffer *get_rx_queue_pkts(uint8_t port_id) {
         return m_rx_port_mngr[port_id].get_pkt_buffer();
     }
 
-- 
cgit 1.2.3-korg