From 5c7d44cbfb7370dc9e47a6bfec892dcf395fff9e Mon Sep 17 00:00:00 2001 From: Kevin Darby Date: Thu, 12 Oct 2017 10:40:54 -0400 Subject: [PATCH 1/2] cleanup json --- .vscode/launch.json | 97 +++++++++------------------------------------ 1 file changed, 19 insertions(+), 78 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 12796e4f9..5103682fc 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -12,53 +12,6 @@ "stopAtEntry": false, "externalConsole": true }, - { - "name": "Python", - "type": "python", - "request": "launch", - "stopOnEntry": false, - "pythonPath": "${config:python.pythonPath}", - "program": "${file}", - "cwd": "${workspaceRoot}", - "env": {}, - "envFile": "${workspaceRoot}/.env", - "args": [ "DEBUG" ], - "debugOptions": [ - "WaitOnAbnormalExit", - "WaitOnNormalExit", - "RedirectOutput" - ] - }, - { - "name": "WSL Launch", - "type": "cppdbg", - "request": "launch", - "program": "/mnt/d/blue/spark/build/gcc_debug/src/server/sparkd/sparkd", - "miDebuggerServerAddress": "localhost:8002", - "args": ["md", "dump", "abc"], - "stopAtEntry": false, - "cwd": "/mnt/d/blue/spark/build/gcc_debug/src/server/sparkd/", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "enable pretty-printer", - "ignoreFailures": true - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\windows\\sysnative\\bash.exe", - "pipeArgs": ["-c"], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/mnt/d/blue/spark/": "d:\\blue\\spark" - } - }, { "name": "Docker Launch", "type": "cppdbg", @@ -103,37 +56,25 @@ }, "sourceFileMap": { "/bts/": "${workspaceRoot}" - } - }, - { - "name": "eh-3 launch", - "type": "cppdbg", + } + }, + { + "name": "Python", + "type": "python", "request": "launch", - "program": "/home/eharding/spark/sparkd", - "args": ["run"], - "stopAtEntry": false, - "cwd": "/home/eharding/spark/", - "environment": [], - "externalConsole": true, - "MIMode": "gdb", - "preLaunchTask": "", - "setupCommands": [ - { - "description": "Enable pretty-printing for gdb", - "text": "enable pretty-printer", - "ignoreFailures": true - } - ], - "pipeTransport": { - "pipeCwd": "${workspaceRoot}", - "pipeProgram": "c:\\program files\\git\\usr\\bin\\ssh.exe", - "pipeArgs": ["eharding@eh-3"], - "debuggerPath": "/usr/bin/gdb" - }, - "sourceFileMap": { - "/bts/": "d:\\blue\\spark" - } - }, + "stopOnEntry": false, + "pythonPath": "${config:python.pythonPath}", + "program": "${file}", + "cwd": "${workspaceRoot}", + "env": {}, + "envFile": "${workspaceRoot}/.env", + "args": [ "DEBUG" ], + "debugOptions": [ + "WaitOnAbnormalExit", + "WaitOnNormalExit", + "RedirectOutput" + ] + }, { "name": "edge-asp051", "type": "cppdbg", @@ -160,7 +101,7 @@ "debuggerPath": "/usr/bin/gdb" }, "sourceFileMap": { - "/bts/": "d:\\blue\\spark" + "/bts/": "${workspaceRoot}" } } ] From cec94f5929db650ca3c998bdab64eb16d055bc81 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Thu, 12 Oct 2017 14:41:26 +0000 Subject: [PATCH 2/2] Supressed MD updates to dead spreaders. --- .../orderman/components/SpreaderOrderMan.cpp | 15 ++++++++++++--- .../orderman/spreader_orders/SpreaderOrder.h | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/server/sparkd/orderman/components/SpreaderOrderMan.cpp b/src/server/sparkd/orderman/components/SpreaderOrderMan.cpp index 7f61c34b4..4e83b3011 100644 --- a/src/server/sparkd/orderman/components/SpreaderOrderMan.cpp +++ b/src/server/sparkd/orderman/components/SpreaderOrderMan.cpp @@ -25,12 +25,14 @@ struct SpreaderOrderMan::PImpl { sec_db(db), native_order_factory(factory), spreader_orders(), + md_subscribers(), gateway_ready(false) {} securities::SecurityDB &sec_db; NativeOrderFactory &native_order_factory; SpreaderOrderMap spreader_orders; + std::vector md_subscribers; bool gateway_ready; }; @@ -77,7 +79,14 @@ void SpreaderOrderMan::on(event::CreateSpreaderOrder const&cso) create_native_order_signal, update_native_order_signal, cancel_native_order_signal, - md_subscription_signal); + [this,order_ptr = order.get()] (const event::MDSubscription &sub) { + auto it = std::find(me->md_subscribers.begin(), + me->md_subscribers.end(), + order_ptr); + if (it == me->md_subscribers.end()) + me->md_subscribers.push_back(order_ptr); + md_subscription_signal(sub); + }); order->init(); if (me->gateway_ready) order->on_connect(); @@ -117,8 +126,8 @@ void SpreaderOrderMan::on(event::CancelSpreaderOrder const&cancel) void SpreaderOrderMan::on(event::BookUpdate const&book_update) { - for (auto const &kvp : me->spreader_orders) - kvp.second->on_book(book_update.correlation_id, book_update.book); + for (auto const &so : me->md_subscribers) + so->on_book(book_update.correlation_id, book_update.book); } void SpreaderOrderMan::on(event::GatewayStatusChange const&c) diff --git a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h index c902a63eb..f66da92b0 100644 --- a/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h +++ b/src/server/sparkd/orderman/spreader_orders/SpreaderOrder.h @@ -18,7 +18,7 @@ namespace orderman { class Book; class NativeOrderFactory; using namespace bts::spreader; -//class SpreaderOrderUpdateMessage; + class SpreaderOrder : public SpreaderOrderBase, public ISpreaderManager { public: