From 9a097084d06e7186206b43d9c81d1f648791d7a4 Mon Sep 17 00:00:00 2001 From: Yuan Zhou Date: Fri, 7 Sep 2018 08:29:51 +0800 Subject: [PATCH 10/10] librbd: new namespace ceph immutable obj cache clean up class/func names to use the new namespace Signed-off-by: Yuan Zhou --- src/common/options.cc | 2 +- src/common/subsys.h | 3 +- src/librbd/CMakeLists.txt | 3 +- .../SharedPersistentObjectCacherObjectDispatch.cc | 175 ---------------- .../SharedPersistentObjectCacherObjectDispatch.h | 133 ------------ src/librbd/cache/SharedReadOnlyObjectDispatch.cc | 170 +++++++++++++++ src/librbd/cache/SharedReadOnlyObjectDispatch.h | 126 ++++++++++++ src/librbd/image/OpenRequest.cc | 4 +- src/tools/CMakeLists.txt | 2 +- .../ceph_immutable_object_cache/CMakeLists.txt | 11 + .../ceph_immutable_object_cache/CacheClient.cc | 205 ++++++++++++++++++ .../ceph_immutable_object_cache/CacheClient.h | 53 +++++ .../ceph_immutable_object_cache/CacheController.cc | 117 +++++++++++ .../ceph_immutable_object_cache/CacheController.h | 53 +++++ .../ceph_immutable_object_cache/CacheServer.cc | 99 +++++++++ .../ceph_immutable_object_cache/CacheServer.h | 54 +++++ .../ceph_immutable_object_cache/CacheSession.cc | 115 +++++++++++ .../ceph_immutable_object_cache/CacheSession.h | 58 ++++++ .../ObjectCacheStore.cc | 172 ++++++++++++++++ .../ceph_immutable_object_cache/ObjectCacheStore.h | 70 +++++++ src/tools/ceph_immutable_object_cache/Policy.hpp | 33 +++ .../ceph_immutable_object_cache/SimplePolicy.hpp | 163 +++++++++++++++ .../ceph_immutable_object_cache/SocketCommon.h | 54 +++++ src/tools/ceph_immutable_object_cache/main.cc | 85 ++++++++ src/tools/rbd_cache/CMakeLists.txt | 9 - src/tools/rbd_cache/CacheController.cc | 116 ----------- src/tools/rbd_cache/CacheController.h | 54 ----- src/tools/rbd_cache/CacheControllerSocket.hpp | 228 -------------------- .../rbd_cache/CacheControllerSocketClient.hpp | 229 --------------------- src/tools/rbd_cache/CacheControllerSocketCommon.h | 62 ------ src/tools/rbd_cache/ObjectCacheStore.cc | 172 ---------------- src/tools/rbd_cache/ObjectCacheStore.h | 70 ------- src/tools/rbd_cache/Policy.hpp | 30 --- src/tools/rbd_cache/SimplePolicy.hpp | 160 -------------- src/tools/rbd_cache/main.cc | 85 -------- 35 files changed, 1646 insertions(+), 1529 deletions(-) delete mode 100644 src/librbd/cache/SharedPersistentObjectCacherObjectDispatch.cc delete mode 100644 src/librbd/cache/SharedPersistentObjectCacherObjectDispatch.h create mode 100644 src/librbd/cache/SharedReadOnlyObjectDispatch.cc create mode 100644 src/librbd/cache/SharedReadOnlyObjectDispatch.h create mode 100644 src/tools/ceph_immutable_object_cache/CMakeLists.txt create mode 100644 src/tools/ceph_immutable_object_cache/CacheClient.cc create mode 100644 src/tools/ceph_immutable_object_cache/CacheClient.h create mode 100644 src/tools/ceph_immutable_object_cache/CacheController.cc create mode 100644 src/tools/ceph_immutable_object_cache/CacheController.h create mode 100644 src/tools/ceph_immutable_object_cache/CacheServer.cc create mode 100644 src/tools/ceph_immutable_object_cache/CacheServer.h create mode 100644 src/tools/ceph_immutable_object_cache/CacheSession.cc create mode 100644 src/tools/ceph_immutable_object_cache/CacheSession.h create mode 100644 src/tools/ceph_immutable_object_cache/ObjectCacheStore.cc create mode 100644 src/tools/ceph_immutable_object_cache/ObjectCacheStore.h create mode 100644 src/tools/ceph_immutable_object_cache/Policy.hpp create mode 100644 src/tools/ceph_immutable_object_cache/SimplePolicy.hpp create mode 100644 src/tools/ceph_immutable_object_cache/SocketCommon.h create mode 100644 src/tools/ceph_immutable_object_cache/main.cc delete mode 100644 src/tools/rbd_cache/CMakeLists.txt delete mode 100644 src/tools/rbd_cache/CacheController.cc delete mode 100644 src/tools/rbd_cache/CacheController.h delete mode 100644 src/tools/rbd_cache/CacheControllerSocket.hpp delete mode 100644 src/tools/rbd_cache/CacheControllerSocketClient.hpp delete mode 100644 src/tools/rbd_cache/CacheControllerSocketCommon.h delete mode 100644 src/tools/rbd_cache/ObjectCacheStore.cc delete mode 100644 src/tools/rbd_cache/ObjectCacheStore.h delete mode 100644 src/tools/rbd_cache/Policy.hpp delete mode 100644 src/tools/rbd_cache/SimplePolicy.hpp delete mode 100644 src/tools/rbd_cache/main.cc diff --git a/src/common/options.cc b/src/common/options.cc index 3172744..bf00aab 100644 --- a/src/common/options.cc +++ b/src/common/options.cc @@ -6358,7 +6358,7 @@ static std::vector