Make test instrument copyable

This commit is contained in:
Eric Harding committed 2018-03-02 18:27:59 -05:00
1 parent 88a90a724d
commit 36bd9744ef
2 files changed
+12 -18

No files matched your search

+10 -14
View File
@@ -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<HotDepthEntry>()),
_cheader(std::make_shared<ColdHeader>()),
_hheader(std::make_shared<HotHeader>())
{
_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<uint8_t>(new uint8_t[ColdEntry::fixed_size() + fsec.size], std::default_delete<uint8_t[]>());
_cold = new (_cold_buffer.get()) ColdEntry(fsec.size);
memcpy(&_cold->security, &fsec, fsec.size);
});
}
Co2TestInstrument::Co2TestInstrument(const Security& security, std::shared_ptr<ColdHeader> cheader, std::shared_ptr<HotHeader> hheader):
_cold(nullptr),
_hot_buffer(),
_hot(new (&_hot_buffer[0]) HotDepthEntry()),
_hot(std::make_shared<HotDepthEntry>()),
_cheader(cheader),
_hheader(hheader)
{
@@ -33,25 +31,23 @@ Co2TestInstrument::Co2TestInstrument(const Security& security, std::shared_ptr<C
//_cheader->has_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<uint8_t>(new uint8_t[ColdEntry::fixed_size() + fsec.size], std::default_delete<uint8_t[]>());
_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
+2 -4
View File
@@ -16,13 +16,11 @@ struct Co2TestInstrument
MDProducerHandle producer();
MDConsumerHandle consumer();
private:
uint8_t* _cold_buffer;
std::shared_ptr<uint8_t> _cold_buffer;
ColdEntry* _cold;
std::array<uint8_t,sizeof(HotDepthEntry)> _hot_buffer;
HotDepthEntry *_hot;
std::shared_ptr<HotDepthEntry> _hot;
std::shared_ptr<ColdHeader> _cheader;
std::shared_ptr<HotHeader> _hheader;
BTS_NO_COPY(Co2TestInstrument);
};
}}//namespace