Merge pull request #51 from connectivecpp/develop

cliffg-softwarelibre · web-flow · commit 6a1fd59945fd · 2020-03-30T13:17:59.000-07:00
Merge dev to master to pull in VC++ build changes
diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
@@ -0,0 +1,85 @@
+# Note differences between Unix variants and Windows shell when invoking
+# multiple commands on one line - bash uses double ampersand, powershell
+# uses semi-colon
+#
+# Currently there is duplication, specially for the dependency management,
+# this should be refactored in the future
+#
+name: CMake Build Matrix
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+
+jobs:
+
+  build-unixes:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+
+    steps:
+    - name: checkout
+      uses: actions/checkout@v2
+      with:
+        path: main
+    - name: checkout-utility-rack
+      uses: actions/checkout@v2
+      with:
+        repository: connectivecpp/utility-rack
+        path: utility-rack
+    - name: checkout-catch
+      uses: actions/checkout@v2
+      with:
+        repository: catchorg/Catch2
+        ref:  master
+        path: Catch2
+    - name: checkout-asio
+      uses: actions/checkout@v2
+      with:
+        repository: chriskohlhoff/asio
+        ref:  master
+        path: asio
+    - name: configure-cmake
+      run:  mkdir build && cd build && cmake ../main
+    - name: build
+      run:  cd build && cmake --build .
+    - name: unit-test
+      run:  cd build && ctest
+
+  build-windows:
+
+    runs-on: windows-latest
+
+    steps:
+    - name: checkout
+      uses: actions/checkout@v2
+      with:
+        path: main
+    - name: checkout-utility-rack
+      uses: actions/checkout@v2
+      with:
+        repository: connectivecpp/utility-rack
+        path: utility-rack
+    - name: checkout-catch
+      uses: actions/checkout@v2
+      with:
+        repository: catchorg/Catch2
+        ref:  master
+        path: Catch2
+    - name: checkout-asio
+      uses: actions/checkout@v2
+      with:
+        repository: chriskohlhoff/asio
+        ref:  master
+        path: asio
+    - name: configure-cmake
+      run: mkdir build; cd build; cmake ../main
+    - name: build
+      run: cd build; cmake --build .
+    - name: unit-test
+      run: cd build; ctest -C "Debug"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,7 +7,7 @@
 
 # CMake 3.8 required for cxx_std_17 target_compile_features
 
-cmake_minimum_required ( VERSION 3.8 )
+cmake_minimum_required ( VERSION 3.12 )
 
 option ( CHOPS_NET_IP_OPT_BUILD_TESTS  "Build and perform chops-net-ip tests" ON )
 option ( CHOPS_NET_IP_OPT_BUILD_EXAMPLES  "Build and perform chops-net-ip examples" ON )
diff --git a/README.md b/README.md
@@ -8,10 +8,14 @@ Chops Net IP is layered on top of the Asio asynchronous networking library, taki
 
 # Build and Release Status, License Info
 
