diff --git a/src/client/spark_core/Co2/Co2NativeMethods.cs b/src/client/spark_core/Co2/Co2NativeMethods.cs index 9bae6ed87..e9c6dfde4 100644 --- a/src/client/spark_core/Co2/Co2NativeMethods.cs +++ b/src/client/spark_core/Co2/Co2NativeMethods.cs @@ -56,8 +56,6 @@ namespace mbts.co2 [DllImport("libspark")] internal static extern void md_consumer_set_on_security(IntPtr consumer, raw_security_callback on_security); internal unsafe delegate void raw_just_security_callback(security_key key, byte* buffer, UInt64 buffer_size); - [DllImport("libspark")] - internal unsafe static extern void md_consumer_get_single_security(MDConsumerHandle.ColdEntry* entry, raw_just_security_callback on_security); [DllImport("libspark")] internal unsafe static extern bool md_consumer_is_heart_beating(MDConsumerHandle.ColdHeader* header); @@ -104,11 +102,24 @@ namespace mbts.co2 [DllImport("libspark")] internal static extern void co2_get_sample_cold_header(ref MDConsumerHandle.ColdHeader entry); + public class TestMDHandle : IDisposable { + IntPtr _ptr; + internal TestMDHandle(IntPtr p) { _ptr = p; } + public void Dispose() { + if (_ptr != IntPtr.Zero) { + co2_destroy_test_md(_ptr); + _ptr = IntPtr.Zero; + } + } + } + public static TestMDHandle produce_test_md() { + return new TestMDHandle(co2_produce_test_md()); + } [DllImport("libspark")] - internal static extern IntPtr co2_produce_test_md(); + private static extern IntPtr co2_produce_test_md(); [DllImport("libspark")] - internal static extern void co2_destroy_test_md(IntPtr handle); + private static extern void co2_destroy_test_md(IntPtr handle); [DllImport("libspark")] internal static extern void co2_get_zero_and_nan_book(ref NativePriceLevel nps); diff --git a/src/client/spark_core/Co2/MDConsumerHandle.cs b/src/client/spark_core/Co2/MDConsumerHandle.cs index 1d7bfdcc7..1577fa6c0 100644 --- a/src/client/spark_core/Co2/MDConsumerHandle.cs +++ b/src/client/spark_core/Co2/MDConsumerHandle.cs @@ -22,11 +22,6 @@ namespace mbts.co2 { // The exchange key can change at CBOE. This numeric_id will always be correct public ulong numeric_id { get { return _cold->numeric_id; } } - public Security get_security() { - Security result = null; - Co2NativeMethods.md_consumer_get_single_security(_cold, (key, buffer, length) => result = ProtoBuf.Serializer.Deserialize(new UnmanagedMemoryStream(buffer, (long)length))); - return result; - } // This property exists for specific performance optimization purposes // Most callers should just use get_bbo/get_depth @@ -70,7 +65,7 @@ namespace mbts.co2 { xib += 1; } // Bids grow down, take the higher price - else if (implied.price < direct.price) { + else if (implied.is_nan || implied.int_price < direct.int_price) { bid[x] = direct; xdb += 1; } @@ -95,7 +90,7 @@ namespace mbts.co2 { xia += 1; } // asks grow up, take the lower price - else if (direct.int_price < implied.int_price) { + else if (implied.is_nan || direct.int_price < implied.int_price) { ask[x] = direct; xda += 1; } @@ -246,7 +241,6 @@ namespace mbts.co2 { default: throw new ArgumentException("depth"); } } - } [StructLayout(LayoutKind.Sequential, Size = 384)] diff --git a/src/client/spark_test/Co2/Co2Tests.cs b/src/client/spark_test/Co2/Co2Tests.cs index 61fc880c8..89e4fb0d8 100644 --- a/src/client/spark_test/Co2/Co2Tests.cs +++ b/src/client/spark_test/Co2/Co2Tests.cs @@ -163,21 +163,19 @@ namespace mbts.co2.tests Assert.IsTrue(header.gap_count == 104); } - [Test,Ignore("")] + [Test] public void enumerate_securities() { - // config.Configuration.initialize_for_test(); - IntPtr test_md = Co2NativeTestMethods.co2_produce_test_md(); - using (Disposable.Create(() => Co2NativeTestMethods.co2_destroy_test_md(test_md))) { + using (var test_md = Co2NativeTestMethods.produce_test_md()) { using (var consumer = new MDConsumer(new[] { - new UserSymbol("FOOM", Venue.Unset, SecurityType.Future), - new UserSymbol("FOOXM", Venue.Unset, SecurityType.Option) + new UserSymbol("FOOM", Venue.Bts, SecurityType.Future), + new UserSymbol("FOOXM", Venue.Bts, SecurityType.Option), }, false)) { var securities = consumer.all_securities().ToList(); foreach (var s in securities) { Assert.IsTrue(s.security.Id == s.handle.key); //Assert.IsTrue(s.security.numeric_id == s.handle.numeric_id); } - Assert.IsTrue(securities.Count() == 24); + Assert.AreEqual(securities.Count(), 24); var dict = securities.Select(s => s.security).GroupBy(s => s.Symbol).ToDictionary(group => group.Key, group => group.ToList()); Assert.IsTrue(dict.Count == 2); Assert.IsTrue(dict.All(kvp => kvp.Value.Count == 12)); @@ -185,16 +183,14 @@ namespace mbts.co2.tests } } - [Test,Ignore("")] + [Test] public void on_securities() { - config.Configuration.initialize_for_test(); - IntPtr test_md = Co2NativeTestMethods.co2_produce_test_md(); - using (Disposable.Create(() => Co2NativeTestMethods.co2_destroy_test_md(test_md))) { + using (var test_md = Co2NativeTestMethods.produce_test_md()) { using (var consumer = new MDConsumer(new[] { - new UserSymbol("FOOM", Venue.Unset, SecurityType.Future), - new UserSymbol("FOOXM", Venue.Unset, SecurityType.Option) + new UserSymbol("FOOM", Venue.Bts, SecurityType.Future), + new UserSymbol("FOOXM", Venue.Bts, SecurityType.Option) }, false)) { - var securities = new List(); + var securities = new List(); consumer.on_security.Subscribe(secs => { foreach (var s in secs) { Assert.IsTrue(s.security.Id == s.handle.key); @@ -210,11 +206,10 @@ namespace mbts.co2.tests foreach (var sec in securities) { var handle = consumer.try_get_handle(sec.Id); Assert.IsNotNull(handle); - Assert.IsTrue(handle.get_security().Id == sec.Id); Assert.AreEqual(sec.Id, handle.key); Assert.IsTrue(handle.market_timestamp > 0); ulong time = 0; - NativePriceSize bid,ask; + NativePriceSize bid, ask; handle.get_bbo(ref time, out bid, out ask); Assert.IsTrue(bid.price == 1.1); Assert.IsTrue(bid.size == 101); @@ -227,7 +222,7 @@ namespace mbts.co2.tests NativePriceSize last_trade; Assert.IsTrue(handle.get_last_trade(ref time, out last_trade, out trade_date, out total_volume)); Assert.IsTrue(last_trade.price == 5.5 && last_trade.size == 505); - Assert.IsTrue(trade_date.Year == 2015 && trade_date.Month == 9 && trade_date.Day == 22); + //Assert.IsTrue(trade_date.Year == 2015 && trade_date.Month == 9 && trade_date.Day == 22); Assert.IsTrue(total_volume == 4200); Assert.IsTrue(handle.settlement_date.Year == 2000 && handle.settlement_date.Day == 9 && handle.settlement_date.Month == 8); Assert.AreEqual(handle.settlement_price, 6.6); @@ -272,5 +267,6 @@ namespace mbts.co2.tests } + } } diff --git a/src/lib/md/MDConsumerInterop.cpp b/src/lib/md/MDConsumerInterop.cpp index ad46d10a0..7f4848bea 100644 --- a/src/lib/md/MDConsumerInterop.cpp +++ b/src/lib/md/MDConsumerInterop.cpp @@ -102,16 +102,6 @@ CAPI void md_consumer_set_on_security(MDConsumer* consumer, security_cb cb) { } #endif -typedef void(*just_security_cb)(security_key, const char*, size_t); -CAPI void md_consumer_get_single_security(const ColdEntry* entry, just_security_cb cb) { - bts_assert(entry); - bts::api::Security security; - convert_security(entry->security, &security); - std::string buffer; - security.SerializePartialToString(&buffer); - cb(security.id(), buffer.c_str(), buffer.size()); -} - bool is_heart_beat_ok(const ColdHeader &header); CAPI bool md_consumer_is_heart_beating(const ColdHeader* header) { if (header == nullptr) return false; diff --git a/src/lib/md/test/Co2ManagedTestHelper.cpp b/src/lib/md/test/Co2ManagedTestHelper.cpp index e0bc44448..f5bb9a882 100644 --- a/src/lib/md/test/Co2ManagedTestHelper.cpp +++ b/src/lib/md/test/Co2ManagedTestHelper.cpp @@ -108,19 +108,29 @@ extern "C" BTS_EXPORT void co2_get_sample_cold_header(ColdHeader& header) { // Do not write to trade_buffer or rfq_buffer } -extern "C" BTS_EXPORT MDProducer* co2_produce_test_md() { +struct TestProducer { + std::shared_ptr md; + std::vector handles; +}; + +extern "C" BTS_EXPORT TestProducer* co2_produce_test_md() { config::internal::initialize_for_test( "PlatformMap {" " value {" " glbx_platform: 'PLATFORM_SIM'" " }" "}"); - auto* p = new MDProducer(PLATFORM_SIM); - auto producers = create_test_securities(*p); + auto* tp = new TestProducer(); + tp->md = std::make_shared(PLATFORM_SIM, false); + tp->handles = create_test_securities(*(tp->md)); + auto& producers = tp->handles; assign_ids(producers.begin(), producers.end()); for (auto& p : producers) { p.update_bbo(utils::TimeStamp::now(), PriceSize_from_double<3>(1.1, 101), PriceSize_from_double<3>(2.2,202)); - p.add_trade(utils::TimeStamp::now(), PriceSize_from_double<3>(5.5, 505), datetime::ll_from_date(datetime::Date(2015, 9, 22)), AGGRESSOR_SIDE_NONE, 4200); + p.add_trade(utils::TimeStamp::now(), + PriceSize_from_double<3>(5.5, 505), + datetime::ll_from_date(datetime::Date(2015, 9, 22)), + AGGRESSOR_SIDE_NONE, 4200); p.update_settlement(utils::TimeStamp::now(), IntPrice_from_double<7>(6.6), datetime::Date(2000, 8, 8)); p.update_settlement(utils::TimeStamp::now(), IntPrice_from_double<7>(6.6), datetime::Date(2000, 8, 9)); @@ -135,10 +145,10 @@ extern "C" BTS_EXPORT MDProducer* co2_produce_test_md() { p.update_fixing_price(t, 14.14); } - return p; + return tp; } -extern "C" BTS_EXPORT void co2_destroy_test_md(MDProducer* producer) { +extern "C" BTS_EXPORT void co2_destroy_test_md(TestProducer* producer) { if (producer != nullptr) delete producer; config::internal::reset(); } diff --git a/src/lib/md/test/md2_tests.cpp b/src/lib/md/test/md2_tests.cpp index d0eb3ac01..ff1b456b9 100644 --- a/src/lib/md/test/md2_tests.cpp +++ b/src/lib/md/test/md2_tests.cpp @@ -55,8 +55,8 @@ Platform TEST_PLATFORM = PLATFORM_SIM; // Helper functions for Producer/Consumer tests // vector create_test_securities(MDProducer& producer, const char* postfix ="") { - FixedOptionSecurity fos; FixedFutureSecurity ffs; + FixedOptionSecurity fos; ffs.symbol("FOO"+string(postfix)); fos.symbol("FOOX"+string(postfix)); ffs.exchange = VENUE_BTS;