version 13.0

.clang-tidy

@@ -20,6 +20,7 @@ modernize-*,\
 -modernize-use-noexcept,\
 -modernize-use-transparent-functors,\
 -modernize-use-using,\
+-modernize-use-trailing-return-type,\
 performance-*,\
 -performance-inefficient-string-concatenation,\
 readability-*,\

CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
 #-----------------------------------------------------------------
 # The project
 #-----------------------------------------------------------------
-project (SolidFrame VERSION 12.3)
+project (SolidFrame VERSION 13.0)
 
 message("SolidFrame version: ${PROJECT_VERSION} - ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
 #-----------------------------------------------------------------
@@ -33,19 +33,25 @@ find_package(Threads REQUIRED)
 #-----------------------------------------------------------------
 
 if(NOT CMAKE_CXX_STANDARD)
-    file (READ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/check/cpp20.cpp" source_code)
+    file (READ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/check/cpp23.cpp" source_code)
 
-    set(CMAKE_CXX_STANDARD 20)
+    set(CMAKE_CXX_STANDARD 23)
     include(CheckCXXSourceCompiles)
-    CHECK_CXX_SOURCE_COMPILES("${source_code}" SOLID_COMPILE_CXX20)
-    if(NOT SOLID_COMPILE_CXX20)
-        set(CMAKE_CXX_STANDARD 17)
-        set(CMAKE_CXX_STANDARD_REQUIRED ON)
-        file (READ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/check/cpp17.cpp" source_code)
-        CHECK_CXX_SOURCE_COMPILES("${source_code}" SOLID_COMPILE_CXX17)
-
-        if(NOT SOLID_COMPILE_CXX17)
-            message(FATAL_ERROR "SolidFrame needs at least CXX17!")
+    CHECK_CXX_SOURCE_COMPILES("${source_code}" SOLID_COMPILE_CXX23)
+    if(NOT SOLID_COMPILE_CXX23)
+        file (READ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/check/cpp20.cpp" source_code)
+
+        set(CMAKE_CXX_STANDARD 20)
+        CHECK_CXX_SOURCE_COMPILES("${source_code}" SOLID_COMPILE_CXX20)
+        if(NOT SOLID_COMPILE_CXX20)
+            set(CMAKE_CXX_STANDARD 17)
+            set(CMAKE_CXX_STANDARD_REQUIRED ON)
+            file (READ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/check/cpp17.cpp" source_code)
+            CHECK_CXX_SOURCE_COMPILES("${source_code}" SOLID_COMPILE_CXX17)
+
+            if(NOT SOLID_COMPILE_CXX17)
+                message(FATAL_ERROR "SolidFrame needs at least CXX17!")
+            endif()
         endif()
     endif()
 endif()
@@ -64,7 +70,7 @@ message("Install directory: \"${CMAKE_INSTALL_PREFIX}\"")
 message("External directory: \"${EXTERNAL_DIR}\"")
 message("Fortify: \"${FORTIFY}\"")
 
-list(APPEND CMAKE_PREFIX_PATH ${EXTERNAL_PATH})
+list(APPEND CMAKE_PREFIX_PATH ${EXTERNAL_DIR})
 
 #-----------------------------------------------------------------
 # Prepare the definitions for build types
@@ -150,7 +156,6 @@ set(SYSTEM_BASIC_LIBRARIES "")
 
 
 option(SOLID_FRAME_AIO_REACTOR_USE_SPINLOCK "Use SpinLock on AIO Reactor" ON)
-option(SOLID_MPRPC_USE_SHARED_PTR_MESSAGE "Use std::shared_ptr with mprpc::Message" OFF)
 
 #-----------------------------------------------------------------
 # Per OS configuration
@@ -199,6 +204,10 @@ if(CMAKE_SYSTEM MATCHES "Darwin*")
         "$<$<CONFIG:MAINTAIN>:SHELL: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wall -Wshorten-64-to-32 -Wunreachable-code -Wconditional-uninitialized -Wabi>"
         "$<$<CONFIG:CUSTOM>:>"
     )
+
+    if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+        add_compile_options("-stdlib=libc++")
+    endif()
 
     string(APPEND CMAKE_EXE_LINKER_FLAGS "-framework ApplicationServices -framework CoreFoundation")
 
@@ -328,7 +337,7 @@ if(NOT NO_EXTERNAL)
     include_directories(${CMAKE_BINARY_DIR}/external/include)
 
     if(EXTERNAL_DIR STREQUAL "" OR NOT EXISTS ${EXTERNAL_DIR})
-        set(EXTERNAL_DIR "${CMAKE_CURRENT_BINARY_DIR}/external")
+        set(EXTERNAL_DIR "${CMAKE_BINARY_DIR}/external")
 
         include(cmake/build-openssl.cmake)
     else()

JOURNAL.md

@@ -1,3 +1,6 @@
+## 20251220
+ * release 13.0 - breaking changes on mprpc
+
 ## 20250119
  * release 12.3
  * Experimental Mutable/ConstSharedBuffer

RELEASES.md

@@ -1,5 +1,17 @@
 # SolidFrame Releases
 
+## Version 13.0
+ * solid/utility:
+    * MutableIntrusivePtr, ConstIntrusivePtr
+    * Pool of MutableIntrusivePtr of Poolable types
+    * MutableSharedBuffer, ConstSharedBuffer
+    * BufferPool of MutableSharedBuffers
+ * solid/frame/aio:
+    * Reactor improvements
+ * solid/frame/mprpc:
+    * breaking change related to write buffer - both the message header and the message chunk should fit in write buffer
+    * breaking change - switch to using MutableMessagePointer and ConstMessagePointer for Recv and Send messages respectively, in the message callback.
+
 ## Version 12.2
  * improvements and fixes on reflection
  * use std::variant in example_threadpool

cmake/build-snappy.cmake

@@ -13,7 +13,7 @@ ExternalProject_Add(
     URL https://github.com/google/snappy/archive/1.1.9.tar.gz
     DOWNLOAD_NO_PROGRESS ON
     CMAKE_ARGS
-            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/external -DCMAKE_INSTALL_LIBDIR=lib -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF
+            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}/external -DCMAKE_INSTALL_LIBDIR=lib -DSNAPPY_BUILD_TESTS=OFF -DSNAPPY_BUILD_BENCHMARKS=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5
     LOG_UPDATE ON
     LOG_CONFIGURE ON
     LOG_BUILD ON

cmake/check/cpp23.cpp

@@ -0,0 +1,22 @@
+#include <expected>
+#include <print>
+
+using namespace std;
+
+struct base {
+    template <class Self>
+    void f(this Self&& self)
+    {
+        print("{0}", typeid(Self).name());
+    }
+};
+
+struct derived : base {};
+
+int main()
+{
+    derived my_derived;
+    my_derived.f();
+
+    return 0;
+}

configure

@@ -76,8 +76,6 @@ print_usage(){
     echo "7) create a debug Ninja build for C++17" 
     echo "./configure -b debug -e ../external -f debug -g Ninja -P \"-DCMAKE_CXX_STANDARD=17\""
     echo
-    echo "8) create release build with using std::shared_ptr for solid::frame::mprpc::Message"
-    echo "./configure -f release_sp -e ../external/ -g Ninja -P \"-DSOLID_MPRPC_USE_SHARED_PTR_MESSAGE=on\""
     echo
     exit
 }

examples/frame/aio_echo/example_echo_auto_client.cpp

@@ -110,7 +110,7 @@ frame::aio::Resolver& async_resolver(frame::aio::Resolver* _pres = nullptr)
     return r;
 }
 
-using CallPoolT = ThreadPool<Function<void()>, Function<void()>>;
+using CallPoolT = ThreadPool<Function64T<void()>, Function64T<void()>>;
 
 } // namespace
 

examples/frame/aio_echo/example_secure_echo_client.cpp

@@ -1,3 +1,11 @@
+#include "solid/utility/common.hpp"
+
+#ifdef SOLID_ON_WINDOWS
+#define NOMINMAX
+#include <WinSock2.h>
+#include <windows.h>
+#endif
+
 #include "solid/frame/aio/openssl/aiosecurecontext.hpp"
 #include "solid/frame/aio/openssl/aiosecuresocket.hpp"
 

examples/frame/aio_echo/example_secure_echo_server.cpp

@@ -7,6 +7,14 @@
 
 */
 
+#include "solid/utility/common.hpp"
+
+#ifdef SOLID_ON_WINDOWS
+#define NOMINMAX
+#include <WinSock2.h>
+#include <windows.h>
+#endif
+
 #include "solid/frame/aio/openssl/aiosecurecontext.hpp"
 #include "solid/frame/aio/openssl/aiosecuresocket.hpp"
 
@@ -277,7 +285,7 @@ bool parseArguments(Params& _par, int argc, char* argv[])
 void Listener::onAccept(frame::aio::ReactorContext& _rctx, SocketDevice& _rsd)
 {
     solid_log(generic_logger, Info, "");
-    unsigned repeatcnt = backlog_size();
+    size_t repeatcnt = backlog_size();
 
     do {
         if (!_rctx.error()) {

examples/frame/mprpc_echo/example_mprpc_echo.cpp

@@ -1,3 +1,4 @@
+#include "solid/frame/mprpc/mprpcmessage.hpp"
 #include "solid/frame/mprpc/mprpcsocketstub_openssl.hpp"
 
 #include "solid/frame/manager.hpp"
@@ -17,6 +18,7 @@
 #include "solid/frame/mprpc/mprpcprotocol_serialization_v3.hpp"
 #include "solid/frame/mprpc/mprpcservice.hpp"
 
+#include "solid/utility/intrusiveptr.hpp"
 #include "solid/utility/threadpool.hpp"
 
 #include "solid/system/socketaddress.hpp"
@@ -86,11 +88,9 @@ typedef std::vector<MessageStub> MessageVectorT;
 struct FirstMessage;
 
 namespace {
-mutex              mtx;
-condition_variable cnd;
-Params             params;
+Params params;
 
-void broadcast_message(frame::mprpc::Service& _rsvc, frame::mprpc::MessagePointerT<>& _rmsgptr);
+void broadcast_message(frame::mprpc::Service& _rsvc, frame::mprpc::SendMessagePointerT<> _rmsgptr);
 } // namespace
 
 struct FirstMessage : frame::mprpc::Message {
@@ -191,8 +191,8 @@ int main(int argc, char* argv[])
                         return 1;
                     }
                 } else {
-                    frame::mprpc::MessagePointerT<> msgptr = frame::mprpc::make_message<FirstMessage>(s);
-                    broadcast_message(ipcsvc, msgptr);
+                    frame::mprpc::SendMessagePointerT<FirstMessage> msgptr = frame::mprpc::make_message<FirstMessage>(s);
+                    broadcast_message(ipcsvc, static_pointer_cast<solid::frame::mprpc::Message>(std::move(msgptr)));
                 }
             } while (s.size());
         }
@@ -212,14 +212,14 @@ bool restart(
         [&](auto& _rmap) {
             _rmap.template registerMessage<FirstMessage>(1, "FirstMessage",
                            [](
-                    frame::mprpc::ConnectionContext&             _rctx,
-                    frame::mprpc::MessagePointerT<FirstMessage>& _rsend_msg,
-                    frame::mprpc::MessagePointerT<FirstMessage>& _rrecv_msg,
-                    ErrorConditionT const&                       _rerr) {
+                    frame::mprpc::ConnectionContext&                 _rctx,
+                    frame::mprpc::SendMessagePointerT<FirstMessage>& _rsend_msg,
+                    frame::mprpc::RecvMessagePointerT<FirstMessage>& _rrecv_msg,
+                    ErrorConditionT const&                           _rerr) {
                     if (_rrecv_msg) {
                         solid_log(generic_logger, Info, _rctx.recipientId() << " Message received: is_on_sender: " << _rrecv_msg->isOnSender() << ", is_on_peer: " << _rrecv_msg->isOnPeer() << ", is_back_on_sender: " << _rrecv_msg->isBackOnSender());
                         if (_rrecv_msg->isOnPeer()) {
-                            _rctx.service().sendResponse(_rctx.recipientId(), _rrecv_msg);
+                            _rctx.service().sendResponse(_rctx.recipientId(), std::move(_rrecv_msg));
                         } else if (_rrecv_msg->isBackOnSender()) {
                             cout << "Received from " << _rctx.recipientName() << ": " << _rrecv_msg->str << endl;
                         }
@@ -252,16 +252,13 @@ bool restart(
     cfg.client.connection_start_fnc   = &outgoing_connection_start;
     cfg.client.connection_start_state = frame::mprpc::ConnectionState::Active;
     cfg.server.connection_start_state = frame::mprpc::ConnectionState::Active;
-#if 1
+
     if (params.secure) {
         // configure OpenSSL:
         solid_log(generic_logger, Info, "Configure SSL ---------------------------------------");
         frame::mprpc::openssl::setup_client(
             cfg,
             [](frame::aio::openssl::Context& _rctx) -> ErrorCodeT {
-                //_rctx.loadVerifyFile("echo-ca-cert.pem"/*"/etc/pki/tls/certs/ca-bundle.crt"*/);
-                //_rctx.loadCertificateFile("echo-client-cert.pem");
-                //_rctx.loadPrivateKeyFile("echo-client-key.pem");
                 _rctx.addVerifyAuthority(loadFile("echo-ca-cert.pem"));
                 _rctx.loadCertificate(loadFile("echo-client-cert.pem"));
                 _rctx.loadPrivateKey(loadFile("echo-client-key.pem"));
@@ -280,7 +277,6 @@ bool restart(
             frame::mprpc::openssl::NameCheckSecureStart{"echo-client"} // does nothing - OpenSSL does not check for hostname on SSL_accept
         );
     }
-#endif
 
     {
         frame::mprpc::ServiceStartStatus start_status;
@@ -341,7 +337,7 @@ std::string loadFile(const char* _path)
 
 namespace {
 
-void broadcast_message(frame::mprpc::Service& _rsvc, frame::mprpc::MessagePointerT<frame::mprpc::Message>& _rmsgptr)
+void broadcast_message(frame::mprpc::Service& _rsvc, frame::mprpc::SendMessagePointerT<> _rmsgptr)
 {
 
     solid_log(generic_logger, Verbose, "done stop===============================");

examples/frame/relay_server/example_relay_server_bi_cp.cpp

@@ -279,7 +279,7 @@ bool parseArguments(Params& _par, int argc, char* argv[])
 void Listener::onAccept(frame::aio::ReactorContext& _rctx, SocketDevice& _rsd)
 {
     solid_log(generic_logger, Info, "");
-    unsigned repeatcnt = SocketInfo::max_listen_backlog_size();
+    size_t repeatcnt = SocketInfo::max_listen_backlog_size();
 
     do {
         if (!_rctx.error()) {

examples/utility/algorithm/example_bit_count.cpp

@@ -22,7 +22,7 @@ int main(int argc, char* argv[])
     if (argc == 2) {
         cout << "Generate table for [0, 255]:" << endl;
         cout << '{';
-        for (size_t i = 0; i < 256; ++i) {
+        for (uint32_t i = 0; i < 256; ++i) {
             if (!(i % 16)) {
                 cout << endl
                      << "\t";

examples/utility/memory_file/example_memory_file.cpp

@@ -43,9 +43,9 @@ int main(int argc, char* argv[])
             return 0;
         }
         cout << "File size: " << fd.size() << endl;
-        char b[20 * 1024];
-        int  rv;
-        int  rc;
+        char    b[20 * 1024];
+        ssize_t rv;
+        ssize_t rc;
         do {
             rv = 2 * 1024; // randomsize();
             // cout<<rv<<endl;
@@ -66,8 +66,8 @@ int main(int argc, char* argv[])
             return 0;
         }
         mf.seek(0, SeekBeg);
-        char b[20 * 1024];
-        int  rv, rc;
+        char    b[20 * 1024];
+        ssize_t rv, rc;
         do {
             rv = 2 * 1024; // randomsize();
             // cout<<rv<<endl;

examples/utility/threadpool/example_file_open_pool.cpp

@@ -44,7 +44,7 @@ static T align(T _v, const unsigned long _by)
     }
 }
 
-const uint32_t pagesize = memory_page_size();
+const size_t pagesize = memory_page_size();
 
 using FileDeuqeT = std::deque<FileDevice>;
 
@@ -111,14 +111,12 @@ int main(int argc, char* argv[])
         {1, 100, 0}, [](const size_t, Context&) {}, [](const size_t, Context&) {},
         [](FileDevice* _pfile, Context& _rctx) {
             int64_t sz = _pfile->size();
-            int     toread;
-            int     cnt = 0;
+            int64_t toread;
             while (sz > 0) {
                 toread = _rctx.readsz;
                 if (toread > sz)
                     toread = sz;
-                int rv = _pfile->read(_rctx.buf, toread);
-                cnt += rv;
+                ssize_t rv = _pfile->read(_rctx.buf, toread);
                 sz -= rv;
             }
         },