Tidy up cmake files and examples

This commit is contained in:
Vinnie Falco
2019-10-06 08:04:15 -07:00
parent 3eebf420f0
commit 5521b91d8c
7 changed files with 24 additions and 3 deletions

View File

@@ -1,3 +1,12 @@
Version 271:
* Add HTTP async client with system_executor example
* Add WebSocket async client with system_executor example
* Fix data race in HTTP server examples
* Fix data race in WebSocket examples
--------------------------------------------------------------------------------
Version 270: Version 270:
* Silence unused variables * Silence unused variables

View File

@@ -32,6 +32,10 @@ used to evaluate robustness. All asynchronous clients support timeouts.
[HTTP, asynchronous] [HTTP, asynchronous]
[[path_link example/http/client/async/http_client_async.cpp http_client_async.cpp]] [[path_link example/http/client/async/http_client_async.cpp http_client_async.cpp]]
[[path_link example/http/client/async-ssl/http_client_async_ssl.cpp http_client_async_ssl.cpp]] [[path_link example/http/client/async-ssl/http_client_async_ssl.cpp http_client_async_ssl.cpp]]
][
[HTTP, asynchronous using __system_executor__]
[]
[[path_link example/http/client/async-ssl-system-executor/http_client_async_ssl_system_executor.cpp http_client_async_ssl_system_executor.cpp]]
][ ][
[HTTP, coroutine] [HTTP, coroutine]
[[path_link example/http/client/coro/http_client_coro.cpp http_client_coro.cpp]] [[path_link example/http/client/coro/http_client_coro.cpp http_client_coro.cpp]]
@@ -56,6 +60,10 @@ before disconnecting. All asynchronous clients support timeouts.
[WebSocket, asynchronous] [WebSocket, asynchronous]
[[path_link example/websocket/client/async/websocket_client_async.cpp websocket_client_async.cpp]] [[path_link example/websocket/client/async/websocket_client_async.cpp websocket_client_async.cpp]]
[[path_link example/websocket/client/async-ssl/websocket_client_async_ssl.cpp websocket_client_async_ssl.cpp]] [[path_link example/websocket/client/async-ssl/websocket_client_async_ssl.cpp websocket_client_async_ssl.cpp]]
][
[WebSocket, asynchronous using __system_executor__]
[]
[[path_link example/websocket/client/async-ssl-system-executor/websocket_client_async_ssl_system_executor.cpp websocket_client_async_ssl_system_executor.cpp]]
][ ][
[WebSocket, coroutine] [WebSocket, coroutine]
[[path_link example/websocket/client/coro/websocket_client_coro.cpp websocket_client_coro.cpp]] [[path_link example/websocket/client/coro/websocket_client_coro.cpp websocket_client_coro.cpp]]

View File

@@ -59,6 +59,7 @@
[def __ssl_context__ [@boost:/doc/html/boost_asio/reference/ssl__context.html `net::ssl::context`]] [def __ssl_context__ [@boost:/doc/html/boost_asio/reference/ssl__context.html `net::ssl::context`]]
[def __ssl_stream__ [@boost:/doc/html/boost_asio/reference/ssl__stream.html `net::ssl::stream`]] [def __ssl_stream__ [@boost:/doc/html/boost_asio/reference/ssl__stream.html `net::ssl::stream`]]
[def __streambuf__ [@boost:/doc/html/boost_asio/reference/streambuf.html `net::streambuf`]] [def __streambuf__ [@boost:/doc/html/boost_asio/reference/streambuf.html `net::streambuf`]]
[def __system_executor__ [@boost:/doc/html/boost_asio/reference/system_executor.html `net::system_executor`]]
[def __use_future__ [@boost:/doc/html/boost_asio/reference/use_future_t.html `net::use_future`]] [def __use_future__ [@boost:/doc/html/boost_asio/reference/use_future_t.html `net::use_future`]]
[def __yield_context__ [@boost:/doc/html/boost_asio/reference/yield_context.html `net::yield_context`]] [def __yield_context__ [@boost:/doc/html/boost_asio/reference/yield_context.html `net::yield_context`]]

View File

@@ -14,6 +14,7 @@ add_subdirectory (sync)
if (OPENSSL_FOUND) if (OPENSSL_FOUND)
add_subdirectory (async-ssl) add_subdirectory (async-ssl)
add_subdirectory (async-ssl-system-executor)
add_subdirectory (coro-ssl) add_subdirectory (coro-ssl)
add_subdirectory (sync-ssl) add_subdirectory (sync-ssl)
endif() endif()

View File

@@ -20,6 +20,7 @@
#include <boost/beast/ssl.hpp> #include <boost/beast/ssl.hpp>
#include <boost/beast/version.hpp> #include <boost/beast/version.hpp>
#include <boost/asio/strand.hpp> #include <boost/asio/strand.hpp>
#include <boost/asio/system_executor.hpp>
#include <cstdlib> #include <cstdlib>
#include <functional> #include <functional>
#include <iostream> #include <iostream>

View File

@@ -10,7 +10,7 @@
if (OPENSSL_FOUND) if (OPENSSL_FOUND)
GroupSources(include/boost/beast beast) GroupSources(include/boost/beast beast)
GroupSources(example/common common) GroupSources(example/common common)
GroupSources(example/websocket/client/async-ssl "/") GroupSources(example/websocket/client/async-ssl-system-executor "/")
add_executable (websocket-client-async-ssl-system-executor add_executable (websocket-client-async-ssl-system-executor
${BOOST_BEAST_FILES} ${BOOST_BEAST_FILES}
@@ -19,7 +19,7 @@ if (OPENSSL_FOUND)
websocket_client_async_ssl_system_executor.cpp websocket_client_async_ssl_system_executor.cpp
) )
set_property(TARGET websocket-client-async-ssl-system-executor PROPERTY FOLDER "example-websocket-client-system-executor") set_property(TARGET websocket-client-async-ssl-system-executor PROPERTY FOLDER "example-websocket-client")
target_link_libraries (websocket-client-async-ssl-system-executor target_link_libraries (websocket-client-async-ssl-system-executor
OpenSSL::SSL OpenSSL::Crypto OpenSSL::SSL OpenSSL::Crypto

View File

@@ -9,7 +9,7 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// //
// Example: WebSocket SSL client, asynchronous // Example: WebSocket SSL client, asynchronous, using system_executor
// //
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@@ -20,6 +20,7 @@
#include <boost/beast/websocket.hpp> #include <boost/beast/websocket.hpp>
#include <boost/beast/websocket/ssl.hpp> #include <boost/beast/websocket/ssl.hpp>
#include <boost/asio/strand.hpp> #include <boost/asio/strand.hpp>
#include <boost/asio/system_executor.hpp>
#include <cstdlib> #include <cstdlib>
#include <functional> #include <functional>
#include <iostream> #include <iostream>