Compare commits
43
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b8bfc1058d | ||
|
|
82278a4e94 | ||
|
|
592ff2a7fe | ||
|
|
d65dc1c8e3 | ||
|
|
464a153582 | ||
|
|
0610f9ac04 | ||
|
|
91c2f6f033 | ||
|
|
486c314f19 | ||
|
|
1f0b8bd82d | ||
|
|
6aafb2c5f1 | ||
|
|
e4d20be735 | ||
|
|
ca028c58ed | ||
|
|
162969d2f7 | ||
|
|
d798594836 | ||
|
|
9611462e2c | ||
|
|
54986aeccd | ||
|
|
6d489ce246 | ||
|
|
6217b190bb | ||
|
|
6a262719af | ||
|
|
cf0282f86d | ||
|
|
76be3074cd | ||
|
|
029d89386f | ||
|
|
1544a6c3aa | ||
|
|
158dfdd606 | ||
|
|
aaa3ff114b | ||
|
|
c98891f5e3 | ||
|
|
f31d8d011b | ||
|
|
7df97373ef | ||
|
|
df7f8fc48f | ||
|
|
33d9e344ed | ||
|
|
368dce37c6 | ||
|
|
e228b33c5a | ||
|
|
0116a0cfe5 | ||
|
|
6b7c115779 | ||
|
|
85593f782d | ||
|
|
cfa5c5a283 | ||
|
|
29b901f546 | ||
|
|
42a1f37dcf | ||
|
|
f63e6e2ad7 | ||
|
|
d40b34e6d5 | ||
|
|
c1cf6230fa | ||
|
|
1118e89cf4 | ||
|
|
6a536c1208 |
No files matched your search
@@ -9,7 +9,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"fable": {
|
"fable": {
|
||||||
"version": "4.24.0",
|
"version": "4.0.6",
|
||||||
"commands": [
|
"commands": [
|
||||||
"fable"
|
"fable"
|
||||||
]
|
]
|
||||||
@@ -25,12 +25,6 @@
|
|||||||
"commands": [
|
"commands": [
|
||||||
"fake"
|
"fake"
|
||||||
]
|
]
|
||||||
},
|
|
||||||
"dotnet-t4": {
|
|
||||||
"version": "3.0.0",
|
|
||||||
"commands": [
|
|
||||||
"t4"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,131 +0,0 @@
|
|||||||
FROM ubuntu:22.04
|
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
# Note installations that take a while (more than 10s)
|
|
||||||
|
|
||||||
RUN apt-get update
|
|
||||||
RUN apt-get install -y ca-certificates
|
|
||||||
RUN apt-get install -y ccache
|
|
||||||
RUN apt-get install -y curl
|
|
||||||
RUN apt-get install -y fish
|
|
||||||
RUN apt-get install -y gdb
|
|
||||||
# git-all: ~250s
|
|
||||||
RUN apt-get install -y git-all
|
|
||||||
RUN apt-get install -y gnupg
|
|
||||||
# liblttng-ust-dev: ~30s
|
|
||||||
RUN apt-get install -y liblttng-ust-dev
|
|
||||||
RUN apt-get install -y libssh2-1-dev
|
|
||||||
RUN apt-get install -y locales
|
|
||||||
RUN apt-get install -y ninja-build
|
|
||||||
# openssh-server: ~40s
|
|
||||||
RUN apt-get install -y openssh-server
|
|
||||||
RUN apt-get install -y pkg-config
|
|
||||||
RUN apt-get install -y software-properties-common
|
|
||||||
RUN apt-get install -y sudo
|
|
||||||
RUN apt-get install -y tzdata
|
|
||||||
RUN apt-get install -y vim
|
|
||||||
RUN apt-get install -y zip
|
|
||||||
|
|
||||||
# Python: ~30s
|
|
||||||
RUN apt-get install -y \
|
|
||||||
python3-pip \
|
|
||||||
python3-venv \
|
|
||||||
&& python3 -m pip install --upgrade pip
|
|
||||||
|
|
||||||
# GCC
|
|
||||||
ARG gcc_major=13
|
|
||||||
RUN \
|
|
||||||
add-apt-repository ppa:ubuntu-toolchain-r/test \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install -y g++-$gcc_major
|
|
||||||
|
|
||||||
# Clang
|
|
||||||
ARG clang_major=17
|
|
||||||
RUN \
|
|
||||||
curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key 2> /dev/null \
|
|
||||||
| gpg --dearmor - \
|
|
||||||
| tee /usr/share/keyrings/llvm-snapshot.gpg > /dev/null \
|
|
||||||
&& echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg] http://apt.llvm.org/$(lsb_release -cs)/ llvm-toolchain-$(lsb_release -cs)-$clang_major main" \
|
|
||||||
| tee -a "/etc/apt/sources.list.d/llvm.list" \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install -y \
|
|
||||||
clang-$clang_major \
|
|
||||||
clang-format-$clang_major \
|
|
||||||
clangd-$clang_major
|
|
||||||
|
|
||||||
# CMake
|
|
||||||
RUN \
|
|
||||||
curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc 2> /dev/null \
|
|
||||||
| gpg --dearmor - \
|
|
||||||
| tee /usr/share/keyrings/kitware-archive-keyring.gpg > /dev/null \
|
|
||||||
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" \
|
|
||||||
| tee /etc/apt/sources.list.d/kitware.list > /dev/null \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install -y cmake
|
|
||||||
|
|
||||||
# Dotnet
|
|
||||||
RUN apt-get update && apt-get install -y dotnet8
|
|
||||||
|
|
||||||
# Node
|
|
||||||
ARG node_major=18
|
|
||||||
RUN mkdir -p /etc/apt/keyrings \
|
|
||||||
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
|
|
||||||
| gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
|
|
||||||
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$node_major.x nodistro main" \
|
|
||||||
| tee /etc/apt/sources.list.d/nodesource.list \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install -y nodejs
|
|
||||||
|
|
||||||
# Emumba (deps)
|
|
||||||
RUN apt-get update && apt-get -y install rapidjson-dev
|
|
||||||
# Emumba
|
|
||||||
COPY emumba /emumba
|
|
||||||
RUN dpkg -i /emumba/emumba-deribit-connector-3.3.1-Linux.LICENSE_DISABLED.deb \
|
|
||||||
&& rm -r /emumba
|
|
||||||
|
|
||||||
# Pcap
|
|
||||||
RUN apt-get update && apt-get install -y libpcap0.8-dev
|
|
||||||
|
|
||||||
# Databento (deps)
|
|
||||||
RUN apt-get update && apt-get -y install libzstd-dev
|
|
||||||
|
|
||||||
# Docker in Docker
|
|
||||||
RUN apt-get update && apt-get install -y \
|
|
||||||
docker.io \
|
|
||||||
docker-compose \
|
|
||||||
docker-compose-v2
|
|
||||||
|
|
||||||
# Set up default executables (update-alternatives)
|
|
||||||
RUN \
|
|
||||||
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-$clang_major 100; \
|
|
||||||
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-$clang_major 100; \
|
|
||||||
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-$clang_major 100; \
|
|
||||||
update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-$clang_major 100; \
|
|
||||||
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-$gcc_major 100; \
|
|
||||||
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-$gcc_major 100
|
|
||||||
|
|
||||||
# Add compiler symlinks for ccache
|
|
||||||
RUN \
|
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/clang; \
|
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/clang++; \
|
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/clang-$clang_major; \
|
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/clang++-$clang_major; \
|
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/gcc; \
|
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/g++
|
|
||||||
|
|
||||||
RUN locale-gen en_US.UTF-8
|
|
||||||
|
|
||||||
ARG docker_user="bts"
|
|
||||||
ARG docker_uid="1000"
|
|
||||||
ARG docker_pass="bts"
|
|
||||||
|
|
||||||
RUN \
|
|
||||||
groupadd -g "$docker_uid" "$docker_user" \
|
|
||||||
&& useradd \
|
|
||||||
-m \
|
|
||||||
-u "$docker_uid" \
|
|
||||||
-g "$docker_uid" \
|
|
||||||
-G sudo \
|
|
||||||
--password "$(openssl passwd -1 "$docker_pass")" \
|
|
||||||
"$docker_user"
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
{
|
|
||||||
"dockerFile": "Dockerfile",
|
|
||||||
"hostRequirements": {
|
|
||||||
"memory": "8gb",
|
|
||||||
"storage": "10gb"
|
|
||||||
},
|
|
||||||
"containerUser": "bts",
|
|
||||||
"updateRemoteUserUID": true,
|
|
||||||
"shutdownAction": "none",
|
|
||||||
// Note: If running multiple containers on the same host, each must use a
|
|
||||||
// unique set of ports. Usually we just add 1000 to each port as needed. For
|
|
||||||
// example, if 8000-8003 is taken, go with 9000-9003, then 10000-10003, etc.
|
|
||||||
"runArgs": [
|
|
||||||
"--shm-size",
|
|
||||||
"8gb"
|
|
||||||
],
|
|
||||||
"mounts": [
|
|
||||||
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
|
|
||||||
],
|
|
||||||
"customizations": {
|
|
||||||
"vscode": {
|
|
||||||
"extensions": [
|
|
||||||
"eamodio.gitlens",
|
|
||||||
"llvm-vs-code-extensions.vscode-clangd",
|
|
||||||
"ms-python.python",
|
|
||||||
"ms-vscode.cmake-tools",
|
|
||||||
"ms-vscode.cpptools",
|
|
||||||
"xaver.clang-format"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
@@ -1,4 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
this_dir="$(realpath "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")")"
|
|
||||||
sudo dpkg -i "$this_dir/emumba-deribit-connector-3.3.1-Linux.LICENSE_DISABLED.deb"
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
# This file defines the global default configuration for docker deployments.
|
|
||||||
# It is tracked in source control. For temporary modifications, please create
|
|
||||||
# a separate file called ".env.local" (it's in .gitignore, so won't be tracked).
|
|
||||||
# If a variable is defined in both files, the value in .env.local will be used.
|
|
||||||
#
|
|
||||||
# About the deployment procedure:
|
|
||||||
# We use Docker Compose to build images and launch containers for various services
|
|
||||||
# that make up our software suite:
|
|
||||||
# - sparkd
|
|
||||||
# - TODO: pubsub
|
|
||||||
# - TODO: md-publisher
|
|
||||||
# - TODO: webapp (DSQA on the web)
|
|
||||||
# - TODO: api-server (websocket based)
|
|
||||||
# From inside a devcontainer, you can launch all services in separate containers
|
|
||||||
# on your machine by running:
|
|
||||||
#
|
|
||||||
# tools/deploy.sh
|
|
||||||
#
|
|
||||||
# This script builds release versions for each service, packaged (generally) in
|
|
||||||
# self-contained directories. Next, it runs a few "docker compose" commands to
|
|
||||||
# build docker images loaded with the self-contained binaries from the previous
|
|
||||||
# step, and start containers with those images to run each service. To view the
|
|
||||||
# commands that deploy.sh runs internally (without actually running them), run:
|
|
||||||
#
|
|
||||||
# tools/deploy.sh --dry-run
|
|
||||||
#
|
|
||||||
# For additional information/help, run:
|
|
||||||
#
|
|
||||||
# tools/deploy.sh --help
|
|
||||||
#
|
|
||||||
|
|
||||||
### Sparkd ###
|
|
||||||
# The internal image for sparkd to use. For more info, view:
|
|
||||||
# src/server/sparkd/Dockerfile
|
|
||||||
SPARKD__IMAGE=sparkd
|
|
||||||
# The config dir for this service to use
|
|
||||||
SPARKD__CONFIG_DIR=src/app_sparkd/configurations/dev
|
|
||||||
# Mount a specific volume or dir to "~/sparkdata/data" inside the docker.
|
|
||||||
# Defaults to a volume named "sparkd_<config_port>" (e.g., sparkd_8000).
|
|
||||||
# SPARKD__DATA_DIR=/home/bts/sparkdata/data
|
|
||||||
SPARKD__SOURCE_DIR=install/sparkd-release-gcc
|
|
||||||
SPARKD__RUNTIME_CONF_DIR=/home/ubuntu/8000/sparkdata/conf/
|
|
||||||
SPARKD__CONFIG_PORT=8000
|
|
||||||
SPARKD__QUICKBUS_PORT=8001
|
|
||||||
SPARKD__SIM_FIX_PORT=8002
|
|
||||||
SPARKD__SHM_SIZE=4gb
|
|
||||||
SPARKD__PYTHON_REQUIREMENTS=requirements.txt
|
|
||||||
|
|
||||||
# TODO: add config for other services (pubsub, md-publisher, webapp, api-server, etc.)
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
*.cmd text=auto eol=crlf
|
|
||||||
*.cs text=auto eol=crlf
|
|
||||||
*.sh text=auto eol=lf
|
|
||||||
+2
-9
@@ -8,10 +8,7 @@ cmake-build-debug/
|
|||||||
.idea/
|
.idea/
|
||||||
.dir-locals.el
|
.dir-locals.el
|
||||||
*.pyc
|
*.pyc
|
||||||
**.vscode/*
|
**.vscode
|
||||||
!.vscode/launch.json
|
|
||||||
!.vscode/tasks.json
|
|
||||||
!.vscode/*.env
|
|
||||||
.vs
|
.vs
|
||||||
obj/
|
obj/
|
||||||
*.csproj.user
|
*.csproj.user
|
||||||
@@ -55,12 +52,8 @@ trace_data/
|
|||||||
.cache/
|
.cache/
|
||||||
/src/Spark.Admin.WebApp/tsconfig.*.g.json
|
/src/Spark.Admin.WebApp/tsconfig.*.g.json
|
||||||
/src/Spark.Admin.WebApp/src/bin/
|
/src/Spark.Admin.WebApp/src/bin/
|
||||||
/src/client/**/*appsettings.Local.json
|
|
||||||
/src/DataStreamSuite/**/*appsettings.Local.json
|
|
||||||
**/CMakeDeps.cmake
|
**/CMakeDeps.cmake
|
||||||
**/CMakeDeps_win.cmake
|
**/CMakeDeps_win.cmake
|
||||||
.devcontainer/
|
**/.devcontainer
|
||||||
*.Generated.cs
|
*.Generated.cs
|
||||||
*.lst
|
*.lst
|
||||||
.env.local
|
|
||||||
.secrets
|
|
||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[submodule "externals"]
|
[submodule "externals"]
|
||||||
path = externals
|
path = externals
|
||||||
url = https://bitbucket.org/bluetradesys/externals.git
|
url = https://x-token-auth:ATCTT3xFfGN0h_ENnUSfEAIzbfVzkQPLG26cIli50MtcTwZ7VEc8lin5tJYqibjlBJ9PM9R642Ra5GjiL52TBfbO8KeUBT0UoMT7gLQHL2Y1TkW9yZr6NkvsoDkSl49DeD4Ijiu4_0u4qEm4oMVDDg2_fB059-uOWOo7ZL94tGZET8CSVpFIGvs=B0E03660@bitbucket.org/bluetradesys/externals.git
|
||||||
[submodule "vcpkg"]
|
[submodule "vcpkg"]
|
||||||
path = vcpkg
|
path = vcpkg
|
||||||
url = https://github.com/microsoft/vcpkg.git
|
url = https://github.com/microsoft/vcpkg.git
|
||||||
+49
@@ -0,0 +1,49 @@
|
|||||||
|
# This configuration file was automatically generated by Gitpod.
|
||||||
|
# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml)
|
||||||
|
# and commit this file to your remote git repository to share the goodness with others.
|
||||||
|
|
||||||
|
# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart
|
||||||
|
|
||||||
|
image: gitpod/workspace-dotnet-8
|
||||||
|
tasks:
|
||||||
|
- name: Install Deps
|
||||||
|
init: |
|
||||||
|
(
|
||||||
|
set -e
|
||||||
|
sudo install-packages rapidjson-dev
|
||||||
|
sudo install-packages libssh2-1-dev
|
||||||
|
sudo install-packages openssh-server
|
||||||
|
sudo install-packages liblttng-ust-dev
|
||||||
|
sudo install-packages libpcap0.8-dev
|
||||||
|
sudo install-packages ccache
|
||||||
|
sudo ln -s $(which ccache) /usr/local/bin/clang
|
||||||
|
sudo ln -s $(which ccache) /usr/local/bin/clang++
|
||||||
|
sudo ln -s $(which ccache) /usr/local/bin/clang-17
|
||||||
|
sudo ln -s $(which ccache) /usr/local/bin/clang++-17
|
||||||
|
sudo ln -s $(which ccache) /usr/local/bin/gcc
|
||||||
|
sudo ln -s $(which ccache) /usr/local/bin/g++
|
||||||
|
sudo ln -s $(which ccache) /usr/local/bin/gcc-12
|
||||||
|
sudo ln -s $(which ccache) /usr/local/bin/g++-12
|
||||||
|
if [ -e externals/src/emumba/install_emumba-deribit-connector.sh ]; then
|
||||||
|
externals/src/emumba/install_emumba-deribit-connector.sh
|
||||||
|
fi
|
||||||
|
)
|
||||||
|
- name: Setup Python venv
|
||||||
|
init: |
|
||||||
|
python -m pip install --upgrade pip
|
||||||
|
python -m venv .venv
|
||||||
|
. .venv/bin/activate
|
||||||
|
python -m pip install --upgrade pip
|
||||||
|
pip install -r requirements.txt
|
||||||
|
|
||||||
|
ports:
|
||||||
|
- name: sparkd config
|
||||||
|
port: 8000
|
||||||
|
onOpen: notify
|
||||||
|
- name: sparkd bus
|
||||||
|
port: 8001
|
||||||
|
|
||||||
|
gitConfig:
|
||||||
|
alias.st: "status"
|
||||||
|
status.short: "true"
|
||||||
|
core.pager: "less -FXRS"
|
||||||
Vendored
-453
@@ -1,453 +0,0 @@
|
|||||||
{
|
|
||||||
"version": "0.2.0",
|
|
||||||
"configurations": [
|
|
||||||
{
|
|
||||||
"name": "Python Debugger: Current File with Arguments",
|
|
||||||
"type": "debugpy",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "${file}",
|
|
||||||
"console": "integratedTerminal",
|
|
||||||
"args": "${command:pickArgs}"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": ".NET Core Attach",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "attach"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Api Server",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"preLaunchTask": "Build Api Server (Debug)",
|
|
||||||
"program": "spark_api_server.exe",
|
|
||||||
"args": [
|
|
||||||
"run",
|
|
||||||
"--sparkd",
|
|
||||||
"http://127.0.0.1:8000/config"
|
|
||||||
],
|
|
||||||
"cwd": "build/Debug/bin/net8.0",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Api Server (Skip Build)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"program": "spark_api_server.exe",
|
|
||||||
"args": [
|
|
||||||
"run",
|
|
||||||
"--sparkd",
|
|
||||||
"http://127.0.0.1:8000/config"
|
|
||||||
],
|
|
||||||
"cwd": "build/Debug/bin/net8.0",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Bts.DataStreamWebApp.Server",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"preLaunchTask": "Build DataStream WebApp (Debug)",
|
|
||||||
"program": "${workspaceFolder}/build/Debug/bin/net8.0/Bts.DataStreamWebApp.Server.dll",
|
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
|
|
||||||
"env": {
|
|
||||||
"ASPNETCORE_HTTP_PORT": "8080",
|
|
||||||
"ASPNETCORE_HTTPS_PORT": "8443",
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "${input:dataStreamWebAppServerEnvironment}",
|
|
||||||
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Bts.DataStreamWebApp.Server (Skip Build)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "${workspaceFolder}/build/Debug/bin/net8.0/Bts.DataStreamWebApp.Server.dll",
|
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
|
|
||||||
"env": {
|
|
||||||
"ASPNETCORE_HTTP_PORT": "8080",
|
|
||||||
"ASPNETCORE_HTTPS_PORT": "8443",
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "${input:dataStreamWebAppServerEnvironment}",
|
|
||||||
"ASPNETCORE_HOSTINGSTARTUPASSEMBLIES": "Microsoft.AspNetCore.SpaProxy",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "DataStreamPublisher",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"preLaunchTask": "Build DataStream (Debug)",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "DataStreamPublisher",
|
|
||||||
},
|
|
||||||
"windows": {
|
|
||||||
"program": "DataStreamPublisher.exe",
|
|
||||||
},
|
|
||||||
"cwd": "build/Debug/bin/net8.0",
|
|
||||||
"env": {
|
|
||||||
"DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "DataStreamPublisher (Skip Build)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "DataStreamPublisher",
|
|
||||||
},
|
|
||||||
"windows": {
|
|
||||||
"program": "DataStreamPublisher.exe",
|
|
||||||
},
|
|
||||||
"cwd": "${workspaceFolder}/build/Debug/bin/net8.0",
|
|
||||||
"env": {
|
|
||||||
"DOTNET_ENVIRONMENT": "${input:dataStreamPublisherEnvironment}",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "(gdb) Launch",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "/home/bts/spark/build/sparkd-debug-clang/server/sparkd",
|
|
||||||
"args": [
|
|
||||||
"run"
|
|
||||||
],
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"cwd": "/home/bts/spark/build/sparkd-debug-clang/server",
|
|
||||||
"environment": [],
|
|
||||||
"externalConsole": false,
|
|
||||||
"MIMode": "gdb",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "spreader tests2",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "/home/bts/spark/build/sparkd-debug-clang/server/sparkd",
|
|
||||||
"args": [
|
|
||||||
"test",
|
|
||||||
"[spreader2]"
|
|
||||||
],
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"cwd": "/home/bts/spark/build/sparkd-debug-clang/server",
|
|
||||||
"environment": [],
|
|
||||||
"externalConsole": false,
|
|
||||||
"MIMode": "gdb",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "spreader tests",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "/home/bts/spark/build/sparkd-debug-clang/server/sparkd",
|
|
||||||
"args": [
|
|
||||||
"test",
|
|
||||||
"[spreader]"
|
|
||||||
],
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"cwd": "/home/bts/spark/build/sparkd-debug-clang/server",
|
|
||||||
"environment": [],
|
|
||||||
"externalConsole": false,
|
|
||||||
"MIMode": "gdb",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "DataStreamQueryAnalyzer",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"preLaunchTask": "Build DataStreamQueryAnalyzer (Debug)",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"program": "DataStreamQueryAnalyzer.exe",
|
|
||||||
"cwd": "build/Debug/bin/net8.0-windows",
|
|
||||||
"env": {
|
|
||||||
"DOTNET_ENVIRONMENT": "${input:dataStreamQueryAnalyzerEnvironment}",
|
|
||||||
"PYTHON_EXE": "${workspaceFolder}/.venv/Scripts/python.exe"
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "DataStreamQueryAnalyzer (Skip Build)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"program": "DataStreamQueryAnalyzer.exe",
|
|
||||||
"cwd": "build/Debug/bin/net8.0-windows",
|
|
||||||
"env": {
|
|
||||||
"DOTNET_ENVIRONMENT": "${input:dataStreamQueryAnalyzerEnvironment}",
|
|
||||||
"PYTHON_EXE": "${workspaceFolder}/.venv/Scripts/python.exe"
|
|
||||||
},
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "PubSubServer",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"preLaunchTask": "Build DataStream (Debug)",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "PubSubServer",
|
|
||||||
},
|
|
||||||
"windows": {
|
|
||||||
"program": "PubSubServer.exe",
|
|
||||||
},
|
|
||||||
"cwd": "build/Debug/bin/net8.0",
|
|
||||||
"env": {
|
|
||||||
"DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "PubSubServer (Skip Build)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "PubSubServer",
|
|
||||||
},
|
|
||||||
"windows": {
|
|
||||||
"program": "PubSubServer.exe",
|
|
||||||
},
|
|
||||||
"cwd": "build/Debug/bin/net8.0",
|
|
||||||
"env": {
|
|
||||||
"DOTNET_ENVIRONMENT": "${input:pubSubServerEnvironment}",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Spark",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"preLaunchTask": "Build Spark (Debug)",
|
|
||||||
"program": "Spark.exe",
|
|
||||||
"cwd": "build/Debug/bin/net8.0-windows",
|
|
||||||
"env": {
|
|
||||||
"DOTNET_ENVIRONMENT": "${input:sparkEnvironment}",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Spark (Skip Build)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"program": "Spark.exe",
|
|
||||||
"cwd": "build/Debug/bin/net8.0-windows",
|
|
||||||
"env": {
|
|
||||||
"DOTNET_ENVIRONMENT": "${input:sparkEnvironment}",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Spark (Parameterized)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"preLaunchTask": "Build Spark (Debug)",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"program": "Spark.exe",
|
|
||||||
"args": [
|
|
||||||
"--sparkd",
|
|
||||||
"${input:sparkConfigServer}"
|
|
||||||
],
|
|
||||||
"cwd": "build/Debug/bin/net8.0-windows",
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Spark Test",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"preLaunchTask": "Build Spark (Debug)",
|
|
||||||
"program": "Spark.Console.exe",
|
|
||||||
"cwd": "build/Debug/bin/net8.0",
|
|
||||||
"args": [
|
|
||||||
"test",
|
|
||||||
"${input:sparkTest}"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Spark Test (Skip Build)",
|
|
||||||
"type": "coreclr",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"windows": {
|
|
||||||
"program": "Spark.Console.exe",
|
|
||||||
"cwd": "build/Debug/bin/net8.0",
|
|
||||||
"args": [
|
|
||||||
"test",
|
|
||||||
"${input:sparkTest}"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"console": "integratedTerminal"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Sparkd",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd/sparkd",
|
|
||||||
},
|
|
||||||
"args": [
|
|
||||||
"run"
|
|
||||||
],
|
|
||||||
"cwd": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd",
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"externalConsole": false,
|
|
||||||
"MIMode": "gdb",
|
|
||||||
"setupCommands": [
|
|
||||||
{
|
|
||||||
"description": "Enable pretty-printing for gdb",
|
|
||||||
"text": "-enable-pretty-printing",
|
|
||||||
"ignoreFailures": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Set Disassembly Flavor to Intel",
|
|
||||||
"text": "-gdb-set disassembly-flavor intel",
|
|
||||||
"ignoreFailures": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Sparkd (Skip Build)",
|
|
||||||
"type": "cppdbg",
|
|
||||||
"request": "launch",
|
|
||||||
"program": "",
|
|
||||||
"linux": {
|
|
||||||
"program": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd/sparkd",
|
|
||||||
},
|
|
||||||
"args": [
|
|
||||||
"run"
|
|
||||||
],
|
|
||||||
"cwd": "${workspaceFolder}/build/sparkd-debug-clang/src/app_sparkd",
|
|
||||||
"stopAtEntry": false,
|
|
||||||
"externalConsole": false,
|
|
||||||
"MIMode": "gdb",
|
|
||||||
"setupCommands": [
|
|
||||||
{
|
|
||||||
"description": "Enable pretty-printing for gdb",
|
|
||||||
"text": "-enable-pretty-printing",
|
|
||||||
"ignoreFailures": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"description": "Set Disassembly Flavor to Intel",
|
|
||||||
"text": "-gdb-set disassembly-flavor intel",
|
|
||||||
"ignoreFailures": true
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
],
|
|
||||||
"inputs": [
|
|
||||||
{
|
|
||||||
"id": "dataStreamPublisherEnvironment",
|
|
||||||
"type": "pickString",
|
|
||||||
"description": "Publisher Configuration",
|
|
||||||
"options": [
|
|
||||||
"Development",
|
|
||||||
"MarketData",
|
|
||||||
"Production",
|
|
||||||
"ProductionAws",
|
|
||||||
"Staging",
|
|
||||||
],
|
|
||||||
"default": "MarketDataPublisher",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "pubSubServerEnvironment",
|
|
||||||
"type": "pickString",
|
|
||||||
"description": "PubSub Configuration",
|
|
||||||
"options": [
|
|
||||||
"Development",
|
|
||||||
"EchoServer",
|
|
||||||
"Production",
|
|
||||||
"ProductionAws",
|
|
||||||
"Staging",
|
|
||||||
],
|
|
||||||
"default": "Development",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "dataStreamWebAppServerEnvironment",
|
|
||||||
"type": "pickString",
|
|
||||||
"description": "DataStream WebApp Environment",
|
|
||||||
"options": [
|
|
||||||
"Development",
|
|
||||||
"Production",
|
|
||||||
"ProductionAws",
|
|
||||||
"Staging",
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "dataStreamQueryAnalyzerEnvironment",
|
|
||||||
"type": "pickString",
|
|
||||||
"description": "DataStreamQueryAnalyzer Configuration",
|
|
||||||
"options": [
|
|
||||||
"Development",
|
|
||||||
"Local",
|
|
||||||
],
|
|
||||||
"default": "Development",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "sparkEnvironment",
|
|
||||||
"type": "pickString",
|
|
||||||
"description": "Spark Configuration",
|
|
||||||
"options": [
|
|
||||||
"Development",
|
|
||||||
"Local",
|
|
||||||
],
|
|
||||||
"default": "Development",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "sparkConfigServer",
|
|
||||||
"type": "promptString",
|
|
||||||
"description": "Config Server URL",
|
|
||||||
"default": "http://localhost:8000/config",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "sparkTest",
|
|
||||||
"type": "promptString",
|
|
||||||
"description": "Test to run",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "sparkdTest",
|
|
||||||
"type": "promptString",
|
|
||||||
"description": "Test to run",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "isSparkApiEnabled",
|
|
||||||
"type": "pickString",
|
|
||||||
"description": "Enable Spark Api (connect to sparkd)",
|
|
||||||
"options": [
|
|
||||||
"True",
|
|
||||||
"False",
|
|
||||||
],
|
|
||||||
"default": "True",
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
Vendored
-1
@@ -1 +0,0 @@
|
|||||||
PYTHONPATH=/workspaces/spark/build/sparkd-debug-clang/src/lib_python_interop;/workspaces/spark/src/lib_python_interop/python_interop_plugins
|
|
||||||
Vendored
-1146
File diff suppressed because it is too large.
Load diff
+58
-35
@@ -1,10 +1,7 @@
|
|||||||
cmake_minimum_required(VERSION 3.12)
|
cmake_minimum_required(VERSION 3.12)
|
||||||
project(spark)
|
project(spark)
|
||||||
include(GNUInstallDirs)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/GitVersion.cmake)
|
|
||||||
set(CMAKE_CXX_STANDARD 20)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
|
|
||||||
get_version_from_git()
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(platform "windows")
|
set(platform "windows")
|
||||||
else()
|
else()
|
||||||
@@ -17,17 +14,12 @@ set(
|
|||||||
CACHE
|
CACHE
|
||||||
STRING
|
STRING
|
||||||
"External dependencies root folder (should contain folders: lib, bin, include")
|
"External dependencies root folder (should contain folders: lib, bin, include")
|
||||||
|
set(SPARK_BIN "${EXTERNALS_ROOT}/bin")
|
||||||
# SHARED_MEMORY_PREFIX serves as a kind of namespace so multiple applications
|
set(SPARK_INCLUDE "${EXTERNALS_ROOT}/include")
|
||||||
# can run simultaneously without fighting over the same shm files (e.g., sparkd,
|
set(SPARK_LIB "${EXTERNALS_ROOT}/lib/$<CONFIG>")
|
||||||
# api server, etc.).
|
set(BUILD_API_SERVER OFF CACHE BOOL "Build the api server")
|
||||||
set(SHARED_MEMORY_PREFIX "\${BTS_SHARED_MEMORY_PREFIX}" CACHE STRING "Prefix to use when creating shared memory files")
|
|
||||||
set(EXTERNALS_BIN "${EXTERNALS_ROOT}/bin")
|
|
||||||
set(EXTERNALS_INCLUDE "${EXTERNALS_ROOT}/include")
|
|
||||||
set(EXTERNALS_LIB "${EXTERNALS_ROOT}/lib/$<CONFIG>")
|
|
||||||
set(BUILD_DOCS OFF CACHE BOOL "Build documentation")
|
set(BUILD_DOCS OFF CACHE BOOL "Build documentation")
|
||||||
set(BUILD_SDK OFF CACHE BOOL "Build the sdk")
|
set(BUILD_SDK OFF CACHE BOOL "Build the sdk")
|
||||||
set(EXPORT_MD_CONSUMER OFF CACHE BOOL "Export (extern) C functions for MD consumer interop")
|
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
set(BUILD_SPARKD OFF CACHE BOOL "Build sparkd")
|
set(BUILD_SPARKD OFF CACHE BOOL "Build sparkd")
|
||||||
set(BUILD_ADMIN_WEB_APP OFF CACHE BOOL "Build the Admin WebApp")
|
set(BUILD_ADMIN_WEB_APP OFF CACHE BOOL "Build the Admin WebApp")
|
||||||
@@ -36,19 +28,32 @@ else()
|
|||||||
set(BUILD_ADMIN_WEB_APP ON CACHE BOOL "Build the Admin WebApp")
|
set(BUILD_ADMIN_WEB_APP ON CACHE BOOL "Build the Admin WebApp")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(BEFORE SYSTEM ${EXTERNALS_INCLUDE} ${EXTERNALS_ROOT}/include/zlib)
|
include_directories(BEFORE SYSTEM ${SPARK_INCLUDE} ${EXTERNALS_ROOT}/include/zlib)
|
||||||
link_directories(${EXTERNALS_LIB})
|
link_directories(${SPARK_LIB})
|
||||||
|
|
||||||
add_compile_definitions(SHARED_MEMORY_PREFIX="${SHARED_MEMORY_PREFIX}")
|
if(BUILD_API_SERVER)
|
||||||
if(DEFINED APP_DATA_DIR)
|
add_compile_definitions(SPARK_ENABLE_API_SERVER)
|
||||||
add_compile_definitions(APP_DATA_DIR="${APP_DATA_DIR}")
|
|
||||||
endif()
|
endif()
|
||||||
add_compile_definitions(EXPORT_MD_CONSUMER="${EXPORT_MD_CONSUMER}")
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
add_compile_definitions(SHARED_MEMORY_PREFIX="spark")
|
||||||
|
add_compile_definitions(APP_DATA_DIR="\$\{APPDATA\}/bts/")
|
||||||
# subdirs
|
# subdirs
|
||||||
add_subdirectory(src/lib_spark)
|
add_subdirectory(src/lib)
|
||||||
else()
|
else()
|
||||||
if(BUILD_SPARKD)
|
# make sparkd look for libspark.so in its directory
|
||||||
|
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
|
||||||
|
set(CMAKE_INSTALL_RPATH ".")
|
||||||
|
set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install")
|
||||||
|
set(SPARK_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/$<CONFIG>")
|
||||||
|
|
||||||
|
if(BUILD_API_SERVER)
|
||||||
|
add_compile_definitions(APP_DATA_DIR="\$\{HOME\}/spark_api/")
|
||||||
|
add_compile_definitions(SHARED_MEMORY_PREFIX="spark_api")
|
||||||
|
elseif(BUILD_SPARKD)
|
||||||
|
add_compile_definitions(SHARED_MEMORY_PREFIX="sparkd")
|
||||||
|
add_compile_definitions(APP_DATA_DIR="\$\{HOME\}/sparkdata/")
|
||||||
|
|
||||||
# Note: All macros that begin w/ 'CCAPI' are ccapi's macros (defined and/or
|
# Note: All macros that begin w/ 'CCAPI' are ccapi's macros (defined and/or
|
||||||
# read by their code). We override some below.
|
# read by their code). We override some below.
|
||||||
add_compile_definitions(SPARK_ENABLE_CCAPI)
|
add_compile_definitions(SPARK_ENABLE_CCAPI)
|
||||||
@@ -85,15 +90,9 @@ else()
|
|||||||
add_compile_definitions(BINANCE_US_PRICE_STATS_PATH="/api/v3/ticker/24hr")
|
add_compile_definitions(BINANCE_US_PRICE_STATS_PATH="/api/v3/ticker/24hr")
|
||||||
|
|
||||||
# ** Binance USDS Futures **
|
# ** Binance USDS Futures **
|
||||||
add_compile_definitions(CCAPI_BINANCE_USDS_FUTURES_URL_REST_BASE="https://fapi.binance.com")
|
add_compile_definitions(CCAPI_BINANCE_USDS_FUTURES_URL_REST_BASE="https://dapi.binance.com")
|
||||||
add_compile_definitions(BINANCE_USDS_FUTURES_INSTRUMENTS_PATH="/fapi/v1/exchangeInfo")
|
add_compile_definitions(BINANCE_USDS_FUTURES_INSTRUMENTS_PATH="/dapi/v1/exchangeInfo")
|
||||||
add_compile_definitions(BINANCE_USDS_FUTURES_PRICE_STATS_PATH="/fapi/v1/ticker/24hr")
|
add_compile_definitions(BINANCE_USDS_FUTURES_PRICE_STATS_PATH="/dapi/v1/ticker/24hr")
|
||||||
add_compile_definitions(BINANCE_USDS_FUTURES_USER_DATA_PATH="/api/v3/userDataStream")
|
|
||||||
|
|
||||||
# ** Binance Coin Futures **
|
|
||||||
add_compile_definitions(CCAPI_BINANCE_COIN_FUTURES_URL_REST_BASE="https://dapi.binance.com")
|
|
||||||
add_compile_definitions(BINANCE_COIN_FUTURES_INSTRUMENTS_PATH="/dapi/v1/exchangeInfo")
|
|
||||||
add_compile_definitions(BINANCE_COIN_FUTURES_PRICE_STATS_PATH="/dapi/v1/ticker/24hr")
|
|
||||||
|
|
||||||
# ** Deribit **
|
# ** Deribit **
|
||||||
add_compile_definitions(DERIBIT_INSTRUMENT_PATH="/api/v2/public/get_instrument")
|
add_compile_definitions(DERIBIT_INSTRUMENT_PATH="/api/v2/public/get_instrument")
|
||||||
@@ -112,15 +111,11 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# subdirs
|
# subdirs
|
||||||
add_subdirectory(src/lib_spark)
|
|
||||||
if (BUILD_SPARKD)
|
if (BUILD_SPARKD)
|
||||||
add_subdirectory(src/lib_python_interop)
|
add_subdirectory(src/server/sparkd)
|
||||||
add_subdirectory(src/lib_onixs_fix)
|
|
||||||
add_subdirectory(src/lib_binance)
|
|
||||||
add_subdirectory(src/lib_okx_execution)
|
|
||||||
add_subdirectory(src/app_sparkd)
|
|
||||||
add_subdirectory(src/data_files)
|
add_subdirectory(src/data_files)
|
||||||
endif()
|
endif()
|
||||||
|
add_subdirectory(src/lib)
|
||||||
if (BUILD_ADMIN_WEB_APP)
|
if (BUILD_ADMIN_WEB_APP)
|
||||||
add_subdirectory(src/Spark.Admin.WebApp)
|
add_subdirectory(src/Spark.Admin.WebApp)
|
||||||
endif()
|
endif()
|
||||||
@@ -130,4 +125,32 @@ else()
|
|||||||
if(BUILD_SDK)
|
if(BUILD_SDK)
|
||||||
add_subdirectory(src/sdk)
|
add_subdirectory(src/sdk)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(BUILD_SPARKD)
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT ${CMAKE_BINARY_DIR}/server
|
||||||
|
COMMAND mkdir -p ${CMAKE_BINARY_DIR}/server
|
||||||
|
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/server/sparkd/sparkd ${CMAKE_BINARY_DIR}/server
|
||||||
|
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/data_files ${CMAKE_BINARY_DIR}/server
|
||||||
|
COMMAND ln ARGS -sf ${CMAKE_BINARY_DIR}/src/lib/libspark.so ${CMAKE_BINARY_DIR}/server
|
||||||
|
COMMAND
|
||||||
|
ln ARGS -sf
|
||||||
|
${EXTERNALS_ROOT}/lib/Release/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0
|
||||||
|
${CMAKE_BINARY_DIR}/server
|
||||||
|
COMMAND ln ARGS -sf ${EXTERNALS_ROOT}/lib/Release/libACE-5.7.5.so ${CMAKE_BINARY_DIR}/server
|
||||||
|
COMMAND mkdir ARGS -p ${CMAKE_BINARY_DIR}/server/plugins
|
||||||
|
COMMENT "Creating server runtime layout"
|
||||||
|
DEPENDS sparkd data_files_dir)
|
||||||
|
|
||||||
|
add_custom_target(server_layout ALL DEPENDS ${CMAKE_BINARY_DIR}/server)
|
||||||
|
|
||||||
|
install(
|
||||||
|
DIRECTORY "${CMAKE_BINARY_DIR}/server/plugins"
|
||||||
|
DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
|
||||||
|
install(
|
||||||
|
FILES
|
||||||
|
"${SPARK_LIB}/libACE-5.7.5.so"
|
||||||
|
"${SPARK_LIB}/libOnixS.IceImpactMulticastPriceFeedHandlerCpp.so.3.16.0.0"
|
||||||
|
DESTINATION "${SPARK_INSTALL_PREFIX}/bin")
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
+80
-115
@@ -15,7 +15,7 @@
|
|||||||
"rhs": "Windows"
|
"rhs": "Windows"
|
||||||
},
|
},
|
||||||
"generator": "Visual Studio 17 2022",
|
"generator": "Visual Studio 17 2022",
|
||||||
"binaryDir": "${sourceDir}/build/${presetName}",
|
"binaryDir": "${sourceDir}/build",
|
||||||
"environment": {
|
"environment": {
|
||||||
"SPARK_CMAKE_CXX_FLAGS": "/MP /WX /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 /bigobj /EHsc /DCURL_STATICLIB /D_WINSOCK_DEPRECATED_NO_WARNINGS /D__TBB_NO_IMPLICIT_LINKAGE /DBOOST_ALL_NO_LIB /std:c++20 /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600"
|
"SPARK_CMAKE_CXX_FLAGS": "/MP /WX /wd4250 /wd4251 /wd4244 /wd4267 /wd4355 /wd4275 /wd4345 /bigobj /EHsc /DCURL_STATICLIB /D_WINSOCK_DEPRECATED_NO_WARNINGS /D__TBB_NO_IMPLICIT_LINKAGE /DBOOST_ALL_NO_LIB /std:c++20 /D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_WIN32_WINNT=0x0600"
|
||||||
},
|
},
|
||||||
@@ -24,17 +24,13 @@
|
|||||||
"CMAKE_CXX_FLAGS_DEBUG": "$env{SPARK_CMAKE_CXX_FLAGS} /MTd",
|
"CMAKE_CXX_FLAGS_DEBUG": "$env{SPARK_CMAKE_CXX_FLAGS} /MTd",
|
||||||
"CMAKE_CXX_FLAGS_RELEASE": "$env{SPARK_CMAKE_CXX_FLAGS} /MT",
|
"CMAKE_CXX_FLAGS_RELEASE": "$env{SPARK_CMAKE_CXX_FLAGS} /MT",
|
||||||
"CMAKE_CXX_STANDARD": "20",
|
"CMAKE_CXX_STANDARD": "20",
|
||||||
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
|
||||||
"CMAKE_SHARED_LINKER_FLAGS_DEBUG": "/DEBUG",
|
"CMAKE_SHARED_LINKER_FLAGS_DEBUG": "/DEBUG",
|
||||||
"CMAKE_SHARED_LINKER_FLAGS_RELEASE": "/OPT:REF /OPT:ICF /LTCG",
|
"CMAKE_SHARED_LINKER_FLAGS_RELEASE": "/OPT:REF /OPT:ICF /LTCG",
|
||||||
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
|
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
|
||||||
"EXTERNALS_ROOT": "${sourceDir}/externals/windows",
|
"EXTERNALS_ROOT": "${sourceDir}/externals/windows",
|
||||||
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf",
|
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf",
|
||||||
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net8.0;${sourceDir}/build/$<CONFIG>/bin/net8.0-windows",
|
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net8.0",
|
||||||
"EXPORT_MD_CONSUMER": {
|
"DOTNET_WINDOWS_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net8.0-windows"
|
||||||
"type": "BOOL",
|
|
||||||
"value": "ON"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -52,18 +48,12 @@
|
|||||||
"platform": "",
|
"platform": "",
|
||||||
"CMAKE_BUILD_WITH_INSTALL_RPATH": {
|
"CMAKE_BUILD_WITH_INSTALL_RPATH": {
|
||||||
"type": "BOOL",
|
"type": "BOOL",
|
||||||
"value": "OFF"
|
"value": "ON"
|
||||||
},
|
},
|
||||||
"CMAKE_CXX_STANDARD": "20",
|
"CMAKE_CXX_STANDARD": "20",
|
||||||
"CMAKE_INSTALL_RPATH": ".",
|
"CMAKE_INSTALL_RPATH": ".",
|
||||||
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}/sparkd",
|
||||||
"CMAKE_PREFIX_PATH": "${sourceDir}/cmake/;${sourceDir}/.venv/lib/python3.10/site-packages/pybind11/share/cmake/pybind11",
|
|
||||||
"CMAKE_EXE_LINKER_FLAGS": "-Wno-undef",
|
"CMAKE_EXE_LINKER_FLAGS": "-Wno-undef",
|
||||||
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
|
|
||||||
"DATABENTO_USE_EXTERNAL_JSON": {
|
|
||||||
"type": "BOOL",
|
|
||||||
"value": "ON"
|
|
||||||
},
|
|
||||||
"EXTERNALS_ROOT": "${sourceDir}/externals/linux",
|
"EXTERNALS_ROOT": "${sourceDir}/externals/linux",
|
||||||
"BUILD_SDK": {
|
"BUILD_SDK": {
|
||||||
"type": "BOOL",
|
"type": "BOOL",
|
||||||
@@ -87,7 +77,7 @@
|
|||||||
"value": "ON"
|
"value": "ON"
|
||||||
},
|
},
|
||||||
"CCAPI_LOG_LEVEL": "Info",
|
"CCAPI_LOG_LEVEL": "Info",
|
||||||
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/md_dev/*.conf;spark/config/profiles/default/*.conf"
|
"CONFIG_DEFAULTS_PATH": "config/profiles/md_dev/*.conf;config/profiles/default/*.conf"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -98,74 +88,105 @@
|
|||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "Release",
|
"CMAKE_BUILD_TYPE": "Release",
|
||||||
"CCAPI_LOG_LEVEL": "Warn",
|
"CCAPI_LOG_LEVEL": "Warn",
|
||||||
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/md_prod/*.conf;spark/config/profiles/default/*.conf"
|
"CONFIG_DEFAULTS_PATH": "config/profiles/md_prod/*.conf;config/profiles/default/*.conf"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-debug-clang",
|
"name": "sparkd-debug-clang",
|
||||||
"inherits": "sparkd-debug",
|
"inherits": "sparkd-debug",
|
||||||
"displayName": "Sparkd (Debug | Clang)",
|
"displayName": "Debug (clang)",
|
||||||
"description": "Debug build compiled w/ clang",
|
"description": "Debug build compiled w/ clang",
|
||||||
|
"binaryDir": "${sourceDir}/build/clang/debug",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_C_COMPILER": "clang",
|
"CMAKE_C_COMPILER": "clang",
|
||||||
"CMAKE_CXX_COMPILER": "clang++",
|
"CMAKE_CXX_COMPILER": "clang++",
|
||||||
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG"
|
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
|
||||||
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/clang/debug/sparkd"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-debug-gcc",
|
"name": "sparkd-debug-gcc",
|
||||||
"inherits": "sparkd-debug",
|
"inherits": "sparkd-debug",
|
||||||
"displayName": "Sparkd (Debug | Gcc)",
|
"displayName": "Debug (gcc)",
|
||||||
"description": "Debug build compiled w/ gcc",
|
"description": "Debug build compiled w/ gcc",
|
||||||
|
"binaryDir": "${sourceDir}/build/gcc/debug",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_C_COMPILER": "gcc",
|
"CMAKE_C_COMPILER": "gcc",
|
||||||
"CMAKE_CXX_COMPILER": "g++",
|
"CMAKE_CXX_COMPILER": "g++",
|
||||||
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -Wno-stringop-overread -DDEBUG"
|
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -Wno-stringop-overread -DDEBUG",
|
||||||
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/gcc/debug/sparkd"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-release-clang",
|
"name": "sparkd-release-clang",
|
||||||
"inherits": "sparkd-release",
|
"inherits": "sparkd-release",
|
||||||
"displayName": "Sparkd (Release | Clang)",
|
"displayName": "Release (clang)",
|
||||||
"description": "Release build compiled w/ clang",
|
"description": "Release build compiled w/ clang",
|
||||||
|
"binaryDir": "${sourceDir}/build/clang/release",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_C_COMPILER": "clang",
|
"CMAKE_C_COMPILER": "clang",
|
||||||
"CMAKE_CXX_COMPILER": "clang++",
|
"CMAKE_CXX_COMPILER": "clang++",
|
||||||
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3"
|
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
|
||||||
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/clang/release/sparkd"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-release-gcc",
|
"name": "sparkd-release-gcc",
|
||||||
"inherits": "sparkd-release",
|
"inherits": "sparkd-release",
|
||||||
"displayName": "Sparkd (Release | Gcc)",
|
"displayName": "Release (gcc)",
|
||||||
"description": "Release build compiled w/ gcc",
|
"description": "Release build compiled w/ gcc",
|
||||||
|
"binaryDir": "${sourceDir}/build/gcc/release",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_C_COMPILER": "gcc",
|
"CMAKE_C_COMPILER": "gcc",
|
||||||
"CMAKE_CXX_COMPILER": "g++",
|
"CMAKE_CXX_COMPILER": "g++",
|
||||||
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers -Wno-stringop-overflow --std=c++20 -fdiagnostics-color -Wno-stringop-overread -Wno-maybe-uninitialized -fno-omit-frame-pointer -DNDEBUG -O3"
|
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -Wno-stringop-overread -Wno-maybe-uninitialized -fno-omit-frame-pointer -DNDEBUG -O3",
|
||||||
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/gcc/release/sparkd"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"name": "spark-api-server-base",
|
||||||
|
"hidden": true,
|
||||||
|
"binaryDir": "${sourceDir}/build/${presetName}",
|
||||||
|
"cacheVariables": {
|
||||||
|
"BUILD_API_SERVER": {
|
||||||
|
"type": "bool",
|
||||||
|
"value": "ON"
|
||||||
|
},
|
||||||
|
"CONFIG_DEFAULTS_PATH": "config/profiles/md_dev/*.conf;config/profiles/default/*.conf"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-api-server-windows",
|
"name": "spark-api-server-windows",
|
||||||
"inherits": "spark",
|
"inherits": "spark",
|
||||||
"displayName": "Spark Api Server (Windows)"
|
"displayName": "Spark Api Server",
|
||||||
|
"cacheVariables": {
|
||||||
|
"BUILD_API_SERVER": {
|
||||||
|
"type": "bool",
|
||||||
|
"value": "ON"
|
||||||
|
}
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-api-server-linux",
|
"name": "spark-api-server-linux",
|
||||||
"inherits": "sparkd",
|
"inherits": "sparkd",
|
||||||
"displayName": "Spark Api Server (Linux)",
|
"displayName": "Spark Api Server",
|
||||||
"generator": "Ninja Multi-Config",
|
"generator": "Ninja Multi-Config",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"BUILD_ADMIN_WEB_APP": {
|
"BUILD_ADMIN_WEB_APP": {
|
||||||
"type": "BOOL",
|
"type": "BOOL",
|
||||||
"value": "OFF"
|
"value": "OFF"
|
||||||
},
|
},
|
||||||
|
"BUILD_API_SERVER": {
|
||||||
|
"type": "bool",
|
||||||
|
"value": "ON"
|
||||||
|
},
|
||||||
"BUILD_SPARKD": {
|
"BUILD_SPARKD": {
|
||||||
"type": "BOOL",
|
"type": "BOOL",
|
||||||
"value": "OFF"
|
"value": "OFF"
|
||||||
@@ -175,16 +196,8 @@
|
|||||||
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
|
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
|
||||||
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
|
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
|
||||||
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}",
|
||||||
"CMAKE_EXPORT_COMPILE_COMMANDS": {
|
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf",
|
||||||
"type": "BOOL",
|
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net8.0"
|
||||||
"value": "ON"
|
|
||||||
},
|
|
||||||
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf",
|
|
||||||
"DOTNET_BINARY_DIR": "${sourceDir}/build/Spark.Api.Server/$<CONFIG>/bin/net8.0",
|
|
||||||
"EXPORT_MD_CONSUMER": {
|
|
||||||
"type": "BOOL",
|
|
||||||
"value": "ON"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -207,56 +220,13 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "data-stream-suite-windows",
|
"name": "data-stream-suite",
|
||||||
"condition": {
|
|
||||||
"type": "equals",
|
|
||||||
"lhs": "${hostSystemName}",
|
|
||||||
"rhs": "Windows"
|
|
||||||
},
|
|
||||||
"inherits": "spark",
|
"inherits": "spark",
|
||||||
"displayName": "Data Stream Suite (Windows)",
|
"displayName": "Data Stream Suite",
|
||||||
"description": "Data Stream utils ported over from Edge",
|
"description": "Data Stream utils ported over from Edge",
|
||||||
"binaryDir": "${sourceDir}/build/${presetName}",
|
"binaryDir": "${sourceDir}/build/${presetName}",
|
||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf;spark/config/profiles/data_stream/*.conf",
|
"CONFIG_DEFAULTS_PATH": "config/profiles/default/*.conf;config/profiles/data_stream/*.conf"
|
||||||
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net8.0;${sourceDir}/build/$<CONFIG>/bin/net8.0-windows"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "data-stream-suite-linux",
|
|
||||||
"displayName": "Data Stream Suite (Linux)",
|
|
||||||
"description": "Data Stream utils ported over from Edge",
|
|
||||||
"condition": {
|
|
||||||
"type": "equals",
|
|
||||||
"lhs": "${hostSystemName}",
|
|
||||||
"rhs": "Linux"
|
|
||||||
},
|
|
||||||
"inherits": "sparkd",
|
|
||||||
"generator": "Ninja Multi-Config",
|
|
||||||
"cacheVariables": {
|
|
||||||
"BUILD_ADMIN_WEB_APP": {
|
|
||||||
"type": "BOOL",
|
|
||||||
"value": "OFF"
|
|
||||||
},
|
|
||||||
"BUILD_SDK": {
|
|
||||||
"type": "BOOL",
|
|
||||||
"value": "OFF"
|
|
||||||
},
|
|
||||||
"BUILD_SPARKD": {
|
|
||||||
"type": "BOOL",
|
|
||||||
"value": "OFF"
|
|
||||||
},
|
|
||||||
"CMAKE_C_COMPILER": "clang",
|
|
||||||
"CMAKE_CXX_COMPILER": "clang++",
|
|
||||||
"CMAKE_CXX_FLAGS_DEBUG": "-g -fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -DDEBUG",
|
|
||||||
"CMAKE_CXX_FLAGS_RELEASE": "-fPIC -Wall -pedantic -Wextra -Werror -Wno-missing-braces -Wno-ignored-qualifiers --std=c++20 -fdiagnostics-color -fno-omit-frame-pointer -DNDEBUG -O3",
|
|
||||||
"CONFIG_DEFAULTS_PATH": "spark/config/profiles/default/*.conf;spark/config/profiles/data_stream/*.conf",
|
|
||||||
"DOTNET_BINARY_DIR": "${sourceDir}/build/$<CONFIG>/bin/net7.0",
|
|
||||||
"EXPORT_MD_CONSUMER": {
|
|
||||||
"type": "BOOL",
|
|
||||||
"value": "ON"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
@@ -274,7 +244,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-debug",
|
"name": "spark-debug",
|
||||||
"displayName": "Spark (Debug)",
|
"displayName": "Debug",
|
||||||
"inherits": "spark",
|
"inherits": "spark",
|
||||||
"configurePreset": "spark",
|
"configurePreset": "spark",
|
||||||
"configuration": "Debug"
|
"configuration": "Debug"
|
||||||
@@ -282,7 +252,7 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-release",
|
"name": "spark-release",
|
||||||
"displayName": "Spark (Release)",
|
"displayName": "Release",
|
||||||
"inherits": "spark",
|
"inherits": "spark",
|
||||||
"configurePreset": "spark",
|
"configurePreset": "spark",
|
||||||
"configuration": "Release"
|
"configuration": "Release"
|
||||||
@@ -295,34 +265,43 @@
|
|||||||
"lhs": "${hostSystemName}",
|
"lhs": "${hostSystemName}",
|
||||||
"rhs": "Linux"
|
"rhs": "Linux"
|
||||||
},
|
},
|
||||||
"hidden": true
|
"hidden": true,
|
||||||
|
"targets": [
|
||||||
|
"data_files_dir",
|
||||||
|
"admin_web_app_bundle",
|
||||||
|
"install",
|
||||||
|
"libspark",
|
||||||
|
"rapidjson_project",
|
||||||
|
"server_layout",
|
||||||
|
"sparkd"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-debug-clang",
|
"name": "sparkd-debug-clang",
|
||||||
"configurePreset": "sparkd-debug-clang",
|
"configurePreset": "sparkd-debug-clang",
|
||||||
"displayName": "Sparkd (Debug | Clang)",
|
"displayName": "Debug (clang)",
|
||||||
"inherits": "sparkd"
|
"inherits": "sparkd"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-debug-gcc",
|
"name": "sparkd-debug-gcc",
|
||||||
"configurePreset": "sparkd-debug-gcc",
|
"configurePreset": "sparkd-debug-gcc",
|
||||||
"displayName": "Sparkd (Debug | Gcc)",
|
"displayName": "Debug (gcc)",
|
||||||
"inherits": "sparkd"
|
"inherits": "sparkd"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-release-clang",
|
"name": "sparkd-release-clang",
|
||||||
"configurePreset": "sparkd-release-clang",
|
"configurePreset": "sparkd-release-clang",
|
||||||
"displayName": "Sparkd (Release | Clang)",
|
"displayName": "Release (clang)",
|
||||||
"inherits": "sparkd"
|
"inherits": "sparkd"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "sparkd-release-gcc",
|
"name": "sparkd-release-gcc",
|
||||||
"configurePreset": "sparkd-release-gcc",
|
"configurePreset": "sparkd-release-gcc",
|
||||||
"displayName": "Sparkd (Release | Gcc)",
|
"displayName": "Release (gcc)",
|
||||||
"inherits": "sparkd"
|
"inherits": "sparkd"
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -339,14 +318,14 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-api-server-windows-debug",
|
"name": "spark-api-server-windows-debug",
|
||||||
"displayName": "Spark Api Server (Windows | Debug)",
|
"displayName": "Spark Api Server (Debug)",
|
||||||
"inherits": "spark-api-server-windows",
|
"inherits": "spark-api-server-windows",
|
||||||
"configuration": "Debug"
|
"configuration": "Debug"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-api-server-windows-release",
|
"name": "spark-api-server-windows-release",
|
||||||
"displayName": "Spark Api Server (Windows | Release)",
|
"displayName": "Spark Api Server (Debug)",
|
||||||
"inherits": "spark-api-server-windows",
|
"inherits": "spark-api-server-windows",
|
||||||
"configuration": "Release"
|
"configuration": "Release"
|
||||||
},
|
},
|
||||||
@@ -365,14 +344,14 @@
|
|||||||
{
|
{
|
||||||
"name": "spark-api-server-linux-debug",
|
"name": "spark-api-server-linux-debug",
|
||||||
"inherits": "spark-api-server-linux",
|
"inherits": "spark-api-server-linux",
|
||||||
"displayName": "Spark Api Server (Linux | Debug)",
|
"displayName": "Spark Api Server (Debug)",
|
||||||
"configuration": "Debug"
|
"configuration": "Debug"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "spark-api-server-linux-release",
|
"name": "spark-api-server-linux-release",
|
||||||
"inherits": "spark-api-server-linux",
|
"inherits": "spark-api-server-linux",
|
||||||
"displayName": "Spark Api Server (Linux | Release)",
|
"displayName": "Spark Api Server (Release)",
|
||||||
"configuration": "Release"
|
"configuration": "Release"
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -392,30 +371,16 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "data-stream-suite-windows-debug",
|
"name": "data-stream-suite-debug",
|
||||||
"displayName": "Data Stream Suite (Windows | Debug)",
|
"displayName": "DataStreamSuite (Debug)",
|
||||||
"configurePreset": "data-stream-suite-windows",
|
"configurePreset": "data-stream-suite",
|
||||||
"configuration": "Debug"
|
"configuration": "Debug"
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
{
|
||||||
"name": "data-stream-suite-windows-release",
|
"name": "data-stream-suite-release",
|
||||||
"displayName": "Data Stream Suite (Windows | Release)",
|
"displayName": "DataStreamSuite (Release)",
|
||||||
"configurePreset": "data-stream-suite-windows",
|
"configurePreset": "data-stream-suite",
|
||||||
"configuration": "Release"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "data-stream-suite-linux-debug",
|
|
||||||
"displayName": "Data Stream Suite (Linux | Debug)",
|
|
||||||
"configurePreset": "data-stream-suite-linux",
|
|
||||||
"configuration": "Debug"
|
|
||||||
},
|
|
||||||
|
|
||||||
{
|
|
||||||
"name": "data-stream-suite-linux-release",
|
|
||||||
"displayName": "Data Stream Suite (Linux | Release)",
|
|
||||||
"configurePreset": "data-stream-suite-linux",
|
|
||||||
"configuration": "Release"
|
"configuration": "Release"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -14,34 +14,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "spark_test", "src\client\sp
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{89D666E6-B500-498F-B026-4D167F68ADFC}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{89D666E6-B500-498F-B026-4D167F68ADFC}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{267F81EF-A8AB-49FD-9F56-D7EC3C1F7C7C}"
|
|
||||||
EndProject
|
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataStreamSuite", "DataStreamSuite", "{C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStreamCore", "src\DataStreamSuite\DataStreamCore\DataStreamCore.csproj", "{EF26A475-6101-4C9C-A717-D60BB92A2302}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedStreams", "src\DataStreamSuite\SharedStreams\SharedStreams.csproj", "{911B08A3-515A-441D-84C8-8A43740B5FC1}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PubSub", "src\DataStreamSuite\PubSub\PubSub.csproj", "{14140310-2233-430A-821B-F3058A25234B}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseUtilities", "src\DataStreamSuite\BaseUtilities\BaseUtilities.csproj", "{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExpressionCore", "src\DataStreamSuite\ExpressionCore\ExpressionCore.csproj", "{6F22DB96-6EAB-4034-99D9-287021C36F01}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArithmeticExpressions", "src\DataStreamSuite\ArithmeticExpressions\ArithmeticExpressions.csproj", "{A5C33956-A41F-49B3-A41D-1082CBA59D02}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStreamExpressions", "src\DataStreamSuite\DataStreamExpressions\DataStreamExpressions.csproj", "{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.ColumnSortExpressions", "src\DataStreamSuite\Bts.ColumnSortExpressions\Bts.ColumnSortExpressions.csproj", "{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColumnMapExpressions", "src\DataStreamSuite\ColumnMapExpressions\ColumnMapExpressions.csproj", "{B945A183-2174-4ACB-B289-8A5C546656FE}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BooleanExpressions", "src\DataStreamSuite\BooleanExpressions\BooleanExpressions.csproj", "{9F6D7DE8-185B-4C1D-B809-3314D092DF28}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.ColumnExpressions", "src\DataStreamSuite\Bts.ColumnExpressions\Bts.ColumnExpressions.csproj", "{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}"
|
|
||||||
EndProject
|
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStream", "src\DataStreamSuite\DataStream\DataStream.csproj", "{39AEA075-6457-46C0-8821-1158BE6EFA57}"
|
|
||||||
EndProject
|
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|x64 = Debug|x64
|
Debug|x64 = Debug|x64
|
||||||
@@ -98,102 +70,6 @@ Global
|
|||||||
{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|x64.Build.0 = Release|x64
|
{89D666E6-B500-498F-B026-4D167F68ADFC}.Release|x64.Build.0 = Release|x64
|
||||||
{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.ActiveCfg = Debug|x64
|
{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.ActiveCfg = Debug|x64
|
||||||
{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.Build.0 = Debug|x64
|
{89D666E6-B500-498F-B026-4D167F68ADFC}.RelWithDebInfo|x64.Build.0 = Debug|x64
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@@ -204,19 +80,4 @@ Global
|
|||||||
GlobalSection(Performance) = preSolution
|
GlobalSection(Performance) = preSolution
|
||||||
HasPerformanceSessions = true
|
HasPerformanceSessions = true
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(NestedProjects) = preSolution
|
|
||||||
{C09ED521-D2DF-40BC-A76F-EB3CB870B2F6} = {267F81EF-A8AB-49FD-9F56-D7EC3C1F7C7C}
|
|
||||||
{EF26A475-6101-4C9C-A717-D60BB92A2302} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{911B08A3-515A-441D-84C8-8A43740B5FC1} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{14140310-2233-430A-821B-F3058A25234B} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{43146EA8-6FCC-46B8-88B0-42F9BB5E6E0A} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{6F22DB96-6EAB-4034-99D9-287021C36F01} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{A5C33956-A41F-49B3-A41D-1082CBA59D02} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{2FE745C3-1EDF-4421-8CD7-A63EE0C1AE43} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{FDA791E0-2B91-4AD5-B91D-CF920A4C4E38} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{B945A183-2174-4ACB-B289-8A5C546656FE} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{39AEA075-6457-46C0-8821-1158BE6EFA57} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{9F6D7DE8-185B-4C1D-B809-3314D092DF28} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
{6BD3F6D8-B6FC-44E8-B8FE-06352F638B9B} = {C09ED521-D2DF-40BC-A76F-EB3CB870B2F6}
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
EndGlobal
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
include_guard(GLOBAL)
|
|
||||||
|
|
||||||
macro(export_to_parent)
|
|
||||||
foreach(var IN ITEMS ${ARGN})
|
|
||||||
set(${var} ${${var}} PARENT_SCOPE)
|
|
||||||
endforeach()
|
|
||||||
endmacro()
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
include_guard(GLOBAL)
|
|
||||||
|
|
||||||
function(get_version_from_git)
|
|
||||||
find_package(Git QUIET)
|
|
||||||
if(NOT Git_FOUND)
|
|
||||||
message(WARNING "Git not found")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
execute_process(
|
|
||||||
COMMAND ${GIT_EXECUTABLE} describe --tags --always
|
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
|
||||||
OUTPUT_VARIABLE GIT_TAG
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
||||||
RESULT_VARIABLE GIT_RESULT
|
|
||||||
)
|
|
||||||
|
|
||||||
if(NOT GIT_RESULT EQUAL 0)
|
|
||||||
message(WARNING "Failed to get git tag")
|
|
||||||
return()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
execute_process(
|
|
||||||
COMMAND ${GIT_EXECUTABLE} rev-parse --short=7 HEAD
|
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
|
||||||
OUTPUT_VARIABLE GIT_COMMIT_SHORT_HASH
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
||||||
)
|
|
||||||
set(PROJECT_VERSION_BUILD_METADATA ${GIT_COMMIT_SHORT_HASH})
|
|
||||||
set(PROJECT_VERSION_BUILD_METADATA ${GIT_COMMIT_SHORT_HASH} PARENT_SCOPE)
|
|
||||||
|
|
||||||
string(REGEX REPLACE "^v" "" CLEAN_TAG "${GIT_TAG}")
|
|
||||||
if(CLEAN_TAG MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-.*)?$")
|
|
||||||
set(PROJECT_VERSION_MAJOR ${CMAKE_MATCH_1})
|
|
||||||
set(PROJECT_VERSION_MAJOR ${CMAKE_MATCH_1} PARENT_SCOPE)
|
|
||||||
set(PROJECT_VERSION_MINOR ${CMAKE_MATCH_2})
|
|
||||||
set(PROJECT_VERSION_MINOR ${CMAKE_MATCH_2} PARENT_SCOPE)
|
|
||||||
set(PROJECT_VERSION_PATCH ${CMAKE_MATCH_3})
|
|
||||||
set(PROJECT_VERSION_PATCH ${CMAKE_MATCH_3} PARENT_SCOPE)
|
|
||||||
|
|
||||||
set(PROJECT_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}")
|
|
||||||
set(PROJECT_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}" PARENT_SCOPE)
|
|
||||||
set(PROJECT_VERSION_FULL "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}+${GIT_COMMIT_SHORT_HASH}")
|
|
||||||
set(PROJECT_VERSION_FULL "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}+${GIT_COMMIT_SHORT_HASH}" PARENT_SCOPE)
|
|
||||||
else()
|
|
||||||
message(WARNING "Tag '${CLEAN_TAG}' does not match semver format")
|
|
||||||
endif()
|
|
||||||
endfunction()
|
|
||||||
@@ -1,142 +0,0 @@
|
|||||||
include_guard(DIRECTORY)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/ExportToParent.cmake)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/InstallBasic.cmake)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/ProtobufGenerateCpp.cmake)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/SetFirstDefined.cmake)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/safe_dep_glob.cmake)
|
|
||||||
|
|
||||||
function(init_library)
|
|
||||||
set(_options SHARED STATIC)
|
|
||||||
set(_one_value_args
|
|
||||||
NAME
|
|
||||||
SOURCE_DIR
|
|
||||||
INCLUDE_DIR
|
|
||||||
)
|
|
||||||
set(_multi_value_args)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
if (_ARGS_SHARED AND _ARGS_STATIC)
|
|
||||||
message(FATAL_ERROR "Invalid args passed to init_library: cannot specify STATIC and SHARED")
|
|
||||||
endif()
|
|
||||||
set_first_defined(_name _ARGS_NAME PROJECT_NAME)
|
|
||||||
set_first_defined(_source_dir _ARGS_SOURCE_DIR _name)
|
|
||||||
set_first_defined(_include_dir _ARGS_INCLUDE_DIR _source_dir)
|
|
||||||
|
|
||||||
# Cpp sources
|
|
||||||
file(
|
|
||||||
GLOB_RECURSE ${_name}_SOURCES
|
|
||||||
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
${_source_dir}/*.cpp
|
|
||||||
)
|
|
||||||
# Note: cpp files inside 'tests' dir(s) are considered tests.
|
|
||||||
# Remove tests from main sources, and add them to test sources
|
|
||||||
foreach(item ${${_name}_SOURCES})
|
|
||||||
if(${item} MATCHES "tests/.*\.cpp$")
|
|
||||||
list(APPEND ${_name}_TEST_SOURCES ${item})
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
foreach(item ${${_name}_TEST_SOURCES})
|
|
||||||
list(REMOVE_ITEM ${_name}_SOURCES ${item})
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
# Proto sources
|
|
||||||
file(
|
|
||||||
GLOB_RECURSE ${_name}_PROTO_SOURCES
|
|
||||||
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
${_source_dir}/protobufs/*.proto
|
|
||||||
)
|
|
||||||
update_deps_file("${${_name}_PROTO_SOURCES};")
|
|
||||||
protobuf_generate_cpp(
|
|
||||||
CXX_SOURCES ${_name}_CXX_PROTO_SOURCES
|
|
||||||
CXX_HEADERS ${_name}_CXX_PROTO_HEADERS
|
|
||||||
CXX_OUT_DIR ${CMAKE_CURRENT_BINARY_DIR}
|
|
||||||
PROTO_INCLUDE_DIRS
|
|
||||||
${EXTERNALS_INCLUDE}
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
PROTO_SOURCES
|
|
||||||
${${_name}_PROTO_SOURCES}
|
|
||||||
)
|
|
||||||
|
|
||||||
export_to_parent(
|
|
||||||
${_name}_SOURCES
|
|
||||||
${_name}_TEST_SOURCES
|
|
||||||
${_name}_PROTO_SOURCES
|
|
||||||
${_name}_CXX_PROTO_SOURCES
|
|
||||||
${_name}_CXX_PROTO_HEADERS
|
|
||||||
)
|
|
||||||
|
|
||||||
# Add main lib
|
|
||||||
if (_ARGS_STATIC)
|
|
||||||
add_library(${_name} STATIC ${${_name}_SOURCES} ${${_name}_CXX_PROTO_SOURCES})
|
|
||||||
elseif(_ARGS_SHARED)
|
|
||||||
add_library(${_name} SHARED ${${_name}_SOURCES} ${${_name}_CXX_PROTO_SOURCES})
|
|
||||||
else()
|
|
||||||
add_library(${_name} ${${_name}_SOURCES} ${${_name}_CXX_PROTO_SOURCES})
|
|
||||||
endif()
|
|
||||||
target_include_directories(
|
|
||||||
${_name}
|
|
||||||
SYSTEM
|
|
||||||
BEFORE
|
|
||||||
PUBLIC
|
|
||||||
$<BUILD_INTERFACE:${EXTERNALS_ROOT}/include>
|
|
||||||
$<BUILD_INTERFACE:${EXTERNALS_ROOT}/include/zlib>
|
|
||||||
)
|
|
||||||
target_include_directories(
|
|
||||||
${_name}
|
|
||||||
PUBLIC
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
|
||||||
)
|
|
||||||
# Include protos (if any)
|
|
||||||
if (${_name}_PROTO_SOURCES)
|
|
||||||
target_include_directories(
|
|
||||||
${_name}
|
|
||||||
PUBLIC
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
target_link_directories(
|
|
||||||
${_name}
|
|
||||||
PUBLIC
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
|
|
||||||
$<BUILD_INTERFACE:${EXTERNALS_ROOT}/lib/$<CONFIG>>
|
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>
|
|
||||||
)
|
|
||||||
# Install main lib
|
|
||||||
foreach(_hdr ${${_name}_CXX_PROTO_HEADERS})
|
|
||||||
file(RELATIVE_PATH _relative_path ${CMAKE_CURRENT_BINARY_DIR} ${_hdr})
|
|
||||||
install(FILES ${_hdr} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${_relative_path})
|
|
||||||
endforeach()
|
|
||||||
install_basic(
|
|
||||||
NAME ${_name}
|
|
||||||
INCLUDE_DIR ${_include_dir}
|
|
||||||
)
|
|
||||||
|
|
||||||
# Add tests executable (if there are any)
|
|
||||||
if (${_name}_TEST_SOURCES AND NOT WIN32)
|
|
||||||
add_executable(${_name}-tests ${${_name}_TEST_SOURCES})
|
|
||||||
|
|
||||||
get_target_property(_lib_type ${_name} TYPE)
|
|
||||||
if (_lib_type STREQUAL "SHARED_LIBRARY")
|
|
||||||
# Set RPATH so the tests exe knows where to find the shared lib.
|
|
||||||
set_target_properties(
|
|
||||||
${_name}-tests
|
|
||||||
PROPERTIES
|
|
||||||
BUILD_RPATH "$ORIGIN"
|
|
||||||
INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Link main lib
|
|
||||||
target_link_directories(
|
|
||||||
${_name}-tests
|
|
||||||
PRIVATE
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
|
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_LIBDIR}>
|
|
||||||
)
|
|
||||||
target_link_libraries(${_name}-tests PRIVATE ${_name})
|
|
||||||
|
|
||||||
# Catch2
|
|
||||||
find_package(Catch2 CONFIG REQUIRED COMPONENTS Catch2WithMain)
|
|
||||||
target_link_libraries(${_name}-tests PRIVATE Catch2::Catch2WithMain)
|
|
||||||
endif()
|
|
||||||
endfunction()
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
include_guard(DIRECTORY)
|
|
||||||
include(GNUInstallDirs)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/ExportToParent.cmake)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/SetFirstDefined.cmake)
|
|
||||||
|
|
||||||
function(init_python_module)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args
|
|
||||||
NAME
|
|
||||||
)
|
|
||||||
set(_multi_value_args
|
|
||||||
SOURCES
|
|
||||||
)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
set_first_defined(_name _ARGS_NAME PROJECT_NAME)
|
|
||||||
set_first_defined(_sources _ARGS_SOURCES ${_name}_SOURCES)
|
|
||||||
|
|
||||||
set(module_proj ${_name}_module)
|
|
||||||
set(${module_proj}_SOURCES ${_sources})
|
|
||||||
pybind11_add_module(${module_proj} SHARED ${_sources})
|
|
||||||
target_link_libraries(
|
|
||||||
${module_proj}
|
|
||||||
PUBLIC
|
|
||||||
pybind11::embed
|
|
||||||
spark
|
|
||||||
${_name}
|
|
||||||
)
|
|
||||||
target_include_directories(
|
|
||||||
${module_proj}
|
|
||||||
PRIVATE
|
|
||||||
$<BUILD_INTERFACE:${pybind11_INCLUDE_DIRS}>
|
|
||||||
)
|
|
||||||
target_include_directories(
|
|
||||||
${module_proj}
|
|
||||||
PUBLIC
|
|
||||||
${Python3_INCLUDE_DIRS}
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
|
|
||||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
|
||||||
)
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/stubs/${_name}.pyi
|
|
||||||
DEPENDS ${_name} ${module_proj}
|
|
||||||
COMMAND PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR} pybind11-stubgen --numpy-array-use-type-var --ignore-invalid-expressions '.*' ${_name}_module
|
|
||||||
COMMENT "Generating py stubs"
|
|
||||||
)
|
|
||||||
add_custom_target(
|
|
||||||
"${_name}_py_stubs"
|
|
||||||
ALL
|
|
||||||
DEPENDS
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/stubs/${_name}.pyi
|
|
||||||
)
|
|
||||||
install(
|
|
||||||
TARGETS ${module_proj}
|
|
||||||
EXPORT ${module_proj}Targets
|
|
||||||
RUNTIME
|
|
||||||
DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
LIBRARY
|
|
||||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
ARCHIVE
|
|
||||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
)
|
|
||||||
foreach(dir ${pybind11_INCLUDE_DIRS})
|
|
||||||
install(DIRECTORY ${dir} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
|
|
||||||
endforeach()
|
|
||||||
install(
|
|
||||||
EXPORT ${module_proj}Targets
|
|
||||||
FILE ${module_proj}Targets.cmake
|
|
||||||
NAMESPACE ${_name}::
|
|
||||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${_name}
|
|
||||||
)
|
|
||||||
endfunction()
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
include_guard(DIRECTORY)
|
|
||||||
include(GNUInstallDirs)
|
|
||||||
|
|
||||||
function(init_python_plugin)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args NAME PLUGIN_NAME)
|
|
||||||
set(_multi_value_args SOURCES)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
set_first_defined(_name _ARGS_NAME PROJECT_NAME)
|
|
||||||
set(_plugin_name ${_ARGS_PLUGIN_NAME})
|
|
||||||
if (NOT DEFINED _ARGS_PLUGIN_NAME)
|
|
||||||
set(_plugin_name ${_name}_plugins)
|
|
||||||
endif()
|
|
||||||
set(${_plugin_name}_SOURCES ${_ARGS_SOURCES})
|
|
||||||
if (NOT DEFINED _ARGS_SOURCES)
|
|
||||||
file(
|
|
||||||
GLOB_RECURSE ${_plugin_name}_SOURCES
|
|
||||||
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
${_plugin_name}/*.py)
|
|
||||||
endif()
|
|
||||||
set(src_outs)
|
|
||||||
foreach(_src ${${_plugin_name}_SOURCES})
|
|
||||||
set(_src_in ${CMAKE_CURRENT_SOURCE_DIR}/${_src})
|
|
||||||
set(_src_out ${CMAKE_CURRENT_BINARY_DIR}/${_src})
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${_src_out}
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy ${_src_in} ${_src_out}
|
|
||||||
DEPENDS ${_src_in}
|
|
||||||
COMMENT "Copying ${_plugin_name} plugin ${_src} to ${_src_out}"
|
|
||||||
)
|
|
||||||
list(APPEND src_outs ${_src_out})
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
add_custom_target(copy_${_plugin_name} ALL DEPENDS ${src_outs})
|
|
||||||
|
|
||||||
add_library(${_plugin_name} INTERFACE)
|
|
||||||
add_library(${_name}::${_plugin_name} ALIAS ${_plugin_name})
|
|
||||||
|
|
||||||
set_target_properties(
|
|
||||||
${_plugin_name}
|
|
||||||
PROPERTIES
|
|
||||||
INTERFACE_PYTHON_SCRIPTS_DIR
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${_plugin_name}>$<INSTALL_INTERFACE:${CMAKE_INSTALL_BINDIR}/${_plugin_name}>
|
|
||||||
)
|
|
||||||
|
|
||||||
set_target_properties(
|
|
||||||
${_plugin_name}
|
|
||||||
PROPERTIES
|
|
||||||
INTERFACE_PYTHON_SCRIPTS $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${${_plugin_name}_SOURCES}>$<INSTALL_INTERFACE:${CMAKE_INSTALL_BINDIR}/${${_plugin_name}_SOURCES}>
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
|
||||||
TARGETS ${_plugin_name}
|
|
||||||
EXPORT ${_plugin_name}Targets
|
|
||||||
DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
|
||||||
EXPORT ${_plugin_name}Targets
|
|
||||||
FILE ${_plugin_name}Targets.cmake
|
|
||||||
NAMESPACE ${_name}::
|
|
||||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${_name}
|
|
||||||
)
|
|
||||||
install(DIRECTORY ${_plugin_name} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
|
||||||
endfunction()
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
include_guard(DIRECTORY)
|
|
||||||
include(GNUInstallDirs)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/PackBasic.cmake)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/SetFirstDefined.cmake)
|
|
||||||
|
|
||||||
function(install_basic)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args NAME INCLUDE_DIR)
|
|
||||||
set(_multi_value_args)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
set_first_defined(_name _ARGS_NAME PROJECT_NAME)
|
|
||||||
set_first_defined(_include_dir _ARGS_INCLUDE_DIR _name)
|
|
||||||
|
|
||||||
file(
|
|
||||||
GLOB_RECURSE ${_name}_HEADERS
|
|
||||||
RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
${_include_dir}/*.h)
|
|
||||||
|
|
||||||
target_sources(${_name}
|
|
||||||
PUBLIC
|
|
||||||
FILE_SET HEADERS FILES ${${_name}_HEADERS})
|
|
||||||
|
|
||||||
install(
|
|
||||||
TARGETS ${_name}
|
|
||||||
EXPORT ${_name}Targets
|
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
FILE_SET HEADERS DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
|
||||||
EXPORT ${_name}Targets
|
|
||||||
FILE ${_name}Targets.cmake
|
|
||||||
NAMESPACE ${_name}::
|
|
||||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${_name})
|
|
||||||
|
|
||||||
pack_basic()
|
|
||||||
endfunction()
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
include_guard(DIRECTORY)
|
|
||||||
include(CMakePackageConfigHelpers)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/SetFirstDefined.cmake)
|
|
||||||
|
|
||||||
function(pack_basic)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args NAME)
|
|
||||||
set(_multi_value_args)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
set_first_defined(_name _ARGS_NAME PROJECT_NAME)
|
|
||||||
|
|
||||||
find_package(Git QUIET)
|
|
||||||
|
|
||||||
if(GIT_FOUND)
|
|
||||||
execute_process(
|
|
||||||
COMMAND ${GIT_EXECUTABLE} describe --tags --always --dirty
|
|
||||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
|
|
||||||
OUTPUT_VARIABLE PROJECT_VERSION
|
|
||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT GIT_FOUND OR PROJECT_VERSION STREQUAL "")
|
|
||||||
set(PROJECT_VERSION "0.0.0")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
write_basic_package_version_file(
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${_name}ConfigVersion.cmake"
|
|
||||||
VERSION ${PROJECT_VERSION}
|
|
||||||
COMPATIBILITY AnyNewerVersion
|
|
||||||
)
|
|
||||||
|
|
||||||
configure_package_config_file(
|
|
||||||
"${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${_name}Config.cmake"
|
|
||||||
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${_name}
|
|
||||||
)
|
|
||||||
|
|
||||||
install(
|
|
||||||
FILES
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${_name}Config.cmake"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${_name}ConfigVersion.cmake"
|
|
||||||
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${_name})
|
|
||||||
endfunction()
|
|
||||||
+78
-115
@@ -1,23 +1,12 @@
|
|||||||
set(Protobuf_PROTOC_EXECUTABLE "${EXTERNALS_BIN}/protoc")
|
set(Protobuf_PROTOC_EXECUTABLE "${SPARK_BIN}/protoc")
|
||||||
set(PROTOBUF_INCLUDE_DIRS "${EXTERNALS_INCLUDE}")
|
set(PROTOBUF_INCLUDE_DIRS "${SPARK_INCLUDE}")
|
||||||
set(PROTOBUF_STATIC_LIB "libprotobuf")
|
set(PROTOBUF_STATIC_LIB "libprotobuf")
|
||||||
set(_protobuf_src_dir ${CMAKE_SOURCE_DIR}/src/lib_spark)
|
|
||||||
set(_protobuf_bin_dir ${CMAKE_BINARY_DIR}/src/lib_spark)
|
|
||||||
|
|
||||||
function(Protobuf_Generate_Cpp)
|
function(Protobuf_Generate_Cpp SRCS HDRS)
|
||||||
set(_options)
|
set(${SRCS})
|
||||||
set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR)
|
set(${HDRS})
|
||||||
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
set(${_ARGS_CXX_SOURCES})
|
|
||||||
set(${_ARGS_CXX_HEADERS})
|
|
||||||
|
|
||||||
set(_proto_include_cli_args)
|
foreach(FIL ${ARGN})
|
||||||
foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
|
|
||||||
list(APPEND _proto_include_cli_args -I ${_dir})
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
foreach(FIL ${_ARGS_PROTO_SOURCES})
|
|
||||||
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
||||||
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
||||||
get_filename_component(FIL_DIR ${FIL} DIRECTORY)
|
get_filename_component(FIL_DIR ${FIL} DIRECTORY)
|
||||||
@@ -25,63 +14,48 @@ function(Protobuf_Generate_Cpp)
|
|||||||
set(FIL_WE "${FIL_DIR}/${FIL_WE}")
|
set(FIL_WE "${FIL_DIR}/${FIL_WE}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc")
|
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
|
||||||
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h")
|
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT
|
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
|
|
||||||
COMMAND
|
COMMAND
|
||||||
${Protobuf_PROTOC_EXECUTABLE}
|
${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_BINARY_DIR}/src -I
|
||||||
ARGS
|
${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL}
|
||||||
--cpp_out=${_ARGS_CXX_OUT_DIR} ${_proto_include_cli_args} ${ABS_FIL}
|
|
||||||
DEPENDS ${ABS_FIL}
|
DEPENDS ${ABS_FIL}
|
||||||
COMMENT "Running C++ protocol buffer compiler on ${FIL}"
|
COMMENT "Running C++ protocol buffer compiler on ${FIL}"
|
||||||
VERBATIM
|
VERBATIM)
|
||||||
)
|
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
set_source_files_properties(
|
set_source_files_properties(${${SRCS}} ${${HDRS}} PROPERTIES GENERATED TRUE)
|
||||||
${${_ARGS_CXX_SOURCES}}
|
|
||||||
${${_ARGS_CXX_HEADERS}}
|
|
||||||
PROPERTIES
|
|
||||||
GENERATED TRUE
|
|
||||||
)
|
|
||||||
|
|
||||||
# remove some warnings from protobuf generated files
|
# remove some warnings from protobuf generated files
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set_source_files_properties(
|
set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS
|
||||||
${${_ARGS_CXX_SOURCES}}
|
"/wd4309 /wd4838")
|
||||||
PROPERTIES
|
|
||||||
COMPILE_FLAGS "/wd4309 /wd4838"
|
|
||||||
)
|
|
||||||
else()
|
else()
|
||||||
set_source_files_properties(
|
set_source_files_properties(
|
||||||
${${_ARGS_CXX_SOURCES}}
|
${${SRCS}}
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
COMPILE_FLAGS "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
COMPILE_FLAGS
|
||||||
|
"-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE)
|
set(${SRCS}
|
||||||
set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE)
|
${${SRCS}}
|
||||||
|
PARENT_SCOPE)
|
||||||
|
set(${HDRS}
|
||||||
|
${${HDRS}}
|
||||||
|
PARENT_SCOPE)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
function(Service_Compiler_Generate_Cpp)
|
function(Service_Compiler_Generate_Cpp SRCS HDRS)
|
||||||
set(_options)
|
set(${SRCS})
|
||||||
set(_one_value_args CXX_SOURCES CXX_HEADERS CXX_OUT_DIR)
|
set(${HDRS})
|
||||||
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
set(${_ARGS_CXX_SOURCES})
|
|
||||||
set(${_ARGS_CXX_HEADERS})
|
|
||||||
|
|
||||||
set(_proto_include_cli_args)
|
foreach(FIL ${ARGN})
|
||||||
foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
|
|
||||||
list(APPEND _proto_include_cli_args -I ${_dir})
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
foreach(FIL ${_ARGS_PROTO_SOURCES})
|
|
||||||
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
get_filename_component(ABS_FIL ${FIL} ABSOLUTE)
|
||||||
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
get_filename_component(FIL_WE ${FIL} NAME_WE)
|
||||||
get_filename_component(FIL_DIR ${FIL} DIRECTORY)
|
get_filename_component(FIL_DIR ${FIL} DIRECTORY)
|
||||||
@@ -89,94 +63,83 @@ function(Service_Compiler_Generate_Cpp)
|
|||||||
set(FIL_WE "${FIL_DIR}/${FIL_WE}")
|
set(FIL_WE "${FIL_DIR}/${FIL_WE}")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc")
|
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc")
|
||||||
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h")
|
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h")
|
||||||
|
|
||||||
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc")
|
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc")
|
||||||
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h")
|
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h")
|
||||||
|
|
||||||
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc")
|
list(APPEND ${SRCS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc")
|
||||||
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h")
|
list(APPEND ${HDRS} "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h")
|
||||||
|
|
||||||
set(TEMPLATES
|
set(TEMPLATES
|
||||||
${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.cc
|
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.cc
|
||||||
${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/client.pb.h
|
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/client.pb.h
|
||||||
${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.cc
|
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.cc
|
||||||
${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/cpp/server.pb.h
|
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/templates/cpp/server.pb.h
|
||||||
)
|
)
|
||||||
|
|
||||||
set(_plugin_py ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.py)
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set(_plugin_cmd ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.cmd)
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT
|
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h"
|
|
||||||
COMMAND SET PYTHONPATH=${SPARK_PYTHON}
|
COMMAND SET PYTHONPATH=${SPARK_PYTHON}
|
||||||
COMMAND ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat
|
COMMAND ${CMAKE_SOURCE_DIR}/.venv/Scripts/activate.bat
|
||||||
COMMAND
|
COMMAND
|
||||||
${Protobuf_PROTOC_EXECUTABLE}
|
${Protobuf_PROTOC_EXECUTABLE} ARGS --cpp_out=${CMAKE_BINARY_DIR}/src
|
||||||
ARGS
|
--plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.cmd
|
||||||
--cpp_out=${_ARGS_CXX_OUT_DIR}
|
--service_out=lang=cpp:${CMAKE_BINARY_DIR}/src -I
|
||||||
--plugin=protoc-gen-service=${_plugin_cmd}
|
${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL}
|
||||||
--service_out=lang=cpp:${_ARGS_CXX_OUT_DIR}
|
DEPENDS ${ABS_FIL} ${TEMPLATES}
|
||||||
-I ${PROTOBUF_INCLUDE_DIRS}
|
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py
|
||||||
-I ${_protobuf_src_dir}
|
|
||||||
${ABS_FIL}
|
|
||||||
DEPENDS
|
|
||||||
${ABS_FIL}
|
|
||||||
${TEMPLATES}
|
|
||||||
${_plugin_cmd}
|
|
||||||
${_plugin_py}
|
|
||||||
COMMENT "Running C++ service compiler on ${FIL}"
|
COMMENT "Running C++ service compiler on ${FIL}"
|
||||||
VERBATIM
|
VERBATIM)
|
||||||
)
|
|
||||||
else()
|
else()
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT
|
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.cc"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.pb.h"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.pb.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.cc"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.client.pb.h"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.client.pb.h"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.cc"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.cc"
|
"${CMAKE_CURRENT_BINARY_DIR}/${FIL_WE}.server.pb.h"
|
||||||
"${_ARGS_CXX_OUT_DIR}/${FIL_WE}.server.pb.h"
|
|
||||||
COMMAND ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh
|
COMMAND ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh
|
||||||
ARGS
|
ARGS
|
||||||
${Protobuf_PROTOC_EXECUTABLE}
|
${Protobuf_PROTOC_EXECUTABLE}
|
||||||
--cpp_out=${_ARGS_CXX_OUT_DIR}
|
--cpp_out=${CMAKE_BINARY_DIR}/src
|
||||||
--plugin=protoc-gen-service=${_plugin_py}
|
--plugin=protoc-gen-service=${CMAKE_SOURCE_DIR}/src/lib/api/service_compiler/plugin.py
|
||||||
--service_out=lang=cpp,make_file_name=${ABS_FIL}:${_ARGS_CXX_OUT_DIR}
|
--service_out=lang=cpp,make_file_name=${ABS_FIL}:${CMAKE_BINARY_DIR}/src
|
||||||
${_proto_include_cli_args} ${ABS_FIL}
|
-I ${PROTOBUF_INCLUDE_DIRS} -I ${CMAKE_SOURCE_DIR}/src ${ABS_FIL}
|
||||||
DEPENDS
|
DEPENDS ${ABS_FIL} ${TEMPLATES}
|
||||||
${ABS_FIL}
|
${CMAKE_CURRENT_SOURCE_DIR}/api/service_compiler/plugin.py
|
||||||
${TEMPLATES}
|
|
||||||
${_plugin_py}
|
|
||||||
COMMENT "Running C++ service compiler on ${FIL}"
|
COMMENT "Running C++ service compiler on ${FIL}"
|
||||||
VERBATIM
|
VERBATIM)
|
||||||
)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
# remove some warnings from protobuf generated files
|
# remove some warnings from protobuf generated files
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
set_source_files_properties(
|
set_source_files_properties(${${SRCS}} PROPERTIES COMPILE_FLAGS
|
||||||
${${_ARGS_CXX_SOURCES}}
|
"/wd4309 /wd4838")
|
||||||
PROPERTIES
|
|
||||||
COMPILE_FLAGS "/wd4309 /wd4838"
|
|
||||||
)
|
|
||||||
else()
|
else()
|
||||||
set_source_files_properties(
|
set_source_files_properties(
|
||||||
${${_ARGS_CXX_SOURCES}}
|
${${SRCS}}
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
COMPILE_FLAGS "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
COMPILE_FLAGS
|
||||||
|
"-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE)
|
set(${SRCS}
|
||||||
set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE)
|
${${SRCS}}
|
||||||
|
PARENT_SCOPE)
|
||||||
|
set(${HDRS}
|
||||||
|
${${HDRS}}
|
||||||
|
PARENT_SCOPE)
|
||||||
|
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
include_guard(GLOBAL)
|
|
||||||
|
|
||||||
function(protobuf_generate_cpp)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args
|
|
||||||
CXX_SOURCES
|
|
||||||
CXX_HEADERS
|
|
||||||
CXX_OUT_DIR
|
|
||||||
PROTOC
|
|
||||||
)
|
|
||||||
set(_multi_value_args
|
|
||||||
PROTO_INCLUDE_DIRS
|
|
||||||
PROTO_SOURCES
|
|
||||||
)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
|
|
||||||
if (NOT DEFINED _ARGS_PROTOC)
|
|
||||||
if (WIN32)
|
|
||||||
set(_ARGS_PROTOC "${EXTERNALS_BIN}/protoc.exe")
|
|
||||||
else()
|
|
||||||
set(_ARGS_PROTOC "${EXTERNALS_BIN}/protoc")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
set(${_ARGS_CXX_SOURCES})
|
|
||||||
set(${_ARGS_CXX_HEADERS})
|
|
||||||
|
|
||||||
set(_proto_include_cli_args)
|
|
||||||
foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
|
|
||||||
list(APPEND _proto_include_cli_args -I ${_dir})
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
foreach(_fil ${_ARGS_PROTO_SOURCES})
|
|
||||||
get_filename_component(_abs_fil ${_fil} ABSOLUTE)
|
|
||||||
get_filename_component(_fil_we ${_fil} NAME_WE)
|
|
||||||
get_filename_component(_fil_dir ${_fil} DIRECTORY)
|
|
||||||
if(_fil_dir)
|
|
||||||
set(_fil_we "${_fil_dir}/${_fil_we}")
|
|
||||||
endif()
|
|
||||||
list(APPEND ${_ARGS_CXX_SOURCES} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.cc")
|
|
||||||
list(APPEND ${_ARGS_CXX_HEADERS} "${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h")
|
|
||||||
message(STATUS "add_custom_command for ${_fil} -> ${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h")
|
|
||||||
# TODO: Pass proto sources by relative path (so this fn can be called from
|
|
||||||
# arbitrary subdirs).
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT
|
|
||||||
"${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.cc"
|
|
||||||
"${_ARGS_CXX_OUT_DIR}/${_fil_we}.pb.h"
|
|
||||||
COMMAND
|
|
||||||
${_ARGS_PROTOC}
|
|
||||||
ARGS
|
|
||||||
--cpp_out=${_ARGS_CXX_OUT_DIR} ${_proto_include_cli_args} ${_abs_fil}
|
|
||||||
DEPENDS ${_abs_fil}
|
|
||||||
COMMENT "Running C++ protocol buffer compiler on ${_fil}"
|
|
||||||
VERBATIM
|
|
||||||
)
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
set_source_files_properties(
|
|
||||||
${${_ARGS_CXX_SOURCES}}
|
|
||||||
${${_ARGS_CXX_HEADERS}}
|
|
||||||
PROPERTIES
|
|
||||||
GENERATED TRUE
|
|
||||||
)
|
|
||||||
|
|
||||||
# remove some warnings from protobuf generated files
|
|
||||||
if(WIN32)
|
|
||||||
set_source_files_properties(
|
|
||||||
${${_ARGS_CXX_SOURCES}}
|
|
||||||
PROPERTIES
|
|
||||||
COMPILE_FLAGS "/wd4309 /wd4838"
|
|
||||||
)
|
|
||||||
else()
|
|
||||||
set_source_files_properties(
|
|
||||||
${${_ARGS_CXX_SOURCES}}
|
|
||||||
PROPERTIES
|
|
||||||
COMPILE_FLAGS "-Wno-unused-parameter -Wno-effc++ -Wno-pedantic -Wno-sign-compare -Wno-uninitialized"
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(${_ARGS_CXX_SOURCES} ${${_ARGS_CXX_SOURCES}} PARENT_SCOPE)
|
|
||||||
set(${_ARGS_CXX_HEADERS} ${${_ARGS_CXX_HEADERS}} PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
include_guard(GLOBAL)
|
|
||||||
|
|
||||||
function(protobuf_generate_cpp_config)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args
|
|
||||||
PROTO_SOURCES_HEADER
|
|
||||||
PROTO_DEFAULTS_HEADER
|
|
||||||
)
|
|
||||||
set(_multi_value_args
|
|
||||||
PROTO_SOURCES
|
|
||||||
PROTO_DEFAULTS
|
|
||||||
)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
|
|
||||||
# Configure the 'config_proto_files' header. It provides an array of strings populated with the
|
|
||||||
# files in PROTO_SOURCES. At runtime, we use this array to generate a special 'config' proto
|
|
||||||
# message with fields for each message defined in said files. A global instance of this 'config'
|
|
||||||
# proto is then constructed, and populated with [compile-time] defaults, and [runtime] overrides
|
|
||||||
# (i.e., in spark.conf). Calls to `bts::config::get<T>()` retrieve the value from the field
|
|
||||||
# associated with type `T` in this global instance.
|
|
||||||
message(STATUS "PROTO_SOURCES: ${_ARGS_PROTO_SOURCES}")
|
|
||||||
message(STATUS "PROTO_SOURCES_HEADER: ${_ARGS_PROTO_SOURCES_HEADER}")
|
|
||||||
message(STATUS "PROTO_DEFAULTS_HEADER: ${_ARGS_PROTO_DEFAULTS_HEADER}")
|
|
||||||
if (_ARGS_PROTO_SOURCES_HEADER)
|
|
||||||
set(PROTO_SOURCES)
|
|
||||||
set(PROTO_SOURCES_CXX_ARRAY_ITEMS "")
|
|
||||||
foreach(_proto_path ${_ARGS_PROTO_SOURCES})
|
|
||||||
list(APPEND PROTO_SOURCES ${_proto_path})
|
|
||||||
string(APPEND PROTO_SOURCES_CXX_ARRAY_ITEMS "\"${_proto_path}\",\n")
|
|
||||||
endforeach()
|
|
||||||
list(LENGTH PROTO_SOURCES PROTO_SOURCES_LENGTH)
|
|
||||||
message(STATUS "CONFIGURING PROTO_SOURCES_HEADER): ${_ARGS_PROTO_SOURCES_HEADER}")
|
|
||||||
configure_file(${CMAKE_SOURCE_DIR}/cmake/config_proto_files.h.in ${_ARGS_PROTO_SOURCES_HEADER})
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Generate static defaults. Ideally, this would be a single string, but we use an array because
|
|
||||||
# the compiler complains if the string is longer than 65k.
|
|
||||||
set(_cfg_defaults_str "inline const char * config_static_defaults[] = { ")
|
|
||||||
|
|
||||||
foreach(_cfg_file_path ${_ARGS_PROTO_DEFAULTS})
|
|
||||||
file(READ ${_cfg_file_path} _cfg_file_content)
|
|
||||||
string(REPLACE "\"" "\\\"" _cfg_file_content_escaped ${_cfg_file_content})
|
|
||||||
string(REPLACE "\n" ";" _cfg_lines ${_cfg_file_content_escaped})
|
|
||||||
|
|
||||||
foreach(_line ${_cfg_lines})
|
|
||||||
string(APPEND _cfg_defaults_str "\n \"${_line}\",")
|
|
||||||
endforeach(_line)
|
|
||||||
endforeach(_cfg_file_path)
|
|
||||||
|
|
||||||
string(APPEND _cfg_defaults_str "};")
|
|
||||||
set(_old_cfg_defaults_str "")
|
|
||||||
|
|
||||||
if(EXISTS ${_ARGS_PROTO_DEFAULTS_HEADER})
|
|
||||||
file(READ ${_ARGS_PROTO_DEFAULTS_HEADER} _old_cfg_defaults_str)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT _cfg_defaults_str STREQUAL _old_cfg_defaults_str)
|
|
||||||
file(WRITE "${_ARGS_PROTO_DEFAULTS_HEADER}" "${_cfg_defaults_str}")
|
|
||||||
endif()
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
include_guard(DIRECTORY)
|
|
||||||
|
|
||||||
function(protobuf_generate_fs)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args TARGET_NAME OUT_DIR PROTOC)
|
|
||||||
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
|
|
||||||
if (NOT DEFINED _ARGS_TARGET_NAME)
|
|
||||||
set(_ARGS_TARGET_NAME "${PROJECT_NAME}_generate_fs_protos")
|
|
||||||
endif()
|
|
||||||
if (NOT DEFINED _ARGS_PROTOC)
|
|
||||||
set(_ARGS_PROTOC "${EXTERNALS_BIN}/protoc")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(_proto_include_cli_args)
|
|
||||||
foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
|
|
||||||
list(APPEND _proto_include_cli_args -I ${_dir})
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
set(_outputs)
|
|
||||||
foreach(_proto_source ${_ARGS_PROTO_SOURCES})
|
|
||||||
# get_filename_component(_abs_proto_source ${_proto_source} ABSOLUTE)
|
|
||||||
get_filename_component(_proto_source_we ${_proto_source} NAME_WE)
|
|
||||||
# get_filename_component(_proto_source_dir ${_proto_source} DIRECTORY)
|
|
||||||
list(APPEND _outputs ${_ARGS_OUT_DIR}/${_proto_source_we}.fable.fs)
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
set(_venv_exec ${CMAKE_SOURCE_DIR}/tools/venv_exec.sh)
|
|
||||||
set(_plugin_py ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/plugin.py)
|
|
||||||
set(_template_fs ${CMAKE_SOURCE_DIR}/src/lib_spark/spark/api/service_compiler/templates/fs/fable.fs)
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${_outputs}
|
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
COMMAND ${_venv_exec}
|
|
||||||
${_ARGS_PROTOC}
|
|
||||||
--plugin=protoc-gen-service=${_plugin_py}
|
|
||||||
--service_out=lang=fs,strip_out_path=1:${_ARGS_OUT_DIR}
|
|
||||||
${_proto_include_cli_args}
|
|
||||||
${_ARGS_PROTO_SOURCES}
|
|
||||||
DEPENDS
|
|
||||||
${_venv_exec}
|
|
||||||
${_plugin_py}
|
|
||||||
${_template_fs}
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json
|
|
||||||
${_ARGS_PROTO_SOURCES}
|
|
||||||
)
|
|
||||||
add_custom_target(${_ARGS_TARGET_NAME} ALL DEPENDS "${_outputs}")
|
|
||||||
endfunction()
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
include_guard(DIRECTORY)
|
|
||||||
|
|
||||||
function(protobuf_generate_js)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args TARGET_NAME OUTPUT)
|
|
||||||
set(_multi_value_args PROTO_INCLUDE_DIRS PROTO_SOURCES)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
|
|
||||||
if (NOT DEFINED _ARGS_TARGET_NAME)
|
|
||||||
set(_ARGS_TARGET_NAME "${PROJECT_NAME}_generate_js_protos")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
set(_proto_include_cli_args)
|
|
||||||
foreach(_dir ${_ARGS_PROTO_INCLUDE_DIRS})
|
|
||||||
list(APPEND _proto_include_cli_args -p ${_dir})
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${_ARGS_OUTPUT}
|
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
|
||||||
COMMAND npx
|
|
||||||
--no-install pbjs
|
|
||||||
-t json-module
|
|
||||||
-w commonjs
|
|
||||||
-o ${_ARGS_OUTPUT}
|
|
||||||
${_proto_include_cli_args}
|
|
||||||
${_ARGS_PROTO_SOURCES}
|
|
||||||
DEPENDS
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json
|
|
||||||
${_ARGS_PROTO_SOURCES}
|
|
||||||
)
|
|
||||||
add_custom_target(${_ARGS_TARGET_NAME} ALL DEPENDS ${_ARGS_OUTPUT})
|
|
||||||
endfunction()
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
include_guard(GLOBAL)
|
|
||||||
|
|
||||||
macro(set_first_defined RESULT)
|
|
||||||
foreach(_arg ${ARGN})
|
|
||||||
if (DEFINED ${_arg})
|
|
||||||
set(${RESULT} ${${_arg}})
|
|
||||||
break()
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
endmacro()
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
include_guard(DIRECTORY)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/TernaryOperator.cmake)
|
|
||||||
|
|
||||||
function(sym_link_dir)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args TARGET_NAME SOURCE DEST COMMENT)
|
|
||||||
set(_multi_value_args)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
add_custom_command(
|
|
||||||
OUTPUT ${_ARGS_DEST}
|
|
||||||
COMMAND ln ARGS -sf ${_ARGS_SOURCE} ${_ARGS_DEST}
|
|
||||||
)
|
|
||||||
set_ternary(_comment _ARGS_COMMENT "${_ARGS_COMMENT}" "linking dir ${_ARGS_SOURCE} -> ${_ARGS_DEST}")
|
|
||||||
add_custom_target(
|
|
||||||
${_ARGS_TARGET_NAME} ALL
|
|
||||||
DEPENDS ${_ARGS_DEST}
|
|
||||||
COMMENT "${_comment}"
|
|
||||||
)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(sym_link_file)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args SOURCE DEST INSTALL_DEST)
|
|
||||||
set(_multi_value_args)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}" "${_multi_value_args}" ${ARGN})
|
|
||||||
file(
|
|
||||||
CREATE_LINK
|
|
||||||
${_ARGS_SOURCE}
|
|
||||||
${_ARGS_DEST}
|
|
||||||
SYMBOLIC
|
|
||||||
)
|
|
||||||
if (DEFINED _ARGS_INSTALL_DEST)
|
|
||||||
install(
|
|
||||||
FILES
|
|
||||||
${_ARGS_SOURCE}
|
|
||||||
DESTINATION ${_ARGS_INSTALL_DEST}
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(sym_link_local_lib LIB_NAME)
|
|
||||||
set(_lib_file_name "${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}.so")
|
|
||||||
file(
|
|
||||||
CREATE_LINK
|
|
||||||
"${CMAKE_BINARY_DIR}/src/lib_${LIB_NAME}/${_lib_file_name}"
|
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${_lib_file_name}"
|
|
||||||
SYMBOLIC
|
|
||||||
)
|
|
||||||
endfunction()
|
|
||||||
@@ -1,39 +0,0 @@
|
|||||||
include_guard(DIRECTORY)
|
|
||||||
include(${CMAKE_SOURCE_DIR}/cmake/SymLink.cmake)
|
|
||||||
|
|
||||||
function(sym_link_python_module)
|
|
||||||
set(_options)
|
|
||||||
set(_one_value_args LIB_NAME MODULE_NAME PLUGIN_NAME)
|
|
||||||
set(_multi_value_args)
|
|
||||||
cmake_parse_arguments(_ARGS "${_options}" "${_one_value_args}"
|
|
||||||
"${_multi_value_args}" ${ARGN})
|
|
||||||
if(NOT DEFINED _ARGS_LIB_NAME)
|
|
||||||
message(
|
|
||||||
FATAL_ERROR "LIB_NAME must be specified for sym_link_python_module()")
|
|
||||||
endif()
|
|
||||||
set(_lib_name ${_ARGS_LIB_NAME})
|
|
||||||
set(_module_name ${_ARGS_MODULE_NAME})
|
|
||||||
if(NOT DEFINED _ARGS_MODULE_NAME)
|
|
||||||
set(_module_name ${_lib_name}_module)
|
|
||||||
endif()
|
|
||||||
set(_plugin_name ${_ARGS_PLUGIN_NAME})
|
|
||||||
set(_deps ${_lib_name} ${_module_name})
|
|
||||||
if(DEFINED _ARGS_PLUGIN_NAME)
|
|
||||||
list(APPEND _deps ${_plugin_name} copy_${_plugin_name})
|
|
||||||
endif()
|
|
||||||
add_dependencies(${PROJECT_NAME} ${_deps})
|
|
||||||
sym_link_local_lib(${_lib_name})
|
|
||||||
set(_module_suffix cpython-310-x86_64-linux-gnu.so)
|
|
||||||
sym_link_file(
|
|
||||||
SOURCE
|
|
||||||
${CMAKE_BINARY_DIR}/src/lib_${_lib_name}/${_module_name}.${_module_suffix}
|
|
||||||
DEST
|
|
||||||
${CMAKE_CURRENT_BINARY_DIR}/${_module_name}.${_module_suffix}
|
|
||||||
INSTALL_DEST
|
|
||||||
${CMAKE_INSTALL_BINDIR}/)
|
|
||||||
if(DEFINED _ARGS_PLUGIN_NAME)
|
|
||||||
get_target_property(plugins ${_plugin_name} INTERFACE_PYTHON_SCRIPTS_DIR)
|
|
||||||
sym_link_dir(TARGET_NAME ${PROJECT_NAME}_link_${_plugin_name} SOURCE
|
|
||||||
${plugins} DEST ${CMAKE_CURRENT_BINARY_DIR}/${_plugin_name})
|
|
||||||
endif()
|
|
||||||
endfunction()
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
include_guard(GLOBAL)
|
|
||||||
|
|
||||||
macro(set_ternary RESULT CONDITION TRUE_VALUE FALSE_VALUE)
|
|
||||||
if(${CONDITION})
|
|
||||||
set(${RESULT} ${TRUE_VALUE})
|
|
||||||
else()
|
|
||||||
set(${RESULT} ${FALSE_VALUE})
|
|
||||||
endif()
|
|
||||||
endmacro()
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
#include <array>
|
|
||||||
|
|
||||||
namespace bts::@PROJECT_NAME@::protobufs {
|
|
||||||
|
|
||||||
inline std::array<const char *, @PROTO_SOURCES_LENGTH@> config_proto_files = {
|
|
||||||
@PROTO_SOURCES_CXX_ARRAY_ITEMS@
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace bts::@PROJECT_NAME@::protobufs
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
#ifndef BTS_SPARK_VERSION_H
|
|
||||||
#define BTS_SPARK_VERSION_H
|
|
||||||
|
|
||||||
#define BTS_SPARK_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
|
|
||||||
#define BTS_SPARK_VERSION_MINOR @PROJECT_VERSION_MINOR@
|
|
||||||
#define BTS_SPARK_VERSION_PATCH @PROJECT_VERSION_PATCH@
|
|
||||||
#define BTS_SPARK_VERSION_BUILD_METADATA @PROJECT_VERSION_BUILD_METADATA@
|
|
||||||
#define BTS_SPARK_VERSION "@PROJECT_VERSION@"
|
|
||||||
#define BTS_SPARK_VERSION_FULL "@PROJECT_VERSION_FULL@"
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
cmake_minimum_required(VERSION 3.5)
|
||||||
|
|
||||||
|
# Explicitly set policy to convert relative paths to absolute (although this is a default policy,
|
||||||
|
# setting it explicitly prevents a compile-warning)
|
||||||
|
cmake_policy(SET CMP0076 NEW)
|
||||||
|
|
||||||
|
# add protos to the library to facilitate source_group
|
||||||
|
target_sources(libspark PUBLIC ${Config_Protos} ${NonConfig_Protos} ${Service_Protos})
|
||||||
|
|
||||||
|
function(assign_source_group)
|
||||||
|
foreach(_source IN ITEMS ${ARGN})
|
||||||
|
if(IS_ABSOLUTE "${_source}")
|
||||||
|
file(RELATIVE_PATH _source_rel "${CMAKE_CURRENT_SOURCE_DIR}" "${_source}")
|
||||||
|
else()
|
||||||
|
set(_source_rel "${_source}")
|
||||||
|
endif()
|
||||||
|
get_filename_component(_source_path "${_source_rel}" PATH)
|
||||||
|
string(REPLACE "/" "\\" _source_path_msvc "${_source_path}")
|
||||||
|
source_group("${_source_path_msvc}" FILES "${_source}")
|
||||||
|
set(SOURCE_FILES "${_source}")
|
||||||
|
endforeach()
|
||||||
|
endfunction(assign_source_group)
|
||||||
|
|
||||||
|
assign_source_group(${SparkLib_Sources} ${Config_Protos} ${NonConfig_Protos} ${Service_Protos})
|
||||||
-163
@@ -1,163 +0,0 @@
|
|||||||
services:
|
|
||||||
sparkd:
|
|
||||||
volumes:
|
|
||||||
- ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/sparkdata/data
|
|
||||||
build:
|
|
||||||
dockerfile: src/app_sparkd/Dockerfile
|
|
||||||
args:
|
|
||||||
- IMAGE=${SPARKD__IMAGE}
|
|
||||||
- SOURCE_DIR=${SPARKD__SOURCE_DIR}
|
|
||||||
- CONFIG_DIR=${SPARKD__CONFIG_DIR}
|
|
||||||
- PYTHON_REQUIREMENTS=${SPARKD__PYTHON_REQUIREMENTS}
|
|
||||||
shm_size: "${SPARKD__SHM_SIZE:-512mb}"
|
|
||||||
command: >
|
|
||||||
sh -c "
|
|
||||||
echo bts | sudo -S chown -R bts:bts /home/bts/sparkdata/data
|
|
||||||
if [ -e "/home/bts/sparkdata/data/logging.sparkd/log" ]; then
|
|
||||||
mv "/home/bts/sparkdata/data/logging.sparkd/log" "/home/bts/sparkdata/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')"
|
|
||||||
fi
|
|
||||||
if [ -e "/home/bts/sparkdata/conf/.env.local" ]; then
|
|
||||||
echo 'Sourcing /home/bts/sparkdata/conf/.env.local'
|
|
||||||
set -a
|
|
||||||
. /home/bts/sparkdata/conf/.env.local
|
|
||||||
set +a
|
|
||||||
fi
|
|
||||||
if [ -d /home/bts/sparkdata/conf/plugins ]; then
|
|
||||||
echo 'Copying /home/bts/sparkdata/conf/plugins to runtime dir (/home/bts/bin)'
|
|
||||||
cp -r /home/bts/sparkdata/conf/plugins /home/bts/bin/
|
|
||||||
fi
|
|
||||||
./sparkd run"
|
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
- ${SPARKD__CONFIG_DIR}/.env
|
|
||||||
ports:
|
|
||||||
- "${SPARKD__CONFIG_PORT}:${SPARKD__CONFIG_PORT}"
|
|
||||||
- "${SPARKD__QUICKBUS_PORT}:${SPARKD__QUICKBUS_PORT}"
|
|
||||||
- "${SPARKD__SIM_FIX_PORT}:${SPARKD__SIM_FIX_PORT}"
|
|
||||||
deploy:
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
memory: "${SPARKD__MEMORY:-4gb}"
|
|
||||||
|
|
||||||
sparkd-symbols:
|
|
||||||
volumes:
|
|
||||||
- ${SPARKD__DATA_DIR:-sparkd_data}:/home/bts/sparkdata/data
|
|
||||||
- ${SPARKD__RUNTIME_CONF_DIR:-sparkd_conf}:/home/bts/sparkdata/conf
|
|
||||||
build:
|
|
||||||
dockerfile: src/app_sparkd/Dockerfile
|
|
||||||
args:
|
|
||||||
- IMAGE=${SPARKD__IMAGE}
|
|
||||||
- SOURCE_DIR=${SPARKD__SOURCE_DIR}
|
|
||||||
- CONFIG_DIR=${SPARKD__CONFIG_DIR}
|
|
||||||
- PYTHON_REQUIREMENTS=${SPARKD__PYTHON_REQUIREMENTS}
|
|
||||||
shm_size: "${SPARKD__SHM_SIZE:-512mb}"
|
|
||||||
command: >
|
|
||||||
sh -c "
|
|
||||||
echo bts | sudo -S chown -R bts:bts /home/bts/sparkdata
|
|
||||||
if [ -e "/home/bts/sparkdata/data/logging.sparkd/log" ]; then
|
|
||||||
mv "/home/bts/sparkdata/data/logging.sparkd/log" "/home/bts/sparkdata/data/logging.sparkd/log_$(date '+%Y%m%d-%H%M')"
|
|
||||||
fi
|
|
||||||
ls -alh /home/bts/sparkdata/conf/
|
|
||||||
cat /home/bts/sparkdata/conf/.env.local
|
|
||||||
if [ -e "/home/bts/sparkdata/conf/.env.local" ]; then
|
|
||||||
echo 'Sourcing /home/bts/sparkdata/conf/.env.local'
|
|
||||||
set -a
|
|
||||||
. /home/bts/sparkdata/conf/.env.local
|
|
||||||
set +a
|
|
||||||
fi
|
|
||||||
if [ -d /home/bts/sparkdata/conf/plugins ]; then
|
|
||||||
echo 'Copying /home/bts/sparkdata/conf/plugins to runtime dir (/home/bts/bin)'
|
|
||||||
cp -r /home/bts/sparkdata/conf/plugins /home/bts/bin/
|
|
||||||
fi
|
|
||||||
./sparkd run"
|
|
||||||
env_file:
|
|
||||||
- .env
|
|
||||||
- ${SPARKD__CONFIG_DIR}/.env
|
|
||||||
ports:
|
|
||||||
- "${SPARKD__CONFIG_PORT}:${SPARKD__CONFIG_PORT}"
|
|
||||||
- "${SPARKD__QUICKBUS_PORT}:${SPARKD__QUICKBUS_PORT}"
|
|
||||||
- "${SPARKD__SIM_FIX_PORT}:${SPARKD__SIM_FIX_PORT}"
|
|
||||||
deploy:
|
|
||||||
restart_policy:
|
|
||||||
condition: any
|
|
||||||
delay: 3s
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
memory: "${SPARKD__MEMORY:-4gb}"
|
|
||||||
|
|
||||||
sparkd-tail:
|
|
||||||
image: bluetradingsystems/linux_dotnet7
|
|
||||||
volumes:
|
|
||||||
- type: volume
|
|
||||||
read_only: true
|
|
||||||
source: sparkd_data
|
|
||||||
target: /home/bts/sparkdata/data/logging.sparkd
|
|
||||||
volume:
|
|
||||||
subpath: logging.sparkd
|
|
||||||
command: ["tail", "-f", "/home/bts/sparkdata/data/logging.sparkd/log"]
|
|
||||||
|
|
||||||
sparkd-ping-test:
|
|
||||||
depends_on:
|
|
||||||
- sparkd
|
|
||||||
profiles:
|
|
||||||
- ping-test
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile_inline: |
|
|
||||||
FROM bluetradingsystems/linux_dotnet7
|
|
||||||
USER "root"
|
|
||||||
RUN apt-get update && apt-get -y install iputils-ping
|
|
||||||
command: [ "ping", "sparkd" ]
|
|
||||||
|
|
||||||
pubsub:
|
|
||||||
environment:
|
|
||||||
- DOTNET_ENVIRONMENT=Staging
|
|
||||||
build:
|
|
||||||
dockerfile: src/DataStreamSuite/PubSubServer/Dockerfile
|
|
||||||
args:
|
|
||||||
- SOURCE_DIR=build/Release/bin/net8.0/linux-x64/publish
|
|
||||||
- CONF_FILE=src/DataStreamSuite/PubSubServer/spark.conf
|
|
||||||
ports:
|
|
||||||
- 22019:22019
|
|
||||||
command: [ "./PubSubServer" ]
|
|
||||||
|
|
||||||
md-publisher:
|
|
||||||
build:
|
|
||||||
dockerfile: src/DataStreamSuite/DataStreamPublisher/Dockerfile
|
|
||||||
args:
|
|
||||||
- SOURCE_DIR=build/Release/bin/net8.0/linux-x64/publish
|
|
||||||
- CONF_FILE=src/DataStreamSuite/DataStreamPublisher/spark.conf
|
|
||||||
depends_on:
|
|
||||||
- pubsub
|
|
||||||
- sparkd
|
|
||||||
command: [ "dockerize", "-wait", "tcp://pubsub:22019", "-wait", "tcp://sparkd:8000", "-timeout", "10s", "./DataStreamPublisher" ]
|
|
||||||
environment:
|
|
||||||
- DOTNET_ENVIRONMENT=MarketData
|
|
||||||
|
|
||||||
api-server:
|
|
||||||
depends_on:
|
|
||||||
- sparkd
|
|
||||||
ports:
|
|
||||||
- 8008:8008
|
|
||||||
- 9443:9443
|
|
||||||
build:
|
|
||||||
dockerfile: src/client/spark_api_server/Dockerfile
|
|
||||||
command: [ "dockerize", "-wait", "tcp://sparkd:8000", "-timeout", "10s", "./spark_api_server", "run" ]
|
|
||||||
|
|
||||||
webapp:
|
|
||||||
ports:
|
|
||||||
- 8080:8080
|
|
||||||
- 8443:8443
|
|
||||||
build:
|
|
||||||
dockerfile: src/DataStreamSuite/Bts.DataStreamWebApp.Server/Dockerfile
|
|
||||||
args:
|
|
||||||
- SOURCE_DIR=build/Release/bin/net8.0/linux-x64/publish
|
|
||||||
- WEB_ROOT=build/Bts.DataStreamWebApp.Client/production/dist
|
|
||||||
- CONF_FILE=src/DataStreamSuite/Bts.DataStreamWebApp.Server/spark.conf
|
|
||||||
command: [ "./Bts.DataStreamWebApp.Server" ]
|
|
||||||
environment:
|
|
||||||
- ASPNETCORE_ENVIRONMENT=Staging
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
sparkd_data:
|
|
||||||
name: "sparkd_${SPARKD__CONFIG_PORT:-8000}"
|
|
||||||
@@ -124,8 +124,8 @@ service OrderService {
|
|||||||
```
|
```
|
||||||
### C++ Example
|
### C++ Example
|
||||||
```cpp
|
```cpp
|
||||||
#include "spark/api/public/ServiceContext.h"
|
#include "lib/api/public/ServiceContext.h"
|
||||||
#include "spark/api/services/OrderService.client.pb.h"
|
#include "lib/api/services/OrderService.client.pb.h"
|
||||||
using namespace bts::api;
|
using namespace bts::api;
|
||||||
ServiceContext ctx;
|
ServiceContext ctx;
|
||||||
auto orders = ctx.locate<orderman::OrderService>();
|
auto orders = ctx.locate<orderman::OrderService>();
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ namespace sample {
|
|||||||
```
|
```
|
||||||
|
|
||||||
```cpp
|
```cpp
|
||||||
#include "spark/api/public/ServiceContext.h"
|
#include "lib/api/public/ServiceContext.h"
|
||||||
#include "spark/domain_model/Security.h"
|
#include "spark/lib/domain_model/Security.h"
|
||||||
#include "spark/api/services/MarketDataService.client.pb.h"
|
#include "lib/api/services/MarketDataService.client.pb.h"
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
using namespace bts::api;
|
using namespace bts::api;
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
FROM ubuntu:22.04
|
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN apt-get update && apt-get install -y pkg-config
|
|
||||||
RUN apt-get update && apt-get install -y locales
|
|
||||||
RUN apt-get update && apt-get install -y ca-certificates
|
|
||||||
RUN apt-get update && apt-get install -y libssh2-1-dev
|
|
||||||
RUN apt-get update && apt-get install -y software-properties-common
|
|
||||||
RUN apt-get update && apt-get install -y sudo
|
|
||||||
|
|
||||||
# GCC
|
|
||||||
ARG gcc_major=13
|
|
||||||
RUN add-apt-repository ppa:ubuntu-toolchain-r/test \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install -y g++-$gcc_major
|
|
||||||
|
|
||||||
RUN apt-get update \
|
|
||||||
&& apt-get install -y dotnet7
|
|
||||||
|
|
||||||
RUN locale-gen en_US.UTF-8
|
|
||||||
|
|
||||||
ARG docker_user="bts"
|
|
||||||
ARG docker_uid="1000"
|
|
||||||
ARG docker_pass="bts"
|
|
||||||
|
|
||||||
RUN \
|
|
||||||
groupadd -g "$docker_uid" "$docker_user" \
|
|
||||||
&& useradd \
|
|
||||||
-m \
|
|
||||||
-u "$docker_uid" \
|
|
||||||
-g "$docker_uid" \
|
|
||||||
-G sudo \
|
|
||||||
--password "$(openssl passwd -1 "$docker_pass")" \
|
|
||||||
"$docker_user"
|
|
||||||
|
|
||||||
USER bts
|
|
||||||
WORKDIR /home/bts
|
|
||||||
@@ -1,65 +1,65 @@
|
|||||||
FROM ubuntu:latest
|
FROM ubuntu:22.04
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
ENV TZ=America/New_York
|
|
||||||
|
|
||||||
# light deps (should be quick to download/install)
|
# Foundational Deps
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
|
build-essential \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
gnupg \
|
gnupg \
|
||||||
liblttng-ust-dev \
|
liblttng-ust-dev \
|
||||||
libpcap0.8-dev \
|
libpcap0.8-dev \
|
||||||
|
libssh2-1-dev \
|
||||||
locales \
|
locales \
|
||||||
ninja-build \
|
openssh-server \
|
||||||
software-properties-common \
|
software-properties-common \
|
||||||
sqlite3 \
|
sudo \
|
||||||
tzdata
|
tzdata
|
||||||
|
|
||||||
# clang
|
# Clang 17
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN curl -fsSL https://apt.llvm.org/llvm-snapshot.gpg.key 2> /dev/null \
|
||||||
clang-13 \
|
| gpg --dearmor - \
|
||||||
clang-format-13 \
|
| tee /usr/share/keyrings/llvm-snapshot.gpg > /dev/null \
|
||||||
clangd-13 \
|
&& echo "deb [signed-by=/usr/share/keyrings/llvm-snapshot.gpg] http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" \
|
||||||
clang-15 \
|
| tee -a "/etc/apt/sources.list.d/llvm.list" \
|
||||||
clang-format-15 \
|
&& apt-get update \
|
||||||
clangd-15
|
&& apt-get install -y \
|
||||||
|
clang-17 \
|
||||||
|
clang-format-17 \
|
||||||
|
clangd-17
|
||||||
|
|
||||||
# g++
|
# G++
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
g++-11 \
|
g++
|
||||||
g++-12
|
|
||||||
|
|
||||||
# python
|
# Ninja
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
python3-pip \
|
ninja-build
|
||||||
python3-venv \
|
|
||||||
&& python3 -m pip install --upgrade pip
|
|
||||||
|
|
||||||
# dotnet
|
# CMake
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc 2> /dev/null \
|
||||||
dotnet7
|
|
||||||
|
|
||||||
# ssh
|
|
||||||
RUN apt-get update && apt-get install -y \
|
|
||||||
libssh2-1-dev \
|
|
||||||
openssh-server
|
|
||||||
|
|
||||||
# cmake
|
|
||||||
RUN \
|
|
||||||
curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc 2> /dev/null \
|
|
||||||
| gpg --dearmor - \
|
| gpg --dearmor - \
|
||||||
| tee /usr/share/keyrings/kitware-archive-keyring.gpg > /dev/null \
|
| tee /usr/share/keyrings/kitware-archive-keyring.gpg > /dev/null \
|
||||||
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" \
|
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" \
|
||||||
| tee /etc/apt/sources.list.d/kitware.list > /dev/null \
|
| tee /etc/apt/sources.list.d/kitware.list > /dev/null \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& rm /usr/share/keyrings/kitware-archive-keyring.gpg \
|
|
||||||
&& apt-get install -y kitware-archive-keyring \
|
|
||||||
&& echo "deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs)-rc main" \
|
|
||||||
| tee -a /etc/apt/sources.list.d/kitware.list >/dev/null \
|
|
||||||
&& apt-get install -y cmake
|
&& apt-get install -y cmake
|
||||||
|
|
||||||
# node
|
# Dotnet
|
||||||
|
RUN curl -fsSLO "https://packages.microsoft.com/config/ubuntu/$(lsb_release -rs)/packages-microsoft-prod.deb" \
|
||||||
|
&& dpkg -i packages-microsoft-prod.deb \
|
||||||
|
&& rm packages-microsoft-prod.deb \
|
||||||
|
&& apt-get update \
|
||||||
|
&& apt-get install -y dotnet-sdk-8.0
|
||||||
|
|
||||||
|
# Python
|
||||||
|
RUN apt-get update && apt-get install -y \
|
||||||
|
python3-pip \
|
||||||
|
python3-venv \
|
||||||
|
&& python3 -m pip install --upgrade pip
|
||||||
|
|
||||||
|
# Node
|
||||||
ARG node_major=18
|
ARG node_major=18
|
||||||
RUN mkdir -p /etc/apt/keyrings \
|
RUN mkdir -p /etc/apt/keyrings \
|
||||||
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
|
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key \
|
||||||
@@ -69,54 +69,35 @@ RUN mkdir -p /etc/apt/keyrings \
|
|||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y nodejs
|
&& apt-get install -y nodejs
|
||||||
|
|
||||||
# ccache is done here so that ccache sees clang++ installed, not clang-10
|
# Sqlite3
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
ccache
|
sqlite3
|
||||||
|
|
||||||
# emumba (light deps)
|
# Dev Utils (install last so they can be added/removed with minimal rebuild)
|
||||||
RUN apt-get update && apt-get install -y \
|
|
||||||
build-essential \
|
|
||||||
doxygen \
|
|
||||||
python3-sphinx \
|
|
||||||
graphviz \
|
|
||||||
libgtest-dev \
|
|
||||||
libssl-dev \
|
|
||||||
rapidjson-dev \
|
|
||||||
zlib1g-dev \
|
|
||||||
pkg-config
|
|
||||||
|
|
||||||
# emumba (boost)
|
|
||||||
RUN apt-get update && apt-get install -y \
|
|
||||||
libboost-filesystem-dev \
|
|
||||||
libboost-program-options-dev \
|
|
||||||
libboost-test-dev \
|
|
||||||
libboost-date-time-dev
|
|
||||||
|
|
||||||
# dev utils
|
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
|
ccache \
|
||||||
fish \
|
fish \
|
||||||
|
gdb \
|
||||||
git-all \
|
git-all \
|
||||||
sudo \
|
vim
|
||||||
vim \
|
|
||||||
wget
|
|
||||||
|
|
||||||
# set up default executables (update-alternatives)
|
# Set up default executables (update-alternatives)
|
||||||
RUN \
|
RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-17 100; \
|
||||||
update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-13 100; \
|
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-17 100; \
|
||||||
update-alternatives --install /usr/bin/clang clang /usr/bin/clang-13 100; \
|
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-17 100; \
|
||||||
update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-13 100; \
|
update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-17 100; \
|
||||||
update-alternatives --install /usr/bin/clangd clangd /usr/bin/clangd-13 100; \
|
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 100; \
|
||||||
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 100; \
|
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100
|
||||||
update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100
|
|
||||||
|
|
||||||
# Add compiler symlinks for ccache
|
# Add compiler symlinks for ccache
|
||||||
RUN \
|
RUN ln -s /usr/bin/ccache /usr/local/bin/clang; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/clang; \
|
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/clang++; \
|
ln -s /usr/bin/ccache /usr/local/bin/clang++; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/clang-13; \
|
ln -s /usr/bin/ccache /usr/local/bin/clang-13; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/clang++-13; \
|
ln -s /usr/bin/ccache /usr/local/bin/clang++-13; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/clang-15; \
|
ln -s /usr/bin/ccache /usr/local/bin/clang-15; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/clang++-15; \
|
ln -s /usr/bin/ccache /usr/local/bin/clang++-15; \
|
||||||
|
ln -s /usr/bin/ccache /usr/local/bin/clang-17; \
|
||||||
|
ln -s /usr/bin/ccache /usr/local/bin/clang++-17; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/gcc; \
|
ln -s /usr/bin/ccache /usr/local/bin/gcc; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/g++; \
|
ln -s /usr/bin/ccache /usr/local/bin/g++; \
|
||||||
ln -s /usr/bin/ccache /usr/local/bin/gcc-11; \
|
ln -s /usr/bin/ccache /usr/local/bin/gcc-11; \
|
||||||
@@ -130,8 +111,7 @@ ARG docker_user="bts"
|
|||||||
ARG docker_uid="1000"
|
ARG docker_uid="1000"
|
||||||
ARG docker_pass="bts"
|
ARG docker_pass="bts"
|
||||||
|
|
||||||
RUN \
|
RUN groupadd -g "$docker_uid" "$docker_user" \
|
||||||
groupadd -g "$docker_uid" "$docker_user" \
|
|
||||||
&& useradd \
|
&& useradd \
|
||||||
-m \
|
-m \
|
||||||
-u "$docker_uid" \
|
-u "$docker_uid" \
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
FROM ubuntu:22.04
|
|
||||||
|
|
||||||
ARG DEBIAN_FRONTEND=noninteractive
|
|
||||||
|
|
||||||
RUN apt-get update \
|
|
||||||
&& apt-get install -y pkg-config \
|
|
||||||
&& apt-get install -y locales \
|
|
||||||
&& apt-get install -y ca-certificates \
|
|
||||||
&& apt-get install -y libssh2-1-dev \
|
|
||||||
&& apt-get install -y software-properties-common \
|
|
||||||
&& apt-get install -y sudo
|
|
||||||
|
|
||||||
# GCC
|
|
||||||
ARG gcc_major=13
|
|
||||||
RUN add-apt-repository ppa:ubuntu-toolchain-r/test \
|
|
||||||
&& apt-get update \
|
|
||||||
&& apt-get install -y g++-$gcc_major
|
|
||||||
|
|
||||||
RUN apt-get update \
|
|
||||||
&& apt-get install -y dotnet7
|
|
||||||
|
|
||||||
RUN locale-gen en_US.UTF-8
|
|
||||||
|
|
||||||
ARG docker_user="bts"
|
|
||||||
ARG docker_uid="1000"
|
|
||||||
ARG docker_pass="bts"
|
|
||||||
|
|
||||||
RUN \
|
|
||||||
groupadd -g "$docker_uid" "$docker_user" \
|
|
||||||
&& useradd \
|
|
||||||
-m \
|
|
||||||
-u "$docker_uid" \
|
|
||||||
-g "$docker_uid" \
|
|
||||||
-G sudo \
|
|
||||||
--password "$(openssl passwd -1 "$docker_pass")" \
|
|
||||||
"$docker_user"
|
|
||||||
|
|
||||||
USER bts
|
|
||||||
WORKDIR /home/bts
|
|
||||||
+1
-1
Submodule externals updated: 4f6734703c...cae5fd20da.
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"sdk": {
|
||||||
|
"version": "6.0.200",
|
||||||
|
"rollForward": "latestMajor"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
/* global use, db */
|
||||||
|
// MongoDB Playground
|
||||||
|
// To disable this template go to Settings | MongoDB | Use Default Template For Playground.
|
||||||
|
// Make sure you are connected to enable completions and to be able to run a playground.
|
||||||
|
// Use Ctrl+Space inside a snippet or a string literal to trigger completions.
|
||||||
|
// The result of the last command run in a playground is shown on the results panel.
|
||||||
|
// By default the first 20 documents will be returned with a cursor.
|
||||||
|
// Use 'console.log()' to print to the debug output.
|
||||||
|
// For more documentation on playgrounds please refer to
|
||||||
|
// https://www.mongodb.com/docs/mongodb-vscode/playgrounds/
|
||||||
|
|
||||||
|
// Select the database to use.
|
||||||
|
use('mongodbVSCodePlaygroundDB');
|
||||||
|
|
||||||
|
// Insert a few documents into the sales collection.
|
||||||
|
db.getCollection('sales').insertMany([
|
||||||
|
{ 'item': 'abc', 'price': 10, 'quantity': 2, 'date': new Date('2014-03-01T08:00:00Z') },
|
||||||
|
{ 'item': 'jkl', 'price': 20, 'quantity': 1, 'date': new Date('2014-03-01T09:00:00Z') },
|
||||||
|
{ 'item': 'xyz', 'price': 5, 'quantity': 10, 'date': new Date('2014-03-15T09:00:00Z') },
|
||||||
|
{ 'item': 'xyz', 'price': 5, 'quantity': 20, 'date': new Date('2014-04-04T11:21:39.736Z') },
|
||||||
|
{ 'item': 'abc', 'price': 10, 'quantity': 10, 'date': new Date('2014-04-04T21:23:13.331Z') },
|
||||||
|
{ 'item': 'def', 'price': 7.5, 'quantity': 5, 'date': new Date('2015-06-04T05:08:13Z') },
|
||||||
|
{ 'item': 'def', 'price': 7.5, 'quantity': 10, 'date': new Date('2015-09-10T08:43:00Z') },
|
||||||
|
{ 'item': 'abc', 'price': 10, 'quantity': 5, 'date': new Date('2016-02-06T20:20:13Z') },
|
||||||
|
]);
|
||||||
|
|
||||||
|
// Run a find command to view items sold on April 4th, 2014.
|
||||||
|
const salesOnApril4th = db.getCollection('sales').find({
|
||||||
|
date: { $gte: new Date('2014-04-04'), $lt: new Date('2014-04-05') }
|
||||||
|
}).count();
|
||||||
|
|
||||||
|
// Print a message to the output window.
|
||||||
|
console.log(`${salesOnApril4th} sales occurred in 2014.`);
|
||||||
|
|
||||||
|
// Here we run an aggregation and open a cursor to the results.
|
||||||
|
// Use '.toArray()' to exhaust the cursor to return the whole result set.
|
||||||
|
// You can use '.hasNext()/.next()' to iterate through the cursor page by page.
|
||||||
|
db.getCollection('sales').aggregate([
|
||||||
|
// Find all of the sales that occurred in 2014.
|
||||||
|
{ $match: { date: { $gte: new Date('2014-01-01'), $lt: new Date('2015-01-01') } } },
|
||||||
|
// Group the total sales for each product.
|
||||||
|
{ $group: { _id: '$item', totalSaleAmount: { $sum: { $multiply: ['$price', '$quantity'] } } } }
|
||||||
|
]);
|
||||||
|
|
||||||
|
|
||||||
@@ -1,42 +1,22 @@
|
|||||||
astroid==2.7.3
|
astroid==2.7.3
|
||||||
autopep8==1.5.7
|
autopep8==1.5.7
|
||||||
blinker==1.9.0
|
|
||||||
boto3==1.37.9
|
|
||||||
botocore==1.37.9
|
|
||||||
certifi==2023.5.7
|
certifi==2023.5.7
|
||||||
charset-normalizer==3.1.0
|
charset-normalizer==3.1.0
|
||||||
click==8.1.8
|
|
||||||
colorama==0.4.4
|
colorama==0.4.4
|
||||||
Flask==3.1.0
|
|
||||||
idna==3.4
|
idna==3.4
|
||||||
isort==5.9.3
|
isort==5.9.3
|
||||||
itsdangerous==2.2.0
|
|
||||||
Jinja2==3.1.6
|
|
||||||
jmespath==1.0.1
|
|
||||||
lazy-object-proxy==1.6.0
|
lazy-object-proxy==1.6.0
|
||||||
MarkupSafe==3.0.2
|
|
||||||
mccabe==0.6.1
|
mccabe==0.6.1
|
||||||
numpy==2.2.6
|
|
||||||
platformdirs==2.3.0
|
platformdirs==2.3.0
|
||||||
protobuf==4.21.12
|
protobuf==4.21.12
|
||||||
pybars3==0.9.7
|
pybars3==0.9.7
|
||||||
pybind11==2.13.6
|
|
||||||
pybind11-stubgen==2.5.3
|
|
||||||
pybit==5.11.0
|
|
||||||
pycodestyle==2.7.0
|
pycodestyle==2.7.0
|
||||||
pycparser==2.20
|
pycparser==2.20
|
||||||
pycryptodome==3.23.0
|
|
||||||
pylint==2.10.2
|
pylint==2.10.2
|
||||||
PyMeta3==0.5.1
|
PyMeta3==0.5.1
|
||||||
python-dateutil==2.9.0.post0
|
|
||||||
python-dotenv==1.0.1
|
|
||||||
requests==2.31.0
|
requests==2.31.0
|
||||||
s3transfer==0.11.4
|
|
||||||
six==1.17.0
|
|
||||||
termcolor==1.1.0
|
termcolor==1.1.0
|
||||||
toml==0.10.2
|
toml==0.10.2
|
||||||
urllib3==2.0.3
|
urllib3==2.0.3
|
||||||
websocket-client==1.8.0
|
|
||||||
Werkzeug==3.1.3
|
|
||||||
wrapt==1.12.1
|
wrapt==1.12.1
|
||||||
yapf==0.31.0
|
yapf==0.31.0
|
||||||
+103
-164
@@ -1,164 +1,103 @@
|
|||||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
# Visual Studio Version 17
|
# Visual Studio Version 17
|
||||||
VisualStudioVersion = 17.3.32922.545
|
VisualStudioVersion = 17.3.32922.545
|
||||||
MinimumVisualStudioVersion = 15.0.26124.0
|
MinimumVisualStudioVersion = 15.0.26124.0
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api", "src\client\spark_api\spark_api.csproj", "{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "src\client\spark\Spark.csproj", "{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark", "src\client\spark\Spark.csproj", "{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{387566C6-C6F6-412C-A30C-9855BBCB4816}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Spark.Console", "src\client\Spark.Console\Spark.Console.csproj", "{387566C6-C6F6-412C-A30C-9855BBCB4816}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_core", "src\client\spark_core\spark_core.csproj", "{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_sdk", "src\client\spark_sdk\spark_sdk.csproj", "{6963C314-83C4-4667-B0D0-C2F7AE208C29}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_sdk", "src\client\spark_sdk\spark_sdk.csproj", "{6963C314-83C4-4667-B0D0-C2F7AE208C29}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{ECD78CC5-138F-4809-A764-2358C2AC2E82}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_test", "src\client\spark_test\spark_test.csproj", "{ECD78CC5-138F-4809-A764-2358C2AC2E82}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_websocket", "src\client\spark_websocket\spark_websocket.csproj", "{3201359D-C071-4089-9EDE-B04D759F1508}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_websocket", "src\client\spark_websocket\spark_websocket.csproj", "{3201359D-C071-4089-9EDE-B04D759F1508}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api_server", "src\client\spark_api_server\spark_api_server.csproj", "{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}"
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "spark_api_server", "src\client\spark_api_server\spark_api_server.csproj", "{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStreamCore", "src\DataStreamSuite\DataStreamCore\DataStreamCore.csproj", "{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}"
|
Global
|
||||||
EndProject
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DataStream", "src\DataStreamSuite\DataStream\DataStream.csproj", "{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}"
|
Debug|x64 = Debug|x64
|
||||||
EndProject
|
MinSizeRel|x64 = MinSizeRel|x64
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedStreams", "src\DataStreamSuite\SharedStreams\SharedStreams.csproj", "{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}"
|
Release|x64 = Release|x64
|
||||||
EndProject
|
RelWithDebInfo|x64 = RelWithDebInfo|x64
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PubSub", "src\DataStreamSuite\PubSub\PubSub.csproj", "{51C40BA9-F226-4A35-939D-1ED6F5FF7299}"
|
EndGlobalSection
|
||||||
EndProject
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{4564E677-343A-46CB-AF02-AFC4E38BF94B}"
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
EndProject
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "client", "client", "{56A8A70A-DA03-4CED-A144-EC10F1379FD8}"
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64
|
||||||
EndProject
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64
|
||||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataStreamSuite", "DataStreamSuite", "{915EF238-CA0D-4E73-AF50-88CB3F29C7AD}"
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64
|
||||||
EndProject
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bts.Extensions.Hosting", "src\DataStreamSuite\Bts.Extensions.Hosting\Bts.Extensions.Hosting.csproj", "{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}"
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
EndProject
|
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
Global
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.Build.0 = Debug|x64
|
||||||
Debug|x64 = Debug|x64
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.ActiveCfg = Release|x64
|
||||||
MinSizeRel|x64 = MinSizeRel|x64
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.Build.0 = Release|x64
|
||||||
Release|x64 = Release|x64
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.ActiveCfg = Release|x64
|
||||||
RelWithDebInfo|x64 = RelWithDebInfo|x64
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.Build.0 = Release|x64
|
||||||
EndGlobalSection
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.ActiveCfg = Debug|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Debug|x64.Build.0 = Debug|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.Build.0 = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.ActiveCfg = Release|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.MinSizeRel|x64.Build.0 = Release|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.Build.0 = Debug|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.ActiveCfg = Release|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.ActiveCfg = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.Release|x64.Build.0 = Release|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.Build.0 = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
{DC9A8975-8211-4FC9-A9BA-C8B9D26AD481}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.ActiveCfg = Debug|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Debug|x64.Build.0 = Debug|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.ActiveCfg = Release|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.MinSizeRel|x64.Build.0 = Release|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.ActiveCfg = Release|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.Release|x64.Build.0 = Release|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
{9A4D4D07-1AB6-4B2B-B111-A4F34D6C267E}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.ActiveCfg = Debug|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Debug|x64.Build.0 = Debug|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.Build.0 = Debug|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.ActiveCfg = Release|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.MinSizeRel|x64.Build.0 = Debug|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.Build.0 = Release|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.ActiveCfg = Release|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.ActiveCfg = Release|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.Release|x64.Build.0 = Release|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.Build.0 = Release|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
{387566C6-C6F6-412C-A30C-9855BBCB4816}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.ActiveCfg = Debug|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Debug|x64.Build.0 = Debug|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.Build.0 = Debug|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.ActiveCfg = Release|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.MinSizeRel|x64.Build.0 = Release|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.Build.0 = Debug|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.ActiveCfg = Release|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.ActiveCfg = Release|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.Release|x64.Build.0 = Release|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
{6E449EB6-20AC-4FA6-B8D9-10F4BB7E1FEE}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.ActiveCfg = Debug|x64
|
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Debug|x64.Build.0 = Debug|x64
|
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.Build.0 = Debug|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.ActiveCfg = Release|x64
|
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.MinSizeRel|x64.Build.0 = Release|x64
|
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.Build.0 = Debug|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.ActiveCfg = Release|x64
|
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.ActiveCfg = Release|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.Release|x64.Build.0 = Release|x64
|
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.Build.0 = Release|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
{6963C314-83C4-4667-B0D0-C2F7AE208C29}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.ActiveCfg = Debug|x64
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Debug|x64.Build.0 = Debug|x64
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.Build.0 = Debug|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.MinSizeRel|x64.Build.0 = Debug|x64
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.Build.0 = Debug|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.ActiveCfg = Release|x64
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.ActiveCfg = Release|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.Release|x64.Build.0 = Release|x64
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.Build.0 = Release|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
||||||
{ECD78CC5-138F-4809-A764-2358C2AC2E82}.RelWithDebInfo|x64.Build.0 = Release|x64
|
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.Build.0 = Release|x64
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.ActiveCfg = Debug|x64
|
EndGlobalSection
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Debug|x64.Build.0 = Debug|x64
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
HideSolutionNode = FALSE
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.MinSizeRel|x64.Build.0 = Debug|x64
|
EndGlobalSection
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.ActiveCfg = Release|x64
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.Release|x64.Build.0 = Release|x64
|
SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58}
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
EndGlobalSection
|
||||||
{3201359D-C071-4089-9EDE-B04D759F1508}.RelWithDebInfo|x64.Build.0 = Release|x64
|
GlobalSection(Performance) = preSolution
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.ActiveCfg = Debug|x64
|
HasPerformanceSessions = true
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Debug|x64.Build.0 = Debug|x64
|
EndGlobalSection
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.ActiveCfg = Debug|x64
|
EndGlobal
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.MinSizeRel|x64.Build.0 = Debug|x64
|
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.ActiveCfg = Release|x64
|
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.Release|x64.Build.0 = Release|x64
|
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.ActiveCfg = Release|x64
|
|
||||||
{2B8C5D01-FF78-4BFA-B332-5E430586DAF9}.RelWithDebInfo|x64.Build.0 = Release|x64
|
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{4E4F491F-C688-43C4-88DA-AC92BC5FA1B8}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{2AC54ADC-3246-427E-9CA9-FEA2DBCB9432}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{4E96E5CC-7791-40B3-A8A1-C34FBB736B3B}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{51C40BA9-F226-4A35-939D-1ED6F5FF7299}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.Debug|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.Debug|x64.Build.0 = Debug|Any CPU
|
|
||||||
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.MinSizeRel|x64.Build.0 = Debug|Any CPU
|
|
||||||
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.Release|x64.ActiveCfg = Release|Any CPU
|
|
||||||
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.Release|x64.Build.0 = Release|Any CPU
|
|
||||||
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU
|
|
||||||
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
|
||||||
HideSolutionNode = FALSE
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
|
||||||
SolutionGuid = {422D1620-0166-4C26-9A81-CA8A2EB1AB58}
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(Performance) = preSolution
|
|
||||||
HasPerformanceSessions = true
|
|
||||||
EndGlobalSection
|
|
||||||
GlobalSection(NestedProjects) = preSolution
|
|
||||||
{56A8A70A-DA03-4CED-A144-EC10F1379FD8} = {4564E677-343A-46CB-AF02-AFC4E38BF94B}
|
|
||||||
{915EF238-CA0D-4E73-AF50-88CB3F29C7AD} = {4564E677-343A-46CB-AF02-AFC4E38BF94B}
|
|
||||||
{4E0E51AA-7B59-4808-B7CC-9EAEDF397460} = {915EF238-CA0D-4E73-AF50-88CB3F29C7AD}
|
|
||||||
EndGlobalSection
|
|
||||||
EndGlobal
|
|
||||||
@@ -8,6 +8,7 @@
|
|||||||
public int Integer;
|
public int Integer;
|
||||||
public double Real;
|
public double Real;
|
||||||
public string Identifier;
|
public string Identifier;
|
||||||
|
public DateTime DateTime;
|
||||||
public ImmutableList<IArithmeticExpression> Arguments;
|
public ImmutableList<IArithmeticExpression> Arguments;
|
||||||
public ImmutableList<Assignment> Assignments;
|
public ImmutableList<Assignment> Assignments;
|
||||||
public IArithmeticExpression Argument;
|
public IArithmeticExpression Argument;
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -1,22 +1,41 @@
|
|||||||
using System.Diagnostics;
|
using mbts.spark;
|
||||||
|
|
||||||
namespace BCG.Utilities.General;
|
using System;
|
||||||
|
using System.Runtime;
|
||||||
|
|
||||||
/// <summary>
|
namespace BCG.Utilities.General
|
||||||
/// Summary description for Crono.
|
{
|
||||||
/// </summary>
|
/// <summary>
|
||||||
public class Crono {
|
/// Summary description for Crono.
|
||||||
readonly Stopwatch myTimer = new();
|
/// </summary>
|
||||||
|
public class Crono
|
||||||
|
{
|
||||||
|
public Crono()
|
||||||
|
{
|
||||||
|
myTimer = new HighPerformanceTimer();
|
||||||
|
}
|
||||||
|
|
||||||
public void start() =>
|
public void start()
|
||||||
myTimer.Start();
|
{myTimer.start();}
|
||||||
|
|
||||||
public void stop() =>
|
public void stop()
|
||||||
myTimer.Stop();
|
{myTimer.stop();}
|
||||||
|
|
||||||
public TimeSpan time =>
|
public TimeSpan time
|
||||||
myTimer.Elapsed;
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
return new TimeSpan((long) (myTimer.totalMilliseconds * TimeSpan.TicksPerMillisecond));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public double miliseconds
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{return myTimer.totalMilliseconds;}
|
||||||
|
}
|
||||||
|
|
||||||
|
private HighPerformanceTimer myTimer;
|
||||||
|
}
|
||||||
|
|
||||||
public double miliseconds =>
|
|
||||||
myTimer.Elapsed.TotalMilliseconds;
|
|
||||||
}
|
}
|
||||||
@@ -1,192 +1,192 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using Microsoft.Win32;
|
using Microsoft.Win32;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
{
|
{
|
||||||
public enum RegistryRoot { HKCU, HKLM }
|
public enum RegistryRoot { HKCU, HKLM }
|
||||||
|
|
||||||
[Serializable]
|
[Serializable]
|
||||||
public class BlueRegistry
|
public class BlueRegistry
|
||||||
{
|
{
|
||||||
public const string BlueSubKey = @"Software\Blue Capital Group\";
|
public const string BlueSubKey = @"Software\Blue Capital Group\";
|
||||||
public static readonly string ApplicationPrefix;
|
public static readonly string ApplicationPrefix;
|
||||||
protected string myFullPath;
|
protected string myFullPath;
|
||||||
|
|
||||||
public BlueRegistry(string subPath)
|
public BlueRegistry(string subPath)
|
||||||
{
|
{
|
||||||
myFullPath = string.Concat(BlueRegistry.ApplicationPrefix, @"\", subPath);
|
myFullPath = string.Concat(BlueRegistry.ApplicationPrefix, @"\", subPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
public BlueRegistry(BlueRegistry parent, string subPath)
|
public BlueRegistry(BlueRegistry parent, string subPath)
|
||||||
{
|
{
|
||||||
myFullPath = string.Concat(parent.myFullPath, @"\", subPath);
|
myFullPath = string.Concat(parent.myFullPath, @"\", subPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
static BlueRegistry()
|
static BlueRegistry()
|
||||||
{
|
{
|
||||||
string app = "Applications";
|
string app = "Applications";
|
||||||
|
|
||||||
Assembly ass = Assembly.GetEntryAssembly();
|
Assembly ass = Assembly.GetEntryAssembly();
|
||||||
if (ass != null)
|
if (ass != null)
|
||||||
{
|
{
|
||||||
app = ass.GetName().Name;
|
app = ass.GetName().Name;
|
||||||
|
|
||||||
object[] attrs = ass.GetCustomAttributes(
|
object[] attrs = ass.GetCustomAttributes(
|
||||||
Type.GetType("System.Reflection.AssemblyTitleAttribute"), true);
|
Type.GetType("System.Reflection.AssemblyTitleAttribute"), true);
|
||||||
|
|
||||||
if (attrs.Length > 0 && ((AssemblyTitleAttribute)attrs[0]).Title != string.Empty)
|
if (attrs.Length > 0 && ((AssemblyTitleAttribute)attrs[0]).Title != string.Empty)
|
||||||
{
|
{
|
||||||
app = ((AssemblyTitleAttribute)attrs[0]).Title;
|
app = ((AssemblyTitleAttribute)attrs[0]).Title;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ApplicationPrefix = string.Concat(BlueRegistry.BlueSubKey, app);
|
ApplicationPrefix = string.Concat(BlueRegistry.BlueSubKey, app);
|
||||||
}
|
}
|
||||||
|
|
||||||
public object getValue(string name)
|
public object getValue(string name)
|
||||||
{
|
{
|
||||||
return getValue(RegistryRoot.HKCU, name);
|
return getValue(RegistryRoot.HKCU, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
public object getValue(string name, object defaultValue)
|
public object getValue(string name, object defaultValue)
|
||||||
{
|
{
|
||||||
return getValue(RegistryRoot.HKCU, name, defaultValue);
|
return getValue(RegistryRoot.HKCU, name, defaultValue);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setValue(string name, object value)
|
public void setValue(string name, object value)
|
||||||
{
|
{
|
||||||
setValue(RegistryRoot.HKCU, name, value);
|
setValue(RegistryRoot.HKCU, name, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void deleteValue(string name)
|
public void deleteValue(string name)
|
||||||
{
|
{
|
||||||
deleteValue(RegistryRoot.HKCU, name);
|
deleteValue(RegistryRoot.HKCU, name);
|
||||||
}
|
}
|
||||||
|
|
||||||
private RegistryKey myGetRegistryKey(RegistryRoot root)
|
private RegistryKey myGetRegistryKey(RegistryRoot root)
|
||||||
{
|
{
|
||||||
if (root == RegistryRoot.HKCU)
|
if (root == RegistryRoot.HKCU)
|
||||||
return Registry.CurrentUser.CreateSubKey(myFullPath);
|
return Registry.CurrentUser.CreateSubKey(myFullPath);
|
||||||
else
|
else
|
||||||
return Registry.LocalMachine.CreateSubKey(myFullPath);
|
return Registry.LocalMachine.CreateSubKey(myFullPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Generic Methods
|
#region Generic Methods
|
||||||
public virtual void setValue(RegistryRoot root, string name, object value)
|
internal virtual void setValue(RegistryRoot root, string name, object value)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
rk.SetValue(name, value);
|
rk.SetValue(name, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual object getValue(RegistryRoot root, string name)
|
internal virtual object getValue(RegistryRoot root, string name)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
return rk.GetValue(name);
|
return rk.GetValue(name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual void deleteValue(RegistryRoot root, string name)
|
internal virtual void deleteValue(RegistryRoot root, string name)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
rk.DeleteValue(name);
|
rk.DeleteValue(name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual object getValue(RegistryRoot root, string name, object defaultValue)
|
internal virtual object getValue(RegistryRoot root, string name, object defaultValue)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
return rk.GetValue(name, defaultValue);
|
return rk.GetValue(name, defaultValue);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Double
|
#region Double
|
||||||
internal virtual void setDouble(RegistryRoot root, string name, double value)
|
internal virtual void setDouble(RegistryRoot root, string name, double value)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
DoubleRegistryHandler.setValue(rk, name, value);
|
DoubleRegistryHandler.setValue(rk, name, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual double getDouble(RegistryRoot root, string name)
|
internal virtual double getDouble(RegistryRoot root, string name)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
return DoubleRegistryHandler.getValue(rk, name);
|
return DoubleRegistryHandler.getValue(rk, name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Enum
|
#region Enum
|
||||||
internal virtual void setEnum(RegistryRoot root, string name, Enum value)
|
internal virtual void setEnum(RegistryRoot root, string name, Enum value)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
EnumRegistryHandler.setValue(rk, name, value);
|
EnumRegistryHandler.setValue(rk, name, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual Enum getEnum(RegistryRoot root, string name, Type enumType)
|
internal virtual Enum getEnum(RegistryRoot root, string name, Type enumType)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
return EnumRegistryHandler.getValue(rk, name, enumType);
|
return EnumRegistryHandler.getValue(rk, name, enumType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region Array
|
#region Array
|
||||||
internal virtual void setArray(RegistryRoot root, string name, Array array)
|
internal virtual void setArray(RegistryRoot root, string name, Array array)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
ArrayRegistryHandler.setValue(rk, name, array);
|
ArrayRegistryHandler.setValue(rk, name, array);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual Array getArray(RegistryRoot root, string name, Type elementType)
|
internal virtual Array getArray(RegistryRoot root, string name, Type elementType)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
return ArrayRegistryHandler.getValue(rk, name, elementType);
|
return ArrayRegistryHandler.getValue(rk, name, elementType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
#region SortedList
|
#region SortedList
|
||||||
internal virtual void setSortedList(RegistryRoot root, string name, SortedList slist)
|
internal virtual void setSortedList(RegistryRoot root, string name, SortedList slist)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
SortedListRegistryHandler.setValue(rk, name, slist);
|
SortedListRegistryHandler.setValue(rk, name, slist);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual SortedList getSortedList(RegistryRoot root, string name)
|
internal virtual SortedList getSortedList(RegistryRoot root, string name)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
return SortedListRegistryHandler.getValue(rk, name);
|
return SortedListRegistryHandler.getValue(rk, name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual void deleteSortedList(RegistryRoot root, string name)
|
internal virtual void deleteSortedList(RegistryRoot root, string name)
|
||||||
{
|
{
|
||||||
using (RegistryKey rk = myGetRegistryKey(root))
|
using (RegistryKey rk = myGetRegistryKey(root))
|
||||||
{
|
{
|
||||||
SortedListRegistryHandler.deleteValue(rk, name);
|
SortedListRegistryHandler.deleteValue(rk, name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,10 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net8.0</TargetFramework>
|
<TargetFramework>net8.0-windows</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
<UseWindowsForms>true</UseWindowsForms>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,6 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Runtime.Versioning;
|
|
||||||
|
|
||||||
using Microsoft.Win32;
|
using Microsoft.Win32;
|
||||||
|
|
||||||
namespace BCG
|
namespace BCG
|
||||||
@@ -12,7 +10,6 @@ namespace BCG
|
|||||||
rk.SetValue (name, value.ToString ());
|
rk.SetValue (name, value.ToString ());
|
||||||
}
|
}
|
||||||
|
|
||||||
[SupportedOSPlatform("windows")]
|
|
||||||
public static double getValue (RegistryKey rk, string name)
|
public static double getValue (RegistryKey rk, string name)
|
||||||
{
|
{
|
||||||
object v = rk.GetValue (name);
|
object v = rk.GetValue (name);
|
||||||
|
|||||||
+21
-30
@@ -11,11 +11,11 @@ namespace BCG
|
|||||||
{
|
{
|
||||||
// event info that allows form to persist extra window state data
|
// event info that allows form to persist extra window state data
|
||||||
public delegate void WindowStateHandler (object sender, BlueRegistry bluereg);
|
public delegate void WindowStateHandler (object sender, BlueRegistry bluereg);
|
||||||
public event WindowStateHandler? LoadState;
|
public event WindowStateHandler LoadState;
|
||||||
public event WindowStateHandler? SaveState;
|
public event WindowStateHandler SaveState;
|
||||||
|
|
||||||
private Form? myParent;
|
private Form myParent;
|
||||||
private BlueRegistry? myRegistry;
|
private BlueRegistry myRegistry;
|
||||||
|
|
||||||
private int myNormalLeft;
|
private int myNormalLeft;
|
||||||
private int myNormalTop;
|
private int myNormalTop;
|
||||||
@@ -42,16 +42,13 @@ namespace BCG
|
|||||||
set { mySaveState = value; }
|
set { mySaveState = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public Form? parent
|
public Form parent
|
||||||
{
|
{
|
||||||
[DebuggerStepThrough]
|
[DebuggerStepThrough]
|
||||||
get { return myParent; }
|
get { return myParent; }
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
myParent = value;
|
myParent = value;
|
||||||
if (myParent is null) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
myRegistry = new BlueRegistry (myParent.Text);
|
myRegistry = new BlueRegistry (myParent.Text);
|
||||||
|
|
||||||
// subscribe to parent form's events
|
// subscribe to parent form's events
|
||||||
@@ -66,7 +63,7 @@ namespace BCG
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public BlueRegistry? blueRegistry
|
public BlueRegistry blueRegistry
|
||||||
{
|
{
|
||||||
[DebuggerStepThrough]
|
[DebuggerStepThrough]
|
||||||
get { return myRegistry; }
|
get { return myRegistry; }
|
||||||
@@ -86,10 +83,8 @@ namespace BCG
|
|||||||
set { myAllowSaveMinimized = value; }
|
set { myAllowSaveMinimized = value; }
|
||||||
}
|
}
|
||||||
|
|
||||||
void myOnResize(object? sender, EventArgs e) {
|
private void myOnResize(object sender, System.EventArgs e)
|
||||||
if (myParent is null) {
|
{
|
||||||
return;
|
|
||||||
}
|
|
||||||
// save width and height
|
// save width and height
|
||||||
if (myParent.WindowState == FormWindowState.Normal && myResizable)
|
if (myParent.WindowState == FormWindowState.Normal && myResizable)
|
||||||
{
|
{
|
||||||
@@ -98,10 +93,8 @@ namespace BCG
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void myOnMove(object? sender, EventArgs e) {
|
private void myOnMove(object sender, System.EventArgs e)
|
||||||
if (myParent is null) {
|
{
|
||||||
return;
|
|
||||||
}
|
|
||||||
// save position
|
// save position
|
||||||
if(myParent.WindowState == FormWindowState.Normal)
|
if(myParent.WindowState == FormWindowState.Normal)
|
||||||
{
|
{
|
||||||
@@ -112,18 +105,19 @@ namespace BCG
|
|||||||
myWindowState = myParent.WindowState;
|
myWindowState = myParent.WindowState;
|
||||||
}
|
}
|
||||||
|
|
||||||
void myOnClosing(object? sender, System.ComponentModel.CancelEventArgs e) {
|
private void myOnClosing(object sender, System.ComponentModel.CancelEventArgs e)
|
||||||
|
{
|
||||||
// save position, size and state
|
// save position, size and state
|
||||||
if (mySavePosition)
|
if (mySavePosition)
|
||||||
{
|
{
|
||||||
myRegistry?.setValue (RegistryRoot.HKCU, "Left", myNormalLeft);
|
myRegistry.setValue (RegistryRoot.HKCU, "Left", myNormalLeft);
|
||||||
myRegistry?.setValue (RegistryRoot.HKCU, "Top", myNormalTop);
|
myRegistry.setValue (RegistryRoot.HKCU, "Top", myNormalTop);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (myResizable)
|
if (myResizable)
|
||||||
{
|
{
|
||||||
myRegistry?.setValue (RegistryRoot.HKCU, "Width", myNormalWidth);
|
myRegistry.setValue (RegistryRoot.HKCU, "Width", myNormalWidth);
|
||||||
myRegistry?.setValue (RegistryRoot.HKCU, "Height", myNormalHeight);
|
myRegistry.setValue (RegistryRoot.HKCU, "Height", myNormalHeight);
|
||||||
}
|
}
|
||||||
|
|
||||||
// check if we are allowed to save the state as minimized (not normally)
|
// check if we are allowed to save the state as minimized (not normally)
|
||||||
@@ -134,18 +128,15 @@ namespace BCG
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (mySaveState)
|
if (mySaveState)
|
||||||
myRegistry?.setValue (RegistryRoot.HKCU, "WindowState", (int) myWindowState);
|
myRegistry.setValue (RegistryRoot.HKCU, "WindowState", (int) myWindowState);
|
||||||
|
|
||||||
// fire SaveState event
|
// fire SaveState event
|
||||||
if (myRegistry is not null) {
|
if (SaveState != null)
|
||||||
SaveState?.Invoke(this, myRegistry);
|
SaveState (this, myRegistry);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void myOnLoad (object? sender, EventArgs e) {
|
private void myOnLoad (object sender, System.EventArgs e)
|
||||||
if (myRegistry is null || myParent is null) {
|
{
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (mySavePosition)
|
if (mySavePosition)
|
||||||
{
|
{
|
||||||
int left = (int) myRegistry.getValue (RegistryRoot.HKCU, "Left", myParent.Left);
|
int left = (int) myRegistry.getValue (RegistryRoot.HKCU, "Left", myParent.Left);
|
||||||
@@ -6,80 +6,23 @@ using Spark.Core.Collections;
|
|||||||
|
|
||||||
static class ArgumentComparer {
|
static class ArgumentComparer {
|
||||||
public static int Compare(
|
public static int Compare(
|
||||||
IArgument value1, IArgument value2, IDictionary<string, object?> env) {
|
IArgument value1, IArgument value2, IDictionary<string,object?> env) {
|
||||||
if (value1 is null) {
|
if (value1 is null) {
|
||||||
throw new ArgumentNullException(nameof(value1));
|
throw new ArgumentNullException(nameof(value1));
|
||||||
}
|
}
|
||||||
if (value2 is null) {
|
if (value2 is null) {
|
||||||
throw new ArgumentNullException(nameof(value2));
|
throw new ArgumentNullException(nameof(value2));
|
||||||
}
|
}
|
||||||
var obj1 = value1.GetValue(env);
|
var cmp1 = value1.Cast<IComparable>();
|
||||||
var obj2 = value2.GetValue(env);
|
var cmp2 = value2.Cast<IComparable>();
|
||||||
if (obj1 is null) {
|
|
||||||
if (obj2 is null) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
if (obj2 is null) {
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
return compareObjs(obj1, obj2);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int compareObjs(object obj1, object obj2) {
|
|
||||||
try {
|
try {
|
||||||
var typ1 = obj1.GetType();
|
var v1 = cmp1.GetValue(env);
|
||||||
var typ2 = obj2.GetType();
|
var v2 = cmp2.GetValue(env);
|
||||||
bool areSameTypes = typ1 == typ2;
|
return v1.GetType().IsNumeric() ?
|
||||||
if (areSameTypes) {
|
new NumericComparer().Compare(v1, v2) : v1.CompareTo(v2);
|
||||||
return ((IComparable)obj1).CompareTo(obj2);
|
|
||||||
}
|
|
||||||
if (typ1.IsNumeric()) {
|
|
||||||
return tryCompareNumeric(obj1, obj2);
|
|
||||||
} else if (typ2.IsNumeric()) {
|
|
||||||
return -tryCompareNumeric(obj2, obj1);
|
|
||||||
} else if (typ1.IsEnum) {
|
|
||||||
if (typ2 == typeof(string)) {
|
|
||||||
return -((string)obj2).CompareTo(obj1.ToString());
|
|
||||||
}
|
|
||||||
} else if (typ1 == typeof(string)) {
|
|
||||||
return ((string)obj1).CompareTo(obj2.ToString());
|
|
||||||
} else if (typ1 == typeof(DateTime)) {
|
|
||||||
if (typ2 == typeof(TimeSpan)) {
|
|
||||||
return ((DateTime)obj1).Ticks.CompareTo(((TimeSpan)obj2).Ticks);
|
|
||||||
}
|
|
||||||
} else if (typ1 == typeof(TimeSpan)) {
|
|
||||||
if (typ2 == typeof(DateTime)) {
|
|
||||||
return ((TimeSpan)obj1).Ticks.CompareTo(((DateTime)obj2).Ticks);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
Log.Ui.error($"Comparison failed: {ex}");
|
Log.Ui.error($"Comparison failed: {ex}");
|
||||||
throw;
|
throw;
|
||||||
}
|
}
|
||||||
throw new ArgumentException("Failed to compare obj1 and obj2", nameof(obj1));
|
|
||||||
}
|
|
||||||
|
|
||||||
static int tryCompareNumeric(object numericObj1, object obj2) {
|
|
||||||
var typ2 = obj2.GetType();
|
|
||||||
if (typ2.IsNumeric()) {
|
|
||||||
return new NumericComparer().Compare(numericObj1, obj2);
|
|
||||||
} else if (typ2.IsEnum) {
|
|
||||||
var undTyp2 = typ2.GetEnumUnderlyingType();
|
|
||||||
if (undTyp2 == typeof(byte)) {
|
|
||||||
return new NumericComparer().Compare(numericObj1, (byte)obj2);
|
|
||||||
}
|
|
||||||
if (undTyp2 == typeof(short)) {
|
|
||||||
return new NumericComparer().Compare(numericObj1, (short)obj2);
|
|
||||||
}
|
|
||||||
if (undTyp2 == typeof(int)) {
|
|
||||||
return new NumericComparer().Compare(numericObj1, (int)obj2);
|
|
||||||
}
|
|
||||||
if (undTyp2 == typeof(long)) {
|
|
||||||
return new NumericComparer().Compare(numericObj1, (long)obj2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw new ArgumentException("Failed to compare numeric obj1 and obj2", nameof(obj2));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,11 +1,19 @@
|
|||||||
namespace Bts.BooleanExpressions;
|
namespace Bts.BooleanExpressions;
|
||||||
|
|
||||||
|
using bts;
|
||||||
|
|
||||||
class BooleanExpression : IBooleanExpression {
|
class BooleanExpression : IBooleanExpression {
|
||||||
readonly Func<IDictionary<string, object?>, bool> evaluate;
|
readonly Func<IDictionary<string, object?>, bool> evaluate;
|
||||||
|
|
||||||
public BooleanExpression(Func<IDictionary<string, object?>, bool> evaluate) =>
|
public BooleanExpression(Func<IDictionary<string, object?>, bool> evaluate) =>
|
||||||
this.evaluate = evaluate;
|
this.evaluate = evaluate;
|
||||||
|
|
||||||
public bool Evaluate(IDictionary<string, object?> env) =>
|
public bool Evaluate(IDictionary<string, object?> env) {
|
||||||
evaluate(env);
|
try {
|
||||||
|
return evaluate(env);
|
||||||
|
} catch (Exception ex) {
|
||||||
|
Log.assert(false, $"BooleanExpression.Evaluate failed: {ex}");
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -41,11 +41,17 @@ Identifier {Letter}({Letter}*[0-9]*_*)*
|
|||||||
OpenParenthesis \(
|
OpenParenthesis \(
|
||||||
CloseParenthesis \)
|
CloseParenthesis \)
|
||||||
Comma ,
|
Comma ,
|
||||||
|
Negate '!'
|
||||||
MapsTo ':'
|
MapsTo ':'
|
||||||
IsOfType '/'
|
IsOfType '/'
|
||||||
|
|
||||||
%%
|
%%
|
||||||
|
|
||||||
|
{StringConstant} {
|
||||||
|
yylval.String = yytext.Substring(1, yytext.Length - 2).Replace(@"\'", "'");
|
||||||
|
return (int)Token.STRING_CONSTANT;
|
||||||
|
}
|
||||||
|
|
||||||
{BooleanConstant} {
|
{BooleanConstant} {
|
||||||
yylval.Boolean = yytext.ToLower() switch {
|
yylval.Boolean = yytext.ToLower() switch {
|
||||||
"true" => true,
|
"true" => true,
|
||||||
@@ -56,11 +62,6 @@ IsOfType '/'
|
|||||||
return (int)Token.BOOLEAN_CONSTANT;
|
return (int)Token.BOOLEAN_CONSTANT;
|
||||||
}
|
}
|
||||||
|
|
||||||
{StringConstant} {
|
|
||||||
yylval.String = yytext.Substring(1, yytext.Length - 2).Replace(@"\'", "'");
|
|
||||||
return (int)Token.STRING_CONSTANT;
|
|
||||||
}
|
|
||||||
|
|
||||||
{NullConstant} {
|
{NullConstant} {
|
||||||
yylval.Null = DBNull.Value;
|
yylval.Null = DBNull.Value;
|
||||||
return (int)Token.NULL_CONSTANT;
|
return (int)Token.NULL_CONSTANT;
|
||||||
@@ -93,6 +94,10 @@ IsOfType '/'
|
|||||||
return (int)Token.COMMA;
|
return (int)Token.COMMA;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{Negate} {
|
||||||
|
return (int)Token.NEGATE;
|
||||||
|
}
|
||||||
|
|
||||||
{MapsTo} {
|
{MapsTo} {
|
||||||
return (int)Token.MAPS_TO;
|
return (int)Token.MAPS_TO;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Google.Protobuf" Version="3.24.3" />
|
<PackageReference Include="Google.Protobuf" Version="3.24.3" />
|
||||||
<PackageReference Include="YaccLexTools" Version="1.2.3" />
|
<PackageReference Include="YaccLexTools" Version="1.2.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -2,8 +2,6 @@ namespace Bts.BooleanExpressions;
|
|||||||
|
|
||||||
using Bts.BooleanExpressions.Arguments;
|
using Bts.BooleanExpressions.Arguments;
|
||||||
|
|
||||||
using Spark.Core.Collections;
|
|
||||||
|
|
||||||
class BoundBooleanExpression : IBooleanExpression {
|
class BoundBooleanExpression : IBooleanExpression {
|
||||||
readonly IBooleanExpression expression;
|
readonly IBooleanExpression expression;
|
||||||
readonly IDictionary<string, FunctionDefinition> definitions;
|
readonly IDictionary<string, FunctionDefinition> definitions;
|
||||||
@@ -19,10 +17,10 @@ class BoundBooleanExpression : IBooleanExpression {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public bool Evaluate(IDictionary<string, object?> env) {
|
public bool Evaluate(IDictionary<string, object?> env) {
|
||||||
if (identifiers.Count > 0) {
|
foreach (var kv in env) {
|
||||||
env = AggregateDictionary.Create(env, identifiers);
|
identifiers[kv.Key] = kv.Value;
|
||||||
}
|
}
|
||||||
env = new EvaluationEnvironment(env, definitions);
|
env = new EvaluationEnvironment(identifiers, definitions);
|
||||||
return expression.Evaluate(env);
|
return expression.Evaluate(env);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,15 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\..\client\spark_websocket\spark_websocket.csproj" />
|
||||||
|
<ProjectReference Include="..\DataStreamExpressions\DataStreamExpressions.csproj" />
|
||||||
|
<ProjectReference Include="..\..\client\spark_core\spark_core.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
namespace Bts.DataStream.Websocket;
|
||||||
|
|
||||||
|
class ClientSubscription(WebsocketClientID id, SubscriptionParams @params, IDisposable dispose) : IDisposable {
|
||||||
|
public SubscriptionParams Params => @params;
|
||||||
|
public WebsocketClientID Id => id;
|
||||||
|
|
||||||
|
public void Dispose() =>
|
||||||
|
dispose.Dispose();
|
||||||
|
}
|
||||||
@@ -0,0 +1,301 @@
|
|||||||
|
namespace Bts.DataStream.Websocket;
|
||||||
|
|
||||||
|
using BCG;
|
||||||
|
|
||||||
|
using bts;
|
||||||
|
using bts.api.core;
|
||||||
|
using bts.collections;
|
||||||
|
|
||||||
|
using Bts.DataStreamExpressions;
|
||||||
|
using Bts.Websocket;
|
||||||
|
|
||||||
|
using mbts.utils;
|
||||||
|
|
||||||
|
using Spark.Core.Disposables;
|
||||||
|
using Spark.Core.Json;
|
||||||
|
|
||||||
|
using System.Buffers;
|
||||||
|
using System.Reactive.Subjects;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Nodes;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Represents an I/O model (<see cref="ISubject{TSource, TResult}"/>), that accepts websocket
|
||||||
|
/// requests (from clients) as input, and emits data/notifications (to clients) as output.
|
||||||
|
/// This class's chief role is managing data subscriptions to sparkd on the clients' behalf.
|
||||||
|
/// </summary>
|
||||||
|
public class DataSync(JsonSerializerOptions? serializerOpts = null) :
|
||||||
|
ISubject<WebsocketConnectionUpdate, IEnumerable<WebsocketOutgoingMessage>> {
|
||||||
|
protected readonly object lockObj = new();
|
||||||
|
readonly JsonSerializerOptions serializerOpts = serializerOpts ?? JsonSerializerOptions.Default;
|
||||||
|
readonly Dictionary<WebsocketClientID, List<ClientSubscription>> clients = [];
|
||||||
|
|
||||||
|
event Action<IEnumerable<WebsocketOutgoingMessage>>? requestSend;
|
||||||
|
|
||||||
|
public void OnCompleted() =>
|
||||||
|
Log.Api.info("DataSync incoming request stream has completed.");
|
||||||
|
|
||||||
|
public void OnError(Exception error) =>
|
||||||
|
Log.Api.error($"DataSync error: {error}");
|
||||||
|
|
||||||
|
public void OnNext(WebsocketConnectionUpdate value) {
|
||||||
|
switch (value.Type) {
|
||||||
|
case WebsocketConnectionUpdateType.IncomingMessage:
|
||||||
|
onIncomingMessage(value.IncomingMessage);
|
||||||
|
break;
|
||||||
|
case WebsocketConnectionUpdateType.Connect:
|
||||||
|
onConnect(value.Connect);
|
||||||
|
break;
|
||||||
|
case WebsocketConnectionUpdateType.Disconnect:
|
||||||
|
onDisconnect(value.Disconnect);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
Log.assert(false, $"Unexpected WebsocketConnectionUpdate type: {value.Type}");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public IDisposable Subscribe(IObserver<IEnumerable<WebsocketOutgoingMessage>> observer) {
|
||||||
|
lock (lockObj) {
|
||||||
|
requestSend += observer.OnNext;
|
||||||
|
return Disposable.Create(Dispose);
|
||||||
|
}
|
||||||
|
void Dispose() {
|
||||||
|
lock (lockObj) {
|
||||||
|
requestSend -= observer.OnNext;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static JsonRpcId? extractRpcId(string messageBody) {
|
||||||
|
try {
|
||||||
|
return JsonNode.Parse(messageBody)
|
||||||
|
?.AsObject()
|
||||||
|
?.GetValueOrDefault("id")
|
||||||
|
?.Deserialize<JsonRpcId>();
|
||||||
|
} catch {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static string getRpcNotification(DataPacket dp) {
|
||||||
|
using (var buffer = new MemoryStream())
|
||||||
|
using (var writer = new Utf8JsonWriter(buffer))
|
||||||
|
using (writer.WriteObject()) {
|
||||||
|
writer.WriteString("method", "subscription");
|
||||||
|
using (writer.WriteObject("params")) {
|
||||||
|
writer.Write("tableName", dp.schema.tableName);
|
||||||
|
writer.Write("columns", dp.schema.columnInfo);
|
||||||
|
var cellJsonFactories = dp.schema.columnInfo.Select(getCellJsonFactory).ToList();
|
||||||
|
using (writer.WriteArray("added")) {
|
||||||
|
foreach (IBlueRow row in (dp.addedRows?.Cast<IBlueRow>()).empty_if_null()) {
|
||||||
|
using (writer.WriteObject()) {
|
||||||
|
for (int i = 0; i < cellJsonFactories.Count; i++) {
|
||||||
|
writer.Write(dp.schema.columnInfo[i].colName, cellJsonFactories[i](row));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
using (writer.WriteArray("deleted")) {
|
||||||
|
foreach (IBlueRow row in (dp.deletedRows?.Cast<IBlueRow>()).empty_if_null()) {
|
||||||
|
using (writer.WriteObject()) {
|
||||||
|
for (int i = 0; i < cellJsonFactories.Count; i++) {
|
||||||
|
writer.Write(dp.schema.columnInfo[i].colName, cellJsonFactories[i](row));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
writer.WriteString("jsonrpc", "2.0");
|
||||||
|
writer.Flush();
|
||||||
|
return Encoding.UTF8.GetString(buffer.ToArray());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static Func<IBlueRow, JsonNode?> getCellJsonFactory(ColumnInfo colInfo) {
|
||||||
|
var t = colInfo.colType;
|
||||||
|
if (t == typeof(int)) {
|
||||||
|
return NullCheckWrapper(v => (int)v);
|
||||||
|
}
|
||||||
|
if (t == typeof(uint)) {
|
||||||
|
return NullCheckWrapper(v => (uint)v);
|
||||||
|
}
|
||||||
|
if (t == typeof(long)) {
|
||||||
|
return NullCheckWrapper(v => (long)v);
|
||||||
|
}
|
||||||
|
if (t == typeof(ulong)) {
|
||||||
|
return NullCheckWrapper(v => (ulong)v);
|
||||||
|
}
|
||||||
|
if (t == typeof(short)) {
|
||||||
|
return NullCheckWrapper(v => (short)v);
|
||||||
|
}
|
||||||
|
if (t == typeof(ushort)) {
|
||||||
|
return NullCheckWrapper(v => (ushort)v);
|
||||||
|
}
|
||||||
|
if (t == typeof(double)) {
|
||||||
|
return NullCheckWrapper(v => (double)v);
|
||||||
|
}
|
||||||
|
if (t == typeof(float)) {
|
||||||
|
return NullCheckWrapper(v => (float)v);
|
||||||
|
}
|
||||||
|
if (t == typeof(bool)) {
|
||||||
|
return NullCheckWrapper(v => (bool)v);
|
||||||
|
}
|
||||||
|
return NullCheckWrapper(v => (string)v);
|
||||||
|
|
||||||
|
Func<IBlueRow, JsonNode?> NullCheckWrapper(Func<object, JsonNode> toJson) =>
|
||||||
|
r => {
|
||||||
|
var obj = r[colInfo.colNo];
|
||||||
|
if (obj is null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return toJson(obj);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
void onConnect(WebsocketConnectNotification notification) {
|
||||||
|
var id = notification.Id;
|
||||||
|
lock (lockObj) {
|
||||||
|
clients.Add(id, []);
|
||||||
|
}
|
||||||
|
Log.Api.info($"DataStreamWebsocketDataSync client connected. clientId: {notification.Id}");
|
||||||
|
if (notification.Message is not null) {
|
||||||
|
onIncomingMessage(notification.Message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void onDisconnect(WebsocketDisconnectNotification notification) {
|
||||||
|
Log.Api.warn($"DataStreamWebsocketDataSync client disconnected. clientId: {notification.Id}");
|
||||||
|
unsubscribeAll(notification.Id);
|
||||||
|
clients.Remove(notification.Id);
|
||||||
|
}
|
||||||
|
|
||||||
|
void onIncomingMessage(WebsocketIncomingMessage message) {
|
||||||
|
var id = message.sender_client_id;
|
||||||
|
if (!JsonRpcRequest.TryDeserialize(message, out var req, out var err)) {
|
||||||
|
onBadRequest(message, err);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
switch (req.Method!.ToLower()) {
|
||||||
|
case "subscribe":
|
||||||
|
subscribe(id, req);
|
||||||
|
break;
|
||||||
|
case "publish":
|
||||||
|
Log.Api.error("DataStreamWebsocket api 'publish' not implemented.");
|
||||||
|
// TODO
|
||||||
|
break;
|
||||||
|
case "unsubscribe":
|
||||||
|
unsubscribe(id, req);
|
||||||
|
break;
|
||||||
|
case "unsubscribe_all":
|
||||||
|
unsubscribeAll(id);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
Log.Api.error($"Received request of unknown type: {req}");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void sendResponse<T>(WebsocketClientID id, JsonRpcId rpcId, T rpcParams) {
|
||||||
|
var rpcRes = JsonRpcResponse.Create(rpcId, rpcParams);
|
||||||
|
var rpcResStr = JsonSerializer.Serialize(rpcRes, serializerOpts);
|
||||||
|
send([new(id, rpcResStr)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
void sendError<T>(WebsocketClientID id, JsonRpcId rpcId, JsonRpcError<T> error) {
|
||||||
|
var rpcRes = JsonRpcResponse.CreateError(rpcId, error);
|
||||||
|
var rpcResStr = JsonSerializer.Serialize(rpcRes, serializerOpts);
|
||||||
|
send([new(id, rpcResStr)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool send(IEnumerable<WebsocketOutgoingMessage> messages) {
|
||||||
|
lock (lockObj) {
|
||||||
|
if (requestSend is null) {
|
||||||
|
Log.Api.warn(
|
||||||
|
$"Unable to send message(s) because '{nameof(requestSend)}' handler is null");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
requestSend(messages);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void subscribe(WebsocketClientID id, JsonRpcRequest<JsonObject?> req) {
|
||||||
|
var subParams = req.Params!.Deserialize<SubscriptionParams>()!;
|
||||||
|
var exp = DataStreamExpressionsInterpreter.Evaluate(subParams.Query!);
|
||||||
|
var stream = exp.getView(new Dictionary<string, StatementExpression>(0));
|
||||||
|
var sub = new ClientSubscription(id, subParams, Disposable.Create(Dispose));
|
||||||
|
lock (lockObj) {
|
||||||
|
clients[id].Add(sub);
|
||||||
|
sendResponse(id, req.Id!.Value, req.Params);
|
||||||
|
stream.onChange += OnChange;
|
||||||
|
}
|
||||||
|
|
||||||
|
void OnChange(object? newValue) {
|
||||||
|
var dp = ExceptionAssert.of_type<DataPacket>(newValue);
|
||||||
|
var notif = getRpcNotification(dp);
|
||||||
|
send([new(id, notif)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Dispose() =>
|
||||||
|
stream.onChange -= OnChange;
|
||||||
|
}
|
||||||
|
|
||||||
|
void unsubscribe(WebsocketClientID id, JsonRpcRequest<JsonObject?> req) {
|
||||||
|
var subParams = req.Params!.Deserialize<SubscriptionParams>();
|
||||||
|
var subParamsStr = JsonSerializer.Serialize(subParams, serializerOpts);
|
||||||
|
// Minimize amount of code inside lock (just need it to find/remove the subscription)
|
||||||
|
List<ClientSubscription>? subs = null;
|
||||||
|
ClientSubscription? sub = null;
|
||||||
|
lock (lockObj) {
|
||||||
|
subs = clients.GetValueOrDefault(id);
|
||||||
|
subs?.TryRemoveFirst(s => s!.Params.Equals(subParams), out sub);
|
||||||
|
}
|
||||||
|
if (subs is null) {
|
||||||
|
// Didn't find client (log/throw).
|
||||||
|
var msg = $"Unable to unsubscribe: did not find client. Id: {id}.\nParams:\n{subParamsStr}";
|
||||||
|
Log.Api.error(msg);
|
||||||
|
throw new Exception(msg);
|
||||||
|
}
|
||||||
|
if (sub is null) {
|
||||||
|
// Found client, but didn't find subscription (log/throw).
|
||||||
|
var msg = $"Unable to unsubscribe: did not find the specified subscription. " +
|
||||||
|
$"Id: {id}. Request:\n{subParams}";
|
||||||
|
Log.Api.error(msg);
|
||||||
|
throw new Exception(msg);
|
||||||
|
}
|
||||||
|
// Found client and subscription (dispose/remove subscription).
|
||||||
|
Log.Api.info($"Unsubscribing client. Id: {id}.\nParams:\n{subParamsStr}");
|
||||||
|
sub.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void unsubscribeAll(WebsocketClientID id) {
|
||||||
|
lock (lockObj) {
|
||||||
|
if (!clients.TryGetValue(id, out var subs)) {
|
||||||
|
throw new Exception(
|
||||||
|
$"Unable to unsubscribe: did not find client with id {id}");
|
||||||
|
}
|
||||||
|
subs.DisposeAll();
|
||||||
|
subs.Clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void onBadRequest(WebsocketIncomingMessage req, string? errorMsg) {
|
||||||
|
var rpcId = extractRpcId(req.message_body);
|
||||||
|
var logMsg = $"Recieved invalid request:\n{req.message_body}";
|
||||||
|
if (errorMsg is not null) {
|
||||||
|
logMsg += $"\n\n**Exception**\n{errorMsg}";
|
||||||
|
}
|
||||||
|
Log.Api.error(logMsg);
|
||||||
|
if (rpcId is null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Send error back to client
|
||||||
|
var rpcErr = JsonRpcError.Create(
|
||||||
|
(long)JsonRpcErrorCode.InvalidRequest,
|
||||||
|
$"Received invalid request: {errorMsg ?? "unknown error"}",
|
||||||
|
req.message_body);
|
||||||
|
sendError(req.sender_client_id, rpcId.Value, rpcErr);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
namespace Bts.DataStream.Websocket;
|
||||||
|
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
|
|
||||||
|
public static class JObjectExtensions {
|
||||||
|
public static bool TryParse<T>(
|
||||||
|
this JObject filter, string key, [MaybeNull] out T obj, [NotNullWhen(false)] out string? error) {
|
||||||
|
obj = default;
|
||||||
|
var value = filter.GetValueOrDefault(key)?.ToString();
|
||||||
|
if (value == null) {
|
||||||
|
error = $"{key} not present";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return WebsocketJsonParsers.TryParse(value, key, out obj, out error);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static bool TryParse<T>(
|
||||||
|
this JObject filter, string key, out T result, [NotNullWhen(false)] out string? error, T defaultValue) {
|
||||||
|
var value = filter.GetValueOrDefault(key)?.ToString();
|
||||||
|
if (value == null) {
|
||||||
|
result = defaultValue;
|
||||||
|
error = $"{key} not present";
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (WebsocketJsonParsers.TryParse<T>(value, key, out var maybeRes, out error)) {
|
||||||
|
result = maybeRes ?? defaultValue;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
result = defaultValue;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
namespace Bts.DataStream.Websocket;
|
||||||
|
|
||||||
|
using Newtonsoft.Json.Linq;
|
||||||
|
|
||||||
|
class JsonParseResult {
|
||||||
|
public string? MessageId { get; init; }
|
||||||
|
public RequestType Type { get; init; }
|
||||||
|
public JObject? Parameters { get; init; }
|
||||||
|
public string? Error { get; init; }
|
||||||
|
public bool Successful => Error is not null;
|
||||||
|
|
||||||
|
public static JsonParseResult CreateError(string error) =>
|
||||||
|
new() {
|
||||||
|
Error = error,
|
||||||
|
MessageId = "missing"
|
||||||
|
};
|
||||||
|
|
||||||
|
public static JsonParseResult Create(string messageId, RequestType type, JObject parameters) =>
|
||||||
|
new() {
|
||||||
|
MessageId = messageId,
|
||||||
|
Parameters = parameters,
|
||||||
|
Type = type
|
||||||
|
};
|
||||||
|
}
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
namespace bts.websocket_core.json_rpc;
|
namespace Bts.DataStream.Websocket;
|
||||||
|
|
||||||
public enum JsonRpcErrorCode {
|
public enum JsonRpcErrorCode {
|
||||||
None = 0,
|
None = 0,
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
namespace Bts.DataStream.Websocket;
|
||||||
|
|
||||||
|
using Spark.Core;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
class MultilineStringJsonConverter : JsonConverter<string> {
|
||||||
|
public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
|
||||||
|
if (typeToConvert != typeof(string)) {
|
||||||
|
throw new ArgumentException($"Unable to parse {typeToConvert}", nameof(typeToConvert));
|
||||||
|
}
|
||||||
|
return reader.TokenType switch {
|
||||||
|
JsonTokenType.String => StringImpl(ref reader),
|
||||||
|
JsonTokenType.StartArray => ArrayImpl(ref reader),
|
||||||
|
_ => throw new ArgumentException(
|
||||||
|
$"Unable to parse {typeof(SubscriptionParams)} from {reader.TokenType}"),
|
||||||
|
};
|
||||||
|
|
||||||
|
static string? StringImpl(ref Utf8JsonReader reader) =>
|
||||||
|
new(reader.GetString()!);
|
||||||
|
|
||||||
|
static string? ArrayImpl(ref Utf8JsonReader reader) {
|
||||||
|
var lines = new List<string>(2);
|
||||||
|
while (reader.Read()) {
|
||||||
|
switch (reader.TokenType) {
|
||||||
|
case JsonTokenType.String:
|
||||||
|
lines.Add(reader.GetString()!);
|
||||||
|
break;
|
||||||
|
case JsonTokenType.EndArray:
|
||||||
|
return string.Join("\n", lines);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new JsonException(
|
||||||
|
$"Failed to parse {typeof(SubscriptionParams)} (did not reach end of array)");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options) {
|
||||||
|
var lines = value.Split("\n");
|
||||||
|
if (lines.Length < 2) {
|
||||||
|
writer.WriteRawValue(value);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
writer.WriteRawValue($"[{", ".join(lines)}]");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace Bts.DataStream.Websocket;
|
||||||
|
|
||||||
|
public enum RequestType {
|
||||||
|
Unspecified,
|
||||||
|
Subscribe,
|
||||||
|
Unsubscribe,
|
||||||
|
UnsubscribeAll,
|
||||||
|
}
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
namespace Bts.DataStream.Websocket;
|
||||||
|
|
||||||
|
using bts;
|
||||||
|
|
||||||
|
using Bts.Websocket;
|
||||||
|
|
||||||
|
using Google.Protobuf;
|
||||||
|
|
||||||
|
using System.Text.Json;
|
||||||
|
|
||||||
|
public static class Session {
|
||||||
|
static int sessionIdCounter;
|
||||||
|
|
||||||
|
public static async Task Start(
|
||||||
|
WebsocketServerConfig config, JsonSerializerOptions? opts) {
|
||||||
|
opts ??= JsonSerializerOptions.Default;
|
||||||
|
var sessionId = Interlocked.Increment(ref sessionIdCounter);
|
||||||
|
var gateway = new WebsocketGatewayObservable(config);
|
||||||
|
var sync = new DataSync(opts);
|
||||||
|
using (gateway.Subscribe(sync))
|
||||||
|
using (sync.Subscribe(gateway)) {
|
||||||
|
Log.Api.info($"Starting DataStream Websocket Session {sessionId}");
|
||||||
|
Log.Api.info($"DataStream Websocket Session {sessionId} config:\n{JsonFormatter.Default.Format(config)}");
|
||||||
|
await gateway.ConnectAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,110 @@
|
|||||||
|
namespace Bts.DataStream.Websocket;
|
||||||
|
|
||||||
|
using Spark.Core;
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Diagnostics.CodeAnalysis;
|
||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
public class SubscriptionParams : IEquatable<SubscriptionParams> {
|
||||||
|
static class PropNames {
|
||||||
|
public const string QUERY = "query";
|
||||||
|
}
|
||||||
|
|
||||||
|
public SubscriptionParams(string? query) {
|
||||||
|
Query = query;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Serializer supports plain string, or an array of lines for convenience
|
||||||
|
[MaybeNull]
|
||||||
|
[JsonPropertyName(PropNames.QUERY)]
|
||||||
|
[JsonConverter(typeof(MultilineStringJsonConverter))]
|
||||||
|
public string? Query { get; set; }
|
||||||
|
|
||||||
|
public bool Equals(SubscriptionParams? other) =>
|
||||||
|
other is not null &&
|
||||||
|
Query == other.Query;
|
||||||
|
|
||||||
|
class SubscriptionParamsConverter : JsonConverter<SubscriptionParams> {
|
||||||
|
public override bool CanConvert(Type typeToConvert) =>
|
||||||
|
typeToConvert == typeof(SubscriptionParams);
|
||||||
|
|
||||||
|
public override SubscriptionParams Read(
|
||||||
|
ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) {
|
||||||
|
if (typeToConvert != typeof(SubscriptionParams)) {
|
||||||
|
throw new ArgumentException($"Unable to parse {typeToConvert}", nameof(typeToConvert));
|
||||||
|
}
|
||||||
|
return read(ref reader);
|
||||||
|
}
|
||||||
|
|
||||||
|
SubscriptionParams read(ref Utf8JsonReader reader) {
|
||||||
|
return reader.TokenType switch {
|
||||||
|
JsonTokenType.String => stringImpl(ref reader),
|
||||||
|
JsonTokenType.StartArray => arrayImpl(ref reader),
|
||||||
|
JsonTokenType.StartObject => objectImpl(ref reader),
|
||||||
|
_ => throw new ArgumentException(
|
||||||
|
$"Unable to parse {typeof(SubscriptionParams)} from {reader.TokenType}"),
|
||||||
|
};
|
||||||
|
|
||||||
|
static SubscriptionParams stringImpl(ref Utf8JsonReader reader) =>
|
||||||
|
new(reader.GetString()!);
|
||||||
|
|
||||||
|
static SubscriptionParams arrayImpl(ref Utf8JsonReader reader) {
|
||||||
|
var lines = new List<string>(2);
|
||||||
|
while (reader.Read()) {
|
||||||
|
switch (reader.TokenType) {
|
||||||
|
case JsonTokenType.String:
|
||||||
|
lines.Add(reader.GetString()!);
|
||||||
|
break;
|
||||||
|
case JsonTokenType.EndArray:
|
||||||
|
return new("\n".join(lines));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new JsonException(
|
||||||
|
$"Failed to parse {typeof(SubscriptionParams)} (did not reach end of array)");
|
||||||
|
}
|
||||||
|
|
||||||
|
static SubscriptionParams objectImpl(ref Utf8JsonReader reader) {
|
||||||
|
var lines = new List<string>(2);
|
||||||
|
while (reader.Read()) {
|
||||||
|
switch (reader.TokenType) {
|
||||||
|
case JsonTokenType.PropertyName:
|
||||||
|
var propName = reader.GetString()!;
|
||||||
|
if (propName == PropNames.QUERY) {
|
||||||
|
switch (reader.TokenType) {
|
||||||
|
case JsonTokenType.StartArray:
|
||||||
|
return arrayImpl(ref reader);
|
||||||
|
case JsonTokenType.String:
|
||||||
|
return stringImpl(ref reader);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case JsonTokenType.String:
|
||||||
|
lines.Add(reader.GetString()!);
|
||||||
|
break;
|
||||||
|
case JsonTokenType.EndArray:
|
||||||
|
return new("\n".join(lines));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new JsonException(
|
||||||
|
$"Failed to parse {typeof(SubscriptionParams)} (did not reach end of array)");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Write(
|
||||||
|
Utf8JsonWriter writer, SubscriptionParams value, JsonSerializerOptions options) {
|
||||||
|
var q = value.Query;
|
||||||
|
var lines = q?.Split("\n");
|
||||||
|
if (lines is null || lines.Length < 2) {
|
||||||
|
writer.WriteString(PropNames.QUERY, value.Query);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
writer.WriteStartArray(PropNames.QUERY);
|
||||||
|
foreach (var l in lines) {
|
||||||
|
writer.WriteStringValue(l);
|
||||||
|
}
|
||||||
|
writer.WriteEndArray();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
global using bts.websocket_core;
|
||||||
|
|
||||||
|
global using System;
|
||||||
|
|
||||||
|
global using System.Collections.Immutable;
|
||||||
+10
@@ -0,0 +1,10 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<EnableDefaultContentItems>True</EnableDefaultContentItems>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
@page
|
||||||
|
@model ErrorModel
|
||||||
|
@{
|
||||||
|
ViewData["Title"] = "Error";
|
||||||
|
}
|
||||||
|
|
||||||
|
<h1 class="text-danger">Error.</h1>
|
||||||
|
<h2 class="text-danger">An error occurred while processing your request.</h2>
|
||||||
|
|
||||||
|
@if (Model.ShowRequestId)
|
||||||
|
{
|
||||||
|
<p>
|
||||||
|
<strong>Request ID:</strong> <code>@Model.RequestId</code>
|
||||||
|
</p>
|
||||||
|
}
|
||||||
|
|
||||||
|
<h3>Development Mode</h3>
|
||||||
|
<p>
|
||||||
|
Swapping to the <strong>Development</strong> environment displays detailed information about the error that occurred.
|
||||||
|
</p>
|
||||||
|
<p>
|
||||||
|
<strong>The Development environment shouldn't be enabled for deployed applications.</strong>
|
||||||
|
It can result in displaying sensitive information from exceptions to end users.
|
||||||
|
For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
|
||||||
|
and restarting the app.
|
||||||
|
</p>
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
using System.Diagnostics;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||||
|
|
||||||
|
namespace Bts.DataStream.WebsocketClient.Pages;
|
||||||
|
|
||||||
|
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
|
||||||
|
[IgnoreAntiforgeryToken]
|
||||||
|
public class ErrorModel : PageModel
|
||||||
|
{
|
||||||
|
public string? RequestId { get; set; }
|
||||||
|
|
||||||
|
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
|
||||||
|
|
||||||
|
private readonly ILogger<ErrorModel> _logger;
|
||||||
|
|
||||||
|
public ErrorModel(ILogger<ErrorModel> logger)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnGet()
|
||||||
|
{
|
||||||
|
RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
@page
|
||||||
|
@model IndexModel
|
||||||
|
@{
|
||||||
|
ViewData["Title"] = "Home page";
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="text-center">
|
||||||
|
<h1 class="display-4">Welcome</h1>
|
||||||
|
<p>Learn about <a href="https://docs.microsoft.com/aspnet/core">building Web apps with ASP.NET Core</a>.</p>
|
||||||
|
<button id="connectButton">Connect to Websocket</button>
|
||||||
|
<div id="output"></div>
|
||||||
|
<input type="text" id="methodInput" placeholder="Enter method name" />
|
||||||
|
<input type="text" id="paramsInput" placeholder="Enter method parameters (if any)" />
|
||||||
|
<button id="sendMessageButton">Send JSON-RPC Request</button>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||||
|
|
||||||
|
namespace Bts.DataStream.WebsocketClient.Pages;
|
||||||
|
|
||||||
|
public class IndexModel : PageModel {
|
||||||
|
private readonly ILogger<IndexModel> _logger;
|
||||||
|
|
||||||
|
public IndexModel(ILogger<IndexModel> logger) {
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnGet() {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
@page
|
||||||
|
@model PrivacyModel
|
||||||
|
@{
|
||||||
|
ViewData["Title"] = "Privacy Policy";
|
||||||
|
}
|
||||||
|
<h1>@ViewData["Title"]</h1>
|
||||||
|
|
||||||
|
<p>Use this page to detail your site's privacy policy.</p>
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||||
|
|
||||||
|
namespace Bts.DataStream.WebsocketClient.Pages;
|
||||||
|
|
||||||
|
public class PrivacyModel : PageModel
|
||||||
|
{
|
||||||
|
private readonly ILogger<PrivacyModel> _logger;
|
||||||
|
|
||||||
|
public PrivacyModel(ILogger<PrivacyModel> logger)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void OnGet()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8" />
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
|
<title>@ViewData["Title"] - Bts.DataStream.WebsocketClient</title>
|
||||||
|
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
|
||||||
|
<link rel="stylesheet" href="~/css/site.css" asp-append-version="true" />
|
||||||
|
<link rel="stylesheet" href="~/Bts.DataStream.WebsocketClient.styles.css" asp-append-version="true" />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<header>
|
||||||
|
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
|
||||||
|
<div class="container">
|
||||||
|
<a class="navbar-brand" asp-area="" asp-page="/Index">Bts.DataStream.WebsocketClient</a>
|
||||||
|
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target=".navbar-collapse" aria-controls="navbarSupportedContent"
|
||||||
|
aria-expanded="false" aria-label="Toggle navigation">
|
||||||
|
<span class="navbar-toggler-icon"></span>
|
||||||
|
</button>
|
||||||
|
<div class="navbar-collapse collapse d-sm-inline-flex justify-content-between">
|
||||||
|
<ul class="navbar-nav flex-grow-1">
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link text-dark" asp-area="" asp-page="/Index">Home</a>
|
||||||
|
</li>
|
||||||
|
<li class="nav-item">
|
||||||
|
<a class="nav-link text-dark" asp-area="" asp-page="/Privacy">Privacy</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
</header>
|
||||||
|
<div class="container">
|
||||||
|
<main role="main" class="pb-3">
|
||||||
|
@RenderBody()
|
||||||
|
</main>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<footer class="border-top footer text-muted">
|
||||||
|
<div class="container">
|
||||||
|
© 2023 - Bts.DataStream.WebsocketClient - <a asp-area="" asp-page="/Privacy">Privacy</a>
|
||||||
|
</div>
|
||||||
|
</footer>
|
||||||
|
|
||||||
|
<script src="~/lib/jquery/dist/jquery.min.js"></script>
|
||||||
|
<script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
|
||||||
|
<script src="~/js/site.js" asp-append-version="true"></script>
|
||||||
|
|
||||||
|
@await RenderSectionAsync("Scripts", required: false)
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
@@ -0,0 +1,48 @@
|
|||||||
|
/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
|
||||||
|
for details on configuring this project to bundle and minify static web assets. */
|
||||||
|
|
||||||
|
a.navbar-brand {
|
||||||
|
white-space: normal;
|
||||||
|
text-align: center;
|
||||||
|
word-break: break-all;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: #0077cc;
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn-primary {
|
||||||
|
color: #fff;
|
||||||
|
background-color: #1b6ec2;
|
||||||
|
border-color: #1861ac;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
|
||||||
|
color: #fff;
|
||||||
|
background-color: #1b6ec2;
|
||||||
|
border-color: #1861ac;
|
||||||
|
}
|
||||||
|
|
||||||
|
.border-top {
|
||||||
|
border-top: 1px solid #e5e5e5;
|
||||||
|
}
|
||||||
|
.border-bottom {
|
||||||
|
border-bottom: 1px solid #e5e5e5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.box-shadow {
|
||||||
|
box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
|
||||||
|
}
|
||||||
|
|
||||||
|
button.accept-policy {
|
||||||
|
font-size: 1rem;
|
||||||
|
line-height: inherit;
|
||||||
|
}
|
||||||
|
|
||||||
|
.footer {
|
||||||
|
position: absolute;
|
||||||
|
bottom: 0;
|
||||||
|
width: 100%;
|
||||||
|
white-space: nowrap;
|
||||||
|
line-height: 60px;
|
||||||
|
}
|
||||||
+2
@@ -0,0 +1,2 @@
|
|||||||
|
<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
|
||||||
|
<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
@using Bts.DataStream.WebsocketClient
|
||||||
|
@namespace Bts.DataStream.WebsocketClient.Pages
|
||||||
|
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
@{
|
||||||
|
Layout = "_Layout";
|
||||||
|
}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
|
||||||
|
var builder = WebApplication.CreateBuilder(args);
|
||||||
|
|
||||||
|
// Add services to the container.
|
||||||
|
builder.Services.AddRazorPages();
|
||||||
|
|
||||||
|
var app = builder.Build();
|
||||||
|
|
||||||
|
// Configure the HTTP request pipeline.
|
||||||
|
if (!app.Environment.IsDevelopment()) {
|
||||||
|
app.UseExceptionHandler("/Error");
|
||||||
|
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
|
||||||
|
app.UseHsts();
|
||||||
|
}
|
||||||
|
|
||||||
|
app.UseHttpsRedirection();
|
||||||
|
app.UseStaticFiles();
|
||||||
|
|
||||||
|
app.UseRouting();
|
||||||
|
|
||||||
|
app.UseAuthorization();
|
||||||
|
|
||||||
|
app.MapRazorPages();
|
||||||
|
|
||||||
|
app.Run();
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
{
|
||||||
|
"iisSettings": {
|
||||||
|
"windowsAuthentication": false,
|
||||||
|
"anonymousAuthentication": true,
|
||||||
|
"iisExpress": {
|
||||||
|
"applicationUrl": "http://localhost:29312",
|
||||||
|
"sslPort": 44390
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"profiles": {
|
||||||
|
"http": {
|
||||||
|
"commandName": "Project",
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"launchBrowser": true,
|
||||||
|
"applicationUrl": "http://localhost:5214",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"https": {
|
||||||
|
"commandName": "Project",
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"launchBrowser": true,
|
||||||
|
"applicationUrl": "https://localhost:7176;http://localhost:5214",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"IIS Express": {
|
||||||
|
"commandName": "IISExpress",
|
||||||
|
"launchBrowser": true,
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"DetailedErrors": true,
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
{
|
||||||
|
"Logging": {
|
||||||
|
"LogLevel": {
|
||||||
|
"Default": "Information",
|
||||||
|
"Microsoft.AspNetCore": "Warning"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"AllowedHosts": "*"
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
html {
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (min-width: 768px) {
|
||||||
|
html {
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.btn:focus, .btn:active:focus, .btn-link.nav-link:focus, .form-control:focus, .form-check-input:focus {
|
||||||
|
box-shadow: 0 0 0 0.1rem white, 0 0 0 0.25rem #258cfb;
|
||||||
|
}
|
||||||
|
|
||||||
|
html {
|
||||||
|
position: relative;
|
||||||
|
min-height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
body {
|
||||||
|
margin-bottom: 60px;
|
||||||
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 5.3 KiB |
@@ -0,0 +1,67 @@
|
|||||||
|
// Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
|
||||||
|
// for details on configuring this project to bundle and minify static web assets.
|
||||||
|
|
||||||
|
// Write your JavaScript code.
|
||||||
|
const connectButton = document.getElementById('connectButton');
|
||||||
|
const output = document.getElementById('output');
|
||||||
|
const methodInput = document.getElementById('methodInput');
|
||||||
|
const paramsInput = document.getElementById('paramsInput');
|
||||||
|
const sendMessageButton = document.getElementById('sendMessageButton');
|
||||||
|
|
||||||
|
let socket;
|
||||||
|
|
||||||
|
connectButton.addEventListener('click', () => {
|
||||||
|
if (socket && socket.readyState === WebSocket.OPEN) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
socket = new WebSocket('ws://localhost:8080'); // Replace with your WebSocket server URL
|
||||||
|
|
||||||
|
socket.onopen = (event) => {
|
||||||
|
output.innerHTML += 'Connected to WebSocket server<br>';
|
||||||
|
};
|
||||||
|
|
||||||
|
socket.onmessage = (event) => {
|
||||||
|
const message = JSON.parse(event.data);
|
||||||
|
output.innerHTML += `Received JSON-RPC response: ${JSON.stringify(message)}<br>`;
|
||||||
|
};
|
||||||
|
|
||||||
|
socket.onclose = (event) => {
|
||||||
|
if (event.wasClean) {
|
||||||
|
output.innerHTML += `Connection closed cleanly, code=${event.code}, reason=${event.reason}<br>`;
|
||||||
|
} else {
|
||||||
|
output.innerHTML += 'Connection abruptly closed<br>';
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
socket.onerror = (error) => {
|
||||||
|
output.innerHTML += `WebSocket Error: ${error.message}<br>`;
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
sendMessageButton.addEventListener('click', () => {
|
||||||
|
// const method = methodInput.value;
|
||||||
|
// const params = paramsInput.value;
|
||||||
|
const method = 'subscribe';
|
||||||
|
const params = `{
|
||||||
|
"expression": "literal("n", "2.0")"
|
||||||
|
}'
|
||||||
|
`
|
||||||
|
if (socket && socket.readyState === WebSocket.OPEN && method) {
|
||||||
|
// const reqParams = {
|
||||||
|
// 'expression': message
|
||||||
|
// }
|
||||||
|
const request = {
|
||||||
|
jsonrpc: '2.0',
|
||||||
|
method: method,
|
||||||
|
params: {
|
||||||
|
query: `literal("n", "2.0")`
|
||||||
|
},
|
||||||
|
id: 1, // You can set a unique ID for each request
|
||||||
|
};
|
||||||
|
|
||||||
|
socket.send(JSON.stringify(request));
|
||||||
|
methodInput.value = ''; // Clear the input fields
|
||||||
|
paramsInput.value = '';
|
||||||
|
}
|
||||||
|
});
|
||||||
+18
@@ -0,0 +1,18 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<TargetFramework>net7.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\Bts.DataStream.Websocket\Bts.DataStream.Websocket.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"host": "localhost",
|
||||||
|
"port": 8080,
|
||||||
|
"scheme": "ws",
|
||||||
|
"default_end_point": "/",
|
||||||
|
"keep_alive_interval_secs": 1
|
||||||
|
}
|
||||||
File renamed without changes.
@@ -0,0 +1,76 @@
|
|||||||
|
using bts.api.core;
|
||||||
|
|
||||||
|
using Bts.DataStream.Websocket;
|
||||||
|
|
||||||
|
using Google.Protobuf;
|
||||||
|
|
||||||
|
using System.CommandLine.Parsing;
|
||||||
|
using System.Text.Json;
|
||||||
|
|
||||||
|
static WebsocketServerConfig readConfigFile(string path) {
|
||||||
|
using var fs = File.OpenRead(path);
|
||||||
|
using var sr = new StreamReader(fs);
|
||||||
|
return JsonParser.Default.Parse<WebsocketServerConfig>(sr);
|
||||||
|
}
|
||||||
|
|
||||||
|
static WebsocketServerConfig? readConfigArg(ArgumentResult result) {
|
||||||
|
var path = result.Tokens.Select(t => t.Value).FirstOrDefault() ?? string.Empty;
|
||||||
|
return readConfigFile(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
static WebsocketServerConfig getDefaultConfig() {
|
||||||
|
const string defaultCfgPath = "DataStreamWebsocketServer.conf";
|
||||||
|
if (File.Exists(defaultCfgPath)) {
|
||||||
|
return readConfigFile(defaultCfgPath);
|
||||||
|
}
|
||||||
|
return new() {
|
||||||
|
Scheme = "http",
|
||||||
|
Host = "localhost",
|
||||||
|
Port = 8080,
|
||||||
|
DefaultEndPoint = "/",
|
||||||
|
KeepAliveIntervalSecs = 1
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
static async Task run(
|
||||||
|
WebsocketServerConfig? wssConfig, string user, string password, string? sparkdConfigSource) {
|
||||||
|
var opts = new JsonSerializerOptions(JsonSerializerDefaults.Web);
|
||||||
|
wssConfig ??= getDefaultConfig();
|
||||||
|
Console.WriteLine("Starting DataStreamWebsocketServer...");
|
||||||
|
var serviceCtx = ServiceContext.create(sparkdConfigSource);
|
||||||
|
await serviceCtx.login(user, password);
|
||||||
|
await Session.Start(wssConfig, opts);
|
||||||
|
// if (sparkdConfigSource is not null && sparkdConfigSource.Length > 9999) {
|
||||||
|
// } else {
|
||||||
|
// await ChatGptSession.Start();
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
var userOpt = new Option<string>("--user", () => "bts");
|
||||||
|
var passOpt = new Option<string>("--password", () => string.Empty);
|
||||||
|
var sparkdConfigSourceOpt = new Option<string>(
|
||||||
|
"--sparkd", description: "The sparkd config server url");
|
||||||
|
// var bling = new ParseArgument<WebsocketServerConfig?>(parseWsConfig);
|
||||||
|
|
||||||
|
// WebsocketServerConfig? parseWsConfig(ArgumentResult result) {
|
||||||
|
// Token t;
|
||||||
|
// TokenType tt;
|
||||||
|
// Symbol s;
|
||||||
|
// throw new NotImplementedException();
|
||||||
|
// }
|
||||||
|
|
||||||
|
var configOpt = new Option<WebsocketServerConfig?>(
|
||||||
|
"--config", readConfigArg, description: "WebsocketServerConfig file path");
|
||||||
|
configOpt.SetDefaultValue(new());
|
||||||
|
var rootCommand = new RootCommand("Starts a DataStream Websocket Server");
|
||||||
|
rootCommand.AddOption(configOpt);
|
||||||
|
rootCommand.AddOption(userOpt);
|
||||||
|
rootCommand.AddOption(passOpt);
|
||||||
|
rootCommand.SetHandler(run, configOpt, userOpt, passOpt, sparkdConfigSourceOpt);
|
||||||
|
|
||||||
|
try {
|
||||||
|
return await rootCommand.InvokeAsync(args);
|
||||||
|
} catch (Exception ex) {
|
||||||
|
Console.WriteLine($"Error: {ex}");
|
||||||
|
}
|
||||||
|
return 1;
|
||||||
File renamed without changes.
@@ -0,0 +1,7 @@
|
|||||||
|
global using Bts.Websocket;
|
||||||
|
|
||||||
|
global using bts.websocket_core;
|
||||||
|
|
||||||
|
global using System.CommandLine;
|
||||||
|
|
||||||
|
global using System.Collections.Immutable;
|
||||||
@@ -1 +0,0 @@
|
|||||||
VITE_DATASTREAM_WEBSOCKET_URL=wss://localhost:8443/ws
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
VITE_DATASTREAM_WEBSOCKET_URL=wss://localhost:8443/ws
|
|
||||||
@@ -9,7 +9,7 @@ module.exports = {
|
|||||||
],
|
],
|
||||||
ignorePatterns: ['dist', '.eslintrc.cjs'],
|
ignorePatterns: ['dist', '.eslintrc.cjs'],
|
||||||
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
|
parserOptions: { ecmaVersion: 'latest', sourceType: 'module' },
|
||||||
settings: { react: { version: '18.3.1' } },
|
settings: { react: { version: '18.2' } },
|
||||||
plugins: ['react-refresh'],
|
plugins: ['react-refresh'],
|
||||||
rules: {
|
rules: {
|
||||||
'react-refresh/only-export-components': [
|
'react-refresh/only-export-components': [
|
||||||
|
|||||||
Loaded 100 of 3964 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user