From 6a35a96ea838760945073b756ea7ae13e9a68ccf Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 15 Aug 2017 06:53:18 -0400 Subject: [PATCH] mgr: clean up python source file naming Signed-off-by: John Spray (cherry picked from commit 70d45a6b93c92baf8d6a3b15765110a5384c5e60) --- src/CMakeLists.txt | 6 +++--- src/mgr/{MgrPyModule.cc => ActivePyModule.cc} | 5 ++--- src/mgr/{MgrPyModule.h => ActivePyModule.h} | 5 +---- src/mgr/{PyModules.cc => ActivePyModules.cc} | 4 ++-- src/mgr/{PyModules.h => ActivePyModules.h} | 7 ++----- src/mgr/{PyState.cc => BaseMgrModule.cc} | 2 +- src/mgr/{PyState.h => BaseMgrModule.h} | 0 src/mgr/Mgr.cc | 2 +- src/mgr/PyModuleRegistry.cc | 5 ++++- src/mgr/PyModuleRegistry.h | 9 +++++++-- 10 files changed, 23 insertions(+), 22 deletions(-) rename src/mgr/{MgrPyModule.cc => ActivePyModule.cc} (99%) rename src/mgr/{MgrPyModule.h => ActivePyModule.h} (97%) rename src/mgr/{PyModules.cc => ActivePyModules.cc} (99%) rename src/mgr/{PyModules.h => ActivePyModules.h} (97%) rename src/mgr/{PyState.cc => BaseMgrModule.cc} (99%) rename src/mgr/{PyState.h => BaseMgrModule.h} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 48235ca1e6f55..a351384e44db9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -694,12 +694,12 @@ if (WITH_MGR) mgr/DaemonState.cc mgr/DaemonServer.cc mgr/ClusterState.cc - mgr/PyModules.cc + mgr/ActivePyModules.cc mgr/PyModuleRegistry.cc mgr/PyFormatter.cc mgr/PyOSDMap.cc - mgr/PyState.cc - mgr/MgrPyModule.cc + mgr/BaseMgrModule.cc + mgr/ActivePyModule.cc mgr/MgrStandby.cc mgr/Mgr.cc mgr/Gil.cc diff --git a/src/mgr/MgrPyModule.cc b/src/mgr/ActivePyModule.cc similarity index 99% rename from src/mgr/MgrPyModule.cc rename to src/mgr/ActivePyModule.cc index 268b32e3bd8b3..c734a60c26a9c 100644 --- a/src/mgr/MgrPyModule.cc +++ b/src/mgr/ActivePyModule.cc @@ -11,14 +11,13 @@ * Foundation. See file COPYING. */ -#include "PyState.h" -#include "PyOSDMap.h" +#include "BaseMgrModule.h" #include "PyFormatter.h" #include "common/debug.h" -#include "MgrPyModule.h" +#include "ActivePyModule.h" //XXX courtesy of http://stackoverflow.com/questions/1418015/how-to-get-python-exception-text #include diff --git a/src/mgr/MgrPyModule.h b/src/mgr/ActivePyModule.h similarity index 97% rename from src/mgr/MgrPyModule.h rename to src/mgr/ActivePyModule.h index cab20a7625695..839f678f75297 100644 --- a/src/mgr/MgrPyModule.h +++ b/src/mgr/ActivePyModule.h @@ -13,8 +13,7 @@ */ -#ifndef MGR_PY_MODULE_H_ -#define MGR_PY_MODULE_H_ +#pragma once // Python.h comes first because otherwise it clobbers ceph's assert #include "Python.h" @@ -126,5 +125,3 @@ public: std::string handle_pyerror(); -#endif - diff --git a/src/mgr/PyModules.cc b/src/mgr/ActivePyModules.cc similarity index 99% rename from src/mgr/PyModules.cc rename to src/mgr/ActivePyModules.cc index 11e7d9ffe5236..9d01aea9b0e73 100644 --- a/src/mgr/PyModules.cc +++ b/src/mgr/ActivePyModules.cc @@ -12,7 +12,7 @@ */ // Include this first to get python headers earlier -#include "PyState.h" +#include "BaseMgrModule.h" #include "Gil.h" #include "common/errno.h" @@ -28,7 +28,7 @@ // For ::config_prefix #include "PyModuleRegistry.h" -#include "PyModules.h" +#include "ActivePyModules.h" #define dout_context g_ceph_context #define dout_subsys ceph_subsys_mgr diff --git a/src/mgr/PyModules.h b/src/mgr/ActivePyModules.h similarity index 97% rename from src/mgr/PyModules.h rename to src/mgr/ActivePyModules.h index 1dcc15b07f514..262d7538ecac7 100644 --- a/src/mgr/PyModules.h +++ b/src/mgr/ActivePyModules.h @@ -11,10 +11,9 @@ * Foundation. See file COPYING. */ -#ifndef PY_MODULES_H_ -#define PY_MODULES_H_ +#pragma once -#include "MgrPyModule.h" +#include "ActivePyModule.h" #include "common/Finisher.h" #include "common/Mutex.h" @@ -122,5 +121,3 @@ public: Formatter *f); }; -#endif - diff --git a/src/mgr/PyState.cc b/src/mgr/BaseMgrModule.cc similarity index 99% rename from src/mgr/PyState.cc rename to src/mgr/BaseMgrModule.cc index e37e4aa22170a..512e8f68b4ab8 100644 --- a/src/mgr/PyState.cc +++ b/src/mgr/BaseMgrModule.cc @@ -24,7 +24,7 @@ #include "common/errno.h" #include "common/version.h" -#include "PyState.h" +#include "BaseMgrModule.h" #include "Gil.h" #define dout_context g_ceph_context diff --git a/src/mgr/PyState.h b/src/mgr/BaseMgrModule.h similarity index 100% rename from src/mgr/PyState.h rename to src/mgr/BaseMgrModule.h diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc index a53d91283a5b6..8a0523afd0669 100644 --- a/src/mgr/Mgr.cc +++ b/src/mgr/Mgr.cc @@ -24,7 +24,7 @@ #include "mgr/MgrContext.h" #include "mgr/mgr_commands.h" -#include "MgrPyModule.h" +//#include "MgrPyModule.h" #include "DaemonServer.h" #include "messages/MMgrBeacon.h" #include "messages/MMgrDigest.h" diff --git a/src/mgr/PyModuleRegistry.cc b/src/mgr/PyModuleRegistry.cc index 42c3fdf73932f..d2344ef4d3597 100644 --- a/src/mgr/PyModuleRegistry.cc +++ b/src/mgr/PyModuleRegistry.cc @@ -15,9 +15,12 @@ #include "include/stringify.h" #include "common/errno.h" -#include "PyState.h" +#include "BaseMgrModule.h" +#include "PyOSDMap.h" #include "Gil.h" +#include "ActivePyModules.h" + #include "PyModuleRegistry.h" // definition for non-const static member diff --git a/src/mgr/PyModuleRegistry.h b/src/mgr/PyModuleRegistry.h index 0204ee3ab40bf..842e43f31ee9c 100644 --- a/src/mgr/PyModuleRegistry.h +++ b/src/mgr/PyModuleRegistry.h @@ -17,8 +17,13 @@ // Python.h comes first because otherwise it clobbers ceph's assert #include "Python.h" -// ActivePyModules -#include "PyModules.h" +#include +#include +#include + +#include "common/LogClient.h" + +#include "ActivePyModules.h" class PyModule { -- 2.39.5