From cc352e04fd45913132f3e1ddc86d88571c926879 Mon Sep 17 00:00:00 2001
From: Hanoh Haim <hhaim@cisco.com>
Date: Wed, 11 Nov 2015 15:37:46 +0200
Subject: add first stl test and cleanup valgrind

---
 src/stateless/cp/trex_streams_compiler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/stateless/cp/trex_streams_compiler.cpp')

diff --git a/src/stateless/cp/trex_streams_compiler.cpp b/src/stateless/cp/trex_streams_compiler.cpp
index 06c0119a..667da158 100644
--- a/src/stateless/cp/trex_streams_compiler.cpp
+++ b/src/stateless/cp/trex_streams_compiler.cpp
@@ -31,7 +31,7 @@ TrexStreamsCompiledObj::TrexStreamsCompiledObj(uint8_t port_id, double mul) : m_
 
 TrexStreamsCompiledObj::~TrexStreamsCompiledObj() {
     for (auto &obj : m_objs) {
-        delete obj.m_pkt;
+        delete [] obj.m_pkt;
     }
     m_objs.clear();
 }
-- 
cgit 


From 6294136db42a3327049c67c12eab4684c4abbe47 Mon Sep 17 00:00:00 2001
From: Hanoh Haim <hhaim@cisco.com>
Date: Wed, 11 Nov 2015 16:14:28 +0200
Subject: fix duration for stl tests

---
 src/stateless/cp/trex_streams_compiler.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/stateless/cp/trex_streams_compiler.cpp')

diff --git a/src/stateless/cp/trex_streams_compiler.cpp b/src/stateless/cp/trex_streams_compiler.cpp
index 8238bac7..7891077b 100644
--- a/src/stateless/cp/trex_streams_compiler.cpp
+++ b/src/stateless/cp/trex_streams_compiler.cpp
@@ -34,6 +34,7 @@ TrexStreamsCompiledObj::~TrexStreamsCompiledObj() {
         delete [] obj.m_pkt;
     }
     m_objs.clear();
+    m_duration_sim=-1.0;
 }
 
 void 
@@ -67,9 +68,10 @@ TrexStreamsCompiledObj::clone() {
                                               obj.m_pkt_len);
     }
 
-    /* fix the multiplier */
     new_compiled_obj->m_mul = m_mul;
 
+    new_compiled_obj->m_duration_sim = m_duration_sim;
+
     return new_compiled_obj;
 }
 
-- 
cgit 


From 151266e34245b99ce4cac70d82be79bfb5a3ebf9 Mon Sep 17 00:00:00 2001
From: Hanoh Haim <hhaim@cisco.com>
Date: Wed, 11 Nov 2015 22:10:05 +0200
Subject: add support for multi-burst

---
 src/stateless/cp/trex_streams_compiler.cpp | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

(limited to 'src/stateless/cp/trex_streams_compiler.cpp')

diff --git a/src/stateless/cp/trex_streams_compiler.cpp b/src/stateless/cp/trex_streams_compiler.cpp
index 7891077b..c7b881c5 100644
--- a/src/stateless/cp/trex_streams_compiler.cpp
+++ b/src/stateless/cp/trex_streams_compiler.cpp
@@ -30,24 +30,15 @@ TrexStreamsCompiledObj::TrexStreamsCompiledObj(uint8_t port_id, double mul) : m_
 }
 
 TrexStreamsCompiledObj::~TrexStreamsCompiledObj() {
-    for (auto &obj : m_objs) {
-        delete [] obj.m_pkt;
-    }
     m_objs.clear();
     m_duration_sim=-1.0;
 }
 
 void 
-TrexStreamsCompiledObj::add_compiled_stream(double isg_usec, double pps, uint8_t *pkt, uint16_t pkt_len) {
+TrexStreamsCompiledObj::add_compiled_stream(TrexStream * stream) {
     obj_st obj;
 
-    obj.m_isg_usec  = isg_usec;
-    obj.m_port_id   = m_port_id;
-    obj.m_pps       = pps * m_mul;
-    obj.m_pkt_len   = pkt_len;
-
-    obj.m_pkt = new uint8_t[pkt_len];
-    memcpy(obj.m_pkt, pkt, pkt_len);
+    obj.m_stream = stream;
 
     m_objs.push_back(obj);
 }
@@ -62,10 +53,7 @@ TrexStreamsCompiledObj::clone() {
      * clone each element
      */
     for (auto obj : m_objs) {
-        new_compiled_obj->add_compiled_stream(obj.m_isg_usec,
-                                              obj.m_pps,
-                                              obj.m_pkt,
-                                              obj.m_pkt_len);
+        new_compiled_obj->add_compiled_stream(obj.m_stream);
     }
 
     new_compiled_obj->m_mul = m_mul;
@@ -93,17 +81,8 @@ TrexStreamsCompiler::compile(const std::vector<TrexStream *> &streams, TrexStrea
             continue;
         }
 
-        /* for now support only continous ... */
-        TrexStreamContinuous *cont_stream = dynamic_cast<TrexStreamContinuous *>(stream);
-        if (!cont_stream) {
-            continue;
-        }
-
         /* add it */
-        obj.add_compiled_stream(cont_stream->m_isg_usec,
-                                cont_stream->get_pps(),
-                                cont_stream->m_pkt.binary,
-                                cont_stream->m_pkt.len);
+        obj.add_compiled_stream(stream);
     }
 
     return true;
-- 
cgit 


From 45b71cff9d0465b77f82e4cd40b64a9f3183c1c7 Mon Sep 17 00:00:00 2001
From: Hanoh Haim <hhaim@cisco.com>
Date: Thu, 12 Nov 2015 15:33:30 +0200
Subject: refactor stream object

---
 src/stateless/cp/trex_streams_compiler.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/stateless/cp/trex_streams_compiler.cpp')

diff --git a/src/stateless/cp/trex_streams_compiler.cpp b/src/stateless/cp/trex_streams_compiler.cpp
index c7b881c5..80cdb31c 100644
--- a/src/stateless/cp/trex_streams_compiler.cpp
+++ b/src/stateless/cp/trex_streams_compiler.cpp
@@ -27,18 +27,21 @@ limitations under the License.
  * stream compiled object
  *************************************/
 TrexStreamsCompiledObj::TrexStreamsCompiledObj(uint8_t port_id, double mul) : m_port_id(port_id), m_mul(mul) {
+    m_duration_sim=-1.0;
 }
 
 TrexStreamsCompiledObj::~TrexStreamsCompiledObj() {
+    for (auto obj : m_objs) {
+        delete obj.m_stream;
+    }
     m_objs.clear();
-    m_duration_sim=-1.0;
 }
 
 void 
 TrexStreamsCompiledObj::add_compiled_stream(TrexStream * stream) {
     obj_st obj;
 
-    obj.m_stream = stream;
+    obj.m_stream = stream->clone_as_dp();
 
     m_objs.push_back(obj);
 }
-- 
cgit