Skip to content

Commit 9af517b

Browse files
committed
Attempt to fix VirtualCall static analyzer warnings
1 parent acb72e8 commit 9af517b

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

pluto/src/pluto/memory_resource/MemoryPoolResource.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ std::size_t MemoryPoolResource::capacity() const {
337337
return _capacity;
338338
}
339339

340-
void MemoryPoolResource::release() {
340+
void MemoryPoolResource::do_release() {
341341
std::lock_guard lock(mtx_);
342342
#if PLUTO_DEBUGGING
343343
for (std::size_t i = 0; i < pool_block_sizes_.size(); ++i) {
@@ -357,5 +357,9 @@ void MemoryPoolResource::release() {
357357
pools_.clear();
358358
}
359359

360+
void MemoryPoolResource::release() {
361+
do_release();
362+
}
363+
360364

361365
} // namespace pluto

pluto/src/pluto/memory_resource/MemoryPoolResource.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class MemoryPoolResource : public memory_pool_resource {
3939
memory_tracker_ = memory_tracker;
4040
}
4141

42-
virtual ~MemoryPoolResource() { release(); }
42+
virtual ~MemoryPoolResource() { do_release(); }
4343

4444
void release() override;
4545

@@ -61,6 +61,7 @@ class MemoryPoolResource : public memory_pool_resource {
6161
void* do_allocate_async(std::size_t bytes, std::size_t alignment, stream_view) override;
6262
void do_deallocate_async(void* ptr, std::size_t bytes, std::size_t alignment, stream_view) override;
6363
bool do_is_equal(const memory_resource& other) const noexcept override;
64+
void do_release();
6465
friend void callback_deallocate_async(void* stream);
6566

6667
// A suitable pool or upstream resource to allocate given bytes

src/atlas/array/native/NativeDataStore.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static pluto::memory_resource* device_resource(bool shared) {
9696

9797

9898
template <typename Value>
99-
class DataStore : public ArrayDataStore {
99+
class DataStore final : public ArrayDataStore {
100100
public:
101101
DataStore(size_t size): size_(size),
102102
is_shared_data_{test_device_is_shared()},
@@ -285,7 +285,7 @@ class DataStore : public ArrayDataStore {
285285
//------------------------------------------------------------------------------
286286

287287
template <typename Value>
288-
class WrappedDataStore : public ArrayDataStore {
288+
class WrappedDataStore final : public ArrayDataStore {
289289
public:
290290

291291
void init_device() {

src/atlas/mesh/Connectivity.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,6 @@ MultiBlockConnectivityImpl::MultiBlockConnectivityImpl(eckit::Stream& s): Irregu
453453
//------------------------------------------------------------------------------------------------------
454454

455455
MultiBlockConnectivityImpl::~MultiBlockConnectivityImpl() {
456-
clear();
457456
}
458457

459458
//------------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)