Minor fixes and cleanup.

ecmwf · May 14, 2024 · 02759a5 · 02759a5
1 parent c0f7406
commit 02759a5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/src/fdb5/daos/DaosName.cc b/src/fdb5/daos/DaosName.cc
@@ -240,8 +240,6 @@ const std::string& DaosNameBase::poolName() const {
 
 }
 
-// TODO: containerName, make it longer
-// actually DaosContainerName::name()
 const std::string& DaosNameBase::containerName() const {
 
     ASSERT(cont_.has_value());

diff --git a/src/fdb5/daos/DaosObject.cc b/src/fdb5/daos/DaosObject.cc
@@ -255,7 +255,8 @@ uint64_t DaosArray::write(const void* buf, const uint64_t& len, const eckit::Off
 ///        RPC and reduce performance. If the read interface is not properly 
 ///        implemented, at least DataHandle::copyTo breaks.
 /// @todo: fix this issue by using the "short_read" feature in daos_array_read
-///        and returning actual read size.
+///        and returning actual read size, rather han having DataHandle::read
+///        check the size.
 /// @note: see DaosArrayPartHandle for cases where the object size is known.
 uint64_t DaosArray::read(void* buf, uint64_t len, const eckit::Offset& off) {
 
@@ -284,7 +285,6 @@ uint64_t DaosArray::read(void* buf, uint64_t len, const eckit::Offset& off) {
 
 }
 
-/// @todo: should return a long for consistency with the rest of DaosArray API
 uint64_t DaosArray::size() {
 
     open();

diff --git a/src/fdb5/daos/DaosSession.cc b/src/fdb5/daos/DaosSession.cc
@@ -70,7 +70,7 @@ void DaosManager::error(int code, const char* msg, const char* file, int line, c
 
 void DaosManager::configure(const eckit::LocalConfiguration& config) {
 
-    std::lock_guard<std::recursive_mutex> lock(mutex_);
+    std::lock_guard<std::mutex> lock(mutex_);
     containerOidsPerAlloc_ = config.getInt("container_oids_per_alloc", containerOidsPerAlloc_);
     objectCreateCellSize_ = config.getInt64("object_create_cell_size", objectCreateCellSize_);
     objectCreateChunkSize_ = config.getInt64("object_create_chunk_size", objectCreateChunkSize_);

diff --git a/src/fdb5/daos/DaosSession.h b/src/fdb5/daos/DaosSession.h
@@ -62,7 +62,7 @@ class DaosManager : private eckit::NonCopyable {
 
     friend class DaosSession;
 
-    std::recursive_mutex mutex_;
+    std::mutex mutex_;
     PoolCache pool_cache_;
 
     /// @note: sets number of OIDs allocated in a single daos_cont_alloc_oids call
@@ -159,7 +159,7 @@ class DaosSession : eckit::NonCopyable {
 private: // members
 
     /// @todo: add lock_guards in all DaosSession methods using pool_cache_. Same for cont_cache_ in DaosPool.
-    // std::recursive_mutex& mutex_;
+    // std::mutex& mutex_;
     PoolCache& pool_cache_;
 
 };

diff --git a/src/fdb5/daos/DaosStore.cc b/src/fdb5/daos/DaosStore.cc
@@ -24,11 +24,7 @@ namespace fdb5 {
 //----------------------------------------------------------------------------------------------------------------------
 
 DaosStore::DaosStore(const Schema& schema, const Key& key, const Config& config) :
-    Store(schema), DaosCommon(config, "store", key), db_str_(db_cont_) {
-
-    /// @todo: should assert the store actually exists, as in the constructors of DaosPool etc.
-
-}
+    Store(schema), DaosCommon(config, "store", key), db_str_(db_cont_) {}
 
 eckit::URI DaosStore::uri() const {
 
@@ -89,6 +85,7 @@ std::set<eckit::URI> DaosStore::asCollocatedDataURIs(const std::vector<eckit::UR
     std::set<eckit::URI> res;
 
     for (auto& uri : uris) 
+        /// @note: seems redundant, but intends to check validity of input URIs
         res.insert(fdb5::DaosName(uri).URI());
 
     return res;