Merge pull request #52 from AntelopeIO/construct_copy_destruct_cleanup

cleanup initialization and move operations for `pinnable_mapped_file`
AntelopeIO · Aug 15, 2024 · 1dc5316 · 1dc5316
2 parents 60757ff + 4023355
commit 1dc5316
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/include/chainbase/chainbase.hpp b/include/chainbase/chainbase.hpp
@@ -256,8 +256,13 @@ namespace chainbase {
          database(const std::filesystem::path& dir, open_flags write = read_only, uint64_t shared_file_size = 0,
                   bool allow_dirty = false, pinnable_mapped_file::map_mode = pinnable_mapped_file::map_mode::mapped);
          ~database();
+
          database(database&&) = default;
          database& operator=(database&&) = default;
+
+         database(const database&) = delete;
+         database& operator=(const database&) = delete;
+
          bool is_read_only() const { return _read_only; }
          void flush();
 

diff --git a/include/chainbase/pinnable_mapped_file.hpp b/include/chainbase/pinnable_mapped_file.hpp
@@ -95,9 +95,9 @@ class pinnable_mapped_file {
       bip::file_lock                                _mapped_file_lock;
       std::filesystem::path                         _data_file_path;
       std::string                                   _database_name;
-      size_t                                        _database_size;
-      bool                                          _writable;
-      bool                                          _sharable;
+      size_t                                        _database_size = 0;
+      bool                                          _writable = false;
+      bool                                          _sharable = false;
 
       bip::file_mapping                             _file_mapping;
       bip::mapped_region                            _file_mapped_region;

diff --git a/src/pinnable_mapped_file.cpp b/src/pinnable_mapped_file.cpp
@@ -433,31 +433,25 @@ void pinnable_mapped_file::save_database_file(bool flush /* = true */) {
    std::cerr << "CHAINBASE: Writing \"" << _database_name << "\" database file, complete." << '\n';
 }
 
-pinnable_mapped_file::pinnable_mapped_file(pinnable_mapped_file&& o)  noexcept :
-   _mapped_file_lock(std::move(o._mapped_file_lock)),
-   _data_file_path(std::move(o._data_file_path)),
-   _database_name(std::move(o._database_name)),
-   _file_mapped_region(std::move(o._file_mapped_region))
+pinnable_mapped_file::pinnable_mapped_file(pinnable_mapped_file&& o) noexcept
 {
-   _segment_manager = o._segment_manager;
-   _writable = o._writable;
-   _non_file_mapped_mapping = o._non_file_mapped_mapping;
-   o._non_file_mapped_mapping = nullptr;
-   o._segment_manager = nullptr;
-   o._writable = false; //prevent dtor from doing anything interesting
+   // all members are correctly default-initialized, so we can just move into *this
+   *this = std::move(o);
 }
 
 pinnable_mapped_file& pinnable_mapped_file::operator=(pinnable_mapped_file&& o) noexcept {
-   _mapped_file_lock = std::move(o._mapped_file_lock);
-   _data_file_path = std::move(o._data_file_path);
-   _database_name = std::move(o._database_name);
-   _file_mapped_region = std::move(o._file_mapped_region);
-   _non_file_mapped_mapping = o._non_file_mapped_mapping;
-   o._non_file_mapped_mapping = nullptr;
-   _segment_manager = o._segment_manager;
-   _writable = o._writable;
-   o._writable = false; //prevent dtor from doing anything interesting
-   o._segment_manager = nullptr;
+   std::swap(_mapped_file_lock, o._mapped_file_lock);
+   std::swap(_data_file_path, o._data_file_path);
+   std::swap(_database_name, o._database_name);
+   std::swap(_database_size, o._database_size);
+   std::swap(_writable, o._writable);
+   std::swap(_sharable, o._sharable);
+   std::swap(_file_mapping, o._file_mapping);
+   std::swap(_file_mapped_region, o._file_mapped_region);
+   std::swap(_non_file_mapped_mapping, o._non_file_mapped_mapping);
+   std::swap(_non_file_mapped_mapping_size, o._non_file_mapped_mapping_size);
+   std::swap(_db_permissions, o._db_permissions);
+   std::swap(_segment_manager, o._segment_manager);
    return *this;
 }