Merge pull request #49 from connectivecpp/deutsch_python_monitor

Split monitor_msg_handling.hpp into two separate classes

Author: cliffg-softwarelibre

…st_data_blaster/monitor_msg_handling.hpp …/test_data_blaster/monitor_connector.hpptest/test_data_blaster/monitor_msg_handling.hpp renamed to test/test_data_blaster/monitor_connector.hpp test/test_data_blaster/monitor_msg_handling.hpp renamed to test/test_data_blaster/monitor_connector.hpp

@@ -13,8 +13,8 @@
  *
  */
 
-#ifndef MONITOR_MSG_HANDLING_HPP_INCLUDED
-#define MONITOR_MSG_HANDLING_HPP_INCLUDED
+#ifndef MONITOR_CONNECTOR_HPP_INCLUDED
+#define MONITOR_CONNECTOR_HPP_INCLUDED
 
 #include <string>
 #include <string_view>
@@ -23,42 +23,17 @@
 #include <utility> // std::move
 #include <type_traits> // std::is_same
 
+#include "asio/ip/basic_endpoint.hpp"
+
 #include "net_ip/net_ip.hpp"
 #include "net_ip/net_entity.hpp"
 #include "net_ip_component/error_delivery.hpp"
 
-#include "asio/ip/basic_endpoint.hpp"
+#include "test_data_blaster/monitor_msg.hpp"
 
 namespace chops {
 namespace test {
 
-template <typename AsioIpProtocol>
-std::string format_addr (const asio::ip::basic_endpoint<AsioIpProtocol>& endpoint) {
-  return endpoint.address().to_string() + ":" + std::to_string(endpoint.port());
-}
-
-struct monitor_msg_data {
-
-  static constexpr std::size_t max_msg_data_to_capture = 15;
-  enum msg_direction { incoming, outgoing };
-
-  std::string    m_dsr_name;
-  std::string    m_protocol; // "tcp" or "udp"
-  std::string    m_remote_addr; // in "host:port" format, see format_addr above
-  msg_direction  m_direction;
-  std::size_t    m_curr_msg_num;
-  std::size_t    m_curr_msg_size;
-  std::string    m_curr_msg_beginning; // up to max_msg_data_to_capture chars
-  std::size_t    m_total_msgs_to_send;  // 0 if direction is incoming, since total not known in advance
-  std::size_t    m_outgoing_queue_size;
-
-};
-
-struct shutdown_msg {
-// to be filled in
-};
-
-
 // shutdown message from monitor process will set promise, which causes future to pop, which
 // tells DSR to shutdown
 class monitor_connector {
@@ -90,16 +65,5 @@ class monitor_connector {
 
 };
 
-inline chops::const_shared_buffer marshall_monitor_msg_data (const monitor_msg_data& msg_data) {
-
-}
-
-inline monitor_msg_data unmarshall_monitor_msg_data (const chops::const_shared_buffer& buf) {
-
 }
-
-} // end namespace test
-} // end namespace chops
-
-#endif
-
+}

test/test_data_blaster/monitor_connector_test.cpp

@@ -0,0 +1,21 @@
+/** @file
+ *
+ *  @ingroup test_module
+ *
+ *  @brief Unit tests for monitor_connector.hpp
+ *
+ *  @author (fill in)
+ *
+ *  Copyright (c) 2019 by Cliff Green, (fill in)
+ *
+ *  Distributed under the Boost Software License, Version 1.0. 
+ *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ *
+ */
+
+#include "catch2/catch.hpp"
+#include "test_data_blaster/monitor_connector.hpp"
+
+TEST_CASE("monitor connector test", "[monitor_connector_test]") {
+
+}

test/test_data_blaster/monitor_msg.hpp

@@ -0,0 +1,81 @@
+/** @file
+ *
+ *  @ingroup test_module
+ *
+ *  @brief Data structures sent between nodes in test data blaster
+ *
+ *  @author (fill in)
+ *
+ *  Copyright (c) 2019 by Cliff Green, (fill in)
+ *
+ *  Distributed under the Boost Software License, Version 1.0. 
+ *  (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ *
+ */
+
+#ifndef MONITOR_MSG_HPP_INCLUDED
+#define MONITOR_MSG_HPP_INCLUDED
+
+#include <string>
+#include <string_view>
+
+#include "net_ip/net_ip.hpp"
+#include "net_ip/net_entity.hpp"
+#include "net_ip_component/error_delivery.hpp"
+
+#include "asio/ip/basic_endpoint.hpp"
+
+namespace chops {
+namespace test {
+
+
+template <typename AsioIpProtocol>
+std::string format_addr (const asio::ip::basic_endpoint<AsioIpProtocol>& endpoint) {
+  return endpoint.address().to_string() + ":" + std::to_string(endpoint.port());
+}
+
+struct monitor_msg_data {
+
+  static constexpr std::size_t max_msg_data_to_capture = 15;
+  enum msg_direction { incoming, outgoing };
+
+  std::string    m_dsr_name;
+  std::string    m_protocol; // "tcp" or "udp"
+  std::string    m_remote_addr; // in "host:port" format, see format_addr above
+  msg_direction  m_direction;
+  std::size_t    m_curr_msg_num;
+  std::size_t    m_curr_msg_size;
+  std::string    m_curr_msg_beginning; // up to max_msg_data_to_capture chars
+  std::size_t    m_total_msgs_to_send;  // 0 if direction is incoming, since total not known in advance
+  std::size_t    m_outgoing_queue_size;
+
+};
+
+struct shutdown_msg {
+// to be filled in
+};
+
+
+inline chops::const_shared_buffer marshall_monitor_msg_data (const monitor_msg_data& msg_data) {
+    // work in progress
+    return null;
+}
+
+inline monitor_msg_data unmarshall_monitor_msg_data (const chops::const_shared_buffer& buf) {
+    // work in progress
+    return null;
+}
+
+inline chops::const_shared_buffer marshall_shutdown_message() {
+    // work in progress
+    return null;
+}
+
+inline std::string unmarshall_shutdown_message() {
+  // work in progress
+  return null;
+}
+
+
+}
+}