mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-02-18 23:33:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

replay/logreader: use unique_ptr for mbr_ (#29440)

Browse Source 
old-commit-hash: 61a00d2673
This commit is contained in:
Dean Lee
2023-08-18 02:42:35 +08:00
committed by GitHub
parent 4857b61f8f
commit e1f4ce2fb1
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/replay/logreader.cc
View File

@@ -29,8 +29,7 @@ Event::Event(const kj::ArrayPtr<const capnp::word> &amsg, bool frame) : reader(a
LogReader::LogReader(size_t memory_pool_block_size) {
#ifdef HAS_MEMORY_RESOURCE
const size_t buf_size = sizeof(Event) * memory_pool_block_size;
pool_buffer_ = ::operator new(buf_size);
mbr_ = new std::pmr::monotonic_buffer_resource(pool_buffer_, buf_size);
mbr_ = std::make_unique<std::pmr::monotonic_buffer_resource>(buf_size);
#endif
events.reserve(memory_pool_block_size);
}
@@ -39,11 +38,6 @@ LogReader::~LogReader() {
for (Event *e : events) {
delete e;
}
#ifdef HAS_MEMORY_RESOURCE
delete mbr_;
::operator delete(pool_buffer_);
#endif
}
bool LogReader::load(const std::string &url, std::atomic<bool> *abort,
@@ -69,7 +63,7 @@ bool LogReader::parse(const std::set<cereal::Event::Which> &allow, std::atomic<b
kj::ArrayPtr<const capnp::word> words((const capnp::word *)raw_.data(), raw_.size() / sizeof(capnp::word));
while (words.size() > 0 && !(abort && *abort)) {
#ifdef HAS_MEMORY_RESOURCE
Event *evt = new (mbr_) Event(words);
Event *evt = new (mbr_.get()) Event(words);
#else
Event *evt = new Event(words);
#endif
@@ -85,7 +79,7 @@ bool LogReader::parse(const std::set<cereal::Event::Which> &allow, std::atomic<b
evt->which == cereal::Event::WIDE_ROAD_ENCODE_IDX) {
#ifdef HAS_MEMORY_RESOURCE
Event *frame_evt = new (mbr_) Event(words, true);
Event *frame_evt = new (mbr_.get()) Event(words, true);
#else
Event *frame_evt = new Event(words, true);
#endif

3
tools/replay/logreader.h
View File

@@ -61,7 +61,6 @@ private:
bool parse(const std::set<cereal::Event::Which> &allow, std::atomic<bool> *abort);
std::string raw_;
#ifdef HAS_MEMORY_RESOURCE
std::pmr::monotonic_buffer_resource *mbr_ = nullptr;
void *pool_buffer_ = nullptr;
std::unique_ptr<std::pmr::monotonic_buffer_resource> mbr_;
#endif
};