Simplifications.

Author: mzimbres

CMakeLists.txt

@@ -55,13 +55,21 @@ find_package(OpenSSL REQUIRED)
 enable_testing()
 include_directories(include)
 
+#=======================================================================
+
+add_library(boost_redis_src STATIC examples/boost_redis.cpp)
+target_compile_features(boost_redis_src PUBLIC cxx_std_20)
+if (MSVC)
+    target_compile_options(boost_redis_src PRIVATE /bigobj)
+    target_compile_definitions(boost_redis_src PRIVATE _WIN32_WINNT=0x0601)
+endif()
+
 # Main function for the examples.
 #=======================================================================
 
-add_library(test_common STATIC
-   tests/common.cpp
-)
-target_link_libraries(test_common PUBLIC OpenSSL::Crypto OpenSSL::SSL)
+add_library(test_common STATIC)
+target_sources(test_common PUBLIC tests/common.cpp)
+target_link_libraries(test_common PUBLIC OpenSSL::Crypto OpenSSL::SSL boost_redis_src)
 target_compile_features(test_common PUBLIC cxx_std_17)
 if (MSVC)
     target_compile_options(test_common PRIVATE /bigobj)
@@ -70,22 +78,19 @@ endif()
 
 #=======================================================================
 
-add_library(common STATIC
-   examples/start.cpp
-   examples/main.cpp
-   examples/boost_redis.cpp
-)
-target_compile_features(common PUBLIC cxx_std_20)
+add_library(examples_common STATIC examples/main.cpp)
+target_compile_features(examples_common PUBLIC cxx_std_20)
+target_link_libraries(examples_common PRIVATE boost_redis_src)
 if (MSVC)
-    target_compile_options(common PRIVATE /bigobj)
-    target_compile_definitions(common PRIVATE _WIN32_WINNT=0x0601)
+    target_compile_options(examples_common PRIVATE /bigobj)
+    target_compile_definitions(examples_common PRIVATE _WIN32_WINNT=0x0601)
 endif()
 
 # Executables
 #=======================================================================
 
 add_executable(cpp20_intro examples/cpp20_intro.cpp)
-target_link_libraries(cpp20_intro PRIVATE OpenSSL::Crypto OpenSSL::SSL common)
+target_link_libraries(cpp20_intro PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common)
 target_compile_features(cpp20_intro PUBLIC cxx_std_20)
 add_test(cpp20_intro cpp20_intro)
 if (MSVC)
@@ -94,7 +99,7 @@ if (MSVC)
 endif()
 
 add_executable(cpp20_streams examples/cpp20_streams.cpp)
-target_link_libraries(cpp20_streams PRIVATE OpenSSL::Crypto OpenSSL::SSL common)
+target_link_libraries(cpp20_streams PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common)
 target_compile_features(cpp20_streams PUBLIC cxx_std_20)
 if (MSVC)
     target_compile_options(cpp20_streams PRIVATE /bigobj)
@@ -120,12 +125,12 @@ endif()
 if (NOT MSVC)
 add_executable(cpp20_chat_room examples/cpp20_chat_room.cpp)
 target_compile_features(cpp20_chat_room PUBLIC cxx_std_20)
-target_link_libraries(cpp20_chat_room PRIVATE OpenSSL::Crypto OpenSSL::SSL common)
+target_link_libraries(cpp20_chat_room PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common)
 endif()
 
 add_executable(cpp20_containers examples/cpp20_containers.cpp)
 target_compile_features(cpp20_containers PUBLIC cxx_std_20)
-target_link_libraries(cpp20_containers PRIVATE OpenSSL::Crypto OpenSSL::SSL common)
+target_link_libraries(cpp20_containers PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common)
 add_test(cpp20_containers cpp20_containers)
 if (MSVC)
     target_compile_options(cpp20_containers PRIVATE /bigobj)
@@ -135,12 +140,12 @@ endif()
 if (NOT MSVC)
 add_executable(cpp20_echo_server examples/cpp20_echo_server.cpp)
 target_compile_features(cpp20_echo_server PUBLIC cxx_std_20)
-target_link_libraries(cpp20_echo_server PRIVATE OpenSSL::Crypto OpenSSL::SSL common)
+target_link_libraries(cpp20_echo_server PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common)
 endif()
 
 add_executable(cpp20_resolve_with_sentinel examples/cpp20_resolve_with_sentinel.cpp)
 target_compile_features(cpp20_resolve_with_sentinel PUBLIC cxx_std_20)
