update ceph source to reef 18.1.2

[ceph.git] / ceph / src / rocksdb / memory / memkind_kmem_allocator.cc

diff --git a/ceph/src/rocksdb/memory/memkind_kmem_allocator.cc b/ceph/src/rocksdb/memory/memkind_kmem_allocator.cc
index 0ce985f7e12e146f4a2c35f0e92e2d37d7c03d6b..635c2210e761c99fd9808e9a6e40813169d7dde3 100644 (file)
--- a/ceph/src/rocksdb/memory/memkind_kmem_allocator.cc
+++ b/ceph/src/rocksdb/memory/memkind_kmem_allocator.cc
@@ -5,11 +5,22 @@
 //  (found in the LICENSE.Apache file in the root directory).
 
 #ifdef MEMKIND
+#include <memkind.h>
+#endif  // MEMKIND
 
-#include "memkind_kmem_allocator.h"
+#include "memory/memkind_kmem_allocator.h"
 
-namespace rocksdb {
+namespace ROCKSDB_NAMESPACE {
+Status MemkindKmemAllocator::PrepareOptions(const ConfigOptions& options) {
+  std::string message;
+  if (!IsSupported(&message)) {
+    return Status::NotSupported(message);
+  } else {
+    return MemoryAllocator::PrepareOptions(options);
+  }
+}
 
+#ifdef MEMKIND
 void* MemkindKmemAllocator::Allocate(size_t size) {
   void* p = memkind_malloc(MEMKIND_DAX_KMEM, size);
   if (p == NULL) {
@@ -28,6 +39,6 @@ size_t MemkindKmemAllocator::UsableSize(void* p,
   return memkind_malloc_usable_size(MEMKIND_DAX_KMEM, p);
 }
 #endif  // ROCKSDB_MALLOC_USABLE_SIZE
-
-}  // namespace rocksdb
 #endif  // MEMKIND
+
+}  // namespace ROCKSDB_NAMESPACE