Merge remote-tracking branch

Conflicts:
	linux/b
	linux/ws_main.py
	linux_dpdk/ws_main.py
	src/bp_sim.h

4 files changed, 421 insertions, 0 deletions

diff --git a/src/stateless/trex_stateless.cpp b/src/stateless/trex_stateless.cpp
new file mode 100644
index 00000000..05931983
--- /dev/null
+++ b/src/stateless/trex_stateless.cpp
@@ -0,0 +1,63 @@
+/*
+ Itay Marom
+ Cisco Systems, Inc.
+*/
+
+/*
+Copyright (c) 2015-2015 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.
+*/
+#include <trex_stateless_api.h>
+
+/***********************************************************
+ * Trex stateless object
+ * 
+ **********************************************************/
+TrexStateless::TrexStateless(uint8_t port_count) : m_port_count(port_count) {
+
+    m_ports = new TrexStatelessPort*[port_count];
+
+    for (int i = 0; i < m_port_count; i++) {
+        m_ports[i] = new TrexStatelessPort(i);
+    }
+}
+
+TrexStateless::~TrexStateless() {
+    for (int i = 0; i < m_port_count; i++) {
+        delete m_ports[i];
+    }
+
+    delete m_ports;
+}
+
+TrexStatelessPort * TrexStateless::get_port_by_id(uint8_t port_id) {
+    if (port_id >= m_port_count) {
+        throw TrexException("index out of range");
+    }
+
+    return m_ports[port_id];
+
+}
+
+uint8_t TrexStateless::get_port_count() {
+    return m_port_count;
+}
+
+/******** HACK - REMOVE ME ***********/
+TrexStateless * get_trex_stateless() {
+    static TrexStateless trex_stateless(8);
+    return &trex_stateless;
+
+}
+
diff --git a/src/stateless/trex_stateless_api.h b/src/stateless/trex_stateless_api.h
new file mode 100644
index 00000000..6406a946
--- /dev/null
+++ b/src/stateless/trex_stateless_api.h
@@ -0,0 +1,96 @@
+/*
+ Itay Marom
+ Cisco Systems, Inc.
+*/
+
+/*
+Copyright (c) 2015-2015 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_API_H__
+#define __TREX_STATELESS_API_H__
+
+#include <stdint.h>
+#include <string>
+#include <stdexcept>
+
+#include <trex_stream_api.h>
+
+/**
+ * generic exception for errors
+ * TODO: move this to a better place
+ */
+class TrexException : public std::runtime_error 
+{
+public:
+    TrexException() : std::runtime_error("") {
+
+    }
+    TrexException(const std::string &what) : std::runtime_error(what) {
+    }
+};
+
+/**
+ * describes a stateless port
+ * 
+ * @author imarom (31-Aug-15)
+ */
+class TrexStatelessPort {
+public:
+
+    TrexStatelessPort(uint8_t port_id) : m_port_id(port_id) {
+    }
+
+    /**
+     * access the stream table
+     * 
+     */
+    TrexStreamTable *get_stream_table() {
+        return &m_stream_table;
+    }
+
+private:
+    TrexStreamTable  m_stream_table;
+    uint8_t          m_port_id;
+};
+
+/**
+ * defines the T-Rex stateless operation mode
+ * 
+ */
+class TrexStateless {
+public:
+    /**
+     * create a T-Rex stateless object
+     * 
+     * @author imarom (31-Aug-15)
+     * 
+     * @param port_count 
+     */
+    TrexStateless(uint8_t port_count);
+    ~TrexStateless();
+
+    TrexStatelessPort *get_port_by_id(uint8_t port_id);
+    uint8_t            get_port_count();
+
+protected:
+    TrexStatelessPort  **m_ports;
+    uint8_t             m_port_count;
+};
+
+/****** HACK *******/
+TrexStateless *get_trex_stateless();
+
+#endif /* __TREX_STATELESS_API_H__ */
+
diff --git a/src/stateless/trex_stream.cpp b/src/stateless/trex_stream.cpp
new file mode 100644
index 00000000..1465b1ba
--- /dev/null
+++ b/src/stateless/trex_stream.cpp
@@ -0,0 +1,93 @@
+/*
+ Itay Marom
+ Cisco Systems, Inc.
+*/
+
+/*
+Copyright (c) 2015-2015 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.
+*/
+#include <trex_stream_api.h>
+#include <cstddef>
+
+/**************************************
+ * stream
+ *************************************/
+TrexStream::TrexStream(uint8_t port_id, uint32_t stream_id) : m_port_id(port_id), m_stream_id(stream_id) {
+
+    /* default values */
+    m_isg_usec        = 0;
+    m_next_stream_id  = -1;
+    m_enabled    = false;
+    m_self_start = false;
+
+    m_pkt = NULL;
+    m_pkt_len = 0;
+
+    m_rx_check.m_enable = false;
+
+}
+
+TrexStream::~TrexStream() {
+    if (m_pkt) {
+        delete [] m_pkt;
+    }
+}
+
+/**************************************
+ * stream table
+ *************************************/
+TrexStreamTable::TrexStreamTable() {
+
+}
+
+TrexStreamTable::~TrexStreamTable() {
+    for (auto stream : m_stream_table) {
+        delete stream.second;
+    }
+}
+
+void TrexStreamTable::add_stream(TrexStream *stream) {
+    TrexStream *old_stream = get_stream_by_id(stream->m_stream_id);
+    if (old_stream) {
+        remove_stream(old_stream);
+        delete old_stream;
+    }
+
+    m_stream_table[stream->m_stream_id] = stream;
+}                                           
+
+void TrexStreamTable::remove_stream(TrexStream *stream) {
+    m_stream_table.erase(stream->m_stream_id);
+}
+
+
+void TrexStreamTable::remove_and_delete_all_streams() {
+
+    for (auto stream : m_stream_table) {
+        delete stream.second;
+    }
+
+    m_stream_table.clear();
+}
+
+TrexStream * TrexStreamTable::get_stream_by_id(uint32_t stream_id) {
+    auto search = m_stream_table.find(stream_id);
+
+    if (search != m_stream_table.end()) {
+        return search->second;
+    } else {
+        return NULL;
+    }
+}
diff --git a/src/stateless/trex_stream_api.h b/src/stateless/trex_stream_api.h
new file mode 100644
index 00000000..f57b7aae
--- /dev/null
+++ b/src/stateless/trex_stream_api.h
@@ -0,0 +1,169 @@
+/*
+ Itay Marom
+ Cisco Systems, Inc.
+*/
+
+/*
+Copyright (c) 2015-2015 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_STREAM_API_H__
+#define __TREX_STREAM_API_H__
+
+#include <unordered_map>
+#include <stdint.h>
+
+class TrexRpcCmdAddStream;
+
+/**
+ * Stateless Stream
+ * 
+ */
+class TrexStream {
+    /* provide the RPC parser a way to access private fields */
+    friend class TrexRpcCmdAddStream;
+    friend class TrexStreamTable;
+
+public:
+    TrexStream(uint8_t port_id, uint32_t stream_id);
+    virtual ~TrexStream() = 0;
+
+    /* defines the min max per packet supported */
+    static const uint32_t MIN_PKT_SIZE_BYTES = 1;
+    static const uint32_t MAX_PKT_SIZE_BYTES = 9000;
+
+private:
+    /* basic */
+    uint8_t       m_port_id;
+    uint32_t      m_stream_id;
+    
+
+    /* config fields */
+    double        m_isg_usec;
+    uint32_t      m_next_stream_id;
+
+    /* indicators */
+    bool          m_enabled;
+    bool          m_self_start;
+    
+    /* pkt */
+    uint8_t      *m_pkt;
+    uint16_t      m_pkt_len;
+
+    /* VM */
+
+    /* RX check */
+    struct {
+        bool      m_enable;
+        bool      m_seq_enabled;
+        bool      m_latency;
+        uint32_t  m_stream_id;
+
+    } m_rx_check;
+
+};
+
+/**
+ * continuous stream
+ * 
+ */
+class TrexStreamContinuous : public TrexStream {
+public:
+    TrexStreamContinuous(uint8_t port_id, uint32_t stream_id, uint32_t pps) : TrexStream(port_id, stream_id), m_pps(pps) {
+    }
+protected:
+    uint32_t m_pps;
+};
+
+/**
+ * single burst
+ * 
+ */
+class TrexStreamBurst : public TrexStream {
+public:
+    TrexStreamBurst(uint8_t port_id, uint32_t stream_id, uint32_t total_pkts, uint32_t pps) : 
+        TrexStream(port_id, stream_id),
+        m_total_pkts(total_pkts),
+        m_pps(pps) {
+    }
+
+protected:
+    uint32_t   m_total_pkts;
+    uint32_t   m_pps;
+};
+
+/**
+ * multi burst
+ * 
+ */
+class TrexStreamMultiBurst : public TrexStreamBurst {
+public:
+    TrexStreamMultiBurst(uint8_t  port_id,
+                         uint32_t stream_id,
+                         uint32_t pkts_per_burst,
+                         uint32_t pps,
+                         uint32_t num_bursts,
+                         double   ibg_usec) : TrexStreamBurst(port_id, stream_id, pkts_per_burst, pps), m_num_bursts(num_bursts), m_ibg_usec(ibg_usec) {
+
+    }
+protected:
+    uint32_t m_num_bursts;
+    double   m_ibg_usec;
+    
+};
+
+/**
+ * holds all the streams 
+ *  
+ */
+class TrexStreamTable {
+public:
+
+    TrexStreamTable();
+    ~TrexStreamTable();
+
+    /**
+     * add a stream 
+     * if a previous one exists, the old one  will be deleted 
+     */
+    void add_stream(TrexStream *stream);
+
+    /**
+     * remove a stream
+     */
+    void remove_stream(TrexStream *stream);
+
+    /**
+     * remove all streams on the table
+     * memory will be deleted
+     */
+    void remove_and_delete_all_streams();
+
+    /**
+     * fetch a stream if exists 
+     * o.w NULL 
+     *  
+     */
+    TrexStream * get_stream_by_id(uint32_t stream_id);
+
+private:
+    /**
+     * holds all the stream in a hash table by stream id
+     * 
+     */
+    std::unordered_map<int, TrexStream *> m_stream_table;
+};
+
+#endif /* __TREX_STREAM_API_H__ */
+