From d4791e0535ef56688f421d6ac3dbd79c33a37508 Mon Sep 17 00:00:00 2001
From: imarom <imarom@cisco.com>
Date: Tue, 29 Mar 2016 15:24:24 +0300
Subject: RX stats two stage API (stop and remove RX filters)

---
 src/rpc-server/commands/trex_rpc_cmd_stream.cpp | 21 +++++++++++++++++++++
 src/rpc-server/commands/trex_rpc_cmds.h         |  1 +
 src/rpc-server/trex_rpc_cmds_table.cpp          |  2 ++
 src/stateless/cp/trex_stateless_port.cpp        | 19 ++++++++++++++++---
 src/stateless/cp/trex_stateless_port.h          |  8 ++++++++
 5 files changed, 48 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/rpc-server/commands/trex_rpc_cmd_stream.cpp b/src/rpc-server/commands/trex_rpc_cmd_stream.cpp
index ea24c33a..40719325 100644
--- a/src/rpc-server/commands/trex_rpc_cmd_stream.cpp
+++ b/src/rpc-server/commands/trex_rpc_cmd_stream.cpp
@@ -589,6 +589,27 @@ TrexRpcCmdStopTraffic::_run(const Json::Value &params, Json::Value &result) {
     return (TREX_RPC_CMD_OK);
 }
 
+/***************************
+ * remove all hardware filters
+ * 
+ **************************/
+trex_rpc_cmd_rc_e
+TrexRpcCmdRemoveRXFilters::_run(const Json::Value &params, Json::Value &result) {
+
+    uint8_t port_id = parse_port(params, result);
+    TrexStatelessPort *port = get_stateless_obj()->get_port_by_id(port_id);
+
+    try {
+        port->remove_rx_filters();
+    } catch (const TrexException &ex) {
+        generate_execute_err(result, ex.what());
+    }
+
+    result["result"] = Json::objectValue;
+
+    return (TREX_RPC_CMD_OK);
+}
+
 /***************************
  * get all streams
  * 
diff --git a/src/rpc-server/commands/trex_rpc_cmds.h b/src/rpc-server/commands/trex_rpc_cmds.h
index c4b01b85..dbf90fef 100644
--- a/src/rpc-server/commands/trex_rpc_cmds.h
+++ b/src/rpc-server/commands/trex_rpc_cmds.h
@@ -116,6 +116,7 @@ TREX_RPC_CMD_DEFINE(TrexRpcCmdGetStream, "get_stream", 3, false);
 
 TREX_RPC_CMD_DEFINE(TrexRpcCmdStartTraffic,  "start_traffic", 4, true);
 TREX_RPC_CMD_DEFINE(TrexRpcCmdStopTraffic,   "stop_traffic", 1, true);
+TREX_RPC_CMD_DEFINE(TrexRpcCmdRemoveRXFilters, "remove_rx_filters", 1, true);
 TREX_RPC_CMD_DEFINE(TrexRpcCmdPauseTraffic,  "pause_traffic", 1, true);
 TREX_RPC_CMD_DEFINE(TrexRpcCmdResumeTraffic, "resume_traffic", 1, true);
 
diff --git a/src/rpc-server/trex_rpc_cmds_table.cpp b/src/rpc-server/trex_rpc_cmds_table.cpp
index e1bd3eee..c9b41595 100644
--- a/src/rpc-server/trex_rpc_cmds_table.cpp
+++ b/src/rpc-server/trex_rpc_cmds_table.cpp
@@ -61,6 +61,8 @@ TrexRpcCommandsTable::TrexRpcCommandsTable() {
     register_command(new TrexRpcCmdResumeTraffic());
     register_command(new TrexRpcCmdUpdateTraffic());
 
+    register_command(new TrexRpcCmdRemoveRXFilters());
+
     register_command(new TrexRpcCmdValidate());
 }
 
diff --git a/src/stateless/cp/trex_stateless_port.cpp b/src/stateless/cp/trex_stateless_port.cpp
index 90589d7a..6a33fcee 100644
--- a/src/stateless/cp/trex_stateless_port.cpp
+++ b/src/stateless/cp/trex_stateless_port.cpp
@@ -271,6 +271,22 @@ TrexStatelessPort::stop_traffic(void) {
     common_port_stop_actions(false);
 }
 
+/**
+ * remove all RX filters from port
+ * 
+ * @author imarom (28-Mar-16)
+ */
+void
+TrexStatelessPort::remove_rx_filters(void) {
+    /* only valid when IDLE or with streams and not TXing */
+    verify_state(PORT_STATE_STREAMS);
+
+    for (auto entry : m_stream_table) {
+        get_stateless_obj()->m_rx_flow_stat.stop_stream(entry.second);
+    }
+
+}
+
 /**
  * when a port stops, perform various actions
  * 
@@ -287,9 +303,6 @@ TrexStatelessPort::common_port_stop_actions(bool async) {
         get_stateless_obj()->get_publisher()->publish_event(TrexPublisher::EVENT_PORT_STOPPED, data);
     }
 
-    for (auto entry : m_stream_table) {
-        get_stateless_obj()->m_rx_flow_stat.stop_stream(entry.second);
-    }
 }
 
 void
diff --git a/src/stateless/cp/trex_stateless_port.h b/src/stateless/cp/trex_stateless_port.h
index 7e1838d4..7aa3bfa8 100644
--- a/src/stateless/cp/trex_stateless_port.h
+++ b/src/stateless/cp/trex_stateless_port.h
@@ -177,6 +177,14 @@ public:
      */
     void stop_traffic(void);
 
+    /**
+     * remove all RX filters 
+     * valid only when port is stopped 
+     * 
+     * @author imarom (28-Mar-16)
+     */
+    void remove_rx_filters(void);
+
     /**
      * pause traffic
      * throws TrexException in case of an error
-- 
cgit