diff --git a/.gitignore b/.gitignore index 6b9cf2605..7c976336d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ src/server/sparkd/orderman/perf_analysis/logs/ src/server/sparkd/orderman/perf_analysis/trace_data/ .fake *.fsx.lock +*.code-workspace src/lib/orderman/perf_analysis/logs/latency_data/ trace_data/ /src/lib/orderman/perf_analysis/last_pretty_log.csv diff --git a/docker/linux b/docker/linux index 8ee969259..8d82558f9 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit 8ee9692597d9e59adf0a3ab77610b711892f79a6 +Subproject commit 8d82558f9015a699c3baf88e2490b4ac6efcb83e diff --git a/remote-sparkvm.code-workspace b/remote-sparkvm.code-workspace deleted file mode 100644 index 03c875df7..000000000 --- a/remote-sparkvm.code-workspace +++ /dev/null @@ -1,27 +0,0 @@ -{ - "folders": [ - { - "path": "." - }, - { - "uri": "sftp://bts:BT5u53r@sparkvm:22/home/bts/", - "name": "sparkvm" - } - ], - "settings": { - "files.associations": { - "utility": "cpp", - "initializer_list": "cpp", - "list": "cpp", - "type_traits": "cpp", - "vector": "cpp", - "xhash": "cpp", - "xstring": "cpp", - "system_error": "cpp", - "array": "cpp", - "string_view": "cpp", - "xutility": "cpp", - "*.ipp": "cpp" - } - } -} \ No newline at end of file diff --git a/src/client/spark/Orders/OrderSecurity.cs b/src/client/spark/Orders/OrderSecurity.cs index dd9936162..a703e4c2b 100644 --- a/src/client/spark/Orders/OrderSecurity.cs +++ b/src/client/spark/Orders/OrderSecurity.cs @@ -15,7 +15,7 @@ namespace bts.api.orderman { public OrderRecordImmutable order { get; } public override bool Equals(object obj) => (obj is OrderSecurity os) && Equals(os); - public bool Equals(OrderSecurity other) => order.Key == other.order.Key && security == other.security; + public bool Equals(OrderSecurity other) => order.Equals(other.order) && security == other.security; public override int GetHashCode() => (security, order).GetHashCode(); public static bool operator == (OrderSecurity left, OrderSecurity right) => left.Equals(right); diff --git a/src/client/spark/Orders/OrdersModel.cs b/src/client/spark/Orders/OrdersModel.cs index 0503e569e..b41edc81f 100644 --- a/src/client/spark/Orders/OrdersModel.cs +++ b/src/client/spark/Orders/OrdersModel.cs @@ -175,12 +175,12 @@ namespace mbts.spark { clone.Remove(o.order.Key); } } - foreach (var o in table.changed) { - if (o.order.is_active()) { - clone[o.order.Key] = o; + foreach (var o in table.changes) { + if (o.Old.order.is_active()) { + clone.Remove(o.Old.order.Key); } - else { - clone.Remove(o.order.Key); + if (o.New.order.is_active()) { + clone.Add(o.New.order.Key, o.New); } } foreach (var o in table.added) { diff --git a/src/lib/config/ConfigDownloader.cpp b/src/lib/config/ConfigDownloader.cpp index 2c6e94af8..da23232eb 100755 --- a/src/lib/config/ConfigDownloader.cpp +++ b/src/lib/config/ConfigDownloader.cpp @@ -53,7 +53,7 @@ ConfigDownloader::Result ConfigDownloader::get(const string& url, stringstream& curl_easy_setopt(_curl, CURLOPT_WRITEDATA, &out_stream); curl_easy_setopt(_curl, CURLOPT_VERBOSE, 0); curl_easy_setopt(_curl, CURLOPT_FAILONERROR, 1); - curl_easy_setopt(_curl, CURLOPT_CONNECTTIMEOUT, 30); + curl_easy_setopt(_curl, CURLOPT_CONNECTTIMEOUT, 6); curl_easy_setopt(_curl, CURLOPT_SOCKOPTFUNCTION, no_linger); CURLcode res = curl_easy_perform(_curl); diff --git a/src/lib/utils/init_spark_lib.cpp b/src/lib/utils/init_spark_lib.cpp index 772d62c7a..d9dc6fab9 100644 --- a/src/lib/utils/init_spark_lib.cpp +++ b/src/lib/utils/init_spark_lib.cpp @@ -2,7 +2,6 @@ #include "lib/logging/logging.h" #include "lib/utils/bts_assert.h" #include "lib/utils/thread_manager.h" -#include "lib/utils/Dispatcher.h" namespace bts { namespace utils { @@ -21,7 +20,6 @@ void finit_spark_lib() if (poller) { delete poller; } - utils::Dispatcher::background().terminate(); } }} diff --git a/src/web/api/build.sh b/src/web/api/build.sh index 921e590a3..ce57168f7 100755 --- a/src/web/api/build.sh +++ b/src/web/api/build.sh @@ -6,10 +6,6 @@ export PATH="$PATH:/root/.dotnet/tools" if ! [ -x "$(command -v npx)" ]; then npm install -g npx fi -# install paket -if ! [ -x "$(command -v paket)" ]; then - dotnet tool install -g paket -fi export OUT=${BUILD_DIR:-../../../build}/web MODE=manual diff --git a/testing/manual/ladder/ui_performance.txt b/testing/manual/ladder/ui_performance.txt index 9fb54cc18..ee27662c8 100644 --- a/testing/manual/ladder/ui_performance.txt +++ b/testing/manual/ladder/ui_performance.txt @@ -14,3 +14,4 @@ This test needs to run against production market data or high quality recorded d 4. Repeat 2. +5. If there is *any* doubt that the UI is snappy bring up the previous release and compare. At minimum we need to not regress UI performance.