diff options
author | Ido Barnea <ibarnea@cisco.com> | 2016-03-15 13:46:22 +0200 |
---|---|---|
committer | Ido Barnea <ibarnea@cisco.com> | 2016-03-22 17:40:01 +0200 |
commit | 582d3f74d66b81fbe798e54e75ade27561da58d8 (patch) | |
tree | 6f3af27a1e632880f272e23f75ff012cf3a0968c | |
parent | 64dd1f33ad253014d70db8f440bd2e9f7b7e9faf (diff) |
1g pkt flow stat working
-rwxr-xr-x | linux_dpdk/ws_main.py | 3 | ||||
-rwxr-xr-x | src/bp_sim.h | 3 | ||||
-rw-r--r-- | src/latency.cpp | 7 | ||||
-rw-r--r-- | src/latency.h | 5 | ||||
-rw-r--r-- | src/main_dpdk.cpp | 145 | ||||
-rw-r--r-- | src/main_dpdk.h | 5 | ||||
-rw-r--r-- | src/stateless/rx/trex_stateless_rx_core.cpp | 99 | ||||
-rw-r--r-- | src/stateless/rx/trex_stateless_rx_core.h | 55 |
8 files changed, 268 insertions, 54 deletions
diff --git a/linux_dpdk/ws_main.py b/linux_dpdk/ws_main.py index 709b1931..faaca0de 100755 --- a/linux_dpdk/ws_main.py +++ b/linux_dpdk/ws_main.py @@ -173,7 +173,8 @@ stateless_src = SrcGroup(dir='src/stateless/', 'cp/trex_vm_splitter.cpp', 'cp/trex_dp_port_events.cpp', 'dp/trex_stateless_dp_core.cpp', - 'messaging/trex_stateless_messaging.cpp' + 'messaging/trex_stateless_messaging.cpp', + 'rx/trex_stateless_rx_core.cpp' ]) # JSON package json_src = SrcGroup(dir='external_libs/json', diff --git a/src/bp_sim.h b/src/bp_sim.h index 37ed7854..8127261c 100755 --- a/src/bp_sim.h +++ b/src/bp_sim.h @@ -1248,7 +1248,8 @@ static inline int get_is_rx_check_mode(){ static inline bool get_is_rx_filter_enable(){//??? uint32_t latency_rate=CGlobalInfo::m_options.m_latency_rate; - return ( ( get_is_rx_check_mode() || CGlobalInfo::is_learn_mode() || latency_rate != 0) ?true:false ); + return ( ( get_is_rx_check_mode() || CGlobalInfo::is_learn_mode() || latency_rate != 0 + || get_is_stateless()) ?true:false ); } static inline uint16_t get_rx_check_hops() { return (CGlobalInfo::m_options.m_rx_check_hops); diff --git a/src/latency.cpp b/src/latency.cpp index d57e97c8..930876b3 100644 --- a/src/latency.cpp +++ b/src/latency.cpp @@ -177,6 +177,10 @@ void CCPortLatency::reset(){ m_seq_error=0; m_length_error=0; m_no_ipv4_option=0; + for (int i = 0; i < MAX_FLOW_STATS; i++) { + m_rx_pg_pkts[i] = 0; + m_rx_pg_bytes[i] = 0; + } m_hist.Reset(); } @@ -679,7 +683,6 @@ void CLatencyManager::try_rx_queues(){ } } - void CLatencyManager::try_rx(){ rte_mbuf_t * rx_pkts[64]; int i; @@ -712,7 +715,7 @@ void CLatencyManager::reset(){ } -void CLatencyManager::start(int iter){ +void CLatencyManager::start(int iter) { m_do_stop =false; m_is_active =false; int cnt=0; diff --git a/src/latency.h b/src/latency.h index 1f8ef5c0..e85e3a5a 100644 --- a/src/latency.h +++ b/src/latency.h @@ -243,9 +243,10 @@ public: uint64_t m_seq_error; uint64_t m_rx_check; uint64_t m_no_ipv4_option; - - uint64_t m_length_error; + uint32_t m_rx_pg_pkts[MAX_FLOW_STATS]; + uint32_t m_rx_pg_bytes[MAX_FLOW_STATS]; + CTimeHistogram m_hist; /* all window */ CJitter m_jitter; }; diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp index 1b750bbd..111426c3 100644 --- a/src/main_dpdk.cpp +++ b/src/main_dpdk.cpp @@ -58,6 +58,7 @@ #include "stateless/cp/trex_stateless.h" #include "stateless/dp/trex_stream_node.h" #include "stateless/messaging/trex_stateless_messaging.h" +#include "stateless/rx/trex_stateless_rx_core.h" #include "publisher/trex_publisher.h" #include "../linux_dpdk/version.h" extern "C" { @@ -106,7 +107,7 @@ static inline int get_vm_one_queue_enable(){ } static inline int get_is_rx_thread_enabled() { - return (CGlobalInfo::m_options.is_rx_enabled() ?1:0); + return ((CGlobalInfo::m_options.is_rx_enabled() || CGlobalInfo::m_options.is_stateless()) ?1:0); } struct port_cfg_t; @@ -140,7 +141,10 @@ public: virtual int wait_for_stable_link()=0; virtual void wait_after_link_up(){}; virtual bool flow_control_disable_supported(){return true;} - virtual int get_rx_stats(CPhyEthIF * _if, uint32_t *stats, uint32_t *prev_stats, int min, int max) {return -1;} + bool hw_rx_stat_supported(){return false;} + virtual int get_rx_stats(CPhyEthIF * _if, uint32_t *pkts, uint32_t *prev_pkts, uint32_t *bytes, uint32_t *prev_bytes + , int min, int max) {return -1;} + virtual int reset_rx_stats(CPhyEthIF * _if, uint32_t *stats) {return 0;} virtual int dump_fdir_global_stats(CPhyEthIF * _if, FILE *fd) { return -1;} virtual int get_stat_counters_num() {return 0;} virtual int get_rx_stat_capabilities() {return 0;} @@ -184,7 +188,11 @@ public: virtual void get_extended_stats(CPhyEthIF * _if,CPhyEthIFStats *stats); virtual void clear_extended_stats(CPhyEthIF * _if); - + int get_rx_stats(CPhyEthIF * _if, uint32_t *pkts, uint32_t *prev_pkts, uint32_t *bytes, uint32_t *prev_bytes + , int min, int max); + int dump_fdir_global_stats(CPhyEthIF * _if, FILE *fd) {return 0;} + int get_stat_counters_num() {return MAX_FLOW_STATS;} + int get_rx_stat_capabilities() {return TrexPlatformApi::IF_STAT_IPV4_ID;} virtual int wait_for_stable_link(); void wait_after_link_up(); }; @@ -313,13 +321,15 @@ public: } virtual void get_extended_stats(CPhyEthIF * _if,CPhyEthIFStats *stats); virtual void clear_extended_stats(CPhyEthIF * _if); - int get_rx_stats(CPhyEthIF * _if, uint32_t *stats, uint32_t *prev_stats, int min, int max); + int reset_rx_stats(CPhyEthIF * _if, uint32_t *stats); + int get_rx_stats(CPhyEthIF * _if, uint32_t *pkts, uint32_t *prev_pkts, uint32_t *bytes, uint32_t *prev_bytes, int min, int max); int dump_fdir_global_stats(CPhyEthIF * _if, FILE *fd); int get_stat_counters_num() {return MAX_FLOW_STATS;} int get_rx_stat_capabilities() {return TrexPlatformApi::IF_STAT_IPV4_ID;} virtual int wait_for_stable_link(); // disabling flow control on 40G using DPDK API causes the interface to malfunction bool flow_control_disable_supported(){return false;} + bool hw_rx_stat_supported(){return true;} private: void add_del_rules(enum rte_filter_op op, uint8_t port_id, uint16_t type, uint8_t ttl, uint16_t ip_id, int queue, uint16_t stat_idx); virtual int configure_rx_filter_rules_statfull(CPhyEthIF * _if); @@ -1019,11 +1029,11 @@ static int parse_options(int argc, char *argv[], CParserOption* po, bool first_t } if ( (po->is_latency_enabled()) || (po->preview.getOnlyLatency()) ){ - parse_err("Latecny check is not supported with interactive mode "); + parse_err("Latency check is not supported with interactive mode "); } if ( po->preview.getSingleCore() ){ - parse_err("single core is not supported with interactive mode "); + parse_err("Single core is not supported with interactive mode "); } } @@ -2588,7 +2598,8 @@ public: int queues_prob_init(); int ixgbe_start(); int ixgbe_rx_queue_flush(); - int ixgbe_configure_mg(); + void ixgbe_configure_mg(); + void rx_sl_configure(); bool is_all_links_are_up(bool dump=false); int reset_counters(); @@ -2676,7 +2687,8 @@ public: CFlowGenList m_fl; bool m_fl_was_init; volatile uint8_t m_signal[BP_MAX_CORES] __rte_cache_aligned ; - CLatencyManager m_mg; + CLatencyManager m_mg; // statefull RX core + CRxCoreStateless m_rx_sl; // stateless RX core CTrexGlobalIoMode m_io_modes; private: @@ -2810,7 +2822,7 @@ int CGlobalTRex::ixgbe_rx_queue_flush(){ } -int CGlobalTRex::ixgbe_configure_mg(void){ +void CGlobalTRex::ixgbe_configure_mg(void) { int i; CLatencyManagerCfg mg_cfg; mg_cfg.m_max_ports = m_max_ports; @@ -2850,10 +2862,36 @@ int CGlobalTRex::ixgbe_configure_mg(void){ m_mg.Create(&mg_cfg); m_mg.set_mask(CGlobalInfo::m_options.m_latency_mask); - - return (0); } +// init m_rx_sl object for stateless rx core +void CGlobalTRex::rx_sl_configure(void) { + CRxSlCfg rx_sl_cfg; + + rx_sl_cfg.m_max_ports = m_max_ports; + + if ( get_vm_one_queue_enable() ) { +#if 0 + ??? + /* vm mode, indirect queues */ + for (i=0; i < m_max_ports; i++) { + CMessagingManager * rx_dp = CMsgIns::Ins()->getRxDp(); + uint8_t thread_id = (i >> 1); + CNodeRing * r = rx_dp->getRingCpToDp(thread_id); ///??? should be rx to dp? + m_latency_vm_vports[i].Create((uint8_t)i,r,&m_mg); + rx_sl_cfg.m_ports[i] =&m_latency_vm_vports[i]; + } +#endif + } else { + for (int i = 0; i < m_max_ports; i++) { + CPhyEthIF * _if = &m_ports[i]; + m_latency_vports[i].Create(_if, m_latency_tx_queue_id, 1); + rx_sl_cfg.m_ports[i] = &m_latency_vports[i]; + } + } + + m_rx_sl.create(rx_sl_cfg); +} int CGlobalTRex::ixgbe_start(void){ int i; @@ -2971,8 +3009,11 @@ int CGlobalTRex::ixgbe_start(void){ ixgbe_rx_queue_flush(); - - ixgbe_configure_mg(); + if (! get_is_stateless()) { + ixgbe_configure_mg(); + } else { + rx_sl_configure(); + } /* core 0 - control @@ -3739,10 +3780,14 @@ int CGlobalTRex::run_in_master() { int CGlobalTRex::run_in_rx_core(void){ - if ( CGlobalInfo::m_options.is_rx_enabled() ){ - m_mg.start(0); + if (get_is_stateless()) { + m_rx_sl.start(); + } else { + if ( CGlobalInfo::m_options.is_rx_enabled() ){ + m_mg.start(0); + } } - // ??? start stateless rx + return (0); } @@ -3929,28 +3974,28 @@ int CGlobalTRex::start_master_statefull() { static CGlobalTRex g_trex; -// The HW counters start from some random values. The driver give us the diffs from previous, -// each time we do get_rx_stats. We need to make one first call, at system startup, -// and ignore the returned diffs int CPhyEthIF::reset_hw_flow_stats() { - uint32_t diff_stats[MAX_FLOW_STATS]; - - if (get_ex_drv()->get_rx_stats(this, diff_stats, m_stats.m_fdir_prev_stats, 0, MAX_FLOW_STATS - 1) < 0) { - return -1; + if (get_ex_drv()->hw_rx_stat_supported()) { + if (get_ex_drv()->reset_rx_stats(this, m_stats.m_fdir_prev_pkts) < 0) { + return -1; + } + } else { + g_trex.m_rx_sl.reset_rx_stats(get_port_id()); } - return 0; } // get/reset flow director counters // return 0 if OK. -1 if operation not supported. -// rx_stats, tx_stats - arrays of len max - min + 1. Returning rx, tx updated values. +// rx_stats, tx_stats - arrays of len max - min + 1. Returning rx, tx updated absolute values. // min, max - minimum, maximum counters range to get // reset - If true, need to reset counter value after reading int CPhyEthIF::get_flow_stats(uint64_t *rx_stats, tx_per_flow_t *tx_stats, int min, int max, bool reset) { - uint32_t diff_stats[MAX_FLOW_STATS]; + uint32_t diff_pkts[MAX_FLOW_STATS]; + uint32_t diff_bytes[MAX_FLOW_STATS]; - if (get_ex_drv()->get_rx_stats(this, diff_stats, m_stats.m_fdir_prev_stats, min, max) < 0) { + if (get_ex_drv()->get_rx_stats(this, diff_pkts, m_stats.m_fdir_prev_pkts + , diff_bytes, m_stats.m_fdir_prev_bytes, min, max) < 0) { return -1; } @@ -3958,14 +4003,14 @@ int CPhyEthIF::get_flow_stats(uint64_t *rx_stats, tx_per_flow_t *tx_stats, int m if ( reset ) { // return value so far, and reset if (rx_stats != NULL) { - rx_stats[i - min] = m_stats.m_rx_per_flow[i] + diff_stats[i]; + rx_stats[i - min] = m_stats.m_rx_per_flow[i] + diff_pkts[i]; } if (tx_stats != NULL) { tx_stats[i - min] = g_trex.clear_flow_tx_stats(m_port_id, i); } m_stats.m_rx_per_flow[i] = 0; } else { - m_stats.m_rx_per_flow[i] += diff_stats[i]; + m_stats.m_rx_per_flow[i] += diff_pkts[i]; if (rx_stats != NULL) { rx_stats[i - min] = m_stats.m_rx_per_flow[i]; } @@ -4060,7 +4105,6 @@ static int slave_one_lcore(__attribute__((unused)) void *dummy) CPlatformSocketInfo * lpsock=&CGlobalInfo::m_socket; physical_thread_id_t phy_id =rte_lcore_id(); - if ( lpsock->thread_phy_is_rx(phy_id) ) { g_trex.run_in_rx_core(); }else{ @@ -4387,7 +4431,7 @@ int main_test(int argc , char * argv[]){ && (CGlobalInfo::m_options.m_latency_prev > 0)) { uint32_t pkts = CGlobalInfo::m_options.m_latency_prev * CGlobalInfo::m_options.m_latency_rate; - printf("Start prev latency check- for %d sec \n",CGlobalInfo::m_options.m_latency_prev); + printf("Starting pre latency check for %d sec\n",CGlobalInfo::m_options.m_latency_prev); g_trex.m_mg.start(pkts); delay(CGlobalInfo::m_options.m_latency_prev* 1000); printf("Finished \n"); @@ -4610,7 +4654,7 @@ int CTRexExtendedDriverBase1G::configure_rx_filter_rules_stateless(CPhyEthIF * _ } rule_id = 0; - // filter for byte 18 of packet (lsb of IP ID) should equal ff + // filter for byte 18 of packet (msb of IP ID) should equal ff _if->pci_reg_write( (E1000_FHFT(rule_id)+(2*16)) , 0x00ff0000); _if->pci_reg_write( (E1000_FHFT(rule_id)+(2*16) + 8) , 0x04); /* MASK */ // + bytes 12 + 13 (ether type) should indicate IP. @@ -4682,7 +4726,11 @@ void CTRexExtendedDriverBase1G::get_extended_stats(CPhyEthIF * _if,CPhyEthIFStat void CTRexExtendedDriverBase1G::clear_extended_stats(CPhyEthIF * _if){ } - +int CTRexExtendedDriverBase1G::get_rx_stats(CPhyEthIF * _if, uint32_t *pkts, uint32_t *prev_pkts + ,uint32_t *bytes, uint32_t *prev_bytes, int min, int max) { + uint32_t port_id = _if->get_port_id(); + return g_trex.m_rx_sl.get_rx_stats(port_id, pkts, prev_pkts, bytes, prev_bytes, min, max); +} void CTRexExtendedDriverBase10G::clear_extended_stats(CPhyEthIF * _if){ _if->pci_reg_read(IXGBE_RXNFGPC); @@ -4939,13 +4987,24 @@ int CTRexExtendedDriverBase40G::configure_rx_filter_rules(CPhyEthIF * _if) { } } +int CTRexExtendedDriverBase40G::reset_rx_stats(CPhyEthIF * _if, uint32_t *stats) { + uint32_t diff_stats[MAX_FLOW_STATS]; + + // The HW counters start from some random values. The driver give us the diffs from previous, + // each time we do get_rx_stats. We need to make one first call, at system startup, + // and ignore the returned diffs + return get_rx_stats(_if, diff_stats, stats, NULL, NULL, 0, MAX_FLOW_STATS - 1); +} + // instead of adding this to rte_ethdev.h extern "C" int rte_eth_fdir_stats_get(uint8_t port_id, uint32_t *stats, uint32_t start, uint32_t len); // get rx stats on _if, between min and max -// prev_stats should be the previous values read from the hardware. +// prev_pkts should be the previous values read from the hardware. // Getting changed to be equal to current HW values. -// stats return the diff between prev_stats and current hw values -int CTRexExtendedDriverBase40G::get_rx_stats(CPhyEthIF * _if, uint32_t *stats, uint32_t *prev_stats, int min, int max) { +// pkts return the diff between prev_pkts and current hw values +// bytes and prev_bytes are not used. X710 fdir filters do not support byte count. +int CTRexExtendedDriverBase40G::get_rx_stats(CPhyEthIF * _if, uint32_t *pkts, uint32_t *prev_pkts + ,uint32_t *bytes, uint32_t *prev_bytes, int min, int max) { uint32_t hw_stats[MAX_FLOW_STATS]; uint32_t port_id = _if->get_port_id(); uint32_t start = (port_id % m_if_per_card) * MAX_FLOW_STATS + min; @@ -4954,13 +5013,13 @@ int CTRexExtendedDriverBase40G::get_rx_stats(CPhyEthIF * _if, uint32_t *stats, u rte_eth_fdir_stats_get(port_id, hw_stats, start, len); for (int i = loop_start; i < loop_start + len; i++) { - if (hw_stats[i - min] >= prev_stats[i]) { - stats[i] = (uint64_t)(hw_stats[i - min] - prev_stats[i]); + if (hw_stats[i - min] >= prev_pkts[i]) { + pkts[i] = (uint64_t)(hw_stats[i - min] - prev_pkts[i]); } else { // Wrap around - stats[i] = (uint64_t)((hw_stats[i - min] + ((uint64_t)1 << 32)) - prev_stats[i]); + pkts[i] = (uint64_t)((hw_stats[i - min] + ((uint64_t)1 << 32)) - prev_pkts[i]); } - prev_stats[i] = hw_stats[i - min]; + prev_pkts[i] = hw_stats[i - min]; } return 0; @@ -5197,12 +5256,6 @@ TrexDpdkPlatformApi::get_interface_info(uint8_t interface_id, intf_info_st &info /* hardware */ g_trex.m_ports[interface_id].macaddr_get(&rte_mac_addr); assert(ETHER_ADDR_LEN == 6); - printf("interface %d speed: %d mac:", interface_id, info.speed); - for (int i = 0; i < 6; i++) { - info.mac_info.hw_macaddr[i] = rte_mac_addr.addr_bytes[i]; - printf("%x:", rte_mac_addr.addr_bytes[i]); - } - printf("\n"); /* software */ uint8_t sw_macaddr[12]; diff --git a/src/main_dpdk.h b/src/main_dpdk.h index a475d321..c5d2d4d7 100644 --- a/src/main_dpdk.h +++ b/src/main_dpdk.h @@ -39,8 +39,9 @@ class CPhyEthIFStats { uint64_t imcasts; /**< Total number of multicast received packets. */ uint64_t rx_nombuf; /**< Total number of RX mbuf allocation failures. */ uint64_t m_rx_per_flow [MAX_FLOW_STATS]; // Per flow RX statistics - // Previous fdir stats values read from HW. Since on xl710 this is 32 bit, we save old value, to handle wrap around. - uint32_t m_fdir_prev_stats [MAX_FLOW_STATS]; + // Previous fdir stats values read from driver. Since on xl710 this is 32 bit, we save old value, to handle wrap around. + uint32_t m_fdir_prev_pkts [MAX_FLOW_STATS]; + uint32_t m_fdir_prev_bytes [MAX_FLOW_STATS]; public: void Clear(); void Dump(FILE *fd); diff --git a/src/stateless/rx/trex_stateless_rx_core.cpp b/src/stateless/rx/trex_stateless_rx_core.cpp new file mode 100644 index 00000000..a108bef3 --- /dev/null +++ b/src/stateless/rx/trex_stateless_rx_core.cpp @@ -0,0 +1,99 @@ +#include <stdio.h> +#include "latency.h" +#include "flow_stat_parser.h" +#include "stateless/rx/trex_stateless_rx_core.h" + + +void CRxCoreStateless::create(const CRxSlCfg &cfg) { + m_max_ports = cfg.m_max_ports; + + for (int i = 0; i < m_max_ports; i++) { + CLatencyManagerPerPort * lp = &m_ports[i]; + // CCPortLatency * lpo = &m_ports[swap_port(i)].m_port; + + lp->m_io = cfg.m_ports[i]; + /* lp->m_port.Create(this, + i, + m_pkt_gen.get_payload_offset(), + m_pkt_gen.get_l4_offset(), + m_pkt_gen.get_pkt_size(),lpo );???*/ + } + +} + +void CRxCoreStateless::start() { + static int count = 0; + static int i = 0; + while (1) { + count += try_rx(); + i++; + if (i == 100000000) { + i = 0; + //??? remove + printf("counter:%d port0:[%u], port1:[%u]\n", count, m_ports[0].m_port.m_rx_pg_pkts[0], m_ports[1].m_port.m_rx_pg_pkts[1]); + } + } +} + +// ??? temp try +int CRxCoreStateless::try_rx() { + rte_mbuf_t * rx_pkts[64]; + int i, total_pkts = 0; + for (i = 0; i < m_max_ports; i++) { + CLatencyManagerPerPort * lp = &m_ports[i]; + rte_mbuf_t * m; + //m_cpu_dp_u.start_work(); + /* try to read 64 packets clean up the queue */ + uint16_t cnt_p = lp->m_io->rx_burst(rx_pkts, 64); + total_pkts += cnt_p; + if (cnt_p) { + int j; + for (j = 0; j < cnt_p; j++) { + Cxl710Parser parser; + m = rx_pkts[j]; + if (parser.parse(rte_pktmbuf_mtod(m, uint8_t *), m->pkt_len) == 0) { + uint16_t ip_id; + if (parser.get_ip_id(ip_id) == 0) { + if (is_flow_stat_id(ip_id)) { + uint16_t hw_id = get_hw_id(ip_id); + m_ports[i].m_port.m_rx_pg_bytes[hw_id] += m->pkt_len; + m_ports[i].m_port.m_rx_pg_pkts[hw_id]++; + } + } + } + rte_pktmbuf_free(m); + } + /* commit only if there was work to do ! */ + //m_cpu_dp_u.commit(); //??? what's this? + }/* if work */ + }// all ports + return total_pkts; +} + +bool CRxCoreStateless::is_flow_stat_id(uint16_t id) { + if ((id & 0xff00) == IP_ID_RESERVE_BASE) return true; + return false; +} + +uint16_t CRxCoreStateless::get_hw_id(uint16_t id) { + return (0x00ff & id); +} + +void CRxCoreStateless::reset_rx_stats(uint8_t port_id) { + for (int hw_id = 0; hw_id < MAX_FLOW_STATS; hw_id++) { + m_ports[port_id].m_port.m_rx_pg_bytes[hw_id] = 0; + m_ports[port_id].m_port.m_rx_pg_pkts[hw_id] = 0; + } +} + +int CRxCoreStateless::get_rx_stats(uint8_t port_id, uint32_t *pkts, uint32_t *prev_pkts + , uint32_t *bytes, uint32_t *prev_bytes, int min, int max) { + for (int hw_id = min; hw_id <= max; hw_id++) { + pkts[hw_id] = m_ports[port_id].m_port.m_rx_pg_pkts[hw_id] - prev_pkts[hw_id]; + prev_pkts[hw_id] = m_ports[port_id].m_port.m_rx_pg_pkts[hw_id]; + bytes[hw_id] = m_ports[port_id].m_port.m_rx_pg_bytes[hw_id] - prev_bytes[hw_id]; + prev_bytes[hw_id] = m_ports[port_id].m_port.m_rx_pg_bytes[hw_id]; + } + + return 0; +} diff --git a/src/stateless/rx/trex_stateless_rx_core.h b/src/stateless/rx/trex_stateless_rx_core.h new file mode 100644 index 00000000..942ddbd6 --- /dev/null +++ b/src/stateless/rx/trex_stateless_rx_core.h @@ -0,0 +1,55 @@ +/* + Ido Barnea + Cisco Systems, Inc. +*/ + +/* +Copyright (c) 2016-2016 Cisco Systems, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ +#ifndef __TREX_STATELESS_RX_CORE_H__ +#define __TREX_STATELESS_RX_CORE_H__ +#include <stdint.h> +#include "latency.h" + +class CRxSlCfg { + public: + CRxSlCfg (){ + m_max_ports = 0; + m_cps = 0.0; + } + + public: + uint32_t m_max_ports; + double m_cps;// CPS + CPortLatencyHWBase * m_ports[TREX_MAX_PORTS]; +}; + +class CRxCoreStateless { + public: + void start(); + void create(const CRxSlCfg &cfg); + void reset_rx_stats(uint8_t port_id); + int get_rx_stats(uint8_t port_id, uint32_t *pkts, uint32_t *prev_pkts + , uint32_t *bytes, uint32_t *prev_bytes, int min, int max); + private: + int try_rx(); + bool is_flow_stat_id(uint16_t id); + uint16_t get_hw_id(uint16_t id); + + private: + uint32_t m_max_ports; + CLatencyManagerPerPort m_ports[TREX_MAX_PORTS]; +}; +#endif |