diff --git a/docker/linux b/docker/linux index d4a32d325..e6e4ea0d8 160000 --- a/docker/linux +++ b/docker/linux @@ -1 +1 @@ -Subproject commit d4a32d32592c688c3a1f042750fd3323bcdfd38a +Subproject commit e6e4ea0d84a5d93de174f9b578892de00659b5e3 diff --git a/externals b/externals index 2ddd46715..a97c71a95 160000 --- a/externals +++ b/externals @@ -1 +1 @@ -Subproject commit 2ddd4671513460faf006cd89a851937575cbc9c3 +Subproject commit a97c71a956763c7df9a366591f51a53b1b57a3d2 diff --git a/src/lib/api/core/ApiClientInterop.cpp b/src/lib/api/core/ApiClientInterop.cpp index 6912522cc..8724d5de1 100644 --- a/src/lib/api/core/ApiClientInterop.cpp +++ b/src/lib/api/core/ApiClientInterop.cpp @@ -2,6 +2,7 @@ #include "lib/quickbus/quickbus.h" #include "lib/config/config.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" #include "../public/ServiceContext.h" #include "../public/Result.h" diff --git a/src/lib/api/core/ApiServerInterop.cpp b/src/lib/api/core/ApiServerInterop.cpp index 168281c2f..89182710c 100644 --- a/src/lib/api/core/ApiServerInterop.cpp +++ b/src/lib/api/core/ApiServerInterop.cpp @@ -1,6 +1,7 @@ #include "ApiServerInterop.h" #include "lib/quickbus/quickbus.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" namespace bts { namespace api { diff --git a/src/lib/config/ConfigDownloader.cpp b/src/lib/config/ConfigDownloader.cpp index b25e73bda..2c6e94af8 100755 --- a/src/lib/config/ConfigDownloader.cpp +++ b/src/lib/config/ConfigDownloader.cpp @@ -1,3 +1,5 @@ +#include "lib/utils/windows_wrapper.h" + #include "ConfigDownloader.h" #include diff --git a/src/lib/config/defaults/jetfix.conf b/src/lib/config/defaults/jetfix.conf index d71691900..2c3b5fce3 100644 --- a/src/lib/config/defaults/jetfix.conf +++ b/src/lib/config/defaults/jetfix.conf @@ -147,10 +147,10 @@ JetFIX { } -SparkConnection { - rule: "System.host_name=='pp-6'" - value {connection_name: "cme_m5y"} -} +# SparkConnection { +# rule: "System.host_name=='pp-6'" +# value {connection_name: "cme_m5y"} +# } SparkConnection { rule: "System.host_name=='TAHA-SUPER_spark'" @@ -163,4 +163,4 @@ SparkConnection { value {connection_name: "cme_mc8"} } -SparkConnection {value {connection_name: "cme_mbx"}} +SparkConnection {value {connection_name: "sim"}} diff --git a/src/lib/config/tests/HTTPServer.cpp b/src/lib/config/tests/HTTPServer.cpp index 3c1e189f8..72f18ebdf 100755 --- a/src/lib/config/tests/HTTPServer.cpp +++ b/src/lib/config/tests/HTTPServer.cpp @@ -1,5 +1,6 @@ #include "HTTPServer.h" +#include "lib/utils/bts_assert.h" using boost::asio::ip::tcp; diff --git a/src/lib/logging/Common.h b/src/lib/logging/Common.h index 1e9488534..a1f98f084 100644 --- a/src/lib/logging/Common.h +++ b/src/lib/logging/Common.h @@ -1,5 +1,7 @@ #pragma once +#include "lib/utils/windows_wrapper.h" + #include #include #include diff --git a/src/lib/logging/Logger.h b/src/lib/logging/Logger.h index 365cd9b31..2d80391aa 100644 --- a/src/lib/logging/Logger.h +++ b/src/lib/logging/Logger.h @@ -2,7 +2,6 @@ #include "MsgPacking.h" #include "LogRec.h" -#include "lib/utils/bts_assert.h" #include #include @@ -38,7 +37,7 @@ public: void enqueue (Subsystem subsystem,Level lv, const char*file, int line, const char *msg_template, Args&&... msg_args) { - bts_assert(_active); + assert(_active); lock(); if (lv.ordinal >= _filter[subsystem.ordinal].ordinal) { if (_wcursor == _write_q->size()) @@ -123,7 +122,7 @@ public: void mark_inactive() { lock(); - bts_assert(_active); + assert(_active); _active=false; unlock(); } @@ -131,8 +130,8 @@ public: ~Logger() { #ifndef WIN32 - bts_assert(!_active); - bts_assert(_wcursor == 0); + assert(!_active); + assert(_wcursor == 0); #endif } diff --git a/src/lib/logging/LoggerHub.cpp b/src/lib/logging/LoggerHub.cpp index f8838c03a..37aaf35f0 100644 --- a/src/lib/logging/LoggerHub.cpp +++ b/src/lib/logging/LoggerHub.cpp @@ -4,6 +4,8 @@ #include "lib/utils/bts_chrono.h" #include "Logger.h" #include "lib/os/os.h" +#include "lib/utils/bts_assert.h" + #include #include #include diff --git a/src/lib/logging/Sink.cpp b/src/lib/logging/Sink.cpp index c2cc1a5d3..79e77664b 100644 --- a/src/lib/logging/Sink.cpp +++ b/src/lib/logging/Sink.cpp @@ -4,6 +4,7 @@ #include "lib/os/os.h" #include "lib/utils/datetime.h" #include "lib/utils/file_utils.h" +#include "lib/utils/bts_assert.h" #include #include diff --git a/src/lib/md/relay/RelayRecorder.cpp b/src/lib/md/relay/RelayRecorder.cpp index 8313552d4..3506da79f 100644 --- a/src/lib/md/relay/RelayRecorder.cpp +++ b/src/lib/md/relay/RelayRecorder.cpp @@ -10,6 +10,7 @@ #include "lib/md/common.h" #include "lib/md/protos/co2.pb.h" #include "lib/config/protos/system.pb.h" +#include "lib/utils/bts_chrono.h" #include #include @@ -132,15 +133,18 @@ void replay_recording(istream& in, IRelayWriter& writer, int32_t naggle_ms) { } void replay_file(const std::string& filename, IRelayWriter& writer, int32_t naggle_ms, bool loop = false) { - ifstream in; - in.open(filename, ios::binary | ios::in); - if (in.is_open()) { - replay_recording(in, writer, naggle_ms); - } - else { - LOG(MarketData,Diag, "Cannot read file {}", filename); - } - if (loop) replay_file(filename, writer, naggle_ms, true); + do { + ifstream in; + in.open(filename, ios::binary | ios::in); + if (in.is_open()) { + replay_recording(in, writer, naggle_ms); + } + else { + LOG(MarketData,Diag, "Cannot read file {}", filename); + if (loop) + sleep_for(10s); + } + } while (loop); } void replay_url(const std::string& url, IRelayWriter& writer, int32_t naggle_ms) { diff --git a/src/lib/os/os.cpp b/src/lib/os/os.cpp index 4ccdaf173..26f213e5d 100755 --- a/src/lib/os/os.cpp +++ b/src/lib/os/os.cpp @@ -991,11 +991,6 @@ BTS_EXPORT std::string host_ip (std::string const &src_interface_name) return default_ip; } -BTS_EXPORT void debug_break() -{ - DEBUG_BREAK(); -} - BTS_EXPORT void set_thread_name(std::string const&n) {set_thread_name(n.c_str());} @@ -1027,7 +1022,7 @@ BTS_EXPORT void set_thread_name(const char* name) RaiseException(MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(ULONG_PTR), (ULONG_PTR*)&info); #ifdef _MSC_VER } - __except(EXCEPTION_EXECUTE_HANDLER) + __except(EXCEPTION_EXECUTE_HANDLER) { } #endif diff --git a/src/lib/os/os.h b/src/lib/os/os.h index 80ebe8b30..28cda16ce 100755 --- a/src/lib/os/os.h +++ b/src/lib/os/os.h @@ -72,7 +72,6 @@ BTS_EXPORT std::string username(); BTS_EXPORT char* strncpy(char* dest, const char* src, size_t count); BTS_EXPORT void setenv(const char* name, const char* value); -BTS_EXPORT void debug_break(); BTS_EXPORT void set_thread_name(std::string const&); BTS_EXPORT void set_thread_name(const char* name); diff --git a/src/lib/quickbus/core/LocalNode.cpp b/src/lib/quickbus/core/LocalNode.cpp index 2b7cf01f6..05e795dc9 100644 --- a/src/lib/quickbus/core/LocalNode.cpp +++ b/src/lib/quickbus/core/LocalNode.cpp @@ -4,6 +4,7 @@ #include "lib/quickbus/routing/Router.h" #include "lib/quickbus/routing/NodeID.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" namespace bts { namespace qbus { diff --git a/src/lib/quickbus/network/QBConnection.cpp b/src/lib/quickbus/network/QBConnection.cpp index 585dc7d17..c1fba091a 100644 --- a/src/lib/quickbus/network/QBConnection.cpp +++ b/src/lib/quickbus/network/QBConnection.cpp @@ -4,6 +4,7 @@ #include "lib/utils/PBUtils.h" #include "lib/utils/datetime.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" #include "lib/quickbus/routing/Router.h" #include "lib/quickbus/network/endpoint_description.h" diff --git a/src/lib/quickbus/network/QBConnectionManager.cpp b/src/lib/quickbus/network/QBConnectionManager.cpp index 21c7a07bd..135a27274 100644 --- a/src/lib/quickbus/network/QBConnectionManager.cpp +++ b/src/lib/quickbus/network/QBConnectionManager.cpp @@ -4,6 +4,7 @@ #include "lib/quickbus/network/QBConnection.h" #include "lib/logging/logging.h" #include "lib/quickbus/network/endpoint_description.h" +#include "lib/utils/bts_assert.h" #include "lib/config/protos/quickbus_cfg.pb.h" diff --git a/src/lib/quickbus/rpc/RPCServer.cpp b/src/lib/quickbus/rpc/RPCServer.cpp index f3ffa41d6..bbeb2bf3d 100644 --- a/src/lib/quickbus/rpc/RPCServer.cpp +++ b/src/lib/quickbus/rpc/RPCServer.cpp @@ -5,6 +5,7 @@ #include "lib/quickbus/rpc/rpc_utils.h" #include "lib/quickbus/core/Advertisement.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" #include #include diff --git a/src/lib/utils/Dispatcher.h b/src/lib/utils/Dispatcher.h index cb4b5402f..eda3b33b5 100755 --- a/src/lib/utils/Dispatcher.h +++ b/src/lib/utils/Dispatcher.h @@ -2,7 +2,6 @@ #pragma once #include "lib/utils/bts_no_copy.h" -#include "lib/utils/bts_assert.h" #include "lib/utils/bts_export.h" #include diff --git a/src/lib/utils/HTTPStream.cpp b/src/lib/utils/HTTPStream.cpp index 742136464..543ac69c6 100755 --- a/src/lib/utils/HTTPStream.cpp +++ b/src/lib/utils/HTTPStream.cpp @@ -1,6 +1,7 @@ #include "HTTPStream.h" #include "lib/logging/logging.h" #include "lib/utils/defer.h" +#include "lib/utils/bts_assert.h" #include #include diff --git a/src/lib/utils/SharedList.h b/src/lib/utils/SharedList.h index 1a4b51846..7e867fd57 100644 --- a/src/lib/utils/SharedList.h +++ b/src/lib/utils/SharedList.h @@ -5,6 +5,7 @@ #include "lib/utils/SharedMemory.h" #include "lib/utils/bts_array_size.h" #include "lib/logging/logging.h" +#include "lib/utils/bts_assert.h" #include "lib/os/os.h" #include "lib/config/config.h" diff --git a/src/lib/utils/Sqlite_utils.h b/src/lib/utils/Sqlite_utils.h index 6338219e8..44dd96ea2 100644 --- a/src/lib/utils/Sqlite_utils.h +++ b/src/lib/utils/Sqlite_utils.h @@ -13,7 +13,7 @@ typedef std::unique_ptr sqlite3_stmt_ptr; do { \ if (x != SQLITE_OK) \ { \ - bts_assert_msg(false ,sqlite3_errmsg(c)); \ + bts_assert_msg(false ,sqlite3_errmsg(c.get())); \ } \ } while(0) diff --git a/src/lib/utils/bts_assert.h b/src/lib/utils/bts_assert.h index 142d2473a..71beae0ec 100644 --- a/src/lib/utils/bts_assert.h +++ b/src/lib/utils/bts_assert.h @@ -1,5 +1,9 @@ #pragma once #include +#include + +#include "lib/logging/logging.h" +#include "lib/utils/bts_debugger.h" #ifdef _WIN32 #define TERMINATE ::_exit(-1); @@ -7,10 +11,12 @@ #define TERMINATE abort (); #endif -#define bts_assert_msg(EXP, msg) do { \ - if (!(EXP)) { \ - std::cerr << "Assert failure: " << __FILE__ << ":" << __LINE__ << " Exp: " << #EXP << std::endl; \ - TERMINATE; \ +#define bts_assert_msg(EXP, msg) do { \ + if (!(EXP)) { \ + LOG(Assert,Fatal, "Assert failure: {} {}",std::string(#EXP),std::string(msg) ); \ + if (is_debugger_present()) \ + debug_break(); \ + TERMINATE; \ }} while(0) #define bts_assert(EXP) bts_assert_msg(EXP, "") diff --git a/src/lib/utils/bts_chrono.h b/src/lib/utils/bts_chrono.h index 052215a7f..f263e9a20 100644 --- a/src/lib/utils/bts_chrono.h +++ b/src/lib/utils/bts_chrono.h @@ -1,6 +1,7 @@ #pragma once #include #include +#include namespace bts { @@ -24,6 +25,10 @@ inline int64_t sec_diff (TimeStamp t1, TimeStamp t2) { return std::chrono::duration_cast(t1 - t2).count() ; } +template void sleep_for (T t) +{ + std::this_thread::sleep_for(t); +} } inline std::ostream &operator<<(std::ostream &o,const bts::TimeStamp ts) diff --git a/src/lib/utils/bts_debugger.h b/src/lib/utils/bts_debugger.h index 04e0f0a00..0a7efc1ee 100755 --- a/src/lib/utils/bts_debugger.h +++ b/src/lib/utils/bts_debugger.h @@ -1,16 +1,46 @@ -#ifndef BTS_DEBUGGER_H_ -#define BTS_DEBUGGER_H_ +#pragma once -#include "../os/os.h" +#include +#include +#include #include "windows_wrapper.h" -#ifdef _WIN32 - #define DEBUG_BREAK() do { if (IsDebuggerPresent()) __debugbreak(); } while(0) -#else -//#include -//#include -// #define DEBUG_BREAK() do { if (ptrace(PTRACE_TRACEME, 0, NULL, 0) == -1) raise(SIGTRAP); } while(0) -#define DEBUG_BREAK() -#endif +inline bool is_debugger_present() +{ + #ifdef WIN32 + return IsDebuggerPresent(); + #else + char buf[1024]; + int debugger_present = 0; + int status_fd = open("/proc/self/status", O_RDONLY); + if (status_fd == -1) + return 0; + + ssize_t num_read = read(status_fd, buf, sizeof(buf)-1); + + if (num_read > 0) + { + static const char TracerPid[] = "TracerPid:"; + char *tracer_pid; + + buf[num_read] = 0; + tracer_pid = strstr(buf, TracerPid); + if (tracer_pid) + debugger_present = !!atoi(tracer_pid + sizeof(TracerPid) - 1); + } + + return debugger_present; + #endif +} + +inline void debug_break() +{ +#ifdef _WIN32 + __debugbreak(); +#else + std::raise(SIGINT); #endif +} + + diff --git a/src/server/sparkd/CMakeDeps.cmake b/src/server/sparkd/CMakeDeps.cmake index 0460591f5..51d1cf7ea 100644 --- a/src/server/sparkd/CMakeDeps.cmake +++ b/src/server/sparkd/CMakeDeps.cmake @@ -1 +1 @@ -set(sources ;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/Application.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/Market.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/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;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_order_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp) \ No newline at end of file +set(sources ;cmds/CmdRegistry.cpp;cmds/ConfigCheck.cpp;cmds/Help.cpp;cmds/Md.cpp;cmds/Run.cpp;cmds/RunSim.cpp;cmds/Test.cpp;cmds/TestCeloxica.cpp;cmds/TestOrderman.cpp;event_grid/EventNode.cpp;exchange_sim/ExchangeSim.cpp;exchange_sim/ExchangeSimApplication.cpp;exchange_sim/Market.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/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;orderman/components/FillRecorder.cpp;orderman/components/Gateway.cpp;orderman/components/MDSource.cpp;orderman/components/NativeOrderMan.cpp;orderman/components/OrderRecorder.cpp;orderman/components/SpreaderOrderMan.cpp;orderman/events/ExecutionReport.cpp;orderman/events/NativeOrderStateChange.cpp;orderman/events/SpreaderOrderStateChange.cpp;orderman/events/TimeChange.cpp;orderman/native_orders/NativeOrder.cpp;orderman/native_orders/NativeOrderBuilder.cpp;orderman/native_orders/NativeOrderFactory.cpp;orderman/persistence/FillDB.cpp;orderman/persistence/OrderDB.cpp;orderman/persistence/gen_order_id.cpp;orderman/service/OrderServiceServer.cpp;orderman/spreader_orders/SpreaderOrder.cpp;orderman/spreader_orders/SpreaderOrderBase.cpp;orderman/spreader_orders/spreader_states/SpreaderEndStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderStartStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForCancelAllStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWaitingForFirstConnStateWorker.cpp;orderman/spreader_orders/spreader_states/SpreaderWorkingStateWorker.cpp;orderman/tests/spreader_order_tests.cpp;orderman/utils/fix_order_codec.cpp;orderman/utils/orderman_utils.cpp;persistence/IStore.cpp;persistence/PersistenceServiceServer.cpp;persistence/SqliteStore.cpp;persistence/tests/PersistenceServiceTests.cpp;risk_limits/IRiskLimitObserver.cpp;risk_limits/RiskLimitManager.cpp;risk_limits/RiskLimiter.cpp;risk_limits/SharedRiskLimiter.cpp;risk_limits/SymbolKey.cpp;risk_limits/tests/RiskLimitsTests.cpp;securities/SecurityDB.cpp;spreader/QuoteLegPriceQuantityState.cpp;spreader/SingleFillHedger.cpp;spreader/SingleLegQuoter.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelledStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp) \ No newline at end of file diff --git a/src/server/sparkd/cmds/TestOrderman.cpp b/src/server/sparkd/cmds/TestOrderman.cpp index ff8e07797..bda049c01 100644 --- a/src/server/sparkd/cmds/TestOrderman.cpp +++ b/src/server/sparkd/cmds/TestOrderman.cpp @@ -237,12 +237,14 @@ int TestOrderman::execute(std::vector const &) std::cout << "Commands:\n" - "\tcreate native order : n sec_key b/s price quantity\n" - "\tcreate spreader order : s b/s price quantity\n" - "\tupdate order : u price quantity\n" - "\tcancel order : x\n" - "\tchange current order: o order_key n|s\n\n"; + "\tcreate native order : n b/s price quantity\n" + "\tcreate spreader order : s b/s price quantity\n" + "\tupdate order : u price quantity\n" + "\tcancel order : x\n" + "\tchange current order : o order_key s|n \n" + "\tchange current security : k security_key\n"; + auto sec_key = SecurityKey(get_front_month_es_futures().first->id()); while (true) { std::cout << "> "; std::cout.flush(); @@ -250,11 +252,11 @@ int TestOrderman::execute(std::vector const &) std::cin >> choice; switch (choice) { case 'n': { - uint32_t sec_key;char side; double price; int quantity; - std::cin >> sec_key >> side >> price >> quantity; + char side; double price; int quantity; + std::cin >> side >> price >> quantity; display_order_updates = true; auto resp = client.create_order( - make_native_order_create_request(SecurityKey(sec_key), + make_native_order_create_request(sec_key, side == 'b' ? api::SIDE_BUY : api::SIDE_SELL, Price(price), Quantity(quantity))); @@ -326,6 +328,12 @@ int TestOrderman::execute(std::vector const &) << (current_order_type == CurrentOrderType::NATIVE? "native" : "spreader"); break; } + case 'k': { + std::cin >> sec_key.value() ; + std::cout << "Current security key: " + << sec_key.value(); + break; + } } } } diff --git a/src/server/sparkd/exchange_sim/Application.cpp b/src/server/sparkd/exchange_sim/Application.cpp deleted file mode 100644 index 9466eb905..000000000 --- a/src/server/sparkd/exchange_sim/Application.cpp +++ /dev/null @@ -1,206 +0,0 @@ -#include "Application.h" -#include "lib/logging/logging.h" - -#include - -#include - -namespace bts { -namespace sim { - -void Application::onLogon( const FIX::SessionID& ) {} - -void Application::onLogout( const FIX::SessionID& ) {} - -void Application::fromApp( const FIX::Message& message, - const FIX::SessionID& sessionID ) -throw( FIX::FieldNotFound, FIX::IncorrectDataFormat, FIX::IncorrectTagValue, FIX::UnsupportedMessageType ) -{ - crack( message, sessionID ); -} - -void Application::onMessage( const FIX42::NewOrderSingle& message, const FIX::SessionID& ) -{ - FIX::SenderCompID senderCompID; - FIX::TargetCompID targetCompID; - FIX::ClOrdID clOrdID; - FIX::Symbol symbol; - FIX::Side side; - FIX::OrdType ordType; - FIX::Price price; - FIX::OrderQty orderQty; - FIX::TimeInForce timeInForce( FIX::TimeInForce_DAY ); - - message.getHeader().get( senderCompID ); - message.getHeader().get( targetCompID ); - message.get( clOrdID ); - message.get( symbol ); - message.get( side ); - message.get( ordType ); - if ( ordType == FIX::OrdType_LIMIT ) - message.get( price ); - message.get( orderQty ); - message.getFieldIfSet( timeInForce ); - - LOG(ExSim,Info, "Got new order: {}", clOrdID.getString()); - - try - { - if ( timeInForce != FIX::TimeInForce_DAY ) - throw std::logic_error( "Unsupported TIF, use Day" ); - - Order order( clOrdID, symbol, senderCompID, targetCompID, - convert( side ), convert( ordType ), - price, (long)orderQty ); - - processOrder( order ); - } - catch ( std::exception & e ) - { - rejectOrder( senderCompID, targetCompID, clOrdID, symbol, side, e.what() ); - } -} - -void Application::onMessage( const FIX42::OrderCancelRequest& message, const FIX::SessionID& ) -{ - FIX::OrigClOrdID origClOrdID; - FIX::Symbol symbol; - FIX::Side side; - - message.get( origClOrdID ); - message.get( symbol ); - message.get( side ); - - LOG(ExSim,Info, "Got order cancelation for: {}", origClOrdID.getString()); - try - { - processCancel( origClOrdID, symbol, convert( side ) ); - } - catch ( std::exception& ) {} -} - - -void Application::updateOrder( const Order& order, char status ) -{ - FIX::TargetCompID targetCompID( order.getOwner() ); - FIX::SenderCompID senderCompID( order.getTarget() ); - - FIX42::ExecutionReport fixOrder - ( FIX::OrderID ( order.getClientID() ), - FIX::ExecID ( m_generator.genExecutionID() ), - FIX::ExecTransType ( FIX::ExecTransType_NEW ), - FIX::ExecType ( status ), - FIX::OrdStatus ( status ), - FIX::Symbol ( order.getSymbol() ), - FIX::Side ( convert( order.getSide() ) ), - FIX::LeavesQty ( order.getOpenQuantity() ), - FIX::CumQty ( order.getExecutedQuantity() ), - FIX::AvgPx ( order.getAvgExecutedPrice() ) ); - - fixOrder.set( FIX::ClOrdID( order.getClientID() ) ); - fixOrder.set( FIX::OrderQty( order.getQuantity() ) ); - - if ( status == FIX::OrdStatus_FILLED || - status == FIX::OrdStatus_PARTIALLY_FILLED ) - { - fixOrder.set( FIX::LastShares( order.getLastExecutedQuantity() ) ); - fixOrder.set( FIX::LastPx( order.getLastExecutedPrice() ) ); - } - - try - { - FIX::Session::sendToTarget( fixOrder, senderCompID, targetCompID ); - } - catch ( FIX::SessionNotFound& ) {}} - -void Application::rejectOrder -( const FIX::SenderCompID& sender, const FIX::TargetCompID& target, - const FIX::ClOrdID& clOrdID, const FIX::Symbol& symbol, - const FIX::Side& side, const std::string& message ) -{ - FIX::TargetCompID targetCompID( sender.getValue() ); - FIX::SenderCompID senderCompID( target.getValue() ); - - FIX42::ExecutionReport fixOrder - ( FIX::OrderID ( clOrdID.getValue() ), - FIX::ExecID ( m_generator.genExecutionID() ), - FIX::ExecTransType ( FIX::ExecTransType_NEW ), - FIX::ExecType ( FIX::ExecType_REJECTED ), - FIX::OrdStatus ( FIX::ExecType_REJECTED ), - symbol, side, FIX::LeavesQty( 0 ), FIX::CumQty( 0 ), FIX::AvgPx( 0 ) ); - - fixOrder.set( clOrdID ); - fixOrder.set( FIX::Text( message ) ); - - try - { - FIX::Session::sendToTarget( fixOrder, senderCompID, targetCompID ); - } - catch ( FIX::SessionNotFound& ) {}} - -void Application::processOrder( const Order& order ) -{ - if ( m_orderMatcher.insert( order ) ) - { - acceptOrder( order ); - - std::queue < Order > orders; - m_orderMatcher.match( order.getSymbol(), orders ); - - while ( orders.size() ) - { - fillOrder( orders.front() ); - orders.pop(); - } - } - else - rejectOrder( order ); -} - -void Application::processCancel( const std::string& id, - const std::string& symbol, Order::Side side ) -{ - Order & order = m_orderMatcher.find( symbol, side, id ); - order.cancel(); - cancelOrder( order ); - m_orderMatcher.erase( order ); -} - -Order::Side Application::convert( const FIX::Side& side ) -{ - switch ( side ) - { - case FIX::Side_BUY: return Order::buy; - case FIX::Side_SELL: return Order::sell; - default: throw std::logic_error( "Unsupported Side, use buy or sell" ); - } -} - -Order::Type Application::convert( const FIX::OrdType& ordType ) -{ - switch ( ordType ) - { - case FIX::OrdType_LIMIT: return Order::limit; - default: throw std::logic_error( "Unsupported Order Type, use limit" ); - } -} - -FIX::Side Application::convert( Order::Side side ) -{ - switch ( side ) - { - case Order::buy: return FIX::Side( FIX::Side_BUY ); - case Order::sell: return FIX::Side( FIX::Side_SELL ); - default: throw std::logic_error( "Unsupported Side, use buy or sell" ); - } -} - -FIX::OrdType Application::convert( Order::Type type ) -{ - switch ( type ) - { - case Order::limit: return FIX::OrdType( FIX::OrdType_LIMIT ); - default: throw std::logic_error( "Unsupported Order Type, use limit" ); - } -} -}} diff --git a/src/server/sparkd/exchange_sim/Application.h b/src/server/sparkd/exchange_sim/Application.h deleted file mode 100644 index 27cc58880..000000000 --- a/src/server/sparkd/exchange_sim/Application.h +++ /dev/null @@ -1,101 +0,0 @@ -/* -*- C++ -*- */ - -/**************************************************************************** -** Copyright (c) 2001-2014 -** -** This file is part of the QuickFIX FIX Engine -** -** This file may be distributed under the terms of the quickfixengine.org -** license as defined by quickfixengine.org and appearing in the file -** LICENSE included in the packaging of this file. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.quickfixengine.org/LICENSE for licensing information. -** -** Contact ask@quickfixengine.org if any conditions of this licensing are -** not clear to you. -** -****************************************************************************/ - -#ifndef ORDERMATCH_APPLICATION_H -#define ORDERMATCH_APPLICATION_H - -#include "IDGenerator.h" -#include "OrderMatcher.h" -#include "Order.h" -#include -#include - -#include -#include -#include -#include -#include - -#include -#include -#include "lib/utils/warn_ctrl.h" - -namespace bts { -namespace sim { -GCC_DIAG_OFF("-Woverloaded-virtual") -class Application - : public FIX::Application, - public FIX::MessageCracker -{ - // Application overloads - void onCreate( const FIX::SessionID& ) {} - void onLogon( const FIX::SessionID& sessionID ); - void onLogout( const FIX::SessionID& sessionID ); - void toAdmin( FIX::Message&, const FIX::SessionID& ) {} - void toApp( FIX::Message&, const FIX::SessionID& ) - throw( FIX::DoNotSend ) {} - void fromAdmin( const FIX::Message&, const FIX::SessionID& ) - throw( FIX::FieldNotFound, FIX::IncorrectDataFormat, FIX::IncorrectTagValue, FIX::RejectLogon ) {} - void fromApp( const FIX::Message& message, const FIX::SessionID& sessionID ) - throw( FIX::FieldNotFound, FIX::IncorrectDataFormat, FIX::IncorrectTagValue, FIX::UnsupportedMessageType ); - - // MessageCracker overloads - void onMessage( const FIX42::NewOrderSingle&, const FIX::SessionID& ); - void onMessage( const FIX42::OrderCancelRequest&, const FIX::SessionID& ); - - // Order functionality - void processOrder( const Order& ); - void processCancel( const std::string& id, const std::string& symbol, Order::Side ); - - void updateOrder( const Order&, char status ); - void rejectOrder( const Order& order ) - { updateOrder( order, FIX::OrdStatus_REJECTED ); } - void acceptOrder( const Order& order ) - { updateOrder( order, FIX::OrdStatus_NEW ); } - void fillOrder( const Order& order ) - { - updateOrder( order, - order.isFilled() ? FIX::OrdStatus_FILLED - : FIX::OrdStatus_PARTIALLY_FILLED ); - } - void cancelOrder( const Order& order ) - { updateOrder( order, FIX::OrdStatus_CANCELED ); } - - void rejectOrder( const FIX::SenderCompID&, const FIX::TargetCompID&, - const FIX::ClOrdID& clOrdID, const FIX::Symbol& symbol, - const FIX::Side& side, const std::string& message ); - - // Type conversions - Order::Side convert( const FIX::Side& ); - Order::Type convert( const FIX::OrdType& ); - FIX::Side convert( Order::Side ); - FIX::OrdType convert( Order::Type ); - - OrderMatcher m_orderMatcher; - IDGenerator m_generator; - -public: - const OrderMatcher& orderMatcher() { return m_orderMatcher; } -}; -GCC_DIAG_RESTORE() -}} - -#endif diff --git a/src/server/sparkd/exchange_sim/ExchangeSim.cpp b/src/server/sparkd/exchange_sim/ExchangeSim.cpp index f8411391e..0b752dd53 100644 --- a/src/server/sparkd/exchange_sim/ExchangeSim.cpp +++ b/src/server/sparkd/exchange_sim/ExchangeSim.cpp @@ -1,4 +1,4 @@ -#include "Application.h" +#include "ExchangeSimApplication.h" #include #include @@ -48,7 +48,7 @@ int start_exchange_sim() std::istringstream str{str_settings}; FIX::SessionSettings settings( str ); - Application application; + ExchangeSimApplication application; FIX::FileStoreFactory storeFactory( settings ); FIX::FileLogFactory logFactory( settings ); FIX::SocketAcceptor acceptor( application, storeFactory, settings, logFactory ); diff --git a/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp new file mode 100644 index 000000000..1ed5cb446 --- /dev/null +++ b/src/server/sparkd/exchange_sim/ExchangeSimApplication.cpp @@ -0,0 +1,295 @@ +#include "ExchangeSimApplication.h" +#include "lib/logging/logging.h" +#include "lib/utils/datetime.h" + +#include +#include +#include + +namespace bts { +namespace sim { + +GCC_DIAG_OFF("-Wdeprecated") +GCC_DIAG_OFF("-Wignored-qualifiers") + +void ExchangeSimApplication::onLogon( const FIX::SessionID& ) {} + +void ExchangeSimApplication::onLogout( const FIX::SessionID& ) {} + +void ExchangeSimApplication::fromApp( const FIX::Message& message, + const FIX::SessionID& sessionID ) + throw( FIX::FieldNotFound, FIX::IncorrectDataFormat, FIX::IncorrectTagValue, FIX::UnsupportedMessageType ) +{ + crack( message, sessionID ); +} + +void ExchangeSimApplication::onMessage( const FIX42::NewOrderSingle& message, const FIX::SessionID& ) +{ + FIX::SenderCompID senderCompID; + FIX::TargetCompID targetCompID; + FIX::SenderSubID senderSubID; + FIX::ClOrdID clOrdID; + FIX::Account account; + FIX::SecurityDesc sec_desc; + FIX::Side side; + FIX::OrdType ordType; + FIX::Price price; + FIX::OrderQty orderQty; + FIX::TimeInForce timeInForce( FIX::TimeInForce_DAY ); + FIX::ManualOrderIndicator moi; + + message.getHeader().get( senderCompID ); + message.getHeader().get( targetCompID ); + message.getHeader().get( senderSubID ); + message.get( clOrdID ); + message.get( account ); + message.get( sec_desc ); + message.get( side ); + message.get( ordType ); + if ( ordType == FIX::OrdType_LIMIT ) + message.get( price ); + message.get( orderQty ); + message.getFieldIfSet( timeInForce ); + + message.getField(moi); + LOG(ExSim,Info, "Got new order: {}", clOrdID.getString()); + + try + { + if ( timeInForce != FIX::TimeInForce_DAY ) + throw std::logic_error( "Unsupported TIF, use Day" ); + + Order order( clOrdID, sec_desc, account,senderCompID, targetCompID, senderSubID, + convert( side ), convert( ordType ), + price, (long)orderQty,convert(moi) ); + + processOrder( order ); + } + catch ( std::exception & e ) + { + rejectOrder( senderCompID, targetCompID, clOrdID, sec_desc, side, e.what() ); + } +} + +void ExchangeSimApplication::onMessage( const FIX42::OrderCancelReplaceRequest&message, const FIX::SessionID& ) +{ + FIX::Price price; + FIX::OrderQty orderQty; + FIX::ClOrdID clOrdID; + FIX::SecurityDesc sec_desc; + FIX::Side side; + FIX::SenderCompID senderCompID; + FIX::TargetCompID targetCompID; + + message.getHeader().get( senderCompID ); + message.getHeader().get( targetCompID ); + message.get( clOrdID ); + message.get( price ); + message.get( orderQty ); + message.get( sec_desc ); + message.get( side ); + + try { + Order & order = m_orderMatcher.find( sec_desc, convert(side), clOrdID ); + order.update(price,orderQty); + updateOrder(order,FIX::OrdStatus_REPLACED); + + std::queue < Order > orders; + m_orderMatcher.match( order.getSecDesc(), orders ); + + while ( orders.size() ) + { + fillOrder( orders.front() ); + orders.pop(); + } + + } + catch ( std::exception & e ) + { + rejectOrder( senderCompID, targetCompID, clOrdID, sec_desc, side, e.what() ); + } +} + +void ExchangeSimApplication::onMessage( const FIX42::OrderCancelRequest& message, const FIX::SessionID& ) +{ + FIX::OrigClOrdID origClOrdID; + FIX::SecurityDesc sec_desc; + FIX::Side side; + + message.get( origClOrdID ); + message.get( sec_desc ); + message.get( side ); + + LOG(ExSim,Info, "Got order cancellation for: {}", origClOrdID.getString()); + try + { + processCancel( origClOrdID, sec_desc, convert( side ) ); + } + catch ( std::exception& ) {} +} + + +void ExchangeSimApplication::updateOrder( const Order& order, char status ) +{ + FIX::TargetCompID targetCompID( order.getOwner() ); + FIX::SenderCompID senderCompID( order.getTarget() ); + FIX::TargetSubID( order.getSenderSubID() ) ; + + FIX42::ExecutionReport fixOrder; + fixOrder.set(FIX::OrderID ("0")); + fixOrder.set(FIX::ExecID ( m_generator.genExecutionID() )); + fixOrder.set(FIX::ExecTransType ( FIX::ExecTransType_NEW )); + fixOrder.set(FIX::ExecType ( status )); + fixOrder.set(FIX::OrdStatus ( status )); + fixOrder.set(FIX::Account ( order.getAccount() )); + fixOrder.set(FIX::SecurityDesc ( order.getSecDesc() )); + fixOrder.set(FIX::Side ( convert( order.getSide() ) )); + fixOrder.set(FIX::LeavesQty ( order.getOpenQuantity() )); + fixOrder.set(FIX::CumQty ( order.getExecutedQuantity() )); + fixOrder.set(FIX::AvgPx ( order.getAvgExecutedPrice() ) ); + fixOrder.set(FIX::ClOrdID( order.getClientID() ) ); + fixOrder.set(FIX::OrderQty( order.getQuantity() ) ); + fixOrder.set(FIX::TimeInForce( FIX::TimeInForce_DAY)); + fixOrder.set(FIX::OrdType( convert(order.getType()))); + fixOrder.set(FIX::Price(order.getPrice())); + fixOrder.set(FIX::OrderQty(order.getQuantity())); + + fixOrder.setField(convert(order.getMOI())); + + boost::posix_time::ptime now = boost::posix_time::second_clock::universal_time (); + fixOrder.set (FIX::TransactTime (FIX::UtcTimeStamp (now.time_of_day ().hours (), + now.time_of_day ().minutes (), + now.time_of_day ().seconds (), + now.date ().day (), now.date ().month (), + now.date ().year ()),true)); + if ( status == FIX::OrdStatus_FILLED || + status == FIX::OrdStatus_PARTIALLY_FILLED ) + { + fixOrder.set( FIX::LastShares( order.getLastExecutedQuantity() ) ); + fixOrder.set( FIX::LastPx( order.getLastExecutedPrice() ) ); + } + + fixOrder.getHeader().set(FIX::TargetSubID(order.getSenderSubID())); + try + { + FIX::Session::sendToTarget( fixOrder, senderCompID, targetCompID); + } + catch ( FIX::SessionNotFound& ) {}} + +void ExchangeSimApplication::rejectOrder +( const FIX::SenderCompID& sender, const FIX::TargetCompID& target, + const FIX::ClOrdID& clOrdID, const FIX::SecurityDesc& symbol, + const FIX::Side& side, const std::string& message ) +{ + FIX::TargetCompID targetCompID( sender.getValue() ); + FIX::SenderCompID senderCompID( target.getValue() ); + + FIX42::ExecutionReport fixOrder; + fixOrder.set (FIX::OrderID ( clOrdID.getValue() )); + fixOrder.set (FIX::ExecID ( m_generator.genExecutionID() )); + fixOrder.set (FIX::ExecTransType ( FIX::ExecTransType_NEW )); + fixOrder.set (FIX::ExecType ( FIX::ExecType_REJECTED )); + fixOrder.set (FIX::OrdStatus ( FIX::ExecType_REJECTED )); + fixOrder.set (symbol); + fixOrder.set (side); + fixOrder.set (FIX::LeavesQty( 0 )); + fixOrder.set (FIX::CumQty( 0 )); + fixOrder.set (FIX::AvgPx( 0 )); + fixOrder.set( clOrdID ); + fixOrder.set( FIX::Text( message ) ); + + try + { + FIX::Session::sendToTarget( fixOrder, senderCompID, targetCompID ); + } + catch ( FIX::SessionNotFound& ) {}} + +void ExchangeSimApplication::processOrder( const Order& order ) +{ + if ( m_orderMatcher.insert( order ) ) + { + acceptOrder( order ); + + std::queue < Order > orders; + m_orderMatcher.match( order.getSecDesc(), orders ); + + while ( orders.size() ) + { + fillOrder( orders.front() ); + orders.pop(); + } + } + else + rejectOrder( order ); +} + +void ExchangeSimApplication::processCancel( const std::string& id, + const std::string& symbol, Order::Side side ) +{ + Order & order = m_orderMatcher.find( symbol, side, id ); + order.cancel(); + cancelOrder( order ); + m_orderMatcher.erase( order ); +} + +Order::Side ExchangeSimApplication::convert( const FIX::Side& side ) +{ + switch ( side ) + { + case FIX::Side_BUY: return Order::buy; + case FIX::Side_SELL: return Order::sell; + default: throw std::logic_error( "Unsupported Side, use buy or sell" ); + } +} + +Order::Type ExchangeSimApplication::convert( const FIX::OrdType& ordType ) +{ + switch ( ordType ) + { + case FIX::OrdType_LIMIT: return Order::limit; + default: throw std::logic_error( "Unsupported Order Type, use limit" ); + } +} + +FIX::Side ExchangeSimApplication::convert( Order::Side side ) +{ + switch ( side ) + { + case Order::buy: return FIX::Side( FIX::Side_BUY ); + case Order::sell: return FIX::Side( FIX::Side_SELL ); + default: throw std::logic_error( "Unsupported Side, use buy or sell" ); + } +} + +FIX::OrdType ExchangeSimApplication::convert( Order::Type type ) +{ + switch ( type ) + { + case Order::limit: return FIX::OrdType( FIX::OrdType_LIMIT ); + default: throw std::logic_error( "Unsupported Order Type, use limit" ); + } +} + + +FIX::ManualOrderIndicator ExchangeSimApplication::convert (const Order::MOI &moi) +{ + switch (moi) + { + case Order::moi_yes: + return FIX::ManualOrderIndicator(true); + default: + return FIX::ManualOrderIndicator(false); + } +} + +Order::MOI ExchangeSimApplication::convert (const FIX::ManualOrderIndicator &moi) +{ + if (moi.getValue()) + return Order::moi_yes; + else + return Order::moi_no; +} + +GCC_DIAG_RESTORE() +GCC_DIAG_RESTORE() +}} diff --git a/src/server/sparkd/exchange_sim/ExchangeSimApplication.h b/src/server/sparkd/exchange_sim/ExchangeSimApplication.h new file mode 100644 index 000000000..8b0a4b949 --- /dev/null +++ b/src/server/sparkd/exchange_sim/ExchangeSimApplication.h @@ -0,0 +1,112 @@ +/* -*- C++ -*- */ + +/**************************************************************************** + ** Copyright (c) 2001-2014 + ** + ** This file is part of the QuickFIX FIX Engine + ** + ** This file may be distributed under the terms of the quickfixengine.org + ** license as defined by quickfixengine.org and appearing in the file + ** LICENSE included in the packaging of this file. + ** + ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + ** + ** See http://www.quickfixengine.org/LICENSE for licensing information. + ** + ** Contact ask@quickfixengine.org if any conditions of this licensing are + ** not clear to you. + ** + ****************************************************************************/ + +#ifndef ORDERMATCH_APPLICATION_H +#define ORDERMATCH_APPLICATION_H + +#include "lib/utils/warn_ctrl.h" + +GCC_DIAG_OFF("-Woverloaded-virtual") +GCC_DIAG_OFF("-Wdeprecated") +GCC_DIAG_OFF("-Wignored-qualifiers") + +#include "IDGenerator.h" +#include "OrderMatcher.h" +#include "Order.h" +#include +#include + +#include +#include +#include +#include +#include + +#include +#include + +namespace bts { +namespace sim { +class ExchangeSimApplication + : public FIX::Application, + public FIX::MessageCracker +{ + // Application overloads + void onCreate( const FIX::SessionID& ) {} + void onLogon( const FIX::SessionID& sessionID ); + void onLogout( const FIX::SessionID& sessionID ); + void toAdmin( FIX::Message&, const FIX::SessionID& ) {} + void toApp( FIX::Message&, const FIX::SessionID& ) + throw( FIX::DoNotSend ) {} + void fromAdmin( const FIX::Message&, const FIX::SessionID& ) + throw( FIX::FieldNotFound, FIX::IncorrectDataFormat, FIX::IncorrectTagValue, FIX::RejectLogon ) {} + void fromApp( const FIX::Message& message, const FIX::SessionID& sessionID ) + throw( FIX::FieldNotFound, FIX::IncorrectDataFormat, FIX::IncorrectTagValue, FIX::UnsupportedMessageType ); + + // MessageCracker overloads + void onMessage( const FIX42::NewOrderSingle&, const FIX::SessionID& ); + void onMessage( const FIX42::OrderCancelReplaceRequest&, const FIX::SessionID& ); + void onMessage( const FIX42::OrderCancelRequest&, const FIX::SessionID& ); + + // Order functionality + void processOrder( const Order& ); + void processCancel( const std::string& id, const std::string& symbol, Order::Side ); + + void updateOrder( const Order&, char status ); + void rejectOrder( const Order& order ) + { updateOrder( order, FIX::OrdStatus_REJECTED ); } + void acceptOrder( const Order& order ) + { updateOrder( order, FIX::OrdStatus_NEW ); } + void fillOrder( const Order& order ) + { + updateOrder( order, + order.isFilled() ? FIX::OrdStatus_FILLED + : FIX::OrdStatus_PARTIALLY_FILLED ); + } + void cancelOrder( const Order& order ) + { updateOrder( order, FIX::OrdStatus_CANCELED ); } + + void rejectOrder( const FIX::SenderCompID&, const FIX::TargetCompID&, + const FIX::ClOrdID& clOrdID, const FIX::SecurityDesc& symbol, + const FIX::Side& side, const std::string& message ); + + // Type conversions + Order::Side convert( const FIX::Side& ); + Order::Type convert( const FIX::OrdType& ); + Order::MOI convert (const FIX::ManualOrderIndicator &); + FIX::ManualOrderIndicator convert (const Order::MOI &moi); + + FIX::Side convert( Order::Side ); + FIX::OrdType convert( Order::Type ); + + OrderMatcher m_orderMatcher; + IDGenerator m_generator; + +public: + const OrderMatcher& orderMatcher() { return m_orderMatcher; } +}; +}} + +GCC_DIAG_RESTORE() +GCC_DIAG_RESTORE() +GCC_DIAG_RESTORE() + +#endif diff --git a/src/server/sparkd/exchange_sim/Market.cpp b/src/server/sparkd/exchange_sim/Market.cpp index 029450b4e..863a243fc 100644 --- a/src/server/sparkd/exchange_sim/Market.cpp +++ b/src/server/sparkd/exchange_sim/Market.cpp @@ -26,6 +26,9 @@ #include "Market.h" #include +namespace bts { +namespace sim { + bool Market::insert( const Order& order ) { if ( order.getSide() == Order::buy ) @@ -135,3 +138,4 @@ void Market::display() const for ( iAsk = m_askOrders.begin(); iAsk != m_askOrders.end(); ++iAsk ) std::cout << iAsk->second << std::endl; } +}} diff --git a/src/server/sparkd/exchange_sim/Market.h b/src/server/sparkd/exchange_sim/Market.h index bbe09f9e2..70d695692 100644 --- a/src/server/sparkd/exchange_sim/Market.h +++ b/src/server/sparkd/exchange_sim/Market.h @@ -28,6 +28,9 @@ #include #include +namespace bts { +namespace sim { + class Market { public: @@ -47,5 +50,5 @@ private: BidOrders m_bidOrders; AskOrders m_askOrders; }; - +}} #endif diff --git a/src/server/sparkd/exchange_sim/Order.h b/src/server/sparkd/exchange_sim/Order.h index 6df5ce296..bc22fe7c1 100644 --- a/src/server/sparkd/exchange_sim/Order.h +++ b/src/server/sparkd/exchange_sim/Order.h @@ -1,23 +1,23 @@ /* -*- C++ -*- */ /**************************************************************************** -** Copyright (c) 2001-2014 -** -** This file is part of the QuickFIX FIX Engine -** -** This file may be distributed under the terms of the quickfixengine.org -** license as defined by quickfixengine.org and appearing in the file -** LICENSE included in the packaging of this file. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -** See http://www.quickfixengine.org/LICENSE for licensing information. -** -** Contact ask@quickfixengine.org if any conditions of this licensing are -** not clear to you. -** -****************************************************************************/ + ** Copyright (c) 2001-2014 + ** + ** This file is part of the QuickFIX FIX Engine + ** + ** This file may be distributed under the terms of the quickfixengine.org + ** license as defined by quickfixengine.org and appearing in the file + ** LICENSE included in the packaging of this file. + ** + ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. + ** + ** See http://www.quickfixengine.org/LICENSE for licensing information. + ** + ** Contact ask@quickfixengine.org if any conditions of this licensing are + ** not clear to you. + ** + ****************************************************************************/ #ifndef ORDERMATCH_ORDER_H #define ORDERMATCH_ORDER_H @@ -26,86 +26,107 @@ #include #include +namespace bts { +namespace sim { + class Order { - friend std::ostream& operator<<( std::ostream&, const Order& ); + friend std::ostream& operator<<( std::ostream&, const Order& ); public: - enum Side { buy, sell }; - enum Type { market, limit }; + enum Side { buy, sell }; + enum Type { market, limit }; + enum MOI { moi_yes, moi_no }; - Order( const std::string& clientId, const std::string& symbol, - const std::string& owner, const std::string& target, - Side side, Type type, double price, long quantity ) -: m_clientId( clientId ), m_symbol( symbol ), m_owner( owner ), - m_target( target ), m_side( side ), m_type( type ), m_price( price ), - m_quantity( quantity ) - { - m_openQuantity = m_quantity; - m_executedQuantity = 0; - m_avgExecutedPrice = 0; - m_lastExecutedPrice = 0; - m_lastExecutedQuantity = 0; - } + Order( const std::string& clientId, const std::string& sec_desc, + std::string const&account, const std::string& owner, + const std::string& target, + const std::string& sender_sub_id, + Side side, Type type, double price, long quantity, + MOI moi) + : m_clientId( clientId ), m_sec_desc( sec_desc ), m_account(account),m_owner( owner ), + m_target( target ), + m_sender_sub_id( sender_sub_id ), + m_side( side ), m_type( type ), m_price( price ), + m_quantity( quantity ), + m_moi(moi) + { + m_openQuantity = m_quantity; + m_executedQuantity = 0; + m_avgExecutedPrice = 0; + m_lastExecutedPrice = 0; + m_lastExecutedQuantity = 0; + } - const std::string& getClientID() const { return m_clientId; } - const std::string& getSymbol() const { return m_symbol; } - const std::string& getOwner() const { return m_owner; } - const std::string& getTarget() const { return m_target; } - Side getSide() const { return m_side; } - Type getType() const { return m_type; } - double getPrice() const { return m_price; } - long getQuantity() const { return m_quantity; } + const std::string& getClientID() const { return m_clientId; } + const std::string& getAccount() const { return m_account; } + const std::string& getSecDesc() const { return m_sec_desc; } + const std::string& getOwner() const { return m_owner; } + const std::string& getTarget() const { return m_target; } + const std::string& getSenderSubID() const { return m_sender_sub_id; } + Side getSide() const { return m_side; } + Type getType() const { return m_type; } + double getPrice() const { return m_price; } + long getQuantity() const { return m_quantity; } - long getOpenQuantity() const { return m_openQuantity; } - long getExecutedQuantity() const { return m_executedQuantity; } - double getAvgExecutedPrice() const { return m_avgExecutedPrice; } - double getLastExecutedPrice() const { return m_lastExecutedPrice; } - long getLastExecutedQuantity() const { return m_lastExecutedQuantity; } + void update (double price, long quantity) { + m_price = price; + m_quantity = quantity; + } + MOI getMOI() const { return m_moi; } - bool isFilled() const { return m_quantity == m_executedQuantity; } - bool isClosed() const { return m_openQuantity == 0; } + long getOpenQuantity() const { return m_openQuantity; } + long getExecutedQuantity() const { return m_executedQuantity; } + double getAvgExecutedPrice() const { return m_avgExecutedPrice; } + double getLastExecutedPrice() const { return m_lastExecutedPrice; } + long getLastExecutedQuantity() const { return m_lastExecutedQuantity; } - void execute( double price, long quantity ) - { - m_avgExecutedPrice = - ( ( quantity * price ) + ( m_avgExecutedPrice * m_executedQuantity ) ) - / ( quantity + m_executedQuantity ); + bool isFilled() const { return m_quantity == m_executedQuantity; } + bool isClosed() const { return m_openQuantity == 0; } - m_openQuantity -= quantity; - m_executedQuantity += quantity; - m_lastExecutedPrice = price; - m_lastExecutedQuantity = quantity; - } - void cancel() - { - m_openQuantity = 0; - } + void execute( double price, long quantity ) + { + m_avgExecutedPrice = + ( ( quantity * price ) + ( m_avgExecutedPrice * m_executedQuantity ) ) + / ( quantity + m_executedQuantity ); + + m_openQuantity -= quantity; + m_executedQuantity += quantity; + m_lastExecutedPrice = price; + m_lastExecutedQuantity = quantity; + } + void cancel() + { + m_openQuantity = 0; + } private: - std::string m_clientId; - std::string m_symbol; - std::string m_owner; - std::string m_target; - Side m_side; - Type m_type; - double m_price; - long m_quantity; - - long m_openQuantity; - long m_executedQuantity; - double m_avgExecutedPrice; - double m_lastExecutedPrice; - long m_lastExecutedQuantity; + std::string m_clientId; + std::string m_sec_desc; + std::string m_account; + std::string m_owner; + std::string m_target; + std::string m_sender_sub_id; + Side m_side; + Type m_type; + double m_price; + long m_quantity; + MOI m_moi; + + long m_openQuantity; + long m_executedQuantity; + double m_avgExecutedPrice; + double m_lastExecutedPrice; + long m_lastExecutedQuantity; }; inline std::ostream& operator<<( std::ostream& ostream, const Order& order ) { - return ostream - << "ID: " << std::setw( 10 ) << "," << order.getClientID() - << " OWNER: " << std::setw( 10 ) << "," << order.getOwner() - << " PRICE: " << std::setw( 10 ) << "," << order.getPrice() - << " QUANTITY: " << std::setw( 10 ) << "," << order.getQuantity(); + return ostream + << "ID: " << std::setw( 10 ) << "," << order.getClientID() + << " OWNER: " << std::setw( 10 ) << "," << order.getOwner() + << " PRICE: " << std::setw( 10 ) << "," << order.getPrice() + << " QUANTITY: " << std::setw( 10 ) << "," << order.getQuantity(); } - +}} #endif diff --git a/src/server/sparkd/exchange_sim/OrderMatcher.h b/src/server/sparkd/exchange_sim/OrderMatcher.h index 2b2bd41fe..65ce8ccc8 100644 --- a/src/server/sparkd/exchange_sim/OrderMatcher.h +++ b/src/server/sparkd/exchange_sim/OrderMatcher.h @@ -26,21 +26,24 @@ #include #include +namespace bts { +namespace sim { + class OrderMatcher { typedef std::map < std::string, Market > Markets; public: bool insert( const Order& order ) { - Markets::iterator i = m_markets.find( order.getSymbol() ); + Markets::iterator i = m_markets.find( order.getSecDesc() ); if ( i == m_markets.end() ) - i = m_markets.insert( std::make_pair( order.getSymbol(), Market() ) ).first; + i = m_markets.insert( std::make_pair( order.getSecDesc(), Market() ) ).first; return i->second.insert( order ); } void erase( const Order& order ) { - Markets::iterator i = m_markets.find( order.getSymbol() ); + Markets::iterator i = m_markets.find( order.getSecDesc() ); if ( i == m_markets.end() ) return ; i->second.erase( order ); } @@ -87,5 +90,5 @@ public: private: Markets m_markets; }; - +}} #endif diff --git a/src/server/sparkd/jetfix/codec/f_toa.h b/src/server/sparkd/jetfix/codec/f_toa.h index e5d2a77e9..2f5cc468d 100644 --- a/src/server/sparkd/jetfix/codec/f_toa.h +++ b/src/server/sparkd/jetfix/codec/f_toa.h @@ -5,6 +5,7 @@ #include #include +namespace bts { inline int f_toa (float n,char*buffer, size_t buffer_size,int pad=0) { static double_conversion::DoubleToStringConverter const &c = @@ -39,4 +40,4 @@ inline int f_toa (float n,char*buffer, size_t buffer_size,int pad=0) return pad; } } - +} diff --git a/src/server/sparkd/md/run_md.cpp b/src/server/sparkd/md/run_md.cpp index 4035271db..4cd16c15d 100644 --- a/src/server/sparkd/md/run_md.cpp +++ b/src/server/sparkd/md/run_md.cpp @@ -47,7 +47,7 @@ void clean_dir(const std::string base_path) { void run_replay() { auto naggle_ms = config::get().naggle_ms(); - auto file = "http://mdreplay/spark/futures.coconut"; + auto file = "http://mdreplay.bluetradesys.local/spark/futures.coconut"; replay_recording(file, naggle_ms); } diff --git a/src/server/sparkd/persistence/SqliteStore.cpp b/src/server/sparkd/persistence/SqliteStore.cpp index 955f769b6..2b4d34ff7 100644 --- a/src/server/sparkd/persistence/SqliteStore.cpp +++ b/src/server/sparkd/persistence/SqliteStore.cpp @@ -19,6 +19,7 @@ boost::filesystem::path db_location (std::string const&store_root,std::string co std::string base_path = store_root; boost::filesystem::path result = utils::normalize_data_path (base_path); result /= "databases"; + result /= db; result /= db + ".sqlite"; return result; } diff --git a/src/server/sparkd/spreader/SingleFillHedger.cpp b/src/server/sparkd/spreader/SingleFillHedger.cpp index 49f7ea19c..3b272007d 100644 --- a/src/server/sparkd/spreader/SingleFillHedger.cpp +++ b/src/server/sparkd/spreader/SingleFillHedger.cpp @@ -9,14 +9,14 @@ namespace bts { namespace orderman { -SingleFillHedger::SingleFillHedger(ISpreaderManager& spreader_manager, +SingleFillHedger::SingleFillHedger(ISpreaderManager& , const LegPropertyData& leg_property_data, bts::orderman::SpreaderOrderBase::ChildOrder order, bts::Price hedge_price, bts::Quantity hedge_quantity, api::Side hedge_side) : - _spreader_manager(spreader_manager), + // _spreader_manager(spreader_manager), _leg_property_data (leg_property_data), _order (order), _price_quantity_state(hedge_price, hedge_quantity, hedge_side), diff --git a/src/server/sparkd/spreader/SingleFillHedger.h b/src/server/sparkd/spreader/SingleFillHedger.h index b25c02676..8451eab1c 100644 --- a/src/server/sparkd/spreader/SingleFillHedger.h +++ b/src/server/sparkd/spreader/SingleFillHedger.h @@ -22,7 +22,7 @@ class SpreaderOrderUpdateMessage; class SingleFillHedger { private: - ISpreaderManager& _spreader_manager; + // ISpreaderManager& _spreader_manager; const LegPropertyData& _leg_property_data; bts::orderman::SpreaderOrderBase::ChildOrder _order; HedgePriceQuantityState _price_quantity_state; diff --git a/tools/replicator/build_win.sh b/tools/replicator/build_win.sh index a885b58ba..49873b290 100644 --- a/tools/replicator/build_win.sh +++ b/tools/replicator/build_win.sh @@ -1,6 +1,6 @@ #!/bin/bash SCRIPT=$(readlink -f "$0") SCRIPTPATH=$(dirname "$SCRIPT") -#$SCRIPTPATH/replicate_to_windows_vm.py && \ +$SCRIPTPATH/replicate_to_windows_vm.py && \ ssh -p 2222 bts@localhost "cd /mnt/c/Users/bts/spark/tools && /mnt/c/Windows/System32/cmd.exe /c clientbuild.cmd" diff --git a/tools/replicator/replicate_to_windows_vm.py b/tools/replicator/replicate_to_windows_vm.py index fcf7c8d79..e009f16c6 100644 --- a/tools/replicator/replicate_to_windows_vm.py +++ b/tools/replicator/replicate_to_windows_vm.py @@ -9,11 +9,14 @@ root = socket://localhost:8080/$TARGET ignore = Path build ignore = Path .git ignore = Path externals +ignore = Path cmake-build-debug +ignore = Path .idea ignore = Path docker ignore = Regex .*\.pyc ignore = Path x64 ignore = Path .vs -repeat = watch +prefer = $SOURCE +#repeat = watch batch = true ''' diff --git a/tools/setup_builds.sh b/tools/setup_builds.sh index bf3334354..39fc31d9d 100755 --- a/tools/setup_builds.sh +++ b/tools/setup_builds.sh @@ -3,34 +3,10 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" mkdir -p $DIR/../build/ cd $DIR/../build/ -rm -rf gcc_debug -mkdir gcc_debug -cd gcc_debug -cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=g++ ../.. -cd .. - -rm -rf gcc_release -mkdir gcc_release -cd gcc_release -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ ../.. -cd .. - -rm -rf clang_debug -mkdir clang_debug -cd clang_debug -cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=clang++ ../.. -cd .. - -rm -rf clang_release -mkdir clang_release -cd clang_release -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=clang++ ../.. -cd .. - rm -rf ninja_debug mkdir ninja_debug cd ninja_debug -cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=g++ ../.. +cmake -G Ninja -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=/usr/lib/ccache/g++ ../.. cd .. rm -rf ninja_release @@ -40,12 +16,6 @@ cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++ ../.. cd .. if hash rtags 2>/dev/null; then - rm -rf rtags - mkdir rtags - cd rtags - cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=rtags ../.. - cd .. - rm -rf rtags_ninja mkdir rtags_ninja cd rtags_ninja