From 36bd9744ef3e640ffb9cfb25ae3d76eda44b7a5d Mon Sep 17 00:00:00 2001 From: Eric Harding Date: Fri, 2 Mar 2018 17:00:18 -0500 Subject: [PATCH] Make test instrument copyable --- src/lib/md/test/Co2TestInstrument.cpp | 24 ++++++++++-------------- src/lib/md/test/Co2TestInstrument.h | 6 ++---- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/lib/md/test/Co2TestInstrument.cpp b/src/lib/md/test/Co2TestInstrument.cpp index f98ac7f1c..4b6cd929c 100644 --- a/src/lib/md/test/Co2TestInstrument.cpp +++ b/src/lib/md/test/Co2TestInstrument.cpp @@ -6,26 +6,24 @@ namespace bts { namespace md { Co2TestInstrument::Co2TestInstrument(const std::string& symbol, SecurityType type): - _cold_buffer(nullptr), + _cold_buffer(), _cold(nullptr), - _hot_buffer(), - _hot(new (&_hot_buffer[0]) HotDepthEntry()), + _hot(std::make_shared()), _cheader(std::make_shared()), _hheader(std::make_shared()) { _cheader->has_depth = enable_depth(symbol, type); with_security(type, 4, nullptr, [&](FixedSecurity& fsec) { fsec.exchange = api::VENUE_BTS; - _cold_buffer = new uint8_t[ColdEntry::fixed_size() + fsec.size]; - _cold = new (_cold_buffer) ColdEntry(fsec.size); + _cold_buffer = std::shared_ptr(new uint8_t[ColdEntry::fixed_size() + fsec.size], std::default_delete()); + _cold = new (_cold_buffer.get()) ColdEntry(fsec.size); memcpy(&_cold->security, &fsec, fsec.size); }); } Co2TestInstrument::Co2TestInstrument(const Security& security, std::shared_ptr cheader, std::shared_ptr hheader): _cold(nullptr), - _hot_buffer(), - _hot(new (&_hot_buffer[0]) HotDepthEntry()), + _hot(std::make_shared()), _cheader(cheader), _hheader(hheader) { @@ -33,25 +31,23 @@ Co2TestInstrument::Co2TestInstrument(const Security& security, std::shared_ptrhas_depth = enable_depth(md::SecurityHelper::symbol(security), security.security_type()); with_security_like(security, [&](FixedSecurity& fsec) { convert_security(security, fsec, false); - _cold_buffer = new uint8_t[ColdEntry::fixed_size() + fsec.size]; - _cold = new (_cold_buffer) ColdEntry(fsec.size); + _cold_buffer = std::shared_ptr(new uint8_t[ColdEntry::fixed_size() + fsec.size], std::default_delete()); + _cold = new (_cold_buffer.get()) ColdEntry(fsec.size); memcpy(&_cold->security, &fsec, fsec.size); }); } MDProducerHandle Co2TestInstrument::producer() { - return MDProducerHandle(*_cheader, *_hheader, *_cold, _hot, MDProducerChannel()); + return MDProducerHandle(*_cheader, *_hheader, *_cold, _hot.get(), MDProducerChannel()); } MDConsumerHandle Co2TestInstrument::consumer() { MDConsumerHandle handle; - handle.init(*_cheader, *_cold, _hot); + handle.init(*_cheader, *_cold, _hot.get()); return handle; } -Co2TestInstrument::~Co2TestInstrument() { - if (_cold_buffer != nullptr) { delete[] _cold_buffer; } -} +Co2TestInstrument::~Co2TestInstrument() { } }}//namespace #endif diff --git a/src/lib/md/test/Co2TestInstrument.h b/src/lib/md/test/Co2TestInstrument.h index 64b109d33..0e1601007 100644 --- a/src/lib/md/test/Co2TestInstrument.h +++ b/src/lib/md/test/Co2TestInstrument.h @@ -16,13 +16,11 @@ struct Co2TestInstrument MDProducerHandle producer(); MDConsumerHandle consumer(); private: - uint8_t* _cold_buffer; + std::shared_ptr _cold_buffer; ColdEntry* _cold; - std::array _hot_buffer; - HotDepthEntry *_hot; + std::shared_ptr _hot; std::shared_ptr _cheader; std::shared_ptr _hheader; - BTS_NO_COPY(Co2TestInstrument); }; }}//namespace