diff --git a/.vscode/launch.json b/.vscode/launch.json index 66f59625d..e302e568b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -82,7 +82,7 @@ "type": "cppdbg", "request": "launch", "program": "/home/eharding/spark/sparkd", - "args": [], + "args": ["run"], "stopAtEntry": false, "cwd": "/home/eharding/spark/", "environment": [], diff --git a/src/client/spark_core/Co2/MDConsumerHandle.cs b/src/client/spark_core/Co2/MDConsumerHandle.cs index 7db9ecd48..e4b03b4d9 100644 --- a/src/client/spark_core/Co2/MDConsumerHandle.cs +++ b/src/client/spark_core/Co2/MDConsumerHandle.cs @@ -61,7 +61,6 @@ namespace mbts.co2 if (updated > time && updated != UInt64.MaxValue) { if (bids == null || bids.Length < 10) bids = new NativePriceSize[10]; if (asks == null || asks.Length < 10) asks = new NativePriceSize[10]; - var ask_vec = new NativePriceSize[10]; for (int depth = 0; depth < 10; ++depth) { bids[depth] = _hot_depth->bid(depth); asks[depth] = _hot_depth->ask(depth); diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp index 9a90d76b6..d913ed228 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Listener.cpp @@ -208,7 +208,7 @@ void MDP3Listener::onDefinition(onixs::Handler&, const onixs::Security& osec, co FixedFutureSecurity fsec; set_security_common(sec, fsec); fsec.price_break = 0; - fsec.low_tick = fsec.high_tick = double_of_price(sec.minPriceIncrement()) * pow10(fsec.display_factor); + fsec.low_tick = fsec.high_tick = double_of_price(sec.minPriceIncrement()); auto expiration = date_of_maturity(sec); fsec.expiration_year = expiration.year; fsec.expiration_month = expiration.month; @@ -268,6 +268,11 @@ void MDP3Listener::onDefinition(onixs::Handler&, const onixs::Security&, const o set_security_common(sec, fsec); vector leg_exchange_ids; leg_exchange_ids.reserve(sec.legs().size()); + + int8_t tick_rule; + if (sec.tickRule(tick_rule)) { + decode_ticks(tick_rule, 0.0, fsec); + } fsec.set_leg_count(sec.legs().size()); for(size_t x = 0; x < fsec.leg_count(); ++x) { diff --git a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp index 581a724e8..c47cf8095 100644 --- a/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp +++ b/src/server/sparkd/md/platforms/mdp3_onixs/MDP3Main.cpp @@ -22,15 +22,6 @@ using namespace bts::co2; namespace bts { namespace md { -// void run_onixs_mdp3_server(UserSymbol* psyms, size_t symcount) { -// MDP3Main main; -// vector symbols; -// for (size_t x = 0; x < symcount; ++x) { -// symbols.push_back(psyms[x]); -// } -// main.run(symbols); -// } - MDP3Main::MDP3Main() : _producer(PLATFORM_MDP3ONIXS), _security_recorder(), @@ -321,7 +312,6 @@ unique_ptr MDP3Main::prepare_listener(onixs::Handler& handler, con vector producer_channels; for (auto& symbol : channel.symbols) { producer_channels.push_back(_producer.get_channel(symbol.symbol().c_str(), symbol.type(), symbol.exchange())); - //handler.addSecurityAssetFilter(symbol.symbol()); } unique_ptr listener(new MDP3Listener(_index, _producer, _security_recorder, _settlement_recorder, producer_channels, utils::Dispatcher::current())); diff --git a/tools/docker_shell.bat b/tools/docker_shell.bat index 32dce83c1..810c7b8f5 100644 --- a/tools/docker_shell.bat +++ b/tools/docker_shell.bat @@ -5,10 +5,10 @@ if "%target%"=="" set target=gcc_debug call %~dp0\ensure_lhome.cmd cd %~dp0\.. docker run --rm -i ^ - -p 8000:8000 -p 8001:8001 -p 2000:22 %* ^ --security-opt seccomp=unconfined ^ -v %linuxhome%:/root/ ^ -v %cd%:/bts ^ -h %COMPUTERNAME%_spark ^ + --net host ^ -t bluetradingsystems/linux_docker ^ /bin/bash -c "/usr/sbin/sshd -D & (cd ~/www && python -m SimpleHTTPServer >/dev/null 2>/dev/null) & cd /bts/build/%target%/; /bin/bash"