Merge from master

2 files changed, 113 insertions, 16 deletions

diff --git a/src/stateless/messaging/trex_stateless_messaging.cpp b/src/stateless/messaging/trex_stateless_messaging.cpp
index 856fd9e3..629fe24c 100644
--- a/src/stateless/messaging/trex_stateless_messaging.cpp
+++ b/src/stateless/messaging/trex_stateless_messaging.cpp
@@ -22,12 +22,18 @@ limitations under the License.
 #include <trex_stateless_messaging.h>
 #include <trex_stateless_dp_core.h>
 #include <trex_streams_compiler.h>
+#include <trex_stateless.h>
+
 #include <string.h>
 
 /*************************
   start traffic message
  ************************/ 
-TrexStatelessDpStart::TrexStatelessDpStart(TrexStreamsCompiledObj *obj, double duration) : m_obj(obj), m_duration(duration) {
+TrexStatelessDpStart::TrexStatelessDpStart(uint8_t port_id, int event_id, TrexStreamsCompiledObj *obj, double duration) {
+    m_port_id = port_id;
+    m_event_id = event_id;
+    m_obj = obj;
+    m_duration = duration;
 }
 
 
@@ -40,7 +46,7 @@ TrexStatelessDpStart::clone() {
 
     TrexStreamsCompiledObj *new_obj = m_obj->clone();
 
-    TrexStatelessCpToDpMsgBase *new_msg = new TrexStatelessDpStart(new_obj, m_duration);
+    TrexStatelessCpToDpMsgBase *new_msg = new TrexStatelessDpStart(m_port_id, m_event_id, new_obj, m_duration);
 
     return new_msg;
 }
@@ -54,7 +60,12 @@ TrexStatelessDpStart::~TrexStatelessDpStart() {
 bool
 TrexStatelessDpStart::handle(TrexStatelessDpCore *dp_core) {
 
+    /* mark the event id for DP response */
+    dp_core->get_port_db(m_port_id)->set_event_id(m_event_id);
+
+    /* staet traffic */
     dp_core->start_traffic(m_obj, m_duration);
+
     return true;
 }
 
@@ -63,6 +74,10 @@ TrexStatelessDpStart::handle(TrexStatelessDpCore *dp_core) {
  ************************/ 
 bool
 TrexStatelessDpStop::handle(TrexStatelessDpCore *dp_core) {
+    if (dp_core->get_port_db(m_port_id)->get_state() == TrexStatelessDpPerPort::ppSTATE_IDLE) {
+        return true;
+    }
+
     dp_core->stop_traffic(m_port_id);
     return true;
 }
@@ -96,7 +111,6 @@ bool TrexStatelessDpQuit::handle(TrexStatelessDpCore *dp_core){
     return (true);
 }
 
-
 bool TrexStatelessDpCanQuit::handle(TrexStatelessDpCore *dp_core){
 
     if ( dp_core->are_all_ports_idle() ){
@@ -115,3 +129,12 @@ TrexStatelessDpCanQuit::clone(){
 }
 
 
+/************************* messages from DP to CP **********************/
+bool
+TrexDpPortEventMsg::handle() {
+    TrexStatelessPort *port = get_stateless_obj()->get_port_by_id(m_port_id);
+    port->get_dp_events().handle_event(m_event_type, m_thread_id, m_event_id);
+
+    return (true);
+}
+
diff --git a/src/stateless/messaging/trex_stateless_messaging.h b/src/stateless/messaging/trex_stateless_messaging.h
index 7dc307c7..2fb5a024 100644
--- a/src/stateless/messaging/trex_stateless_messaging.h
+++ b/src/stateless/messaging/trex_stateless_messaging.h
@@ -23,6 +23,7 @@ limitations under the License.
 #define __TREX_STATELESS_MESSAGING_H__
 
 #include <msg_manager.h>
+#include <trex_dp_port_events.h>
 
 class TrexStatelessDpCore;
 class TrexStreamsCompiledObj;
@@ -42,12 +43,8 @@ public:
     virtual ~TrexStatelessCpToDpMsgBase() {
     }
 
-    /**
-     * virtual function to handle a message
-     * 
-     */
-    virtual bool handle(TrexStatelessDpCore *dp_core) = 0;
 
+    virtual bool handle(TrexStatelessDpCore *dp_core) = 0;
 
     /**
      * clone the current message
@@ -66,7 +63,9 @@ public:
 
     /* no copy constructor */
     TrexStatelessCpToDpMsgBase(TrexStatelessCpToDpMsgBase &) = delete;
-private:
+
+protected:
+    int     m_event_id;
     bool    m_quit_scheduler;
 };
 
@@ -78,18 +77,21 @@ private:
 class TrexStatelessDpStart : public TrexStatelessCpToDpMsgBase {
 public:
 
-    TrexStatelessDpStart(TrexStreamsCompiledObj *obj, double duration);
+    TrexStatelessDpStart(uint8_t m_port_id, int m_event_id, TrexStreamsCompiledObj *obj, double duration);
 
     ~TrexStatelessDpStart();
 
-    virtual bool handle(TrexStatelessDpCore *dp_core);
-
     virtual TrexStatelessCpToDpMsgBase * clone();
 
+    virtual bool handle(TrexStatelessDpCore *dp_core);
 
 private:
+
+    uint8_t                 m_port_id;
+    int                     m_event_id;
     TrexStreamsCompiledObj *m_obj;
-    double m_duration;
+    double                  m_duration;
+
 };
 
 /**
@@ -103,10 +105,10 @@ public:
     TrexStatelessDpStop(uint8_t port_id) : m_port_id(port_id) {
     }
 
-    virtual bool handle(TrexStatelessDpCore *dp_core);
-
     virtual TrexStatelessCpToDpMsgBase * clone();
 
+    virtual bool handle(TrexStatelessDpCore *dp_core);
+
 private:
     uint8_t m_port_id;
 };
@@ -122,9 +124,11 @@ public:
     TrexStatelessDpQuit()  {
     }
 
-    virtual bool handle(TrexStatelessDpCore *dp_core);
 
     virtual TrexStatelessCpToDpMsgBase * clone();
+
+    virtual bool handle(TrexStatelessDpCore *dp_core);
+
 };
 
 /**
@@ -145,4 +149,74 @@ public:
 
 
 
+/************************* messages from DP to CP **********************/
+
+/**
+ * defines the base class for CP to DP messages
+ * 
+ * @author imarom (27-Oct-15)
+ */
+class TrexStatelessDpToCpMsgBase {
+public:
+
+    TrexStatelessDpToCpMsgBase() {
+    }
+
+    virtual ~TrexStatelessDpToCpMsgBase() {
+    }
+
+    /**
+     * virtual function to handle a message
+     * 
+     */
+    virtual bool handle() = 0;
+
+    /* no copy constructor */
+    TrexStatelessDpToCpMsgBase(TrexStatelessDpToCpMsgBase &) = delete;
+
+};
+
+
+/**
+ * a message indicating an event has happened on a port at the 
+ * DP 
+ * 
+ */
+class TrexDpPortEventMsg : public TrexStatelessDpToCpMsgBase {
+public:
+
+    TrexDpPortEventMsg(int thread_id, uint8_t port_id, TrexDpPortEvent::event_e type, int event_id) {
+        m_thread_id  = thread_id;
+        m_port_id    = port_id;
+        m_event_type = type;
+        m_event_id   = event_id;
+    }
+
+    virtual bool handle();
+
+    int get_thread_id() {
+        return m_thread_id;
+    }
+
+    uint8_t get_port_id() {
+        return m_port_id;
+    }
+
+    TrexDpPortEvent::event_e get_event_type() {
+        return m_event_type;
+    }
+
+    int get_event_id() {
+        return m_event_id;
+    }
+
+private:
+    int                         m_thread_id;
+    uint8_t                     m_port_id;
+    TrexDpPortEvent::event_e    m_event_type;
+    int                         m_event_id;
+    
+};
+
 #endif /* __TREX_STATELESS_MESSAGING_H__ */
+