GEODE-2346: rename inclusion of GeodeStatisticsFactory
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d1593a02 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d1593a02 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d1593a02 Branch: refs/heads/next-gen-native-client-software-grant Commit: d1593a021ada899e663c79c39a95f9589b407fe2 Parents: 009be9b Author: Ernest Burghardt <eburgha...@pivotal.io> Authored: Tue Jan 24 14:58:49 2017 -0800 Committer: Ernest Burghardt <eburgha...@pivotal.io> Committed: Thu Jan 26 08:16:37 2017 -0800 ---------------------------------------------------------------------- .../src/statistics/GeodeStatisticsFactory.cpp | 66 ++++++++++---------- .../src/statistics/GeodeStatisticsFactory.hpp | 12 ++-- src/cppcache/src/statistics/HostStatHelper.cpp | 2 +- src/cppcache/src/statistics/HostStatSampler.cpp | 6 +- .../src/statistics/LinuxProcessStats.cpp | 6 +- .../src/statistics/NullProcessStats.cpp | 2 +- .../src/statistics/PoolStatsSampler.cpp | 6 +- .../src/statistics/SolarisProcessStats.cpp | 6 +- .../src/statistics/StatArchiveWriter.cpp | 2 +- .../src/statistics/StatisticsFactory.cpp | 4 +- .../src/statistics/StatisticsManager.cpp | 6 +- .../src/statistics/WindowsProcessStats.cpp | 6 +- 12 files changed, 62 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/d1593a02/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp b/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp index 9a7d815..a009e38 100644 --- a/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp +++ b/src/cppcache/src/statistics/GeodeStatisticsFactory.cpp @@ -23,7 +23,7 @@ #include <ace/Thread_Mutex.h> #include <ace/Guard_T.h> #include <gfcpp/Exception.hpp> -#include "GemfireStatisticsFactory.hpp" +#include "GeodeStatisticsFactory.hpp" #include <gfcpp/Log.hpp> #include <string> #include "AtomicStatisticsImpl.hpp" @@ -36,27 +36,27 @@ using namespace apache::geode::statistics; /** * static member initialization */ -GemfireStatisticsFactory* GemfireStatisticsFactory::s_singleton = NULL; +GeodeStatisticsFactory* GeodeStatisticsFactory::s_singleton = NULL; -GemfireStatisticsFactory::GemfireStatisticsFactory( +GeodeStatisticsFactory::GeodeStatisticsFactory( StatisticsManager* statMngr) { - m_name = "GemfireStatisticsFactory"; + m_name = "GeodeStatisticsFactory"; m_id = ACE_OS::getpid(); m_statsListUniqueId = 1; m_statMngr = statMngr; } -GemfireStatisticsFactory* GemfireStatisticsFactory::initInstance( +GeodeStatisticsFactory* GeodeStatisticsFactory::initInstance( StatisticsManager* statMngr) { if (!s_singleton) { - s_singleton = new GemfireStatisticsFactory(statMngr); + s_singleton = new GeodeStatisticsFactory(statMngr); } return s_singleton; } -GemfireStatisticsFactory* GemfireStatisticsFactory::getExistingInstance() { +GeodeStatisticsFactory* GeodeStatisticsFactory::getExistingInstance() { GF_D_ASSERT(!!s_singleton); s_singleton->getId(); // should fault if !s_singleton @@ -65,14 +65,14 @@ GemfireStatisticsFactory* GemfireStatisticsFactory::getExistingInstance() { } /**************************Dtor*******************************************/ -void GemfireStatisticsFactory::clean() { +void GeodeStatisticsFactory::clean() { if (s_singleton != NULL) { delete s_singleton; s_singleton = NULL; } } -GemfireStatisticsFactory::~GemfireStatisticsFactory() { +GeodeStatisticsFactory::~GeodeStatisticsFactory() { try { m_statMngr = NULL; @@ -90,39 +90,39 @@ GemfireStatisticsFactory::~GemfireStatisticsFactory() { statsTypeMap.unbind_all(); } catch (const Exception& ex) { - Log::warningCatch("~GemfireStatisticsFactory swallowing GemFire exception", + Log::warningCatch("~GeodeStatisticsFactory swallowing GemFire exception", ex); } catch (const std::exception& ex) { - std::string what = "~GemfireStatisticsFactory swallowing std::exception: "; + std::string what = "~GeodeStatisticsFactory swallowing std::exception: "; what += ex.what(); LOGWARN(what.c_str()); } catch (...) { - LOGERROR("~GemfireStatisticsFactory swallowing unknown exception"); + LOGERROR("~GeodeStatisticsFactory swallowing unknown exception"); } } -const char* GemfireStatisticsFactory::getName() { return m_name; } +const char* GeodeStatisticsFactory::getName() { return m_name; } -int64 GemfireStatisticsFactory::getId() { return m_id; } +int64 GeodeStatisticsFactory::getId() { return m_id; } -Statistics* GemfireStatisticsFactory::createStatistics(StatisticsType* type) { +Statistics* GeodeStatisticsFactory::createStatistics(StatisticsType* type) { return createAtomicStatistics(type, NULL, 0); } -Statistics* GemfireStatisticsFactory::createStatistics(StatisticsType* type, +Statistics* GeodeStatisticsFactory::createStatistics(StatisticsType* type, const char* textId) { return createAtomicStatistics(type, textId, 0); } -Statistics* GemfireStatisticsFactory::createStatistics(StatisticsType* type, +Statistics* GeodeStatisticsFactory::createStatistics(StatisticsType* type, const char* textId, int64 numericId) { return createAtomicStatistics(type, textId, 0); } -Statistics* GemfireStatisticsFactory::createOsStatistics(StatisticsType* type, +Statistics* GeodeStatisticsFactory::createOsStatistics(StatisticsType* type, const char* textId, int64 numericId) { // Validate input @@ -143,17 +143,17 @@ Statistics* GemfireStatisticsFactory::createOsStatistics(StatisticsType* type, return result; } -Statistics* GemfireStatisticsFactory::createAtomicStatistics( +Statistics* GeodeStatisticsFactory::createAtomicStatistics( StatisticsType* type) { return createAtomicStatistics(type, NULL, 0); } -Statistics* GemfireStatisticsFactory::createAtomicStatistics( +Statistics* GeodeStatisticsFactory::createAtomicStatistics( StatisticsType* type, const char* textId) { return createAtomicStatistics(type, textId, 0); } -Statistics* GemfireStatisticsFactory::createAtomicStatistics( +Statistics* GeodeStatisticsFactory::createAtomicStatistics( StatisticsType* type, const char* textId, int64 numericId) { // Validate input if (type == NULL) { @@ -174,12 +174,12 @@ Statistics* GemfireStatisticsFactory::createAtomicStatistics( return result; } -Statistics* GemfireStatisticsFactory::findFirstStatisticsByType( +Statistics* GeodeStatisticsFactory::findFirstStatisticsByType( StatisticsType* type) { return (m_statMngr->findFirstStatisticsByType(type)); } -StatisticsTypeImpl* GemfireStatisticsFactory::addType(StatisticsTypeImpl* st) { +StatisticsTypeImpl* GeodeStatisticsFactory::addType(StatisticsTypeImpl* st) { StatisticsTypeImpl* st1; std::string temp(st->getName()); int status; @@ -193,7 +193,7 @@ StatisticsTypeImpl* GemfireStatisticsFactory::addType(StatisticsTypeImpl* st) { if (status == 1) { } else if (status == -1) { throw IllegalArgumentException( - "GemfireStatisticsFactory::addType: failed " + "GeodeStatisticsFactory::addType: failed " "to add new type %s", temp.c_str()); } @@ -203,7 +203,7 @@ StatisticsTypeImpl* GemfireStatisticsFactory::addType(StatisticsTypeImpl* st) { /** * Creates a StatisticType for the given shared class. */ -StatisticsType* GemfireStatisticsFactory::createType( +StatisticsType* GeodeStatisticsFactory::createType( const char* name, const char* description, StatisticDescriptor** stats, int32 statsLength) { StatisticsTypeImpl* st = @@ -213,12 +213,12 @@ StatisticsType* GemfireStatisticsFactory::createType( st = addType(st); } else { throw OutOfMemoryException( - "GemfireStatisticsFactory::createType :: out memory"); + "GeodeStatisticsFactory::createType :: out memory"); } return st; } -StatisticsType* GemfireStatisticsFactory::findType(const char* name) { +StatisticsType* GeodeStatisticsFactory::findType(const char* name) { std::string statName = name; StatisticsTypeImpl* st = NULL; int status = statsTypeMap.find(statName, st); @@ -233,42 +233,42 @@ StatisticsType* GemfireStatisticsFactory::findType(const char* name) { } } -StatisticDescriptor* GemfireStatisticsFactory::createIntCounter( +StatisticDescriptor* GeodeStatisticsFactory::createIntCounter( const char* name, const char* description, const char* units, int8 largerBetter) { return StatisticDescriptorImpl::createIntCounter(name, description, units, largerBetter); } -StatisticDescriptor* GemfireStatisticsFactory::createLongCounter( +StatisticDescriptor* GeodeStatisticsFactory::createLongCounter( const char* name, const char* description, const char* units, int8 largerBetter) { return StatisticDescriptorImpl::createLongCounter(name, description, units, largerBetter); } -StatisticDescriptor* GemfireStatisticsFactory::createDoubleCounter( +StatisticDescriptor* GeodeStatisticsFactory::createDoubleCounter( const char* name, const char* description, const char* units, int8 largerBetter) { return StatisticDescriptorImpl::createDoubleCounter(name, description, units, largerBetter); } -StatisticDescriptor* GemfireStatisticsFactory::createIntGauge( +StatisticDescriptor* GeodeStatisticsFactory::createIntGauge( const char* name, const char* description, const char* units, int8 largerBetter) { return StatisticDescriptorImpl::createIntGauge(name, description, units, largerBetter); } -StatisticDescriptor* GemfireStatisticsFactory::createLongGauge( +StatisticDescriptor* GeodeStatisticsFactory::createLongGauge( const char* name, const char* description, const char* units, int8 largerBetter) { return StatisticDescriptorImpl::createLongGauge(name, description, units, largerBetter); } -StatisticDescriptor* GemfireStatisticsFactory::createDoubleGauge( +StatisticDescriptor* GeodeStatisticsFactory::createDoubleGauge( const char* name, const char* description, const char* units, int8 largerBetter) { return StatisticDescriptorImpl::createDoubleGauge(name, description, units, http://git-wip-us.apache.org/repos/asf/geode/blob/d1593a02/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp b/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp index 1d59e3f..25d3da5 100644 --- a/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp +++ b/src/cppcache/src/statistics/GeodeStatisticsFactory.hpp @@ -47,7 +47,7 @@ class StatisticsManager; * Gemfire's implementation of {@link StatisticsFactory}. * */ -class GemfireStatisticsFactory : public StatisticsFactory { +class GeodeStatisticsFactory : public StatisticsFactory { private: //--------------------Properties------------------------------------------------- @@ -57,11 +57,11 @@ class GemfireStatisticsFactory : public StatisticsFactory { StatisticsManager* m_statMngr; - static GemfireStatisticsFactory* s_singleton; + static GeodeStatisticsFactory* s_singleton; //------------------ methods ------------------------------ - GemfireStatisticsFactory(StatisticsManager* statMngr); + GeodeStatisticsFactory(StatisticsManager* statMngr); int64 m_statsListUniqueId; // Creates a unique id for each stats object in // the list @@ -77,7 +77,7 @@ class GemfireStatisticsFactory : public StatisticsFactory { //////////////////////////public member functions/////////////////////////// public: - ~GemfireStatisticsFactory(); + ~GeodeStatisticsFactory(); static void clean(); @@ -85,9 +85,9 @@ class GemfireStatisticsFactory : public StatisticsFactory { int64 getId(); - static GemfireStatisticsFactory* initInstance(StatisticsManager* statMngr); + static GeodeStatisticsFactory* initInstance(StatisticsManager* statMngr); - static GemfireStatisticsFactory* getExistingInstance(); + static GeodeStatisticsFactory* getExistingInstance(); //------------ StatisticsFactory methods: Statistics //------------------------------ http://git-wip-us.apache.org/repos/asf/geode/blob/d1593a02/src/cppcache/src/statistics/HostStatHelper.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/HostStatHelper.cpp b/src/cppcache/src/statistics/HostStatHelper.cpp index 84a816c..19802d3 100644 --- a/src/cppcache/src/statistics/HostStatHelper.cpp +++ b/src/cppcache/src/statistics/HostStatHelper.cpp @@ -19,7 +19,7 @@ #include <ace/OS_NS_sys_utsname.h> #include "HostStatHelper.hpp" -#include "GemfireStatisticsFactory.hpp" +#include "GeodeStatisticsFactory.hpp" using namespace apache::geode::statistics; http://git-wip-us.apache.org/repos/asf/geode/blob/d1593a02/src/cppcache/src/statistics/HostStatSampler.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/HostStatSampler.cpp b/src/cppcache/src/statistics/HostStatSampler.cpp index 45b60d8..e7defcd 100644 --- a/src/cppcache/src/statistics/HostStatSampler.cpp +++ b/src/cppcache/src/statistics/HostStatSampler.cpp @@ -35,7 +35,7 @@ #include <gfcpp/DistributedSystem.hpp> #include <gfcpp/SystemProperties.hpp> #include <gfcpp/Log.hpp> -#include "GemfireStatisticsFactory.hpp" +#include "GeodeStatisticsFactory.hpp" #include <ClientHealthStats.hpp> #include <ClientProxyMembershipID.hpp> using namespace apache::geode::statistics; @@ -541,8 +541,8 @@ void HostStatSampler::putStatsInAdminRegion() { int puts = 0, gets = 0, misses = 0, numListeners = 0, numThreads = 0, creates = 0; int64 cpuTime = 0; - GemfireStatisticsFactory* gf = - GemfireStatisticsFactory::getExistingInstance(); + GeodeStatisticsFactory* gf = + GeodeStatisticsFactory::getExistingInstance(); if (gf) { StatisticsType* cacheStatType = gf->findType("CachePerfStats"); if (cacheStatType) { http://git-wip-us.apache.org/repos/asf/geode/blob/d1593a02/src/cppcache/src/statistics/LinuxProcessStats.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/LinuxProcessStats.cpp b/src/cppcache/src/statistics/LinuxProcessStats.cpp index 6a87c42..4f418f6 100644 --- a/src/cppcache/src/statistics/LinuxProcessStats.cpp +++ b/src/cppcache/src/statistics/LinuxProcessStats.cpp @@ -18,7 +18,7 @@ #include <ace/Thread_Mutex.h> #include <ace/Singleton.h> #include "LinuxProcessStats.hpp" -#include "GemfireStatisticsFactory.hpp" +#include "GeodeStatisticsFactory.hpp" #include "HostStatHelperLinux.hpp" using namespace apache::geode::statistics; @@ -29,8 +29,8 @@ using namespace apache::geode::statistics; */ LinuxProcessStats::LinuxProcessStats(int64 pid, const char* name) { - GemfireStatisticsFactory* statFactory = - GemfireStatisticsFactory::getExistingInstance(); + GeodeStatisticsFactory* statFactory = + GeodeStatisticsFactory::getExistingInstance(); // Create Statistics Type createType(statFactory); http://git-wip-us.apache.org/repos/asf/geode/blob/d1593a02/src/cppcache/src/statistics/NullProcessStats.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/NullProcessStats.cpp b/src/cppcache/src/statistics/NullProcessStats.cpp index 65ffca4..74b1a1a 100644 --- a/src/cppcache/src/statistics/NullProcessStats.cpp +++ b/src/cppcache/src/statistics/NullProcessStats.cpp @@ -18,7 +18,7 @@ #include <ace/Thread_Mutex.h> #include <ace/Singleton.h> #include "NullProcessStats.hpp" -#include "GemfireStatisticsFactory.hpp" +#include "GeodeStatisticsFactory.hpp" #include "HostStatHelperNull.hpp" using namespace apache::geode::statistics; http://git-wip-us.apache.org/repos/asf/geode/blob/d1593a02/src/cppcache/src/statistics/PoolStatsSampler.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/PoolStatsSampler.cpp b/src/cppcache/src/statistics/PoolStatsSampler.cpp index 87a8880..8cc08ec 100644 --- a/src/cppcache/src/statistics/PoolStatsSampler.cpp +++ b/src/cppcache/src/statistics/PoolStatsSampler.cpp @@ -19,7 +19,7 @@ #include <ReadWriteLock.hpp> #include <CacheImpl.hpp> #include <ThinClientPoolDM.hpp> -#include "GemfireStatisticsFactory.hpp" +#include "GeodeStatisticsFactory.hpp" #include <ClientHealthStats.hpp> #include <NanoTimer.hpp> #include "HostStatHelper.hpp" @@ -86,8 +86,8 @@ void PoolStatsSampler::putStatsInAdminRegion() { int puts = 0, gets = 0, misses = 0, numListeners = 0, numThreads = 0, creates = 0; int64 cpuTime = 0; - GemfireStatisticsFactory* gf = - GemfireStatisticsFactory::getExistingInstance(); + GeodeStatisticsFactory* gf = + GeodeStatisticsFactory::getExistingInstance(); if (gf) { StatisticsType* cacheStatType = gf->findType("CachePerfStats"); if (cacheStatType) { http://git-wip-us.apache.org/repos/asf/geode/blob/d1593a02/src/cppcache/src/statistics/SolarisProcessStats.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/SolarisProcessStats.cpp b/src/cppcache/src/statistics/SolarisProcessStats.cpp index f4f5bb8..3a0320b 100644 --- a/src/cppcache/src/statistics/SolarisProcessStats.cpp +++ b/src/cppcache/src/statistics/SolarisProcessStats.cpp @@ -18,7 +18,7 @@ #include <ace/Thread_Mutex.h> #include <ace/Singleton.h> #include "SolarisProcessStats.hpp" -#include "GemfireStatisticsFactory.hpp" +#include "GeodeStatisticsFactory.hpp" #include "HostStatHelperSolaris.hpp" using namespace apache::geode::statistics; @@ -29,8 +29,8 @@ using namespace apache::geode::statistics; */ SolarisProcessStats::SolarisProcessStats(int64 pid, const char* name) { - GemfireStatisticsFactory* statFactory = - GemfireStatisticsFactory::getExistingInstance(); + GeodeStatisticsFactory* statFactory = + GeodeStatisticsFactory::getExistingInstance(); // Create Statistics Type createType(statFactory); http://git-wip-us.apache.org/repos/asf/geode/blob/d1593a02/src/cppcache/src/statistics/StatArchiveWriter.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/StatArchiveWriter.cpp b/src/cppcache/src/statistics/StatArchiveWriter.cpp index 1932287..d600163 100644 --- a/src/cppcache/src/statistics/StatArchiveWriter.cpp +++ b/src/cppcache/src/statistics/StatArchiveWriter.cpp @@ -25,7 +25,7 @@ #include <ace/OS_NS_sys_time.h> #include "StatArchiveWriter.hpp" -#include "GemfireStatisticsFactory.hpp" +#include "GeodeStatisticsFactory.hpp" #include <NanoTimer.hpp> using namespace apache::geode::client; http://git-wip-us.apache.org/repos/asf/geode/blob/d1593a02/src/cppcache/src/statistics/StatisticsFactory.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/StatisticsFactory.cpp b/src/cppcache/src/statistics/StatisticsFactory.cpp index 4341c4e..0ca4502 100644 --- a/src/cppcache/src/statistics/StatisticsFactory.cpp +++ b/src/cppcache/src/statistics/StatisticsFactory.cpp @@ -15,14 +15,14 @@ * limitations under the License. */ -#include "GemfireStatisticsFactory.hpp" +#include "GeodeStatisticsFactory.hpp" namespace apache { namespace geode { namespace statistics { StatisticsFactory* StatisticsFactory::getExistingInstance() { - return GemfireStatisticsFactory::getExistingInstance(); + return GeodeStatisticsFactory::getExistingInstance(); } } // namespace client } // namespace geode http://git-wip-us.apache.org/repos/asf/geode/blob/d1593a02/src/cppcache/src/statistics/StatisticsManager.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/StatisticsManager.cpp b/src/cppcache/src/statistics/StatisticsManager.cpp index 488b590..e42d283 100644 --- a/src/cppcache/src/statistics/StatisticsManager.cpp +++ b/src/cppcache/src/statistics/StatisticsManager.cpp @@ -27,7 +27,7 @@ #include <gfcpp/Exception.hpp> #include "StatisticsManager.hpp" #include <gfcpp/Log.hpp> -#include "GemfireStatisticsFactory.hpp" +#include "GeodeStatisticsFactory.hpp" #include <string> #include "AtomicStatisticsImpl.hpp" #include "OsStatisticsImpl.hpp" @@ -47,7 +47,7 @@ StatisticsManager::StatisticsManager(const char* filePath, int64 sampleInterval, m_sampleIntervalMs = static_cast<int32_t>(sampleInterval) * 1000; /* convert to millis */ m_newlyAddedStatsList.reserve(16); // Allocate initial sizes - GemfireStatisticsFactory::initInstance(this); + GeodeStatisticsFactory::initInstance(this); try { if (m_sampler == NULL && enabled) { @@ -120,7 +120,7 @@ StatisticsManager::~StatisticsManager() { } // Clean Factory: clean Type map etc. - GemfireStatisticsFactory::clean(); + GeodeStatisticsFactory::clean(); } catch (const Exception& ex) { Log::warningCatch("~StatisticsManager swallowing GemFire exception", ex); http://git-wip-us.apache.org/repos/asf/geode/blob/d1593a02/src/cppcache/src/statistics/WindowsProcessStats.cpp ---------------------------------------------------------------------- diff --git a/src/cppcache/src/statistics/WindowsProcessStats.cpp b/src/cppcache/src/statistics/WindowsProcessStats.cpp index f97edbf..d6b71f7 100644 --- a/src/cppcache/src/statistics/WindowsProcessStats.cpp +++ b/src/cppcache/src/statistics/WindowsProcessStats.cpp @@ -19,14 +19,14 @@ #include <ace/Singleton.h> #include "WindowsProcessStats.hpp" #include "HostStatHelperWin.hpp" -#include "GemfireStatisticsFactory.hpp" +#include "GeodeStatisticsFactory.hpp" #include "HostStatHelper.hpp" using namespace apache::geode::statistics; WindowsProcessStats::WindowsProcessStats(int64 pid, const char* name) { - GemfireStatisticsFactory* statFactory = - GemfireStatisticsFactory::getExistingInstance(); + GeodeStatisticsFactory* statFactory = + GeodeStatisticsFactory::getExistingInstance(); // Create for Statistics Type createType(statFactory);
