Merge pull request #7 from charles-typ/fix_build_error

Fix compile error
resource-disaggregation · Jan 20, 2019 · 31a3cf3 · 31a3cf3
2 parents 60df5a0 + 6ec9299
commit 31a3cf3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libmmux/src/mmux/directory/fs/directory_tree.h b/libmmux/src/mmux/directory/fs/directory_tree.h
@@ -594,7 +594,7 @@ class ds_file_node : public ds_node {
                            slot_end,
                            chain_status::stable,
                            storage_mode::in_memory);
-    assert(to_chain.block_names.size() == chain_length);
+    assert(to_chain.block_names.size() == dstatus_.chain_length());
 
     // Set old chain to exporting and new chain to importing
     if (dstatus_.chain_length() == 1) {
@@ -679,7 +679,7 @@ class ds_file_node : public ds_node {
                            slot_end,
                            chain_status::stable,
                            storage_mode::in_memory);
-    assert(to_chain.block_names.size() == chain_length);
+    assert(to_chain.block_names.size() == dstatus_.chain_length());
 
     // Set old chain to exporting and new chain to importing
     if (dstatus_.chain_length() == 1) {

diff --git a/libmmux/src/mmux/storage/kv/kv_block.cpp b/libmmux/src/mmux/storage/kv/kv_block.cpp
@@ -475,7 +475,7 @@ void kv_block::run_command(std::vector<std::string> &_return, int32_t oid, const
 }
 
 void kv_block::reset() {
-  std::unique_lock lock(metadata_mtx_);
+  std::unique_lock<std::shared_mutex> lock(metadata_mtx_);
   block_.clear();
   next_->reset("nil");
   path_ = "";
@@ -526,7 +526,7 @@ bool kv_block::sync(const std::string &path) {
 }
 
 bool kv_block::dump(const std::string &path) {
-  std::unique_lock lock(metadata_mtx_);
+  std::unique_lock<std::shared_mutex> lock(metadata_mtx_);
   bool expected = true;
   bool flushed = false;
   if (dirty_.compare_exchange_strong(expected, false)) {