roland/xo-expression2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of github.com:Rconybea/xo-websock

Browse source
This commit is contained in:
Roland Conybeare 2024-09-21 12:24:47 -04:00
commit 3e64ed53e5
8 changed files with 41 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

20
CMakeLists.txt
View file

@ -3,25 +3,11 @@
cmake_minimum_required(VERSION 3.10)
project(websock VERSION 1.0)
enable_language(CXX)
# common XO cmake macros (see proj/xo-cmake)
include(GNUInstallDirs)
include(cmake/xo-bootstrap-macros.cmake)
# ----------------------------------------------------------------
# unit test setup
enable_testing()
# activate code coverage for all executables + libraries (when configured with -DCODE_COVERAGE=ON)
add_code_coverage()
# 1. assuming that /nix/store/ prefixes .hpp files belonging to gcc, catch2 etc.
# we're not interested in code coverage for these sources.
# 2. exclude the utest/ subdir, we don't need coverage on the unit tests themselves;
# rather, want coverage on the code that the unit tests exercise.
#
# NOTE: this seems to work only with the 'ccov-all' target. In particular, doesn't seem to do anything with the 'ccov' target
#
add_code_coverage_all_targets(EXCLUDE /nix/store/* ${PROJECT_SOURCE_DIR}/utest/* ${PROJECT_BINARY_DIR}/local/* ${PROJECT_SOURCE_DIR}/repo/*)
xo_cxx_toplevel_options3()
# ----------------------------------------------------------------
# c++ settings
@ -31,8 +17,6 @@ set(PROJECT_CXX_FLAGS "")
#set(PROJECT_CXX_FLAGS "-fconcepts-diagnostics-depth=2")
add_definitions(${PROJECT_CXX_FLAGS})
xo_toplevel_compile_options()
# ----------------------------------------------------------------
add_subdirectory(src/websock)

33
cmake/xo-bootstrap-macros.cmake
View file

@ -1,14 +1,35 @@
if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL "prefix"))
# default to typical install location for xo-project-macros
set(CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake)
# ----------------------------------------------------------------
# for example:
# $ PREFIX=/usr/local # for example
# $ cmake -DCMAKE_MODULE_PATH=prefix -DCMAKE_INSTALL_PREFIX=$PREFIX -B .build
#
# will get
# CMAKE_MODULE_PATH
# from xo-cmake-config --cmake-module-path
#
# and expect .cmake macros in
# CMAKE_MODULE_PATH/xo_macros/xo_cxx.cmake
# ----------------------------------------------------------------
find_program(XO_CMAKE_CONFIG_EXECUTABLE NAMES xo-cmake-config REQUIRED)
if ("${XO_CMAKE_CONFIG_EXECUTABLE}" STREQUAL "XO_CMAKE_CONFIG_EXECUTABLE-NOT_FOUND")
message(FATAL "could not find xo-cmake-config executable")
endif()
message(STATUS "XO_CMAKE_CONFIG_EXECUTABLE=${XO_CMAKE_CONFIG_EXECUTABLE}")
if (NOT XO_SUBMODULE_BUILD)
message("-- CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
message("-- CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
if (("${CMAKE_MODULE_PATH}" STREQUAL "") OR ("${CMAKE_MODULE_PATH}" STREQUAL prefix))
# default to typical install location for xo-project-macros
execute_process(COMMAND ${XO_CMAKE_CONFIG_EXECUTABLE} --cmake-module-path OUTPUT_VARIABLE CMAKE_MODULE_PATH)
message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
endif()
endif()
# needs to have been installed somewhere on CMAKE_MODULE_PATH,
# (e.g. from xo-cmake with the same value for CMAKE_INSTALL_PREFIX)
#
include(xo_macros/xo-project-macros)
include(xo_macros/xo_cxx)
xo_cxx_bootstrap_message()

2
include/xo/websock/DynamicEndpoint.hpp
View file

@ -67,7 +67,7 @@ namespace xo {
* send output to ws_sink
*/
CallbackId subscribe(std::string const & incoming_uri,
ref::rp<AbstractSink> const & ws_sink) const;
rp<AbstractSink> const & ws_sink) const;
/* unsubscribe stream from this endpoint;
* reverses the effect of a previous call to .subscribe()

4
include/xo/websock/Webserver.hpp
View file

@ -83,8 +83,8 @@ namespace xo {
* the underlying libwebsocket library is not advertised to be
* threadsafe
*/
static ref::rp<Webserver> make(WebserverConfig const & ws_config,
ref::rp<PrintJson> const & pjson);
static rp<Webserver> make(WebserverConfig const & ws_config,
rp<PrintJson> const & pjson);
/* current state */
virtual Runstate state() const = 0;

8
include/xo/websock/WebsocketSink.hpp
View file

@ -17,10 +17,10 @@ namespace xo {
using PrintJson = xo::json::PrintJson;
public:
static ref::rp<WebsocketSink> make(ref::rp<Webserver> const & websrv,
ref::rp<PrintJson> const & pjson,
uint32_t session_id,
std::string const & stream_name);
static rp<WebsocketSink> make(rp<Webserver> const & websrv,
rp<PrintJson> const & pjson,
uint32_t session_id,
std::string const & stream_name);
}; /*WebsocketSink*/
} /*namespace web*/
} /*namespace xo*/

1
src/websock/DynamicEndpoint.cpp
View file

@ -8,7 +8,6 @@
namespace xo {
using xo::web::Alist;
using xo::fn::CallbackId;
using xo::ref::rp;
namespace web {
DynamicEndpoint::DynamicEndpoint(std::string uri_pattern,

1
src/websock/Webserver.cpp
View file

@ -34,7 +34,6 @@ namespace xo {
using xo::reactor::AbstractSink;
using xo::json::PrintJson;
using xo::fn::CallbackId;
using xo::ref::rp;
using xo::scope;
using xo::xtag;

11
src/websock/WebsocketSink.cpp
View file

@ -16,7 +16,6 @@ namespace xo {
using xo::reflect::Reflect;
using xo::reflect::TaggedPtr;
using xo::reflect::TypeDescr;
using xo::ref::rp;
using xo::ref::brw;
using xo::print::quot;
using xo::print::qcstr;
@ -36,8 +35,8 @@ namespace xo {
using AbstractSource = reactor::AbstractSource;
public:
WebsocketSinkImpl(ref::rp<Webserver> const & websrv,
ref::rp<PrintJson> const & pjson,
WebsocketSinkImpl(rp<Webserver> const & websrv,
rp<PrintJson> const & pjson,
uint32_t session_id,
std::string stream_name)
: websrv_{std::move(websrv)},
@ -56,7 +55,7 @@ namespace xo {
virtual TypeDescr sink_ev_type() const override;
virtual bool allow_volatile_source() const override { return true; }
virtual uint32_t n_in_ev() const override { return n_in_ev_; }
virtual void attach_source(ref::rp<AbstractSource> const & src) override;
virtual void attach_source(rp<AbstractSource> const & src) override;
virtual void notify_ev_tp(TaggedPtr const & ev_tp) override;
private:
@ -66,9 +65,9 @@ namespace xo {
*/
std::string name_;
/* webserver implementation */
ref::rp<Webserver> websrv_;
rp<Webserver> websrv_;
/* print arbitrary reflected stuff as json */
ref::rp<PrintJson> pjson_;
rp<PrintJson> pjson_;
/* websocket session id# - events arriving at this sink
* will be sent only to the session identified by .session_id
*/