summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rwxr-xr-xsrc/main_dpdk.cpp68
-rw-r--r--src/publisher/trex_publisher.cpp107
-rw-r--r--src/publisher/trex_publisher.h80
-rw-r--r--src/stateless/dp/trex_stateless_dp_core.cpp8
4 files changed, 196 insertions, 67 deletions
diff --git a/src/main_dpdk.cpp b/src/main_dpdk.cpp
index 692e1c0e..13eca0d2 100755
--- a/src/main_dpdk.cpp
+++ b/src/main_dpdk.cpp
@@ -58,6 +58,7 @@ limitations under the License.
#include <stateless/cp/trex_stateless.h>
#include <stateless/dp/trex_stream_node.h>
+#include <publisher/trex_publisher.h>
#include <stateless/messaging/trex_stateless_messaging.h>
#include <../linux_dpdk/version.h>
@@ -2402,71 +2403,6 @@ private:
};
-class CZMqPublisher {
-public:
- CZMqPublisher(){
- m_context=0;
- m_publisher=0;
- }
-
- bool Create(uint16_t port,bool disable);
- void Delete();
- void publish_json(std::string & s);
-private:
- void show_zmq_last_error(char *s);
-private:
- void * m_context;
- void * m_publisher;
-};
-
-void CZMqPublisher::show_zmq_last_error(char *s){
- printf(" ERROR %s \n",s);
- printf(" ZMQ: %s",zmq_strerror (zmq_errno ()));
- exit(-1);
-}
-
-
-bool CZMqPublisher::Create(uint16_t port,bool disable){
-
- if (disable) {
- return(true);
- }
- m_context = zmq_ctx_new ();
- if ( m_context == 0 ) {
- show_zmq_last_error((char *)"can't connect to ZMQ library");
- }
- m_publisher = zmq_socket (m_context, ZMQ_PUB);
- if ( m_context == 0 ) {
- show_zmq_last_error((char *)"can't create ZMQ socket");
- }
- char buffer[100];
- sprintf(buffer,"tcp://*:%d",port);
- int rc=zmq_bind (m_publisher, buffer);
- if (rc != 0 ) {
- sprintf(buffer,"can't bind to ZMQ socket %d",port);
- show_zmq_last_error(buffer);
- }
- printf("zmq publisher at: %s \n",buffer);
- return (true);
-}
-
-
-void CZMqPublisher::Delete(){
- if (m_publisher) {
- zmq_close (m_publisher);
- }
- if (m_context) {
- zmq_ctx_destroy (m_context);
- }
-}
-
-
-void CZMqPublisher::publish_json(std::string & s){
- if ( m_publisher ){
- int size = zmq_send (m_publisher, s.c_str(), s.length(), 0);
- assert(size==s.length());
- }
-}
class CPerPortStats {
public:
@@ -2969,7 +2905,7 @@ private:
CLatencyVmPort m_latency_vm_vports[BP_MAX_PORTS]; /* vm driver */
CLatencyPktInfo m_latency_pkt;
- CZMqPublisher m_zmq_publisher;
+ TrexPublisher m_zmq_publisher;
public:
TrexStateless *m_trex_stateless;
diff --git a/src/publisher/trex_publisher.cpp b/src/publisher/trex_publisher.cpp
new file mode 100644
index 00000000..49602708
--- /dev/null
+++ b/src/publisher/trex_publisher.cpp
@@ -0,0 +1,107 @@
+/*
+ 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_publisher.h"
+#include <zmq.h>
+#include <assert.h>
+#include <sstream>
+#include <iostream>
+
+/**
+ * create the publisher
+ *
+ */
+bool
+TrexPublisher::Create(uint16_t port, bool disable){
+
+ if (disable) {
+ return (true);
+ }
+
+ m_context = zmq_ctx_new();
+ if ( m_context == 0 ) {
+ show_zmq_last_error("can't connect to ZMQ library");
+ }
+
+ m_publisher = zmq_socket (m_context, ZMQ_PUB);
+ if ( m_context == 0 ) {
+ show_zmq_last_error("can't create ZMQ socket");
+ }
+
+ std::stringstream ss;
+ ss << "tcp://*:" << port;
+
+ int rc = zmq_bind (m_publisher, ss.str().c_str());
+ if (rc != 0 ) {
+ show_zmq_last_error("can't bind to ZMQ socket at " + ss.str());
+ }
+
+ std::cout << "zmq publisher at: " << ss.str() << "\n";
+ return (true);
+}
+
+
+void
+TrexPublisher::Delete(){
+ if (m_publisher) {
+ zmq_close (m_publisher);
+ m_publisher = NULL;
+ }
+ if (m_context) {
+ zmq_ctx_destroy (m_context);
+ m_context = NULL;
+ }
+}
+
+
+void
+TrexPublisher::publish_json(const std::string &s){
+ if (m_publisher) {
+ int size = zmq_send (m_publisher, s.c_str(), s.length(), 0);
+ assert(size == s.length());
+ }
+}
+
+void
+TrexPublisher::publish_event(TrexPublisherEvent *ev) {
+ Json::FastWriter writer;
+ Json::Value value;
+ std::string s;
+
+ value["name"] = "event";
+ value["type"] = ev->get_type();
+ ev->to_json(value["data"]);
+
+ s = writer.write(value);
+ publish_json(s);
+}
+
+/**
+ * error handling
+ *
+ */
+void
+TrexPublisher::show_zmq_last_error(const std::string &err){
+ std::cout << " ERROR " << err << "\n";
+ std::cout << " ZMQ: " << zmq_strerror (zmq_errno ());
+ exit(-1);
+}
+
diff --git a/src/publisher/trex_publisher.h b/src/publisher/trex_publisher.h
new file mode 100644
index 00000000..7c3fff92
--- /dev/null
+++ b/src/publisher/trex_publisher.h
@@ -0,0 +1,80 @@
+/*
+ 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_PUBLISHER_H__
+#define __TREX_PUBLISHER_H__
+
+#include <stdint.h>
+#include <string>
+#include <json/json.h>
+
+/**
+ * base event type
+ *
+ */
+class TrexPublisherEvent {
+public:
+ virtual void to_json(Json::Value &json) = 0;
+ virtual uint8_t get_type() = 0;
+
+protected:
+ enum {
+ EVENT_PORT_STOPPED = 1
+ };
+
+};
+
+/**
+ * port stopped transmitting
+ *
+ */
+class TrexEventPortStopped : public TrexPublisherEvent {
+public:
+ TrexEventPortStopped(uint8_t port_id);
+ virtual void to_json(Json::Value &json);
+ virtual uint8_t get_type() {
+ return (EVENT_PORT_STOPPED);
+ }
+};
+
+
+class TrexPublisher {
+
+public:
+
+ TrexPublisher() {
+ m_context = NULL;
+ m_publisher = NULL;
+ }
+
+ bool Create(uint16_t port, bool disable);
+ void Delete();
+ void publish_json(const std::string &s);
+
+ void publish_event(TrexPublisherEvent *ev);
+
+private:
+ void show_zmq_last_error(const std::string &err);
+private:
+ void * m_context;
+ void * m_publisher;
+};
+
+#endif /* __TREX_PUBLISHER_H__ */
diff --git a/src/stateless/dp/trex_stateless_dp_core.cpp b/src/stateless/dp/trex_stateless_dp_core.cpp
index b25a4cfc..0747c1a0 100644
--- a/src/stateless/dp/trex_stateless_dp_core.cpp
+++ b/src/stateless/dp/trex_stateless_dp_core.cpp
@@ -260,7 +260,13 @@ TrexStatelessDpCore::stop_traffic(uint8_t port_id) {
m_core->m_node_gen.add_node(node);
}
-
+
+ /* send a message to the control plane to
+ generate an async event that traffic has stopped
+ */
+ //CNodeRing *ring = CMsgIns::Ins()->getCpDp()->getRingDpToCp(m_core->m_thread_id);
+ //ring->Enqueue((CGenNode *)msg->clone());
+
}
/**