[TRAFODION-2650] Code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/67a0e53b Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/67a0e53b Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/67a0e53b Branch: refs/heads/master Commit: 67a0e53be47481e667730dc84f1167766f500f9d Parents: 87849fc Author: Zalo Correa <[email protected]> Authored: Fri Feb 2 13:31:39 2018 -0800 Committer: Zalo Correa <[email protected]> Committed: Fri Feb 2 13:31:39 2018 -0800 ---------------------------------------------------------------------- core/sqf/export/include/trafconf/trafconfig.h | 48 +++++++++++----------- core/sqf/monitor/linux/config.cxx | 8 ++-- core/sqf/monitor/linux/makefile | 1 - core/sqf/monitor/linux/msgdef.h | 4 +- core/sqf/src/trafconf/clusterconf.cpp | 26 ++++++------ core/sqf/src/trafconf/clusterconf.h | 18 ++++---- core/sqf/src/trafconf/lnodeconfig.h | 6 +-- core/sqf/src/trafconf/persistconfig.cpp | 6 +-- core/sqf/src/trafconf/persistconfig.h | 8 ++-- core/sqf/src/trafconf/tcdb.cpp | 18 ++++---- core/sqf/src/trafconf/tcdb.h | 22 +++++----- core/sqf/src/trafconf/tcdbsqlite.cpp | 26 ++++++------ core/sqf/src/trafconf/tcdbsqlite.h | 26 ++++++------ core/sqf/src/trafconf/tcdbstore.cpp | 2 +- core/sqf/src/trafconf/tcdbstore.h | 24 +++++------ core/sqf/src/trafconf/trafconf.cpp | 4 +- core/sqf/src/trafconf/trafconfig.cpp | 24 +++++------ 17 files changed, 135 insertions(+), 136 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/export/include/trafconf/trafconfig.h ---------------------------------------------------------------------- diff --git a/core/sqf/export/include/trafconf/trafconfig.h b/core/sqf/export/include/trafconf/trafconfig.h index db137bf..5ab2f48 100644 --- a/core/sqf/export/include/trafconf/trafconfig.h +++ b/core/sqf/export/include/trafconf/trafconfig.h @@ -92,7 +92,7 @@ typedef enum { ProcessType_Invalid // marks the end of the process // types, add any new process // types before this one -} TC_PROCESS_TYPE; +} TcProcessType_t; typedef enum { ZoneType_Undefined = 0x0000, // No zone type defined @@ -103,7 +103,7 @@ typedef enum { ZoneType_Any = ( ZoneType_Edge | ZoneType_Aggregation | ZoneType_Storage ), ZoneType_Frontend = ( ZoneType_Edge | ZoneType_Aggregation ), ZoneType_Backend = ( ZoneType_Aggregation | ZoneType_Storage ) -} TC_ZONE_TYPE; +} TcZoneType_t; typedef enum { //enum TC_STORAGE_TYPE { @@ -111,7 +111,7 @@ typedef enum { , TCDBMYSQL = 1 // MySQL Database , TCDBPOSTGRESQL = 2 // PostgresQL Database [TBD] , TCDBSQLITE = 3 // Sqlite Database [deprecated] -} TC_STORAGE_TYPE; +} TcStorageType_t; typedef enum { //enum TC_ERRORS { @@ -123,9 +123,9 @@ typedef enum { , TCDBNOEXIST = -5 // Database operation yielded non-existent data , TCDBTRUNCATE = -6 // Database operation returned less data than available , TCDBCORRUPT = -7 // Internal processing error or database corruption -} TC_ERRORS; +} TcError_t; -typedef struct node_configuration_s +typedef struct TcNodeConfiguration_s { int nid; // Node Id (logical) int pnid; // Physical Node ID @@ -136,9 +136,9 @@ typedef struct node_configuration_s int last_core; // Last core assigned or -1 int processors; // Number logical processors int roles; // Role assigment -} node_configuration_t; +} TcNodeConfiguration_t; -typedef struct physical_node_configuration_s +typedef struct TcPhysicalNodeConfiguration_s { int pnid; // Physical Node ID char node_name[TC_PERSIST_PROCESSOR_NAME_MAX]; // hostname @@ -146,16 +146,16 @@ typedef struct physical_node_configuration_s int excluded_last_core; // Last core assigned or -1 int spare_count; // Number of entries in spare_pnid[] int spare_pnid[TC_SPARE_NODES_MAX]; // list of pnids for which this node can be a spare -} physical_node_configuration_t; +} TcPhysicalNodeConfiguration_t; -typedef struct registry_configuration_s +typedef struct TcRegistryConfiguration_s { char scope[TC_REGISTRY_KEY_MAX]; char key[TC_REGISTRY_KEY_MAX]; char value[TC_REGISTRY_VALUE_MAX]; -} registry_configuration_t; +} TcRegistryConfiguration_t; -typedef struct persist_configuration_s +typedef struct TcPersistConfiguration_s { char persist_prefix[TC_PERSIST_KEY_MAX]; // DTM, TMID, or ... (PERSIST_PROCESS_KEYS) char process_name[TC_PERSIST_VALUE_MAX]; // Process name {<prefix>[<format>]} @@ -167,7 +167,7 @@ typedef struct persist_configuration_s int persist_retries; // Process create retries int persist_window; // Process create retries window (seconds) char persist_zones[TC_PERSIST_VALUE_MAX]; // Process creation zones {<format>} -} persist_configuration_t; +} TcPersistConfiguration_t; TC_Export int tc_close( void ) @@ -182,7 +182,7 @@ TC_Export int tc_initialize( bool traceEnabled , const char *rootNode = NULL ) TC_DIAG_UNUSED; -TC_Export TC_STORAGE_TYPE tc_get_storage_type( void ) +TC_Export TcStorageType_t tc_get_storage_type( void ) TC_DIAG_UNUSED; TC_Export int tc_delete_node( int nid @@ -190,18 +190,18 @@ TC_Export int tc_delete_node( int nid TC_DIAG_UNUSED; TC_Export int tc_get_node( const char *node_name - , node_configuration_t *node_config ) + , TcNodeConfiguration_t *node_config ) TC_DIAG_UNUSED; -TC_Export int tc_put_node( node_configuration_t *node_config ) +TC_Export int tc_put_node( TcNodeConfiguration_t *node_config ) TC_DIAG_UNUSED; TC_Export int tc_get_pnode( const char *node_name - , physical_node_configuration_t *pnode_config ) + , TcPhysicalNodeConfiguration_t *pnode_config ) TC_DIAG_UNUSED; -TC_Export int tc_put_pnode( physical_node_configuration_t *pnode_config ) +TC_Export int tc_put_pnode( TcPhysicalNodeConfiguration_t *pnode_config ) TC_DIAG_UNUSED; // @@ -217,7 +217,7 @@ TC_DIAG_UNUSED; // TC_Export int tc_get_nodes( int *count , int max - , node_configuration_t *node_config ) + , TcNodeConfiguration_t *node_config ) TC_DIAG_UNUSED; // @@ -233,7 +233,7 @@ TC_DIAG_UNUSED; // TC_Export int tc_get_snodes( int *count , int max - , physical_node_configuration_t *pnode_config ) + , TcPhysicalNodeConfiguration_t *pnode_config ) TC_DIAG_UNUSED; @@ -251,11 +251,11 @@ TC_Export int tc_delete_persist_process( const char *persist_key_prefix ) TC_DIAG_UNUSED; TC_Export int tc_get_persist_process( const char *persist_key_prefix - , persist_configuration_t *persist_config ) + , TcPersistConfiguration_t *persist_config ) TC_DIAG_UNUSED; TC_Export int tc_put_persist_process( const char *persist_key_prefix - , persist_configuration_t *persist_config ) + , TcPersistConfiguration_t *persist_config ) TC_DIAG_UNUSED; @@ -272,7 +272,7 @@ TC_DIAG_UNUSED; // TC_Export int tc_get_registry_cluster_set( int *count , int max - , registry_configuration_t *registry_config ) + , TcRegistryConfiguration_t *registry_config ) TC_DIAG_UNUSED; // @@ -288,7 +288,7 @@ TC_DIAG_UNUSED; // TC_Export int tc_get_registry_process_set( int *count , int max - , registry_configuration_t *registry_config ) + , TcRegistryConfiguration_t *registry_config ) TC_DIAG_UNUSED; @@ -326,7 +326,7 @@ TC_Export int tc_put_registry_process_data( const char *process_name TC_DIAG_UNUSED; -TC_Export TC_STORAGE_TYPE tc_get_storage_type( void ) +TC_Export TcStorageType_t tc_get_storage_type( void ) TC_DIAG_UNUSED; http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/monitor/linux/config.cxx ---------------------------------------------------------------------- diff --git a/core/sqf/monitor/linux/config.cxx b/core/sqf/monitor/linux/config.cxx index cb2f486..f54706f 100644 --- a/core/sqf/monitor/linux/config.cxx +++ b/core/sqf/monitor/linux/config.cxx @@ -538,8 +538,8 @@ void CConfigContainer::Init(void) int regClusterMax = 0; int regProcessMax = 0; ConfigType type; - registry_configuration_t *regClusterConfig; - registry_configuration_t *regProcessConfig; + TcRegistryConfiguration_t *regClusterConfig; + TcRegistryConfiguration_t *regProcessConfig; // Get cluster scope configuration registry entries count rc = tc_get_registry_cluster_set( ®ClusterCount @@ -555,7 +555,7 @@ void CConfigContainer::Init(void) } regClusterMax = regClusterCount; - regClusterConfig = new registry_configuration_t[regClusterMax]; + regClusterConfig = new TcRegistryConfiguration_t[regClusterMax]; if (regClusterConfig) { rc = tc_get_registry_cluster_set( ®ClusterCount @@ -605,7 +605,7 @@ void CConfigContainer::Init(void) } regProcessMax = regProcessCount; - regProcessConfig = new registry_configuration_t[regProcessMax]; + regProcessConfig = new TcRegistryConfiguration_t[regProcessMax]; if (regClusterConfig) { rc = tc_get_registry_cluster_set( ®ProcessCount http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/monitor/linux/makefile ---------------------------------------------------------------------- diff --git a/core/sqf/monitor/linux/makefile b/core/sqf/monitor/linux/makefile index 95718ff..a337bb1 100644 --- a/core/sqf/monitor/linux/makefile +++ b/core/sqf/monitor/linux/makefile @@ -316,7 +316,6 @@ PGMS += $(BINEXPDIR)/shell PGMS += $(BINEXPDIR)/sqwatchdog PGMS += $(BINEXPDIR)/monmemlog PGMS += $(BINEXPDIR)/pstartd -PGMS += $(BINEXPDIR)/trafconf TEST_PGMS = $(OUTDIR)/client TEST_PGMS += $(OUTDIR)/client2 http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/monitor/linux/msgdef.h ---------------------------------------------------------------------- diff --git a/core/sqf/monitor/linux/msgdef.h b/core/sqf/monitor/linux/msgdef.h index 4f20c55..3f5c8c8 100644 --- a/core/sqf/monitor/linux/msgdef.h +++ b/core/sqf/monitor/linux/msgdef.h @@ -223,7 +223,7 @@ typedef enum { ZoneType_Backend = ( ZoneType_Aggregation | ZoneType_Storage ) } ZoneType; #else -typedef TC_ZONE_TYPE ZoneType; +typedef TcZoneType_t ZoneType; #endif // Service Request types // note: other data structures depend on the ordering of the REQTYPE elements. @@ -354,7 +354,7 @@ typedef enum { // types before this one } PROCESSTYPE; #else -typedef TC_PROCESS_TYPE PROCESSTYPE; +typedef TcProcessType_t PROCESSTYPE; #endif typedef enum { ShutdownLevel_Undefined=-1, http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/src/trafconf/clusterconf.cpp ---------------------------------------------------------------------- diff --git a/core/sqf/src/trafconf/clusterconf.cpp b/core/sqf/src/trafconf/clusterconf.cpp index 5e3eaa0..0ebffeb 100644 --- a/core/sqf/src/trafconf/clusterconf.cpp +++ b/core/sqf/src/trafconf/clusterconf.cpp @@ -243,8 +243,8 @@ bool CClusterConfig::DeleteNodeConfig( int pnid ) // The following method maps the 'sqconfig' text file persist section's // <persist-key>_PROCESS_TYPE string value to the internal -// TC_PROCESS_TYPE enum value -TC_PROCESS_TYPE CClusterConfig::GetProcessType( const char *processtype ) +// TcProcessType_t enum value +TcProcessType_t CClusterConfig::GetProcessType( const char *processtype ) { if (strcmp( "DTM", processtype) == 0) { @@ -351,8 +351,8 @@ bool CClusterConfig::LoadNodeConfig( void ) int rc; int nodeCount = 0; int snodeCount = 0; - node_configuration_t nodeConfigData[TC_NODES_MAX]; - physical_node_configuration_t spareNodeConfigData[TC_SPARE_NODES_MAX]; + TcNodeConfiguration_t nodeConfigData[TC_NODES_MAX]; + TcPhysicalNodeConfiguration_t spareNodeConfigData[TC_SPARE_NODES_MAX]; pnodeConfigInfo_t pnodeConfigInfo; lnodeConfigInfo_t lnodeConfigInfo; @@ -430,7 +430,7 @@ bool CClusterConfig::LoadPersistConfig( void ) return( false ); } - persist_configuration_t persistConfig; + TcPersistConfiguration_t persistConfig; persistConfigInfo_t persistConfigInfo; pkeysVector_t pkeysVector; // vector of persist prefix strings @@ -452,7 +452,7 @@ bool CClusterConfig::LoadPersistConfig( void ) // Process each prefix in the vector for (pkit = pkeysVector.begin(); pkit < pkeysVector.end(); pkit++ ) { - memset( &persistConfig, 0, sizeof(persist_configuration_t) ); + memset( &persistConfig, 0, sizeof(TcPersistConfiguration_t) ); memset( &persistConfigInfo, 0, sizeof(persistConfigInfo_t) ); strncpy( persistConfig.persist_prefix , pkit->c_str() @@ -486,7 +486,7 @@ bool CClusterConfig::LoadPersistConfig( void ) return( persistReady_ ); } -void CClusterConfig::ProcessLNode( node_configuration_t &nodeConfigData +void CClusterConfig::ProcessLNode( TcNodeConfiguration_t &nodeConfigData , pnodeConfigInfo_t &pnodeConfigInfo , lnodeConfigInfo_t &lnodeConfigInfo ) { @@ -549,12 +549,12 @@ void CClusterConfig::ProcessLNode( node_configuration_t &nodeConfigData , nodeConfigData.last_core , lnodeConfigInfo.coreMask ); lnodeConfigInfo.processor = nodeConfigData.processors; - lnodeConfigInfo.zoneType = static_cast<TC_ZONE_TYPE>(nodeConfigData.roles); + lnodeConfigInfo.zoneType = static_cast<TcZoneType_t>(nodeConfigData.roles); TRACE_EXIT; } -void CClusterConfig::ProcessSNode( physical_node_configuration_t &pnodeConfig +void CClusterConfig::ProcessSNode( TcPhysicalNodeConfiguration_t &pnodeConfig , pnodeConfigInfo_t &pnodeConfigInfo ) { const char method_name[] = "CClusterConfig::ProcessSNode"; @@ -603,7 +603,7 @@ void CClusterConfig::ProcessSNode( physical_node_configuration_t &pnodeConfig TRACE_EXIT; } -void CClusterConfig::ProcessPersistInfo( persist_configuration_t &persistConfig +void CClusterConfig::ProcessPersistInfo( TcPersistConfiguration_t &persistConfig , persistConfigInfo_t &persistConfigInfo ) { const char method_name[] = "CClusterConfig::ProcessPersistInfo"; @@ -708,7 +708,7 @@ bool CClusterConfig::SaveNodeConfig( const char *name bool rs = true; int rc; - node_configuration_t nodeConfig; + TcNodeConfiguration_t nodeConfig; pnodeConfigInfo_t pnodeConfigInfo; lnodeConfigInfo_t lnodeConfigInfo; @@ -779,7 +779,7 @@ bool CClusterConfig::UpdatePNodeConfig( int pnid bool rs = true; int rc; - physical_node_configuration_t pnodeConfig; + TcPhysicalNodeConfiguration_t pnodeConfig; if (TcTraceSettings & (TC_TRACE_INIT | TC_TRACE_REQUEST)) { @@ -793,7 +793,7 @@ bool CClusterConfig::UpdatePNodeConfig( int pnid , excludedLastCore ); } - memset( &pnodeConfig, 0, sizeof(physical_node_configuration_t) ); + memset( &pnodeConfig, 0, sizeof(TcPhysicalNodeConfiguration_t) ); pnodeConfig.pnid = pnid; strncpy( pnodeConfig.node_name, name, sizeof(pnodeConfig.node_name) ); pnodeConfig.excluded_first_core = excludedFirstCore; http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/src/trafconf/clusterconf.h ---------------------------------------------------------------------- diff --git a/core/sqf/src/trafconf/clusterconf.h b/core/sqf/src/trafconf/clusterconf.h index 7061bbb..1a8942f 100644 --- a/core/sqf/src/trafconf/clusterconf.h +++ b/core/sqf/src/trafconf/clusterconf.h @@ -49,7 +49,7 @@ public: inline bool IsConfigReady( void ) { return( nodeReady_ && persistReady_ ); } inline bool IsNodeReady( void ) { return( nodeReady_ ); } inline bool IsPersistReady( void ) { return( persistReady_ ); } - inline TC_STORAGE_TYPE GetStorageType( void ) { return(trafConfigStorageType_); } + inline TcStorageType_t GetStorageType( void ) { return(trafConfigStorageType_); } bool LoadConfig( void ); bool LoadNodeConfig( void ); bool LoadPersistConfig( void ); @@ -77,7 +77,7 @@ private: bool persistReady_; // true when persist configuration loaded bool newPNodeConfig_; bool trafConfigInitialized_; - TC_STORAGE_TYPE trafConfigStorageType_; + TcStorageType_t trafConfigStorageType_; CPNodeConfig *prevPNodeConfig_; CLNodeConfig *prevLNodeConfig_; CPersistConfig *prevPersistConfig_; @@ -87,14 +87,14 @@ private: void AddSNodeConfiguration( pnodeConfigInfo_t &pnodeConfigInfo ); void AddPersistConfiguration( persistConfigInfo_t &persistConfigInfo ); bool DeleteDbNodeData( int pnid ); - TC_PROCESS_TYPE GetProcessType( const char *processtype ); - void ProcessLNode( node_configuration_t &nodeConfig - , pnodeConfigInfo_t &pnodeConfigInfo - , lnodeConfigInfo_t &lnodeConfigInfo ); - void ProcessSNode( physical_node_configuration_t &pnodeConfig + TcProcessType_t GetProcessType( const char *processtype ); + void ProcessLNode( TcNodeConfiguration_t &nodeConfig + , pnodeConfigInfo_t &pnodeConfigInfo + , lnodeConfigInfo_t &lnodeConfigInfo ); + void ProcessSNode( TcPhysicalNodeConfiguration_t &pnodeConfig , pnodeConfigInfo_t &pnodeConfigInfo ); - void ProcessPersistInfo( persist_configuration_t &persistConfigData - , persistConfigInfo_t &persistConfigInfo ); + void ProcessPersistInfo( TcPersistConfiguration_t &persistConfigData + , persistConfigInfo_t &persistConfigInfo ); bool SaveDbLNodeData( int nid , int pnid , int firstCore http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/src/trafconf/lnodeconfig.h ---------------------------------------------------------------------- diff --git a/core/sqf/src/trafconf/lnodeconfig.h b/core/sqf/src/trafconf/lnodeconfig.h index 78e40cc..e14e5e0 100644 --- a/core/sqf/src/trafconf/lnodeconfig.h +++ b/core/sqf/src/trafconf/lnodeconfig.h @@ -37,7 +37,7 @@ typedef struct lnodeConfigInfo_s int lastCore; cpu_set_t coreMask; int processor; - TC_ZONE_TYPE zoneType; + TcZoneType_t zoneType; } lnodeConfigInfo_t; @@ -99,7 +99,7 @@ public: CPNodeConfig *GetPNodeConfig( void ) { return(pnodeConfig_); } inline int GetProcessors( void ) { return( processors_ ); } - inline TC_ZONE_TYPE GetZoneType( void ) { return( zoneType_ ); } + inline TcZoneType_t GetZoneType( void ) { return( zoneType_ ); } protected: private: @@ -109,7 +109,7 @@ private: int firstCore_; // First SMP processor core used by logical node int lastCore_; // Last SMP processor core used by logical node int processors_; // # of logical processors in logical node - TC_ZONE_TYPE zoneType_; // type of zone + TcZoneType_t zoneType_; // type of zone CPNodeConfig *pnodeConfig_; // logical node's current physical node CLNodeConfig *next_; // next LNodeConfig in CLNodeConfigContainer list http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/src/trafconf/persistconfig.cpp ---------------------------------------------------------------------- diff --git a/core/sqf/src/trafconf/persistconfig.cpp b/core/sqf/src/trafconf/persistconfig.cpp index 4d4a880..160af0d 100644 --- a/core/sqf/src/trafconf/persistconfig.cpp +++ b/core/sqf/src/trafconf/persistconfig.cpp @@ -28,7 +28,7 @@ using namespace std; #include "tctrace.h" #include "persistconfig.h" -const char *PersistProcessTypeString( TC_PROCESS_TYPE type ) +const char *PersistProcessTypeString( TcProcessType_t type ) { const char *str; @@ -87,7 +87,7 @@ const char *PersistProcessTypeString( TC_PROCESS_TYPE type ) return( str ); } -const char *ProcessTypeString( TC_PROCESS_TYPE type ) +const char *ProcessTypeString( TcProcessType_t type ) { const char *str; @@ -579,7 +579,7 @@ CPersistConfig *CPersistConfigContainer::GetPersistConfig( const char *persistPr return config; } -CPersistConfig *CPersistConfigContainer::GetPersistConfig( TC_PROCESS_TYPE processType +CPersistConfig *CPersistConfigContainer::GetPersistConfig( TcProcessType_t processType , const char *processName , int nid ) { http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/src/trafconf/persistconfig.h ---------------------------------------------------------------------- diff --git a/core/sqf/src/trafconf/persistconfig.h b/core/sqf/src/trafconf/persistconfig.h index add6aa6..681ad9e 100644 --- a/core/sqf/src/trafconf/persistconfig.h +++ b/core/sqf/src/trafconf/persistconfig.h @@ -63,7 +63,7 @@ typedef struct persistConfigInfo_s char programName[TC_PERSIST_VALUE_MAX]; char programArgs[TC_PERSIST_VALUE_MAX]; char zoneFormat[TC_PERSIST_VALUE_MAX]; - TC_PROCESS_TYPE processType; + TcProcessType_t processType; bool requiresDTM; int persistRetries; int persistWindow; @@ -82,7 +82,7 @@ public: void DeletePersistConfig( CPersistConfig *persistConfig ); inline CPersistConfig *GetFirstPersistConfig( void ) { return ( head_ ); } CPersistConfig *GetPersistConfig( const char *persistPrefix ); - CPersistConfig *GetPersistConfig( TC_PROCESS_TYPE processType + CPersistConfig *GetPersistConfig( TcProcessType_t processType , const char *processName , int nid ); inline int GetPersistConfigCount( void ) { return ( persistsCount_ ); } @@ -126,7 +126,7 @@ public: inline int GetProgramArgvLen( void ) { return( programArgvLen_ ); } inline const char *GetZoneFormat( void ) { return( zoneFormat_.c_str() ); } inline FormatZid_t GetZoneZidFormat( void ) { return( zoneZidFormat_ ); } - inline TC_PROCESS_TYPE GetProcessType( void ) { return ( processType_ ); } + inline TcProcessType_t GetProcessType( void ) { return ( processType_ ); } inline bool GetRequiresDTM( void ) { return ( requiresDTM_ ); } inline int GetPersistRetries( void ) { return ( persistRetries_ ); } inline int GetPersistWindow( void ) { return ( persistWindow_ ); } @@ -145,7 +145,7 @@ private: string programName_; string programArgs_; string zoneFormat_; - TC_PROCESS_TYPE processType_; + TcProcessType_t processType_; FormatNid_t processNameNidFormat_; FormatNid_t stdoutNidFormat_; FormatZid_t zoneZidFormat_; http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/src/trafconf/tcdb.cpp ---------------------------------------------------------------------- diff --git a/core/sqf/src/trafconf/tcdb.cpp b/core/sqf/src/trafconf/tcdb.cpp index 7a41c3f..25288b5 100644 --- a/core/sqf/src/trafconf/tcdb.cpp +++ b/core/sqf/src/trafconf/tcdb.cpp @@ -315,7 +315,7 @@ bool CTcdb::IsInitialized( void ) } int CTcdb::GetNode( int nid - , node_configuration_t &nodeConfig ) + , TcNodeConfiguration_t &nodeConfig ) { const char method_name[] = "CTcdb::GetNode"; TRACE_ENTRY; @@ -327,7 +327,7 @@ int CTcdb::GetNode( int nid } int CTcdb::GetNode( const char *name - , node_configuration_t &nodeConfig ) + , TcNodeConfiguration_t &nodeConfig ) { const char method_name[] = "CTcdb::GetNode"; TRACE_ENTRY; @@ -340,7 +340,7 @@ int CTcdb::GetNode( const char *name int CTcdb::GetNodes( int &count , int max - , node_configuration_t nodeConfig[] ) + , TcNodeConfiguration_t nodeConfig[] ) { const char method_name[] = "CTcdb::GetNodes"; TRACE_ENTRY; @@ -352,7 +352,7 @@ int CTcdb::GetNodes( int &count } int CTcdb::GetPNode( int pNid - , physical_node_configuration_t &pnodeConfig ) + , TcPhysicalNodeConfiguration_t &pnodeConfig ) { const char method_name[] = "CTcdb::GetPNode"; TRACE_ENTRY; @@ -364,7 +364,7 @@ int CTcdb::GetPNode( int pNid } int CTcdb::GetPNode( const char *name - , physical_node_configuration_t &pnodeConfig ) + , TcPhysicalNodeConfiguration_t &pnodeConfig ) { const char method_name[] = "CTcdb::GetPNode"; TRACE_ENTRY; @@ -377,7 +377,7 @@ int CTcdb::GetPNode( const char *name int CTcdb::GetSNodes( int &count , int max - , physical_node_configuration_t spareNodeConfig[] ) + , TcPhysicalNodeConfiguration_t spareNodeConfig[] ) { const char method_name[] = "CTcdb::GetSNodes"; TRACE_ENTRY; @@ -389,7 +389,7 @@ int CTcdb::GetSNodes( int &count } int CTcdb::GetPersistProcess( const char *persistPrefix - , persist_configuration_t &persistConfig ) + , TcPersistConfiguration_t &persistConfig ) { const char method_name[] = "CTcdb::GetPersistProcess"; TRACE_ENTRY; @@ -413,7 +413,7 @@ int CTcdb::GetPersistProcessKeys( const char *persistProcessKeys ) int CTcdb::GetRegistryClusterSet( int &count , int max - , registry_configuration_t registryConfig[] ) + , TcRegistryConfiguration_t registryConfig[] ) { const char method_name[] = "CTcdb::GetRegistryClusterSet"; TRACE_ENTRY; @@ -426,7 +426,7 @@ int CTcdb::GetRegistryClusterSet( int &count int CTcdb::GetRegistryProcessSet( int &count , int max - , registry_configuration_t registryConfig[] ) + , TcRegistryConfiguration_t registryConfig[] ) { const char method_name[] = "CTcdb::GetRegistryProcessSet"; TRACE_ENTRY; http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/src/trafconf/tcdb.h ---------------------------------------------------------------------- diff --git a/core/sqf/src/trafconf/tcdb.h b/core/sqf/src/trafconf/tcdb.h index 060f2f6..0698aa7 100644 --- a/core/sqf/src/trafconf/tcdb.h +++ b/core/sqf/src/trafconf/tcdb.h @@ -72,29 +72,29 @@ public: int DeleteNodeData( int pnid ); int DeleteUniqueString( int nid ); int GetNode( int nid - , node_configuration_t &nodeConfig ); + , TcNodeConfiguration_t &nodeConfig ); int GetNode( const char *name - , node_configuration_t &nodeConfig ); + , TcNodeConfiguration_t &nodeConfig ); int GetNodes( int &count , int max - , node_configuration_t nodeConfig[] ); + , TcNodeConfiguration_t nodeConfig[] ); int GetPNode( int pnid - , physical_node_configuration_t &pnodeConfig ); + , TcPhysicalNodeConfiguration_t &pnodeConfig ); int GetPNode( const char *name - , physical_node_configuration_t &pnodeConfig ); + , TcPhysicalNodeConfiguration_t &pnodeConfig ); int GetSNodes( int &count , int max - , physical_node_configuration_t pNodeConfig[] ); + , TcPhysicalNodeConfiguration_t pNodeConfig[] ); int GetPersistProcess( const char *persistPrefix - , persist_configuration_t &persistConfig ); + , TcPersistConfiguration_t &persistConfig ); int GetPersistProcessKeys( const char *persistProcessKeys ); int GetRegistryClusterSet( int &count , int max - , registry_configuration_t registryConfig[] ); + , TcRegistryConfiguration_t registryConfig[] ); int GetRegistryProcessSet( int &count , int max - , registry_configuration_t registryConfig[] ); - inline TC_STORAGE_TYPE GetStorageType( void ) { return(dbStorageType_); } + , TcRegistryConfiguration_t registryConfig[] ); + inline TcStorageType_t GetStorageType( void ) { return(dbStorageType_); } int GetUniqueString( int nid, int id, const char *uniqStr ); int GetUniqueStringId( int nid , const char *uniqStr @@ -110,7 +110,7 @@ public: protected: private: - TC_STORAGE_TYPE dbStorageType_; + TcStorageType_t dbStorageType_; CTcdbStore *tcdbStore_; }; http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/src/trafconf/tcdbsqlite.cpp ---------------------------------------------------------------------- diff --git a/core/sqf/src/trafconf/tcdbsqlite.cpp b/core/sqf/src/trafconf/tcdbsqlite.cpp index c54882b..6b3d37a 100644 --- a/core/sqf/src/trafconf/tcdbsqlite.cpp +++ b/core/sqf/src/trafconf/tcdbsqlite.cpp @@ -1244,7 +1244,7 @@ int CTcdbSqlite::Initialize( void ) } int CTcdbSqlite::GetNode( int nid - , node_configuration_t &nodeConfig ) + , TcNodeConfiguration_t &nodeConfig ) { const char method_name[] = "CTcdbSqlite::GetNode"; TRACE_ENTRY; @@ -1388,7 +1388,7 @@ int CTcdbSqlite::GetNode( int nid } int CTcdbSqlite::GetNode( const char *name - , node_configuration_t &nodeConfig ) + , TcNodeConfiguration_t &nodeConfig ) { const char method_name[] = "CTcdbSqlite::GetNode"; TRACE_ENTRY; @@ -1534,7 +1534,7 @@ int CTcdbSqlite::GetNode( const char *name int CTcdbSqlite::GetNodes( int &count , int max - , node_configuration_t nodeConfig[] ) + , TcNodeConfiguration_t nodeConfig[] ) { const char method_name[] = "CTcdbSqlite::GetNodes"; TRACE_ENTRY; @@ -1679,7 +1679,7 @@ int CTcdbSqlite::GetNodes( int &count } int CTcdbSqlite::GetPNode( int pNid - , physical_node_configuration_t &pnodeConfig ) + , TcPhysicalNodeConfiguration_t &pnodeConfig ) { const char method_name[] = "CTcdbSqlite::GetPNode"; TRACE_ENTRY; @@ -1799,7 +1799,7 @@ int CTcdbSqlite::GetPNode( int pNid } int CTcdbSqlite::GetPNode( const char *name - , physical_node_configuration_t &pnodeConfig ) + , TcPhysicalNodeConfiguration_t &pnodeConfig ) { const char method_name[] = "CTcdbSqlite::GetPNode"; TRACE_ENTRY; @@ -1918,7 +1918,7 @@ int CTcdbSqlite::GetPNode( const char *name int CTcdbSqlite::GetSNodes( int &count , int max - , physical_node_configuration_t spareNodeConfig[] ) + , TcPhysicalNodeConfiguration_t spareNodeConfig[] ) { const char method_name[] = "CTcdbSqlite::GetSNodes"; TRACE_ENTRY; @@ -2066,7 +2066,7 @@ int CTcdbSqlite::GetSNodeData( int pnid , const char *nodename , int excfirstcore , int exclastcore - , physical_node_configuration_t &spareNodeConfig ) + , TcPhysicalNodeConfiguration_t &spareNodeConfig ) { const char method_name[] = "CTcdbSqlite::GetSNodeData"; TRACE_ENTRY; @@ -2205,7 +2205,7 @@ int CTcdbSqlite::GetSNodeData( int pnid } int CTcdbSqlite::GetPersistProcess( const char *persistPrefix - , persist_configuration_t &persistConfig ) + , TcPersistConfiguration_t &persistConfig ) { const char method_name[] = "CTcdbSqlite::GetPersistProcess"; TRACE_ENTRY; @@ -2459,7 +2459,7 @@ int CTcdbSqlite::GetPersistProcessKeys( const char *persistProcessKeys ) int CTcdbSqlite::GetRegistryClusterSet( int &count , int max - , registry_configuration_t registryConfig[] ) + , TcRegistryConfiguration_t registryConfig[] ) { const char method_name[] = "CTcdbSqlite::GetRegistryClusterSet"; TRACE_ENTRY; @@ -2587,7 +2587,7 @@ int CTcdbSqlite::GetRegistryClusterSet( int &count int CTcdbSqlite::GetRegistryProcessSet( int &count , int max - , registry_configuration_t registryConfig[] ) + , TcRegistryConfiguration_t registryConfig[] ) { const char method_name[] = "CTcdbSqlite::GetRegistryProcessSet"; TRACE_ENTRY; @@ -3065,7 +3065,7 @@ void CTcdbSqlite::SetLNodeData( int nid , int lastcore , int processors , int roles - , node_configuration_t &nodeConfig ) + , TcNodeConfiguration_t &nodeConfig ) { const char method_name[] = "CTcdbSqlite::SetLNodeData"; @@ -3106,7 +3106,7 @@ void CTcdbSqlite::SetPNodeData( int pnid , const char *nodename , int excfirstcore , int exclastcore - , physical_node_configuration_t &pnodeConfig ) + , TcPhysicalNodeConfiguration_t &pnodeConfig ) { const char method_name[] = "CTcdbSqlite::SetLNodeData"; @@ -3134,7 +3134,7 @@ void CTcdbSqlite::SetPNodeData( int pnid int CTcdbSqlite::SetPersistProcessData( const char *persistkey , const char *persistvalue - , persist_configuration_t &persistConfig ) + , TcPersistConfiguration_t &persistConfig ) { const char method_name[] = "CTcdbSqlite::GetPersistProcessData"; TRACE_ENTRY; http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/src/trafconf/tcdbsqlite.h ---------------------------------------------------------------------- diff --git a/core/sqf/src/trafconf/tcdbsqlite.h b/core/sqf/src/trafconf/tcdbsqlite.h index b03ebcb..c1ed585 100644 --- a/core/sqf/src/trafconf/tcdbsqlite.h +++ b/core/sqf/src/trafconf/tcdbsqlite.h @@ -59,28 +59,28 @@ public: int DeleteNodeData( int pnid ); int DeleteUniqueString( int nid ); int GetNode( int nid - , node_configuration_t &nodeConfig ); + , TcNodeConfiguration_t &nodeConfig ); int GetNode( const char *name - , node_configuration_t &nodeConfig ); + , TcNodeConfiguration_t &nodeConfig ); int GetNodes( int &count , int max - , node_configuration_t nodeConfig[] ); + , TcNodeConfiguration_t nodeConfig[] ); int GetPNode( int pnid - , physical_node_configuration_t &pnodeConfig ); + , TcPhysicalNodeConfiguration_t &pnodeConfig ); int GetPNode( const char *name - , physical_node_configuration_t &pnodeConfig ); + , TcPhysicalNodeConfiguration_t &pnodeConfig ); int GetSNodes( int &count , int max - , physical_node_configuration_t pNodeConfig[] ); + , TcPhysicalNodeConfiguration_t pNodeConfig[] ); int GetPersistProcess( const char *persistPrefix - , persist_configuration_t &persistConfig ); + , TcPersistConfiguration_t &persistConfig ); int GetPersistProcessKeys( const char *persistProcessKeys ); int GetRegistryClusterSet( int &count , int max - , registry_configuration_t registryConfig[] ); + , TcRegistryConfiguration_t registryConfig[] ); int GetRegistryProcessSet( int &count , int max - , registry_configuration_t registryConfig[] ); + , TcRegistryConfiguration_t registryConfig[] ); int GetUniqueString( int nid, int id, const char *uniqStr ); int GetUniqueStringId( int nid , const char *uniqStr @@ -99,7 +99,7 @@ private: , const char *nodename , int excfirstcore , int exclastcore - , physical_node_configuration_t &spareNodeConfig ); + , TcPhysicalNodeConfiguration_t &spareNodeConfig ); void SetLNodeData( int nid , int pnid , const char *nodename @@ -109,15 +109,15 @@ private: , int lastcore , int processors , int roles - , node_configuration_t &nodeConfig ); + , TcNodeConfiguration_t &nodeConfig ); void SetPNodeData( int pnid , const char *nodename , int excfirstcore , int exclastcore - , physical_node_configuration_t &pnodeConfig ); + , TcPhysicalNodeConfiguration_t &pnodeConfig ); int SetPersistProcessData( const char *persistkey , const char *persistvalue - , persist_configuration_t &persistConfig ); + , TcPersistConfiguration_t &persistConfig ); int UpdatePNodeData( int pnid , const char *name , int excludedFirstCore http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/src/trafconf/tcdbstore.cpp ---------------------------------------------------------------------- diff --git a/core/sqf/src/trafconf/tcdbstore.cpp b/core/sqf/src/trafconf/tcdbstore.cpp index 2263a80..856a02e 100644 --- a/core/sqf/src/trafconf/tcdbstore.cpp +++ b/core/sqf/src/trafconf/tcdbstore.cpp @@ -39,7 +39,7 @@ using namespace std; // Cluster Configuration /////////////////////////////////////////////////////////////////////////////// -CTcdbStore::CTcdbStore( TC_STORAGE_TYPE dbStorageType ) +CTcdbStore::CTcdbStore( TcStorageType_t dbStorageType ) : dbStorageType_(dbStorageType) { const char method_name[] = "CTcdbStore::CTcdbStore"; http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/src/trafconf/tcdbstore.h ---------------------------------------------------------------------- diff --git a/core/sqf/src/trafconf/tcdbstore.h b/core/sqf/src/trafconf/tcdbstore.h index 9c87a9c..a8cc92e 100644 --- a/core/sqf/src/trafconf/tcdbstore.h +++ b/core/sqf/src/trafconf/tcdbstore.h @@ -45,7 +45,7 @@ protected: // member variable of the class public: - CTcdbStore( TC_STORAGE_TYPE dbStorageType ); + CTcdbStore( TcStorageType_t dbStorageType ); virtual ~CTcdbStore( void ); virtual int AddLNodeData( int nid @@ -72,39 +72,39 @@ public: virtual int DeleteNodeData( int pnid ) = 0; virtual int DeleteUniqueString( int nid ) = 0; virtual int GetNode( int nid - , node_configuration_t &nodeConfig ) = 0; + , TcNodeConfiguration_t &nodeConfig ) = 0; virtual int GetNode( const char *name - , node_configuration_t &nodeConfig ) = 0; + , TcNodeConfiguration_t &nodeConfig ) = 0; virtual int GetNodes( int &count , int max - , node_configuration_t nodeConfig[] ) = 0; + , TcNodeConfiguration_t nodeConfig[] ) = 0; virtual int GetPNode( int pnid - , physical_node_configuration_t &pnodeConfig ) = 0; + , TcPhysicalNodeConfiguration_t &pnodeConfig ) = 0; virtual int GetPNode( const char *name - , physical_node_configuration_t &pnodeConfig ) = 0; + , TcPhysicalNodeConfiguration_t &pnodeConfig ) = 0; virtual int GetSNodes( int &count , int max - , physical_node_configuration_t pNodeConfig[] ) = 0; + , TcPhysicalNodeConfiguration_t pNodeConfig[] ) = 0; virtual int GetPersistProcess( const char *persistPrefix - , persist_configuration_t &persistConfig ) = 0; + , TcPersistConfiguration_t &persistConfig ) = 0; virtual int GetPersistProcessKeys( const char *persistProcessKeys ) = 0; virtual int GetRegistryClusterSet( int &count , int max - , registry_configuration_t registryConfig[] ) = 0; + , TcRegistryConfiguration_t registryConfig[] ) = 0; virtual int GetRegistryProcessSet( int &count , int max - , registry_configuration_t registryConfig[] ) = 0; + , TcRegistryConfiguration_t registryConfig[] ) = 0; virtual int GetUniqueString( int nid, int id, const char *uniqStr ) = 0; virtual int GetUniqueStringId( int nid , const char *uniqStr , int &id ) = 0; virtual int GetUniqueStringIdMax( int nid, int &id ) = 0; - inline TC_STORAGE_TYPE GetStorageType( void ) { return( dbStorageType_ ); } + inline TcStorageType_t GetStorageType( void ) { return( dbStorageType_ ); } virtual int Initialize( void ) = 0; virtual bool IsInitialized( void ) = 0; protected: - TC_STORAGE_TYPE dbStorageType_; + TcStorageType_t dbStorageType_; private: }; http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/src/trafconf/trafconf.cpp ---------------------------------------------------------------------- diff --git a/core/sqf/src/trafconf/trafconf.cpp b/core/sqf/src/trafconf/trafconf.cpp index ad14b9b..308ebdd 100644 --- a/core/sqf/src/trafconf/trafconf.cpp +++ b/core/sqf/src/trafconf/trafconf.cpp @@ -90,7 +90,7 @@ long TcTraceSettings = 0; const char *FormatNidString( FormatNid_t type ); const char *FormatZidString( FormatZid_t type ); -extern const char *PersistProcessTypeString( TC_PROCESS_TYPE type ); +extern const char *PersistProcessTypeString( TcProcessType_t type ); /////////////////////////////////////////////////////////////////////////////// // @@ -148,7 +148,7 @@ void DisplayUsage( void ) // Function/Method: RoleTypeString() // /////////////////////////////////////////////////////////////////////////////// -const char *RoleTypeString( TC_ZONE_TYPE type ) +const char *RoleTypeString( TcZoneType_t type ) { const char *str; http://git-wip-us.apache.org/repos/asf/trafodion/blob/67a0e53b/core/sqf/src/trafconf/trafconfig.cpp ---------------------------------------------------------------------- diff --git a/core/sqf/src/trafconf/trafconfig.cpp b/core/sqf/src/trafconf/trafconfig.cpp index e3c43ee..f75527d 100644 --- a/core/sqf/src/trafconf/trafconfig.cpp +++ b/core/sqf/src/trafconf/trafconfig.cpp @@ -127,7 +127,7 @@ TC_Export int tc_delete_node( int nid } int rc = TCDBOPERROR; - node_configuration_t nodeConfig; + TcNodeConfiguration_t nodeConfig; if (node_name) { @@ -155,7 +155,7 @@ TC_Export int tc_delete_node( int nid } TC_Export int tc_get_node( const char *node_name - , node_configuration_t *node_config ) + , TcNodeConfiguration_t *node_config ) { if ( ! TrafConfigDb.IsInitialized() ) { @@ -169,7 +169,7 @@ TC_Export int tc_get_node( const char *node_name return( rc ); } -TC_Export int tc_put_node( node_configuration_t *node_config ) +TC_Export int tc_put_node( TcNodeConfiguration_t *node_config ) { if ( ! TrafConfigDb.IsInitialized() ) { @@ -196,7 +196,7 @@ TC_Export int tc_put_node( node_configuration_t *node_config ) } TC_Export int tc_get_pnode( const char *node_name - , physical_node_configuration_t *pnode_config ) + , TcPhysicalNodeConfiguration_t *pnode_config ) { if ( ! TrafConfigDb.IsInitialized() ) { @@ -210,7 +210,7 @@ TC_Export int tc_get_pnode( const char *node_name return( rc ); } -TC_Export int tc_put_pnode( physical_node_configuration_t *pnode_config ) +TC_Export int tc_put_pnode( TcPhysicalNodeConfiguration_t *pnode_config ) { if ( ! TrafConfigDb.IsInitialized() ) { @@ -229,7 +229,7 @@ TC_Export int tc_put_pnode( physical_node_configuration_t *pnode_config ) TC_Export int tc_get_nodes( int *count , int max - , node_configuration_t *node_config ) + , TcNodeConfiguration_t *node_config ) { if ( ! TrafConfigDb.IsInitialized() ) { @@ -250,7 +250,7 @@ TC_Export int tc_get_nodes( int *count TC_Export int tc_get_snodes( int *scount , int max - , physical_node_configuration_t *pnode_config ) + , TcPhysicalNodeConfiguration_t *pnode_config ) { if ( ! TrafConfigDb.IsInitialized() ) { @@ -328,7 +328,7 @@ TC_Export int tc_delete_persist_process( const char *persist_key_prefix ) } TC_Export int tc_get_persist_process( const char *persist_key_prefix - , persist_configuration_t *persist_config ) + , TcPersistConfiguration_t *persist_config ) { if ( ! TrafConfigDb.IsInitialized() ) { @@ -343,7 +343,7 @@ TC_Export int tc_get_persist_process( const char *persist_key_prefix } TC_Export int tc_put_persist_process( const char *persist_key_prefix - , persist_configuration_t *persist_config ) + , TcPersistConfiguration_t *persist_config ) { if ( ! TrafConfigDb.IsInitialized() ) { @@ -361,7 +361,7 @@ TC_Export int tc_put_persist_process( const char *persist_key_prefix TC_Export int tc_get_registry_cluster_set( int *count , int max - , registry_configuration_t *registry_config ) + , TcRegistryConfiguration_t *registry_config ) { if ( ! TrafConfigDb.IsInitialized() ) { @@ -377,7 +377,7 @@ TC_Export int tc_get_registry_cluster_set( int *count TC_Export int tc_get_registry_process_set( int *count , int max - , registry_configuration_t *registry_config ) + , TcRegistryConfiguration_t *registry_config ) { if ( ! TrafConfigDb.IsInitialized() ) { @@ -516,7 +516,7 @@ TC_Export int tc_put_registry_process_data( const char *process_name return( rc ); } -TC_Export TC_STORAGE_TYPE tc_get_storage_type( void ) +TC_Export TcStorageType_t tc_get_storage_type( void ) { if ( ! TrafConfigDb.IsInitialized() ) {