-target_link_libraries(cpp20_resolve_with_sentinel PRIVATE OpenSSL::Crypto OpenSSL::SSL common)
+target_link_libraries(cpp20_resolve_with_sentinel PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common)
 #add_test(cpp20_resolve_with_sentinel cpp20_resolve_with_sentinel)
 if (MSVC)
     target_compile_options(cpp20_resolve_with_sentinel PRIVATE /bigobj)
@@ -149,7 +154,7 @@ endif()
 
 add_executable(cpp20_json examples/cpp20_json.cpp)
 target_compile_features(cpp20_json PUBLIC cxx_std_20)
-target_link_libraries(cpp20_json PRIVATE OpenSSL::Crypto OpenSSL::SSL common)
+target_link_libraries(cpp20_json PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common)
 add_test(cpp20_json cpp20_json)
 if (MSVC)
     target_compile_options(cpp20_json PRIVATE /bigobj)
@@ -160,7 +165,7 @@ if (Protobuf_FOUND)
    protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS examples/person.proto)
    add_executable(cpp20_protobuf examples/cpp20_protobuf.cpp ${PROTO_SRCS} ${PROTO_HDRS})
    target_compile_features(cpp20_protobuf PUBLIC cxx_std_20)
-   target_link_libraries(cpp20_protobuf PRIVATE OpenSSL::Crypto OpenSSL::SSL common ${Protobuf_LIBRARIES})
+   target_link_libraries(cpp20_protobuf PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common ${Protobuf_LIBRARIES})
    target_include_directories(cpp20_protobuf PUBLIC ${Protobuf_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
    add_test(cpp20_protobuf cpp20_protobuf)
    if (MSVC)
@@ -171,7 +176,7 @@ endif()
 
 add_executable(cpp20_subscriber examples/cpp20_subscriber.cpp)
 target_compile_features(cpp20_subscriber PUBLIC cxx_std_20)
-target_link_libraries(cpp20_subscriber PRIVATE OpenSSL::Crypto OpenSSL::SSL common)
+target_link_libraries(cpp20_subscriber PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common)
 if (MSVC)
     target_compile_options(cpp20_subscriber PRIVATE /bigobj)
     target_compile_definitions(cpp20_subscriber PRIVATE _WIN32_WINNT=0x0601)
@@ -180,7 +185,7 @@ endif()
 add_executable(cpp20_intro_tls examples/cpp20_intro_tls.cpp)
 target_compile_features(cpp20_intro_tls PUBLIC cxx_std_20)
 add_test(cpp20_intro_tls cpp20_intro_tls)
-target_link_libraries(cpp20_intro_tls PRIVATE OpenSSL::Crypto OpenSSL::SSL common)
+target_link_libraries(cpp20_intro_tls PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common)
 if (MSVC)
     target_compile_options(cpp20_intro_tls PRIVATE /bigobj)
     target_compile_definitions(cpp20_intro_tls PRIVATE _WIN32_WINNT=0x0601)
@@ -189,7 +194,7 @@ endif()
 add_executable(cpp20_low_level_async tests/cpp20_low_level_async.cpp)
 target_compile_features(cpp20_low_level_async PUBLIC cxx_std_20)
 add_test(cpp20_low_level_async cpp20_low_level_async)
-target_link_libraries(cpp20_low_level_async PRIVATE OpenSSL::Crypto OpenSSL::SSL common)
+target_link_libraries(cpp20_low_level_async PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common boost_redis_src)
 if (MSVC)
     target_compile_options(cpp20_low_level_async PRIVATE /bigobj)
     target_compile_definitions(cpp20_low_level_async PRIVATE _WIN32_WINNT=0x0601)
@@ -211,6 +216,7 @@ endif()
 
 add_executable(cpp17_low_level_sync tests/cpp17_low_level_sync.cpp)
 target_compile_features(cpp17_low_level_sync PUBLIC cxx_std_17)
+target_link_libraries(cpp17_low_level_sync PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common boost_redis_src)
 add_test(cpp17_low_level_sync cpp17_low_level_sync)
 if (MSVC)
     target_compile_options(cpp17_low_level_sync PRIVATE /bigobj)
@@ -255,7 +261,7 @@ endif()
 
 add_executable(test_conn_reconnect tests/conn_reconnect.cpp)
 target_compile_features(test_conn_reconnect PUBLIC cxx_std_20)
-target_link_libraries(test_conn_reconnect PRIVATE OpenSSL::Crypto OpenSSL::SSL common test_common)
+target_link_libraries(test_conn_reconnect PRIVATE OpenSSL::Crypto OpenSSL::SSL test_common)
 add_test(test_conn_reconnect test_conn_reconnect)
 if (MSVC)
     target_compile_options(test_conn_reconnect PRIVATE /bigobj)
@@ -265,14 +271,15 @@ endif()
 add_executable(test_conn_tls tests/conn_tls.cpp)
 add_test(test_conn_tls test_conn_tls)
 target_compile_features(test_conn_tls PUBLIC cxx_std_17)
-target_link_libraries(test_conn_tls PRIVATE OpenSSL::Crypto OpenSSL::SSL)
+target_link_libraries(test_conn_tls PRIVATE OpenSSL::Crypto OpenSSL::SSL boost_redis_src)
 if (MSVC)
     target_compile_options(test_conn_tls PRIVATE /bigobj)
     target_compile_definitions(test_conn_tls PRIVATE _WIN32_WINNT=0x0601)
 endif()
 
 add_executable(test_low_level tests/low_level.cpp)
 target_compile_features(test_low_level PUBLIC cxx_std_17)
+target_link_libraries(test_low_level PRIVATE OpenSSL::Crypto OpenSSL::SSL boost_redis_src)
 add_test(test_low_level test_low_level)
 if (MSVC)
     target_compile_options(test_low_level PRIVATE /bigobj)
@@ -282,15 +289,15 @@ endif()
 add_executable(test_conn_run_cancel tests/conn_run_cancel.cpp)
 target_compile_features(test_conn_run_cancel PUBLIC cxx_std_20)
 add_test(test_conn_run_cancel test_conn_run_cancel)
-target_link_libraries(test_conn_run_cancel PRIVATE OpenSSL::Crypto OpenSSL::SSL)
+target_link_libraries(test_conn_run_cancel PRIVATE OpenSSL::Crypto OpenSSL::SSL boost_redis_src)
 if (MSVC)
     target_compile_options(test_conn_run_cancel PRIVATE /bigobj)
     target_compile_definitions(test_conn_run_cancel PRIVATE _WIN32_WINNT=0x0601)
 endif()
 
 add_executable(test_conn_exec_cancel tests/conn_exec_cancel.cpp)
 target_compile_features(test_conn_exec_cancel PUBLIC cxx_std_20)
-target_link_libraries(test_conn_exec_cancel PRIVATE OpenSSL::Crypto OpenSSL::SSL common test_common)
+target_link_libraries(test_conn_exec_cancel PRIVATE OpenSSL::Crypto OpenSSL::SSL test_common boost_redis_src)
 add_test(test_conn_exec_cancel test_conn_exec_cancel)
 if (MSVC)
     target_compile_options(test_conn_exec_cancel PRIVATE /bigobj)
@@ -299,7 +306,7 @@ endif()
 
 add_executable(test_conn_exec_cancel2 tests/conn_exec_cancel2.cpp)
 target_compile_features(test_conn_exec_cancel2 PUBLIC cxx_std_20)
-target_link_libraries(test_conn_exec_cancel2 PRIVATE OpenSSL::Crypto OpenSSL::SSL common test_common)
+target_link_libraries(test_conn_exec_cancel2 PRIVATE OpenSSL::Crypto OpenSSL::SSL test_common boost_redis_src)
 add_test(test_conn_exec_cancel2 test_conn_exec_cancel2)
 if (MSVC)
     target_compile_options(test_conn_exec_cancel2 PRIVATE /bigobj)
@@ -308,7 +315,7 @@ endif()
 
 add_executable(test_conn_exec_error tests/conn_exec_error.cpp)
 target_compile_features(test_conn_exec_error PUBLIC cxx_std_17)
-target_link_libraries(test_conn_exec_error PRIVATE OpenSSL::Crypto OpenSSL::SSL common test_common)
+target_link_libraries(test_conn_exec_error PRIVATE OpenSSL::Crypto OpenSSL::SSL test_common boost_redis_src)
 add_test(test_conn_exec_error test_conn_exec_error)
 if (MSVC)
     target_compile_options(test_conn_exec_error PRIVATE /bigobj)
@@ -317,7 +324,7 @@ endif()
 
 add_executable(test_conn_echo_stress tests/conn_echo_stress.cpp)
 target_compile_features(test_conn_echo_stress PUBLIC cxx_std_20)
-target_link_libraries(test_conn_echo_stress PRIVATE OpenSSL::Crypto OpenSSL::SSL common test_common)
+target_link_libraries(test_conn_echo_stress PRIVATE OpenSSL::Crypto OpenSSL::SSL test_common boost_redis_src)
 add_test(test_conn_echo_stress test_conn_echo_stress)
 if (MSVC)
     target_compile_options(test_conn_echo_stress PRIVATE /bigobj)
@@ -326,6 +333,7 @@ endif()
 
 add_executable(test_request tests/request.cpp)
 target_compile_features(test_request PUBLIC cxx_std_17)
+target_link_libraries(test_request PRIVATE OpenSSL::Crypto OpenSSL::SSL test_common boost_redis_src)
 add_test(test_request test_request)
 if (MSVC)
     target_compile_options(test_request PRIVATE /bigobj)
@@ -334,7 +342,7 @@ endif()
 
 add_executable(test_issue_50 tests/issue_50.cpp)
 target_compile_features(test_issue_50 PUBLIC cxx_std_20)
-target_link_libraries(test_issue_50 PRIVATE OpenSSL::Crypto OpenSSL::SSL common)
+target_link_libraries(test_issue_50 PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common boost_redis_src)
 add_test(test_issue_50 test_issue_50)
 if (MSVC)
     target_compile_options(test_issue_50 PRIVATE /bigobj)
@@ -343,7 +351,7 @@ endif()
 
 add_executable(test_conn_check_health tests/conn_check_health.cpp)
 target_compile_features(test_conn_check_health PUBLIC cxx_std_17)
-target_link_libraries(test_conn_check_health PRIVATE OpenSSL::Crypto OpenSSL::SSL common)
+target_link_libraries(test_conn_check_health PRIVATE OpenSSL::Crypto OpenSSL::SSL examples_common boost_redis_src)
 add_test(test_conn_check_health test_conn_check_health)
 if (MSVC)
     target_compile_options(test_conn_check_health PRIVATE /bigobj)
@@ -352,7 +360,7 @@ endif()
 
 add_executable(test_run tests/run.cpp)
 target_compile_features(test_run PUBLIC cxx_std_17)
-target_link_libraries(test_run PRIVATE OpenSSL::Crypto OpenSSL::SSL test_common)
+target_link_libraries(test_run PRIVATE OpenSSL::Crypto OpenSSL::SSL test_common boost_redis_src)
 add_test(test_run test_run)
 if (MSVC)
     target_compile_options(test_run PRIVATE /bigobj)

examples/main.cpp

@@ -4,34 +4,44 @@
  * accompanying file LICENSE.txt)
  */
 
-#include "start.hpp"
 #include <boost/redis/config.hpp>
-#include <boost/asio/awaitable.hpp>
-#include <string>
+#include <boost/asio/co_spawn.hpp>
+#include <boost/asio/use_awaitable.hpp>
+#include <boost/asio/io_context.hpp>
 #include <iostream>
 
-#if defined(BOOST_ASIO_HAS_CO_AWAIT)
-
+namespace net = boost::asio;
 using boost::redis::config;
 
-extern boost::asio::awaitable<void> co_main(config);
+#if defined(BOOST_ASIO_HAS_CO_AWAIT)
+
+extern net::awaitable<void> co_main(config);
 
 auto main(int argc, char * argv[]) -> int
 {
-   config cfg;
-
-   if (argc == 3) {
-      cfg.addr.host = argv[1];
-      cfg.addr.port = argv[2];
+   try {
+      config cfg;
+
+      if (argc == 3) {
+         cfg.addr.host = argv[1];
+         cfg.addr.port = argv[2];
+      }
+
+      net::io_context ioc;
+      net::co_spawn(ioc, std::move(co_main(cfg)), [](std::exception_ptr p) {
+         if (p)
+            std::rethrow_exception(p);
+      });
+      ioc.run();
+
+   } catch (std::exception const& e) {
+      std::cerr << "(main) " << e.what() << std::endl;
+      return 1;
    }
-
-   return start(co_main(cfg));
 }
 
 #else // defined(BOOST_ASIO_HAS_CO_AWAIT)
 
-#include <iostream>
-
 auto main() -> int
 {
    std::cout << "Requires coroutine support." << std::endl;