Merged
This commit is contained in:
1 parent
6aaf85bb1c
commit
b20207cdd0
6 files changed
+20
-39
No files matched your search
+1
-1
Submodule externals updated: 2ddd467151...a97c71a956.
@@ -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/HedgerWaitingForFirstAck.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelled.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp)
|
||||
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/SpreaderBase.cpp;spreader/hedger/hedger_states/HedgerEndStateWorker.cpp;spreader/hedger/hedger_states/HedgerStartStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForCancelAckStateWorker.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAck.cpp;spreader/hedger/hedger_states/HedgerWaitingForFirstAckCancelled.cpp;spreader/hedger/hedger_states/HedgerWorkingStateWorker.cpp;testing/catch_test_runner.cpp;user/UserServiceServer.cpp)
|
||||
@@ -1,13 +1,14 @@
|
||||
#include "Application.h"
|
||||
#include "lib/logging/logging.h"
|
||||
|
||||
#include <quickfix/Session.h>
|
||||
|
||||
#include <quickfix/fix42/ExecutionReport.h>
|
||||
|
||||
namespace bts {
|
||||
namespace sim {
|
||||
|
||||
GCC_DIAG_OFF("-Wdeprecated")
|
||||
GCC_DIAG_OFF("-Wignored-qualifiers")
|
||||
|
||||
void Application::onLogon( const FIX::SessionID& ) {}
|
||||
|
||||
void Application::onLogout( const FIX::SessionID& ) {}
|
||||
@@ -71,7 +72,7 @@ void Application::onMessage( const FIX42::OrderCancelRequest& message, const FIX
|
||||
message.get( symbol );
|
||||
message.get( side );
|
||||
|
||||
LOG(ExSim,Info, "Got order cancelation for: {}", origClOrdID.getString());
|
||||
LOG(ExSim,Info, "Got order cancellation for: {}", origClOrdID.getString());
|
||||
try
|
||||
{
|
||||
processCancel( origClOrdID, symbol, convert( side ) );
|
||||
@@ -203,4 +204,6 @@ FIX::OrdType Application::convert( Order::Type type )
|
||||
default: throw std::logic_error( "Unsupported Order Type, use limit" );
|
||||
}
|
||||
}
|
||||
GCC_DIAG_RESTORE()
|
||||
GCC_DIAG_RESTORE()
|
||||
}}
|
||||
@@ -22,6 +22,12 @@
|
||||
#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"
|
||||
@@ -36,11 +42,9 @@
|
||||
|
||||
#include <quickfix/fix42/NewOrderSingle.h>
|
||||
#include <quickfix/fix42/OrderCancelRequest.h>
|
||||
#include "lib/utils/warn_ctrl.h"
|
||||
|
||||
namespace bts {
|
||||
namespace sim {
|
||||
GCC_DIAG_OFF("-Woverloaded-virtual")
|
||||
class Application
|
||||
: public FIX::Application,
|
||||
public FIX::MessageCracker
|
||||
@@ -95,7 +99,10 @@ class Application
|
||||
public:
|
||||
const OrderMatcher& orderMatcher() { return m_orderMatcher; }
|
||||
};
|
||||
GCC_DIAG_RESTORE()
|
||||
}}
|
||||
|
||||
GCC_DIAG_RESTORE()
|
||||
GCC_DIAG_RESTORE()
|
||||
GCC_DIAG_RESTORE()
|
||||
|
||||
#endif
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
+1
-31
@@ -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
|
||||
|
||||
Reference in new issue
Block a user