Additional updating, cleanup, and porting to C++20

Author: cliffg-softwarelibre

include/net_ip/detail/tcp_acceptor.hpp

@@ -8,7 +8,7 @@
  *
  *  @author Cliff Green
  *
- *  Copyright (c) 2018-2019 by Cliff Green
+ *  Copyright (c) 2018-2025 by Cliff Green
  *
  *  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)
@@ -39,8 +39,6 @@
 
 #include "net_ip/basic_io_output.hpp"
 
-#include "utility/erase_where.hpp"
-
 namespace chops {
 namespace net {
 namespace detail {
@@ -231,7 +229,7 @@ class tcp_acceptor : public std::enable_shared_from_this<tcp_acceptor> {
   // this code invoked via a posted function object, allowing the TCP IO handler
   // to completely shut down 
   void notify_me(std::error_code err, tcp_io_shared_ptr iop) {
-    chops::erase_where(m_io_handlers, iop);
+    std::erase_if (m_io_handlers, [iop] (auto sp) { return iop == sp; } );
     m_entity_common.call_error_cb(iop, err);
     m_entity_common.call_io_state_chg_cb(iop, m_io_handlers.size(), false);
   }

include/net_ip/detail/tcp_io.hpp

@@ -8,7 +8,7 @@
  *
  *  @author Cliff Green
  *
- *  Copyright (c) 2017-2019 by Cliff Green
+ *  Copyright (c) 2017-2025 by Cliff Green
  *
  *  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)
@@ -42,7 +42,7 @@
 #include "net_ip/basic_io_output.hpp"
 #include "net_ip/simple_variable_len_msg_frame.hpp"
 
-#include "marshall/shared_buffer.hpp"
+#include "buffer/shared_buffer.hpp"
 
 namespace chops {
 namespace net {

include/net_ip/detail/udp_entity_io.hpp

@@ -8,7 +8,7 @@
  *
  *  @author Cliff Green
  *
- *  Copyright (c) 2018-2019 by Cliff Green
+ *  Copyright (c) 2018-2025 by Cliff Green
  *
  *  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)
@@ -40,7 +40,7 @@
 #include "net_ip/basic_io_output.hpp"
 #include "net_ip/endpoints_resolver.hpp"
 
-#include "marshall/shared_buffer.hpp"
+#include "buffer/shared_buffer.hpp"
 
 //////
 // #include <iostream>

include/net_ip/net_entity.hpp

@@ -6,7 +6,7 @@
  *
  *  @author Cliff Green
  *
- *  Copyright (c) 2017-2019 by Cliff Green
+ *  Copyright (c) 2017-2025 by Cliff Green
  *
  *  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)
@@ -37,16 +37,15 @@
 
 #include "net_ip/io_type_decls.hpp"
 
-#include "utility/overloaded.hpp"
-
 namespace chops {
 namespace net {
 
-// Cliff note: when C++ 20 lambda templates are available much of this code can be simplified,
-// since most of it is generic (just doesn't have the specific type parameter available as 
-// needed in the right place). Stating it another way, there is waaaaaaay too much boilerplate 
-// code (it may be possible to simplify with C++17 techniques that I don't know yet).
-  
+namespace detail {
+// std::visit utility taken directly from cppreference
+  template<class... Ts>
+  struct overloaded : Ts... { using Ts::operator()...; };
+}
+
 /**
  *  @brief The @c net_entity class provides the primary application interface 
  *  into the TCP acceptor, TCP connector, and UDP entity functionality.
@@ -137,7 +136,7 @@ class net_entity {
  */
   auto is_started() const -> 
           nonstd::expected<bool, std::error_code> {
-    return std::visit(chops::overloaded {
+    return std::visit(detail::overloaded {
         [] (const udp_wp& wp) -> nonstd::expected<bool, std::error_code> {
           return detail::wp_access<bool>(wp, 
                  [] (detail::udp_entity_io_shared_ptr sp) { return sp->is_started(); } );
@@ -175,7 +174,7 @@ class net_entity {
   template <typename F>
   auto visit_socket(F&& func) const ->
           nonstd::expected<void, std::error_code> {
-    return std::visit(chops::overloaded {
+    return std::visit(detail::overloaded {
         [&func] (const udp_wp& wp) -> nonstd::expected<void, std::error_code> {
           if constexpr (std::is_invocable_v<F, asio::ip::udp::socket&>) {
             return detail::wp_access_void(wp,
@@ -225,7 +224,7 @@ class net_entity {
   template <typename F>
   auto visit_io_output(F&& func) const ->
           nonstd::expected<std::size_t, std::error_code> {
-    return std::visit(chops::overloaded {
+    return std::visit(detail::overloaded {
         [&func] (const udp_wp& wp)-> nonstd::expected<std::size_t, std::error_code>  {
           if constexpr (std::is_invocable_v<F, chops::net::udp_io_output>) {
             return detail::wp_access<std::size_t>(wp,
@@ -343,7 +342,7 @@ class net_entity {
   template <typename F1, typename F2>
   auto start(F1&& io_state_chg_func, F2&& err_func) ->
           nonstd::expected<void, std::error_code> {
-    return std::visit(chops::overloaded {
+    return std::visit(detail::overloaded {
         [&io_state_chg_func, &err_func] (const udp_wp& wp)->nonstd::expected<void, std::error_code> {
           if constexpr (std::is_invocable_v<F1, udp_io_interface, std::size_t, bool> &&
                         std::is_invocable_v<F2, udp_io_interface, std::error_code>) {
@@ -389,7 +388,7 @@ class net_entity {
  */
   auto stop() ->
           nonstd::expected<void, std::error_code> {
-    return std::visit(chops::overloaded {
+    return std::visit(detail::overloaded {
         [] (const udp_wp& wp)->nonstd::expected<void, std::error_code> {
           return detail::wp_access_void(wp, 
               [] (detail::udp_entity_io_shared_ptr sp) { return sp->stop(); } );
@@ -414,7 +413,7 @@ class net_entity {
  *
  */
   std::string_view stream_out() const noexcept {
-    return std::visit(chops::overloaded {
+    return std::visit(detail::overloaded {
         [] (const udp_wp& wp) { return "[UDP network entity]"; },
         [] (const acc_wp& wp) { return "[TCP acceptor network entity]"; },
         [] (const conn_wp& wp) { return "[TCP connector network entity]"; },
@@ -442,7 +441,7 @@ class net_entity {
  */
 
 inline bool operator==(const net_entity& lhs, const net_entity& rhs) noexcept {
-  return std::visit(chops::overloaded {
+  return std::visit(detail::overloaded {
     [] (const net_entity::udp_wp& lwp, const net_entity::udp_wp& rwp) {
           return lwp.lock() == rwp.lock();
         },
@@ -487,7 +486,7 @@ inline bool operator==(const net_entity& lhs, const net_entity& rhs) noexcept {
  *  @return As described in the comments.
  */
 inline bool operator<(const net_entity& lhs, const net_entity& rhs) noexcept {
-  return std::visit(chops::overloaded {
+  return std::visit(detail::overloaded {
     [] (const net_entity::udp_wp& lwp, const net_entity::udp_wp& rwp) {
           return lwp.lock() < rwp.lock();
         },

include/net_ip/net_ip.hpp

@@ -41,9 +41,6 @@
 
 #include "net_ip/tcp_connector_timeout.hpp"
 
-#include "utility/erase_where.hpp"
-#include "utility/overloaded.hpp"
-
 namespace chops {
 namespace net {
 
@@ -391,10 +388,17 @@ class net_ip {
  */
   void remove(net_entity ent) {
     lg g(m_mutex);
-    std::visit (chops::overloaded {
-        [this] (detail::tcp_acceptor_weak_ptr p) { chops::erase_where(m_acceptors, p.lock()); },
-        [this] (detail::tcp_connector_weak_ptr p) { chops::erase_where(m_connectors, p.lock()); },
-        [this] (detail::udp_entity_io_weak_ptr p) { chops::erase_where(m_udp_entities, p.lock()); },
+// overloaded utility brought in from net_entity.hpp
+    std::visit (detail::overloaded {
+        [this] (detail::tcp_acceptor_weak_ptr p) { 
+          std::erase_if(m_acceptors, [p] (detail::tcp_acceptor_shared_ptr sp) { sp == p.lock(); } )
+	},
+        [this] (detail::tcp_connector_weak_ptr p) { 
+          std::erase_if(m_connectors, [p] (detail::tcp_connector_shared_ptr sp) { sp == p.lock(); } )
+	},
+        [this] (detail::udp_entity_io_weak_ptr p) {
+          std::erase_if(m_udp_entities, [p] (detail::udp_entity_io_shared_ptr sp) { sp == p.lock(); } )
+	}
       }, ent.m_wptr);
   }
 

include/net_ip_component/send_to_all.hpp

@@ -10,7 +10,7 @@
  *
  *  The "send to all but one" functionality added by Thurman in Oct, 2019.
  *
- *  Copyright (c) 2019 by Cliff Green, Thurman Gillespy
+ *  Copyright (c) 2019-2025 by Cliff Green, Thurman Gillespy
  *
  *  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)
@@ -31,8 +31,7 @@
 
 #include "net_ip_component/output_queue_stats.hpp"
 
-#include "utility/erase_where.hpp"
-#include "marshall/shared_buffer.hpp"
+#include "buffer/shared_buffer.hpp"
 
 namespace chops {
 namespace net {
@@ -64,7 +63,7 @@ namespace net {
 template <typename IOT>
 class send_to_all {
 private:
-  using lock_guard  = std::lock_guard<std::mutex>;
+  using lock_guard  = std::scoped_lock<std::mutex>;
   using io_out      = chops::net::basic_io_output<IOT>;
   using io_outs     = std::vector<io_out>;
   using io_interface = chops::net::basic_io_interface<IOT>;
@@ -91,7 +90,7 @@ class send_to_all {
  */
   void remove_io_output(io_out io) {
     lock_guard gd { m_mutex };
-    chops::erase_where(m_io_outs, io);
+    std::erase_if (m_io_outs, [io] (auto out) { return io == out; } );
   }
 
 /**

test/test_data_blaster/README.md

@@ -8,7 +8,7 @@ Multiple data sender / receiver (DSR) instances are running at the same time (at
 
 A single instance of the monitor (either the C++ or Python version) shows statistics from the DSR instances. The monitor is also responsible for shutting down the DSRs. The same monitor instance can be running for both TCP and UDP DSRs (the log messages sent to the monitor from the DSRs specify whether the test data is being sent over TCP or UDP).
 
-The message definitions between the DSRs and the monitor are text only, so binary endianness is not a factor, and will run on any platform. The data flowing between DSRs is marshalled and unmarshalled as needed by the DSRs.
+The message definitions between the DSRs and the monitor are text only, so binary endianness is not a factor, and will run on any platform. The data flowing between DSRs is serialized and deserialized as needed by the DSRs.
 
 ## Usage
 
@@ -88,7 +88,7 @@ If the "reply" command line parameter is set, an incoming message is reflected b
 
 Degenerate configurations are possible, with infinite message loops or where connection and shutdown timing is not clear. No special coding is in the T-DB to protect for bad configurations.
 
-The DSR internal data messages uses the binary marshalled message format from the `shared_test` facilities (see `msg_handling.hpp` for specific code). The monitor messages are text based messages with all fields in a string format easy to unmarshall for Python applications.
+The DSR internal data messages uses the binary serialized message format from the `shared_test` facilities (see `msg_handling.hpp` for specific code). The monitor messages are text based messages with all fields in a string format easy to deserialize for Python applications.
 
 The general logic flow:
 - Process command line arguments

test/test_data_blaster/monitor_connector.hpp

@@ -2,11 +2,11 @@
  *
  *  @ingroup test_module
  *
- *  @brief Monitor message marshalling, unmarshalling, sending, and shutdown msg handling.
+ *  @brief Monitor message serializing, deserializing, sending, and shutdown msg handling.
  *
  *  @author (fill in)
  *
- *  Copyright (c) 2019 by Cliff Green, (fill in)
+ *  Copyright (c) 2019-2025 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)
@@ -66,4 +66,4 @@ class monitor_connector {
 };
 
 }
-}
+}

test/test_data_blaster/monitor_msg.hpp

@@ -6,7 +6,7 @@
  *
  *  @author (fill in)
  *
- *  Copyright (c) 2019 by Cliff Green, (fill in)
+ *  Copyright (c) 2019-2025 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)
@@ -56,26 +56,26 @@ struct shutdown_msg {
 };
 
 
-inline chops::const_shared_buffer marshall_monitor_msg_data (const monitor_msg_data& msg_data) {
+inline chops::const_shared_buffer serialize_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) {
+inline monitor_msg_data deserialize_monitor_msg_data (const chops::const_shared_buffer& buf) {
     // work in progress
     return null;
 }
 
-inline chops::const_shared_buffer marshall_shutdown_message() {
+inline chops::const_shared_buffer serialize_shutdown_message() {
     // work in progress
     return null;
 }
 
-inline std::string unmarshall_shutdown_message() {
+inline std::string deserialize_shutdown_message() {
   // work in progress
   return null;
 }
 
 
 }
-}
+}

test/test_data_blaster/tcp_dsr.cpp

@@ -7,7 +7,7 @@
  *
  *  @author Cliff Green
  *
- *  Copyright (c) 2019 by Cliff Green
+ *  Copyright (c) 2019-2025 by Cliff Green
  *
  *  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)
@@ -35,7 +35,7 @@
 #include "net_ip_component/error_delivery.hpp"
 
 #include "shared_test/msg_handling.hpp"
-#include "marshall/shared_buffer.hpp"
+#include "buffer/shared_buffer.hpp"
 
 #include "test_data_blaster/dsr_args.hpp"
 #include "test_data_blaster/monitor_msg_handling.hpp"