-Branch | Status
-|---|---|
-**Master** | [![Build Status](https://travis-ci.org/connectivecpp/chops-net-ip.svg?branch=master)](https://travis-ci.org/connectivecpp/chops-net-ip)
-**Develop** | [![Build Status](https://travis-ci.org/connectivecpp/chops-net-ip.svg?branch=develop)](https://travis-ci.org/connectivecpp/chops-net-ip)
+**Travis CI Build Status:**
+
+*Master Branch* | [![Build Status](https://travis-ci.org/connectivecpp/chops-net-ip.svg?branch=master)](https://travis-ci.org/connectivecpp/chops-net-ip)
+*Develop Branch* | [![Build Status](https://travis-ci.org/connectivecpp/chops-net-ip.svg?branch=develop)](https://travis-ci.org/connectivecpp/chops-net-ip)
+
+**GitHub Actions CI Build Status:**
+
+![CMake Build Matrix](https://github.com/connectivecpp/chops-net-ip/workflows/CMake%20Build%20Matrix/badge.svg)
 
 **Latest tag:** ![Latest Tag](https://img.shields.io/github/v/tag/connectivecpp/chops-net-ip)
 
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -5,7 +5,7 @@
 # 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)
 
-cmake_minimum_required ( VERSION 3.9 )
+cmake_minimum_required ( VERSION 3.12 )
 
 project ( chops-net-ip-doc VERSION 1.0 LANGUAGES CXX )
 
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -5,7 +5,7 @@
 # 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)
 
-cmake_minimum_required ( VERSION 3.8 )
+cmake_minimum_required ( VERSION 3.12 )
 
 project ( chops-net-ip-example VERSION 1.0 LANGUAGES CXX )
 
diff --git a/example/echo_binary_text_server_demo.cpp b/example/echo_binary_text_server_demo.cpp
@@ -103,7 +103,7 @@ int main(int argc, char* argv[]) {
         // create buffer to send altered text back to client
         chops::mutable_shared_buffer buf_out;
         // 1st 2 bytes are the size of the message
-        uint16_t size_val = s.size();
+        uint16_t size_val = static_cast<uint16_t>(s.size());
         // endian correct data marshalling
         std::byte tbuf[HDR_SIZE]; // temp buffer to hold the header
         // write those 2 bytes to the temp buffer
diff --git a/include/net_ip/detail/tcp_io.hpp b/include/net_ip/detail/tcp_io.hpp
@@ -174,7 +174,7 @@ class tcp_io : public std::enable_shared_from_this<tcp_io> {
     }
     m_io_common.clear();
     std::error_code ec;
-    m_socket.shutdown(asio::ip::tcp::socket::shutdown_both, ec);
+    m_socket.shutdown(asio::ip::tcp::socket::shutdown_receive, ec);
     m_socket.close(ec); 
     // notify the acceptor or connector that this tcp_io object is closed
     m_notifier_cb(err, shared_from_this());
@@ -298,7 +298,7 @@ inline void tcp_io::start_write(const chops::const_shared_buffer& buf) {
 inline void tcp_io::handle_write(const std::error_code& err, std::size_t /* num_bytes */) {
   if (err) {
     // read pops first, so usually no error is needed in write handlers
-    // m_notifier_cb(err, shared_from_this());
+    close(err);
     return;
   }
   m_io_common.write_next_elem([this] (const chops::const_shared_buffer& buf) {
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -5,7 +5,7 @@
 # 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)
 
-cmake_minimum_required ( VERSION 3.8 )
+cmake_minimum_required ( VERSION 3.12 )
 
 project ( chops-net-ip-test VERSION 1.0 LANGUAGES CXX )
 
diff --git a/test/net_ip/detail/output_queue_test.cpp b/test/net_ip/detail/output_queue_test.cpp
@@ -50,7 +50,7 @@ void output_queue_test(const std::vector<E>& data_vec, int multiplier) {
   REQUIRE (qs.output_queue_size == tot);
   REQUIRE (qs.bytes_in_output_queue == chops::test::accum_io_buf_size(data_vec) * multiplier);
 
-  chops::repeat(tot, [&outq] {
+  chops::repeat(static_cast<int>(tot), [&outq] {
       auto e = outq.get_next_element();
 //      REQUIRE (e);
       assert (e);
diff --git a/test/net_ip/detail/tcp_acceptor_test.cpp b/test/net_ip/detail/tcp_acceptor_test.cpp
@@ -60,7 +60,7 @@
 using namespace chops::test;
 
 const char* test_port = "30434";
-const char* test_host = "";
+const char* test_host = "localhost";
 constexpr int num_msgs = 50;
 
 
diff --git a/test/net_ip/detail/tcp_connector_test.cpp b/test/net_ip/detail/tcp_connector_test.cpp
@@ -60,7 +60,7 @@ using namespace chops::test;
 
 const char* test_port_var = "30777";
 const char* test_port_fixed = "30778";
-const char* test_host = "";
+const char* test_host = "localhost";
 constexpr int num_msgs = 50;
 constexpr std::chrono::milliseconds tout { 800 };
 
diff --git a/test/net_ip/detail/tcp_io_test.cpp b/test/net_ip/detail/tcp_io_test.cpp
@@ -47,7 +47,7 @@
 using namespace chops::test;
 
 const char*   test_port = "30434";
-const char*   test_addr = "";
+const char*   test_addr = "localhost";
 constexpr int num_msgs = 50;
 
 // Catch test framework is not thread-safe, therefore all REQUIRE clauses must be in a single 
@@ -153,6 +153,7 @@ void perform_test (const vec_buf& var_msg_vec, const vec_buf& fixed_msg_vec,
   auto res = 
       chops::net::endpoints_resolver<asio::ip::tcp>(ioc).make_endpoints(true, test_addr, test_port);
   REQUIRE(res);
+
   asio::ip::tcp::acceptor acc(ioc, *(res->cbegin()));
 
   {
diff --git a/test/net_ip/net_ip_test.cpp b/test/net_ip/net_ip_test.cpp
@@ -46,7 +46,7 @@
 using namespace chops::test;
 
 const char* tcp_test_port = "30465";
-const char* tcp_test_host = "";
+const char* tcp_test_host = "localhost";
 constexpr int num_msgs = 50;
 
 const char*   udp_test_addr = "127.0.0.1";
diff --git a/test/shared_test/msg_handling_test.cpp b/test/shared_test/msg_handling_test.cpp
@@ -110,7 +110,7 @@ void make_msg_vec_test(F&& f) {
 
   GIVEN ("A preamble and a char to repeat") {
     auto empty = make_empty_body_msg(f);
-    int delta = empty.size();
+    auto delta = empty.size();
     REQUIRE (delta <= 2);
     WHEN ("make_msg_vec is called") {
       auto vb = make_msg_vec(f, "Good tea!", 'Z', 20);
