From ca2a346054adc4d3fc2de030f819ea3489f4540d Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 16 Jul 2018 13:39:25 +0000 Subject: [PATCH] Work on a new queue. --- src/server/sparkd/CMakeDeps.cmake | 2 +- src/server/sparkd/dspark/mirage.cpp | 220 ------------------ src/server/sparkd/dspark/mirage/core/INode.h | 27 --- .../sparkd/dspark/mirage/core/Notification.h | 13 -- .../dspark/mirage/core/NotificationReply.h | 13 -- .../sparkd/dspark/mirage/core/mirage_common.h | 23 -- .../dspark/mirage/quick_queue/quick_queue.cpp | 188 +++++++++++++++ .../sparkd/dspark/mirage/routing/Router.cpp | 129 ---------- .../sparkd/dspark/mirage/routing/Router.h | 29 --- .../sparkd/dspark/mirage/routing/StreamRec.h | 34 --- 10 files changed, 189 insertions(+), 489 deletions(-) delete mode 100644 src/server/sparkd/dspark/mirage.cpp delete mode 100644 src/server/sparkd/dspark/mirage/core/INode.h delete mode 100644 src/server/sparkd/dspark/mirage/core/Notification.h delete mode 100644 src/server/sparkd/dspark/mirage/core/NotificationReply.h delete mode 100644 src/server/sparkd/dspark/mirage/core/mirage_common.h create mode 100644 src/server/sparkd/dspark/mirage/quick_queue/quick_queue.cpp delete mode 100644 src/server/sparkd/dspark/mirage/routing/Router.cpp delete mode 100644 src/server/sparkd/dspark/mirage/routing/Router.h delete mode 100644 src/server/sparkd/dspark/mirage/routing/StreamRec.h diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 28a9d9409..f72f5bb4d 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage.cpp;dspark/mirage/routing/Router.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;mercury/actors/Actor.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/IPollableActor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;tracing/bts_trace_c.c;user/AdminServiceServer.cpp;user/UserServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file +set(sources cmds/AutoCert.cpp;cmds/Benchmark.cpp;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/QuickTest.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Span.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/Web.cpp;dspark/mirage/quick_queue/quick_queue.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/book/Book.cpp;exchange_sim/book/ExchangeSim.proto;exchange_sim/book/Order.cpp;exchange_sim/book/OrderMatcher.cpp;exchange_sim/book/book_transform.cpp;exchange_sim/tests/test_book_transform.cpp;http/ApiGateway.cpp;http/WebServer.cpp;jetfix/codec/FIXArray.cpp;jetfix/common/OutFIX.cpp;jetfix/connection/AsyncReader.cpp;jetfix/connection/IConnection.cpp;jetfix/connection/SocketConnection.cpp;jetfix/gateway/CoreGateway.cpp;jetfix/gateway/JetFIXGateway.cpp;jetfix/gateway/Session.cpp;jetfix/store/FIXFileStore.cpp;jetfix/store/session_name.cpp;jetfix/tests/async_reader_tests.cpp;jetfix/tests/decoding_tests.cpp;jetfix/tests/fix_encoding_stream_tests.cpp;jetfix/tests/fix_fragment_tests.cpp;jetfix/tests/jetfix_performance_tests.cpp;jetfix/tests/sample_fix.cpp;jetfix/tests/store_tests.cpp;main.cpp;md/platforms/celoxica/CXListener.cpp;md/platforms/celoxica/CXMain.cpp;md/platforms/celoxica/tests/cx_tests.cpp;md/platforms/mdp3_onixs/MDP3Listener.cpp;md/platforms/mdp3_onixs/MDP3Main.cpp;md/platforms/mdp3_onixs/MDP3Utils.cpp;md/platforms/mdp3_onixs/tests/mdp3_tests.cpp;md/run_md.cpp;mercury/actors/Actor.cpp;mercury/broker/AsyncEventBroker.cpp;mercury/broker/CoreEventBroker.cpp;mercury/broker/IEventBroker.cpp;mercury/events/TimerEvent.cpp;mercury/mercury_utils/Executor.cpp;mercury/mercury_utils/IPollableActor.cpp;mercury/mercury_utils/mercury_common.cpp;mercury/synopsis/SynopsisBuilder.cpp;mercury/topics/ITopic.cpp;orderman/actors/AsyncFactory.cpp;orderman/actors/ExecutionGateway.cpp;orderman/actors/FillStore.cpp;orderman/actors/OrderStore.cpp;orderman/actors/SecuritySrc.cpp;orderman/actors/ServiceBridge.cpp;orderman/actors/order_manager/OrderBuilder.cpp;orderman/actors/order_manager/OrderManager.cpp;orderman/actors/order_manager/OrderServicesData.cpp;orderman/events/CancelRejectEvent.cpp;orderman/events/NewExecutionReportEvent.cpp;orderman/limiter/LimitStore.cpp;orderman/limiter/Limiter.cpp;orderman/limiter/ProductLimitNode.cpp;orderman/limiter/ProductLimitTree.cpp;orderman/limiter/SecurityLimitNode.cpp;orderman/limiter/SecurityLimitTree.cpp;orderman/limiter/tests/limit_tests.cpp;orderman/order_factory/OrderFactory.cpp;orderman/order_router/OrderRouter.cpp;orderman/orderman_utils/fix_order_codec.cpp;orderman/orders/IcebergOrder.cpp;orderman/orders/NativeOrder.cpp;orderman/orders/Order.cpp;orderman/orders/TimeBoxOrder.cpp;orderman/orders/book_algos/BookAlgo.cpp;orderman/orders/book_algos/JoinOrder.cpp;orderman/orders/book_algos/LeanOrder.cpp;orderman/orders/book_algos/TickOrder.cpp;orderman/orders/book_algos/TopOrder.cpp;orderman/orders/spreader_orders/SpreaderOrder.cpp;orderman/orders/spreader_orders/spreader/LegPropertyData.cpp;orderman/orders/spreader_orders/spreader/QuoteLegPriceQuantityState.cpp;orderman/orders/spreader_orders/spreader/SingleFillHedger.cpp;orderman/orders/spreader_orders/spreader/SingleLegQuoter.cpp;orderman/orders/spreader_orders/spreader/SpreaderBookkeepingData.cpp;orderman/orders/spreader_orders/spreader/SpreaderChildOrderState.cpp;orderman/orders/spreader_orders/spreader/SpreaderLegData.cpp;orderman/orders/spreader_orders/spreader/SpreaderUtils.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderBuilder.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderOrderServices.cpp;orderman/orders/spreader_orders/spreader/external_interfacing/SpreaderPreActivationOrderServices.cpp;orderman/orders/spreader_orders/spreader/hedger/UnhedgedDelta.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSet.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteDriverSetHistory.cpp;orderman/orders/spreader_orders/spreader/quoter/QuoteLegDriver.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterEndStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterStartStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForCancelAckStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckCancelledWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForFirstAckWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWaitingForSizeStateWorker.cpp;orderman/orders/spreader_orders/spreader/quoter/quoter_states/QuoterWorkingStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/orders/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/orders/spreader_orders/tests/spreader_tests.cpp;orderman/server/OrderServiceServer.cpp;orderman/tests/fat_wrapper_tests.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;position/IMarginObserver.cpp;position/IPositionObserver.cpp;position/MarginServiceCore.cpp;position/PositionServiceCore.cpp;position/tests/PositionTests.cpp;support/ErrorReportService.cpp;support/ShellLatencyServer.cpp;tracing/bts_trace_c.c;user/AdminServiceServer.cpp;user/UserServiceServer.cpp;user/tests/admin_service_tests.cpp) \ No newline at end of file diff --git a/src/server/sparkd/dspark/mirage.cpp b/src/server/sparkd/dspark/mirage.cpp deleted file mode 100644 index adec9d122..000000000 --- a/src/server/sparkd/dspark/mirage.cpp +++ /dev/null @@ -1,220 +0,0 @@ -// #include "lib/utils/ValueWrapper.h" -// #include "lib/utils/bts_assert.h" -// #include "lib/utils/warn_ctrl.h" - -// #include -// #include -// #include -// #include -// #include - -// namespace bts { -// namespace mirage { - - -// bool same_subnet(NodeID, NodeID); - -// struct Router::SubscriberRec { -// INode &subscriber; -// SubToken sub_token; -// }; - -// struct Router::StreamRec { -// StreamRec(NodeID publisher_id, INode &publisher, -// StreamDescriptorPtr const &desc, -// Map &all_neighbours) -// : publisher_id(publisher_id), publisher(publisher), descriptor(desc), -// all_neighbours(all_neighbours) { -// // forward advertisments to neighbours on different subnets -// for (auto &kvp : all_neighbours) { -// auto neighbour_nid = kvp.first; -// if (!same_subnet(neighbour_nid, publisher_id)) { -// auto &neighbour = *kvp.second->my_node; -// neighbour.advertise(me->my_id, sid, desc); -// } -// } -// } - -// NodeID publisher_id; -// INode &publisher; -// StreamDescriptorPtr descriptor; -// std::vector subscribers; -// Map &all_neighbours; -// }; - -// struct Router::NeighbourRec { - -// NeighbourRec(NodeID nid, NodePtr const &n, NodeID router_id, NodePtr router, -// Map &all_neighbours, -// Map &stream_idx) -// : my_id(nid), my_node(n), my_streams(), router_id(router_id), -// all_neighbours(all_neighbours), all_streams_idx(stream_idx) { - -// // Add ourselfs as neighbours of the new neighbour -// my_node->add_neighbour(router_id, router); - -// // Send advertisments of streams we know about that originated -// // in a different subnet. We don't forward advertisements that -// // originated in the same subnet because all nodes inside a -// // single subnet are assumed to have direct routes to each other -// for (auto &kvp : stream_idx) { -// auto sid = kvp.first; -// auto &s = *kvp.second; -// if (!same_subnet(nid, s.publisher_id)) -// my_node->advertise(router_id, sid, s.descriptor); -// } -// } - -// ~NeighbourRec() { -// // remove our streams from global index -// for (auto const &kvp : my_streams) -// all_streams_idx.erase(kvp.first); - -// // removal is mutual -// my_node->remove_neighbour(router_id); -// } - -// void add_stream(StreamID sid, StreamDescriptorPtr const &desc) { -// // create and index a stream record for this stream -// auto &s = my_streams[sid]; -// bts_assert(!s); -// s = std::make_unique(my_id, *my_node, desc); - -// // add the stream record to the global idx -// auto &s_idx = all_streams_idx[sid]; -// bts_assert(!s_idx); -// s_idx = s.get(); -// } - -// NodeID my_id; -// NodePtr my_node; -// Map my_streams; -// NodeID router_id; -// Map &all_neighbours; -// Map &all_streams_idx; -// }; - -// struct Router::PImpl { -// PImpl(NodeID id) : my_id(id) {} -// NodeID my_id; -// Map neighbours; -// Map stream_idx; -// }; - -// Router::Router(NodeID my_id) : me(new PImpl(my_id)) {} -// Router::~Router() {} - -// void Router::add_neighbour(NodeID nid, NodePtr const &node) { -// bts_assert(nid != me->my_id); -// bts_assert(!same_subnet(nid, me->my_id)); - -// auto &rec = me->neighbours[nid]; - -// // neighbours add each other mutually so we need to detect and stop -// // infinite recursion -// if (!rec) -// rec = std::make_unique(nid, node, me->my_id, -// shared_from_this(), me->stream_idx); -// } - -// void Router::remove_neighbour(NodeID nid) { me->neighbours.erase(nid); } - -// void Router::advertise(NodeID nid, StreamID sid, -// StreamDescriptorPtr const &desc) { -// // Find node that is sending the ad (the protocol garantees that we -// // previously received a matching add_node msg) -// auto &nrec = me->neighbours[nid]; -// bts_assert(nrec); - -// // add stream to node's list -// nrec->add_stream(sid, desc); -// } - -// // struct Router::StreamRec { -// // NodePtr stream_src; -// // NodeID stream_src_id; -// // StreamID stream_id; -// // StreamDescriptorPtr stream_dsc; -// // NeighbourMap const &neighbours; - -// // SynopsisBuilderPtr synopsis_builder; -// // SubToken sub_token; -// // SubArray subscribers; -// // NodeID my_id; - -// // static std::atomic sub_token_gen; - -// // StreamRec(NodePtr const&src, -// // NodeID src_id, -// // StreamID sid, -// // StreamDescriptorPtr const&descriptor, -// // NeighbourMap const &neighbours, -// // NodeID my_id) : -// // stream_src(src), -// // stream_src_id(src_id), -// // stream_id(sid), -// // stream_desc(descriptor), -// // neighbours(neighbours), -// // synopsis_builder(descriptor->make_synopsis_builder()), -// // sub_token(sub_token_gen++), -// // subscribers(), -// // my_id(my_id) -// // {} - -// // ~StreamRec() -// // { -// // for (auto &s : subscribers) -// // s.sub_src->unadvertise(my_id,stream_id); -// // } -// // }; - -// // struct Router::NeighbourRec { -// // NeighbourRec(NodeID nid, NodePtr n) -// // : neighbour_id(nid), -// // neighbour(n), -// // neighbour_streams() -// // {} - -// // NodeID neighbour_id; -// // NodePtr neighbour; -// // std::map neighbour_streams; -// // }; - -// // std::atomic Router::StreamRec::sub_token_gen (0); - -// // struct Router::PImpl { -// // PImpl(NodeID id) : my_id(id) {} -// // NodeID my_id; -// // StreamMap streams; -// // NeighbourMap neighbours; -// // }; - -// // void Router::remove_neighbour(NodeID nid) { - -// // auto it = me->neighbours.find(nid); - -// // // neighbours remove each other mutually so we need to detect and -// // // stop infinite recursion -// // if (it != me->neighbours.end()) { -// // auto &n = it.second; -// // n->remove_neighbour(me->my_id,shared_from_this()); - -// // // all the streams provided by this neighbour are dead -// // for (auto nid : n.neighbour_streams) -// // me->streams.erase(nid); - -// // me->neighbours.erase(it); -// // } -// // } - -// // void Router::advertise(NodeID nid, StreamID sid, TopicPtr const&topic) -// // { -// // auto &s = me->streams[sid]; -// // bts_assert(!s); - -// // auto &n = me->neighbours[nid]; -// // bts_assert(!n); -// // s = std::make_unique (nid,sid,topic,me->neighbours); -// // } -// } -// } diff --git a/src/server/sparkd/dspark/mirage/core/INode.h b/src/server/sparkd/dspark/mirage/core/INode.h deleted file mode 100644 index 680560f47..000000000 --- a/src/server/sparkd/dspark/mirage/core/INode.h +++ /dev/null @@ -1,27 +0,0 @@ -#include "lib/utils/warn_ctrl.h" -#include "server/sparkd/dspark/mirage/core/mirage_common.h" - -#include - -namespace bts { -namespace mirage { - -GCC_DIAG_OFF("-Wnon-virtual-dtor") -class INode : public std::enable_shared_from_this { - public: - virtual ~INode(){}; - virtual void add_neighbour(NodeID, NodePtr const &ptr) = 0; - virtual void remove_neighbour(NodeID) = 0; - - virtual void advertise(NodeID, StreamID, StreamDescriptorPtr const &) = 0; - virtual void unadvertise(NodeID, StreamID) = 0; - - virtual void subscribe(NodeID, StreamID, SubToken) = 0; - virtual void unsubscribe(NodeID, StreamID, SubToken) = 0; - - virtual void notify(NodeID, StreamID, Notification const &m) = 0; - virtual void reply(NodeID, StreamID, NotificationReply const &m) = 0; -}; -GCC_DIAG_RESTORE() - -}} diff --git a/src/server/sparkd/dspark/mirage/core/Notification.h b/src/server/sparkd/dspark/mirage/core/Notification.h deleted file mode 100644 index 4dd9fac85..000000000 --- a/src/server/sparkd/dspark/mirage/core/Notification.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include - -namespace bts { -namespace mirage { - -class Notification -{ -public: -}; - -}} diff --git a/src/server/sparkd/dspark/mirage/core/NotificationReply.h b/src/server/sparkd/dspark/mirage/core/NotificationReply.h deleted file mode 100644 index 7f92ec188..000000000 --- a/src/server/sparkd/dspark/mirage/core/NotificationReply.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include - -namespace bts { -namespace mirage { - -class NotificationReply -{ -public: -}; - -}} diff --git a/src/server/sparkd/dspark/mirage/core/mirage_common.h b/src/server/sparkd/dspark/mirage/core/mirage_common.h deleted file mode 100644 index 95cf75761..000000000 --- a/src/server/sparkd/dspark/mirage/core/mirage_common.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include -#include "lib/utils/ValueWrapper.h" - -namespace bts { -namespace mirage { - -using NodeID = utils::ValueWrapper; -using StreamID = utils::ValueWrapper; -using SubToken = utils::ValueWrapper; - -class StreamDescriptor ; -using StreamDescriptorPtr = std::shared_ptr; - -class INode; -using NodePtr = std::shared_ptr; - -class Notification; -class NotificationReply; - -bool same_subnet(NodeID, NodeID); -}} diff --git a/src/server/sparkd/dspark/mirage/quick_queue/quick_queue.cpp b/src/server/sparkd/dspark/mirage/quick_queue/quick_queue.cpp new file mode 100644 index 000000000..e17a94c7c --- /dev/null +++ b/src/server/sparkd/dspark/mirage/quick_queue/quick_queue.cpp @@ -0,0 +1,188 @@ +#include +#include +#include +#include + +#include "lib/utils/bts_assert.h" + +namespace bts { +namespace mirage { + +class QuickQueue { +public: + QuickQueue(size_t n_slots, uint32_t slot_sz) + : _buffer(new uint8_t[n_slots * (sizeof(SlotHeader) + slot_sz)]), + _n_slots(n_slots), _slot_sz(slot_sz), _max_msg_sz(n_slots * slot_sz), + _current_slot(0), _current_sn(0) { + bts_assert(slot_sz > 0); + bts_assert(n_slots > 0); + do { + auto p = current_slot(); + auto &slot = *p.first; + slot.seq_n = 0; + move_to_next_slot(); + } while (_current_slot > 0); + } + + enum class Result { MSG_TO_LARGE, OK }; + Result put(uint8_t const *msg, size_t msg_sz) { + if (msg_sz > _max_msg_sz) + return Result::MSG_TO_LARGE; + if (msg_sz == 0) + return Result::OK; + + auto remaining = msg_sz; + auto msg_cursor = msg; + + while (remaining > 0) { + auto p = current_slot(); + auto &slot = *p.first; + auto slot_buffer = p.second; + + // mark slot as in use + slot.seq_n = 0; + + if (remaining > slot_sz()) { + slot.bytes_in_slot = 0; // signal slot is full + memcpy(slot_buffer, msg_cursor, slot_sz()); + msg_cursor += slot_sz(); + remaining -= slot_sz(); + } else { + slot.bytes_in_slot = remaining; + memcpy(slot_buffer, msg_cursor, remaining); + remaining = 0; + } + move_to_next_slot(); + + // done with slot + slot.seq_n = ++_current_sn; + } + return Result::OK; + } + +protected: + friend class QuickQueueReader; + struct SlotHeader { + std::atomic seq_n; + uint32_t bytes_in_slot; + }; + uint32_t slot_sz() const { return _slot_sz; } + size_t n_slots() const { return _n_slots; } + uint8_t const *buffer() const { return _buffer.get(); } + +private: + std::pair current_slot() { + auto offset = + _buffer.get() + _current_slot * (_slot_sz + sizeof(SlotHeader)); + SlotHeader *h = (SlotHeader *)offset; + return std::make_pair(h, offset + sizeof(SlotHeader)); + } + + void move_to_next_slot() { + if (_current_slot == _n_slots) + _current_slot = 0; + else + _current_slot++; + } + + const std::unique_ptr _buffer; + const size_t _n_slots; + const uint32_t _slot_sz; + const size_t _max_msg_sz; + size_t _current_slot; + size_t _current_sn; +}; + +class QuickQueueReader { +public: + QuickQueueReader(QuickQueue const &q) + : _queue(q), _expected_sn(1), _current_slot(0), + _local_buffer_sz(q.slot_sz() * 10), + _local_buffer(new uint8_t[_local_buffer_sz]), _state(ReaderState::OK) { + } + + struct Result { + enum { MISSING_MSGS, NO_MSG, OK } result; + uint8_t const *msg; + size_t msg_size; + }; + Result get() { + if (_state == ReaderState::LOST_MSGS) + return Result{Result::MISSING_MSGS, nullptr, 0}; + + auto p = current_slot(); + auto &slot = *p.first; + auto slot_buffer = p.second; + + // read sn + size_t sn = slot.seq_n; + auto bytes_in_slot = slot.bytes_in_slot; + + if (sn == 0) + return Result{Result::NO_MSG, nullptr, 0}; + if (sn > _expected_sn) { + _state = ReaderState::LOST_MSGS; + return Result{Result::MISSING_MSGS, nullptr, 0}; + } + + if (slot.bytes_in_slot != 0) { + // single slot msg + memcpy(_local_buffer.get(), slot_buffer, bytes_in_slot); + size_t sn2 = slot.seq_n; + if (sn == sn2) { + // we read atomically, we are good to go + move_to_next_slot(); + return Result{Result::OK, _local_buffer.get(), bytes_in_slot}; + } else { + // the message we needed to read was overwritten + _state = ReaderState::LOST_MSGS; + return Result{Result::MISSING_MSGS, nullptr, 0}; + } + } else + // multi-slot msg + return get_multi_slot(sn, slot, slot_buffer); + } + +private: + enum class ReaderState { OK, LOST_MSGS }; + + QuickQueue const &_queue; + size_t _expected_sn; + size_t _current_slot; + size_t _local_buffer_sz; + std::unique_ptr _local_buffer; + ReaderState _state; + + std::pair current_slot() { + auto offset = + _queue.buffer() + + _current_slot * (_queue.slot_sz() + sizeof(QuickQueue::SlotHeader)); + auto h = (QuickQueue::SlotHeader const *)offset; + return std::make_pair(h, offset + sizeof(QuickQueue::SlotHeader)); + } + + void move_to_next_slot() { + if (_current_slot == _queue.n_slots()) + _current_slot = 0; + else + _current_slot++; + _expected_sn++; + } + + Result get_multi_slot(size_t first_sn, QuickQueue::SlotHeader const &slot, + uint8_t const *slot_buffer) { + memcpy(_local_buffer.get(), slot_buffer, _queue.slot_sz()); + size_t sn2 = slot.seq_n; + if (sn2 != first_sn) { + // the message we needed to read was overwritten + _state = ReaderState::LOST_MSGS; + return Result{Result::MISSING_MSGS, nullptr, 0}; + } + + // firt slot was read successfully, read the rest + return Result{Result::MISSING_MSGS, nullptr, 0}; + } +}; + +} // namespace mirage +} // namespace bts diff --git a/src/server/sparkd/dspark/mirage/routing/Router.cpp b/src/server/sparkd/dspark/mirage/routing/Router.cpp deleted file mode 100644 index 2e1276fe5..000000000 --- a/src/server/sparkd/dspark/mirage/routing/Router.cpp +++ /dev/null @@ -1,129 +0,0 @@ -// #include "Router.h" -// #include "server/sparkd/dspark/mirage/routing/StreamRec.h" -// #include "lib/utils/bts_assert.h" - -// #include -// #include - -// namespace bts { -// namespace mirage { - -// template using Map = std::unordered_map; -// using StreamRecPtr = std::unique_ptr ; - -// struct Router::PImpl -// { -// PImpl(NodeID id) : my_id(id) {} - -// NodeID my_id; -// Map neighbours; -// Map streams; -// }; - -// Router::Router (NodeID id) : me (new PImpl(id)) {} -// Router::~Router () {} - -// void Router::add_neighbour(NodeID nid, NodePtr const &neighbour) -// { -// bts_assert(nid != me->my_id); -// bts_assert(!same_subnet(nid, me->my_id)); - -// auto &n = me->neighbours[nid]; - -// // neighbours add each other mutually so we need to detect and stop -// // infinite recursion -// if (!n) { -// n = neighbour; - -// // Show this node all the streams we know about that originated -// // in a different subnet. Streams that originated on the same -// // subnet will be forwarded directly by the owning nodes inside -// // the subnet. -// for (auto const &kvp : me->streams) { -// auto sid = kvp.first; -// auto &stream = *kvp.second; -// if (!same_subnet(stream.owner_id(),nid)) -// neighbour->advertise(me->my_id,sid,stream.descriptor()); -// } -// } -// } - -// void Router::remove_neighbour(NodeID nid) -// { -// auto &n = me->neighbours[nid]; -// bts_assert(n); - -// // collect removed neigbhours's streams -// std::vector its_streams; -// for (auto &kvp : me->streams) { -// auto &sid = kvp.first; -// auto &stream = *kvp.second; - -// // does the removed neighbour own this stream? -// if (stream.owner_id() == nid) -// its_streams.push_back(sid); -// } - -// // unadvertise orphan streams -// for (auto &sid : its_streams) -// unadvertise(nid,sid); - -// // remove the node from our index -// me->neighbours.erase(nid); -// } - -// void Router::advertise(NodeID nid, StreamID sid, const StreamDescriptorPtr &desc) -// { -// auto &n = me->neighbours[nid]; -// bts_assert(n); - -// // create and index stream rec -// auto &s = me->streams[sid]; -// bts_assert(!s); -// s = std::make_unique (me->my_id,sid,nid,n,desc); - -// // forward advertisement to other subnets -// for (auto &kvp : me->neighbours) { -// auto &neighbour_id = kvp.first; -// auto &neighbour = *kvp.second; -// if (!same_subnet(nid,neighbour_id)) -// neighbour.advertise(me->my_id,sid,desc); -// } -// } - -// void Router::unadvertise(NodeID nid, StreamID sid) -// { -// auto &n = me->neighbours[nid]; -// bts_assert(n); - -// // forward unadvertisement to other subnets -// for (auto &kvp : me->neighbours) { -// auto &neighbour_id = kvp.first; -// auto &neighbour = *kvp.second; -// if (!same_subnet(nid,neighbour_id)) -// neighbour.unadvertise(me->my_id,sid); -// } - -// // remove the stream -// bts_assert(me->streams.erase(sid)); -// } - -// void Router::subscribe(NodeID nid, StreamID sid, SubToken token) -// { -// // find sub source node and stream -// auto &n = me->neighbours[nid]; -// bts_assert(n); - -// auto &s = me->streams[sid]; -// bts_assert(s); -// bts_assert(s->sub_token() == token); - -// // establish subscription -// s->subscribe(nid,n,token); -// } - -// void Router::unsubscribe(NodeID nid, StreamID sid, SubToken token) -// { -// } - -// }} diff --git a/src/server/sparkd/dspark/mirage/routing/Router.h b/src/server/sparkd/dspark/mirage/routing/Router.h deleted file mode 100644 index 9b641825f..000000000 --- a/src/server/sparkd/dspark/mirage/routing/Router.h +++ /dev/null @@ -1,29 +0,0 @@ -#include "server/sparkd/dspark/mirage/core/INode.h" - -namespace bts { -namespace mirage { - -class Router : public INode -{ -public: - Router(NodeID); - ~Router(); - - void add_neighbour(NodeID, NodePtr const &ptr)override; - void remove_neighbour(NodeID)override; - - void advertise(NodeID, StreamID, StreamDescriptorPtr const &)override; - void unadvertise(NodeID, StreamID)override; - - void subscribe(NodeID, StreamID, SubToken)override; - void unsubscribe(NodeID, StreamID, SubToken)override; - - void notify(NodeID, StreamID, Notification const &m)override; - void reply(NodeID, StreamID, NotificationReply const &m)override; - -private: - struct PImpl; - std::unique_ptr me; -}; - -}} diff --git a/src/server/sparkd/dspark/mirage/routing/StreamRec.h b/src/server/sparkd/dspark/mirage/routing/StreamRec.h deleted file mode 100644 index 38c2092bf..000000000 --- a/src/server/sparkd/dspark/mirage/routing/StreamRec.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once - -#include -#include "server/sparkd/dspark/mirage/core/mirage_common.h" - -namespace bts { -namespace mirage { - -class StreamRec -{ -public: - StreamRec(NodeID router_id, - StreamID stream_id, - NodeID stream_owner_id, - NodePtr const&stream_owner, - StreamDescriptorPtr const&desc); - ~StreamRec(); - - void subscribe(NodeID sub_src_id, NodePtr const&sub_src, SubToken sub_token); - void unsubscribe(NodeID sub_src_id, SubToken sub_token); - void notify (Notification const&); - void reply(NotificationReply const&); - - NodeID owner_id() const; - StreamDescriptorPtr descriptor() const; - SubToken sub_token() const; - -private: - struct PImpl; - std::unique_ptr me; -}; - -}} -