diff options
Diffstat (limited to 'src/usr/diag/prdf/common/framework/resolution')
35 files changed, 392 insertions, 510 deletions
diff --git a/src/usr/diag/prdf/common/framework/resolution/iipAnalyzeChipResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipAnalyzeChipResolution.h index a35c7968e..8d5239cee 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipAnalyzeChipResolution.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipAnalyzeChipResolution.h @@ -41,6 +41,9 @@ #include <iipResolution.h> #endif +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -100,6 +103,7 @@ private: // Data }; +} // end namespace PRDF #endif /* iipAnalyzeChipResolution_h */ diff --git a/src/usr/diag/prdf/common/framework/resolution/iipCallAttnResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipCallAttnResolution.h index 3a2283e2b..dd5f277cf 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipCallAttnResolution.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipCallAttnResolution.h @@ -41,6 +41,9 @@ #include <iipResolution.h> #endif +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -106,12 +109,7 @@ private: // Data //{ //} +} // end namespace PRDF + #endif /* iipCallAttnResolution_h */ -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ---- -------- ----- ------------------------------- -// DRG Initial Creation -// -// End Change Log ***************************************************** diff --git a/src/usr/diag/prdf/common/framework/resolution/iipCallResolutionTemplate.h b/src/usr/diag/prdf/common/framework/resolution/iipCallResolutionTemplate.h index ac25b5f11..3e21ebeca 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipCallResolutionTemplate.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipCallResolutionTemplate.h @@ -48,6 +48,9 @@ #include <iipResolution.h> #endif +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -103,6 +106,7 @@ private: // Data }; +} // end namespace PRDF #endif /* iipCallResolutionTemplate_h */ diff --git a/src/usr/diag/prdf/common/framework/resolution/iipCallout.h b/src/usr/diag/prdf/common/framework/resolution/iipCallout.h index e2d50a5bb..819a05e24 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipCallout.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipCallout.h @@ -131,6 +131,8 @@ const PRD_FRU_AND_RC_LIMIT = 12; //#define MruCalloutDCL UINT16 /* How big a mru is in bits. */ +namespace PRDF +{ typedef enum { @@ -160,8 +162,7 @@ typedef enum { LAST_MRU, PRD_MAXMRUNUM = 0x7FFFFFFF} MruCallout; - - +} // end namespace PRDF #endif /* iipCallout_h */ diff --git a/src/usr/diag/prdf/common/framework/resolution/iipCalloutMap.h b/src/usr/diag/prdf/common/framework/resolution/iipCalloutMap.h index bbec65bac..3a22bed71 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipCalloutMap.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipCalloutMap.h @@ -55,6 +55,9 @@ // Forward References //-------------------------------------------------------------------- +namespace PRDF +{ + /** Convert a chipid to a mru callout @author Douglas R. Gilbert @@ -137,6 +140,7 @@ private: // Data }; +} // end namespace PRDF #endif /* iipCalloutMap_h */ diff --git a/src/usr/diag/prdf/common/framework/resolution/iipCalloutResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipCalloutResolution.h index 2c8ab7404..cec2d6f49 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipCalloutResolution.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipCalloutResolution.h @@ -54,6 +54,9 @@ #include <iipResolution.h> #endif +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -142,7 +145,7 @@ CalloutResolution::CalloutResolution(PRDF::PRDcallout callout, inline CalloutResolution::CalloutResolution() : - xMruCallout(NULL), xPriority(PRDF::MRU_MED) + xMruCallout(NULL), xPriority(MRU_MED) {} inline @@ -150,4 +153,6 @@ CalloutResolution::CalloutResolution(const CalloutResolution & cr) : xMruCallout(cr.xMruCallout), xPriority(cr.xPriority) {} +} // end namespace PRDF + #endif /* iipCalloutResolution_h */ diff --git a/src/usr/diag/prdf/common/framework/resolution/iipCaptureResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipCaptureResolution.h index 89829f651..49b0ee8e5 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipCaptureResolution.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipCaptureResolution.h @@ -37,6 +37,9 @@ #include <iipCaptureData.h> #endif +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -120,19 +123,7 @@ xScr(scr), pos(p) {} +} // end namespace PRDF #endif /* iipCaptureResolution_h */ -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ------ -------- ----- ------------------------------- -// d24758.1 v4r1m0 05/14/96 DRG Initial Creation -// d24758.1 v4r1m0 05/28/96 DRG Added new constructor for single scr -// d24758.1 v4r1m0 05/30/96 DRG Changed base class to Resolution -// Now only capture 1 reg/CaputureResolution -// d48127.9 v4r1m0 10/20/97 DRG Add interface for chipId + Address -// dg01 V4r3m0 05/13/99 DRG Add place to capture (FRONT or BACK) -// 359182 fips1 03/07/02 dgilbert fix up for FSP -// -// End Change Log ***************************************************** diff --git a/src/usr/diag/prdf/common/framework/resolution/iipEregResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipEregResolution.h index 8042c2901..000b9dc10 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipEregResolution.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipEregResolution.h @@ -51,6 +51,9 @@ #include <iipResolution.h> #endif +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -119,14 +122,7 @@ inline EregResolution::EregResolution() : errorRegister(NULL) {} +} // end namespace PRDF + #endif /* iipEregResolution_h */ -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- ------- ---- -------- -------- ------------------------------- -// v4r1m0 05/13/96 DRG Initial Creation -// pw01 494911 f310 03/04/05 iawillia Use ErrorRegisterType instead of -// ErrorRegister. -// f522283 fips300 09/27/05 dgilbert Make class FlyWeight -able -// End Change Log ***************************************************** diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolution.C b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C index c68c5190a..6e9cd1ba4 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipResolution.C +++ b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C @@ -46,13 +46,10 @@ #include <iipEregResolution.h> #include <iipsdbug.h> #include <iipResolutionList.h> -//#include <iipThresholdResolution.h> #include <iipCallAttnResolution.h> #include <iipTerminateResolution.h> #include <iipAnalyzeChipResolution.h> #include <xspprdTryResolution.h> -//#include <prdfResetThresholdResolution.H> -//#include <prdfIntervalThresholdResolution.H> #include <iipchip.h> #include <prdfCalloutConnected.H> #include <prdfAnalyzeConnected.H> @@ -60,7 +57,8 @@ #undef iipResolution_C -using namespace PRDF; +namespace PRDF +{ //---------------------------------------------------------------------- // User Types @@ -203,7 +201,7 @@ int32_t TryResolution::Resolve(STEP_CODE_DATA_STRUCT & error) return rc; } -int32_t prdfCalloutConnected::Resolve(STEP_CODE_DATA_STRUCT & serviceData) +int32_t CalloutConnected::Resolve(STEP_CODE_DATA_STRUCT & serviceData) { using namespace TARGETING; @@ -253,10 +251,9 @@ int32_t prdfCalloutConnected::Resolve(STEP_CODE_DATA_STRUCT & serviceData) //-------------------------------------------------------------------- // AnalyzeConnected Member Functions //-------------------------------------------------------------------- -int32_t PrdfAnalyzeConnected::Resolve(STEP_CODE_DATA_STRUCT & serviceData) +int32_t AnalyzeConnected::Resolve(STEP_CODE_DATA_STRUCT & serviceData) { using namespace TARGETING; - using namespace PRDF; CHIP_CLASS * l_connChipObj = NULL; TARGETING::TargetHandle_t l_pconnChipTarget = NULL; @@ -304,54 +301,5 @@ int32_t PrdfAnalyzeConnected::Resolve(STEP_CODE_DATA_STRUCT & serviceData) return PRD_UNRESOLVED_CHIP_CONNECTION; } -//-------------------------------------------------------------------- -// ResetThresholdResolution Member Functions -//-------------------------------------------------------------------- - -#if defined(_OBSOLITE_) -int32_t ResetThresholdResolution::Resolve(STEP_CODE_DATA_STRUCT & error) -{ - ++count; - error.service_data->SetHits((uint16_t)count); - error.service_data->SetThreshold((uint16_t)threshold); - if((count == threshold) || (error.service_data->IsFlooding())) - { - error.service_data->SetThresholdMaskId(maskId); // threshold, degraded YES - count = 0; // Reset the counter when threshold is hit - } - int32_t rc = SUCCESS; - // if(xRes != NULL) rc = xRes->Resolve(error); - return rc; -} -//-------------------------------------------------------------------- -// IntervalThresholdResolution Member Functions -//-------------------------------------------------------------------- - -int32_t IntervalThresholdResolution::Resolve(STEP_CODE_DATA_STRUCT & error) -{ - PrdTimer curTime = error.service_data->GetTOE(); // get timestamp (Time Of Error) from SDC; - ++count; - if (count == 1) // The interval begins now at the first occurrence - intervalEndTime = curTime + intervalLength; // Project the end of interval (intervalLength is in seconds) - else - { - if (curTime > intervalEndTime) // See if we're already past the time window - { - count = 1; // Reset count as if it were the first - intervalEndTime = curTime + intervalLength; // Project the new end of interval (intervalLength is in seconds) - } - else if((count == threshold) || (error.service_data->IsFlooding())) // We've hit threshold within the interval - { - error.service_data->SetThresholdMaskId(maskId); // threshold, degraded YES - count = 0; // Reset the counter when threshold is hit - } - else ; // Nothing else--the count is already incremented - } - error.service_data->SetHits((uint16_t)count); - error.service_data->SetThreshold((uint16_t)threshold); +} // end namespace PRDF - int32_t rc = SUCCESS; - // if(xRes != NULL) rc = xRes->Resolve(error); - return rc; -} -#endif diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipResolution.h index 32123c585..c1b1df029 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipResolution.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipResolution.h @@ -62,6 +62,9 @@ #include <iipstep.h> #endif +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -148,14 +151,7 @@ private: // Data }; +} // end namespace PRDF #endif /* iipResolution_h */ -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- --------- ---- -------- -------- ------------------------------- -// v4r1 05/01/96 dgilbert Replaces ACTION_CLASS -// dg00 d49420.07 v5r2 11/09/00 dgilbert Add support for operator== -// -// End Change Log ***************************************************** diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.C b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.C index 158a5842e..9089c5db2 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.C +++ b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.C @@ -79,7 +79,8 @@ class DumpResolutionFW; // dg06a class GardResolutionFW; // dg06a */ -using namespace PRDF; +namespace PRDF +{ //--------------------------------------------------------------------- // Member Function Specifications @@ -137,7 +138,7 @@ MaskResolution & ResolutionFactory::GetThresholdResolution( uint32_t maskId, const ThresholdResolution::ThresholdPolicy & mfgPolicy ) { MaskResolution * r = NULL; - if ( !PRDF::PlatServices::mfgMode() ) + if ( !PlatServices::mfgMode() ) { r = &iv_thresholdResolutions.get(ThresholdResolution(maskId,policy)); } @@ -152,7 +153,7 @@ MaskResolution & ResolutionFactory::GetThresholdResolution( uint32_t maskId, const ThresholdResolution::ThresholdPolicy & policy ) { MaskResolution * r = NULL; - if ( !PRDF::PlatServices::mfgMode() && + if ( !PlatServices::mfgMode() && !(policy == ThresholdResolution::cv_mnfgDefault) ) { r = &iv_thresholdResolutions.get(ThresholdResolution(maskId,policy)); @@ -168,7 +169,7 @@ MaskResolution & ResolutionFactory::GetThresholdResolution( uint32_t maskId, MaskResolution & ResolutionFactory::GetThresholdResolution(uint32_t maskId) { MaskResolution * r = NULL; - if ( !PRDF::PlatServices::mfgMode() ) + if ( !PlatServices::mfgMode() ) { r = &iv_thresholdResolutions.get( ThresholdResolution(maskId, @@ -189,7 +190,7 @@ Resolution & ResolutionFactory::GetConnectedCalloutResolution( PRDpriority i_priority, Resolution * i_altResolution ) { - prdfCalloutConnected key( i_psourceHandle, + CalloutConnected key( i_psourceHandle, i_targetType, i_idx, i_priority, @@ -203,15 +204,15 @@ Resolution & ResolutionFactory::GetAnalyzeConnectedResolution( TARGETING::TYPE i_targetType, uint32_t i_idx ) { - PrdfAnalyzeConnected key( i_psourceHandle, i_targetType, i_idx ); + AnalyzeConnected key( i_psourceHandle, i_targetType, i_idx ); return iv_analyzeConnected.get(key); } Resolution & ResolutionFactory::GetPluginCallResolution( - PrdfExtensibleChip * i_chip, PrdfExtensibleChipFunction * i_function) + ExtensibleChip * i_chip, ExtensibleChipFunction * i_function) { - return iv_pluginCallFW.get(PrdfPluginCallResolution(i_chip,i_function)); + return iv_pluginCallFW.get(PluginCallResolution(i_chip,i_function)); } Resolution & ResolutionFactory::GetThresholdSigResolution( @@ -258,17 +259,17 @@ Resolution & ResolutionFactory::GetGardResolution(GardResolution::ErrorType et) } Resolution & ResolutionFactory::GetCaptureResolution - (PrdfExtensibleChip * i_chip, + (ExtensibleChip * i_chip, uint32_t i_group) { - return iv_captureResolutionFW.get(PrdfCaptureResolution(i_chip,i_group)); + return iv_captureResolutionFW.get(CaptureResolution(i_chip,i_group)); } Resolution & ResolutionFactory::GetClockResolution( TARGETING::TargetHandle_t i_pClockHandle, TARGETING::TYPE i_targetType ) { - return iv_clockResolutionFW.get( PrdfClockResolution(i_pClockHandle, + return iv_clockResolutionFW.get( ClockResolution(i_pClockHandle, i_targetType) ); } @@ -287,27 +288,6 @@ void ResolutionFactory::Reset() iv_clockResolutionFW.clear(); //jl01a } -// dg03a end -// Change Log ************************************************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- --------- ---- -------- -------- --------------------------------------------------------- -// 02/28/97 DGILBERT Initial Creation -// D49274.11 v4r5 01/20/99 SERAFIN Increased MAX_CALLOUT_RESOLUTIONS and MAX_LINKS -// D49420.1 v5r2 07/17/00 mkobler Add interface which uses ChipEnums -// d49420.2 v5r2 09/20/00 dgilbert increase link vector size -// d49420.7 v5r2 11/10/00 dgilbert move GetCalloutResolution(CHIP_ID...) -// to xspprdCondorOnly.C -// d49420.7 v5r2 11/20/00 mkobler change default list/link size -// d49420.10 v5r2 01/16/00 mkobler change default callout list size -// dg00 p4907689 v5r2 02/22/01 dgilbert link/list size += 1000 -// csp 07/11/01 dgilbert rewrite to solve size problem -// dg01 fips 08/09/02 dgilbert rewrite using FlyWeight template -// dg02 400647 fips 03/24/03 dgilbert add GetThresholdResolution() -// dg04 493306 235 03/01/05 dgilbert Add prdfCalloutConnected -// 497866 235 03/29/05 dgilbert add idx & priority to prdfCalloutConnected -// dg05 498293 310 04/06/05 dgilbert add analyzeConnected -// pw01 F527129 f300 10/31/05 iawillia Move inlined code to .C so it compiles. -// ecdf F550548 f300 05/04/06 iawillia eClipz DUMP flags support. -// dg05 f310 05/18/07 dgilbert Clear iv_captureResolutoinFW to prevent memory leak. -// End Change Log ********************************************************************************* + +} // end namespace PRDF + diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h index a37fdfa98..fe0c0febf 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h @@ -78,6 +78,9 @@ #include <prdfCaptureResolution.H> // pw01 #include <prdfClockResolution.H> // jl01a +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -137,8 +140,8 @@ public: <br><b>Note: </b> Do not call this method from a static object </ul><br> */ - Resolution & GetCalloutResolution( PRDF::PRDcallout callout, - PRDF::PRDpriority p = PRDF::MRU_MED); + Resolution & GetCalloutResolution( PRDcallout callout, + PRDpriority p = PRDF::MRU_MED); /** Get a threshold Resolution @@ -175,7 +178,7 @@ public: Resolution & GetConnectedCalloutResolution(TARGETING::TargetHandle_t i_psourceHandle, TARGETING::TYPE i_targetType, uint32_t i_idx = 0, - PRDF::PRDpriority i_priority = PRDF::MRU_MED, + PRDpriority i_priority = MRU_MED, Resolution * i_altResolution = NULL); // dg04a - end @@ -192,14 +195,14 @@ public: // dg05a - end // dg06a - start /** - * Get a PrdfPluginCallResolution - * @param ptr to PrdfExtensibleChip - * @param ptr to PrdfExtensibleFunction + * Get a PluginCallResolution + * @param ptr to ExtensibleChip + * @param ptr to ExtensibleFunction * @post one instance with these params will exist * @This flyweight is cleared by this->Reset() */ - Resolution & GetPluginCallResolution(PrdfExtensibleChip * i_chip, - PrdfExtensibleChipFunction * i_function); + Resolution & GetPluginCallResolution(ExtensibleChip * i_chip, + ExtensibleChipFunction * i_function); /** * Get a threshold signature resolution @@ -264,7 +267,7 @@ public: * @param i_group - The group to capture. * @post only one instance of this object with this param will exist */ - Resolution & GetCaptureResolution(PrdfExtensibleChip * i_chip, + Resolution & GetCaptureResolution(ExtensibleChip * i_chip, uint32_t i_group); /** @@ -391,17 +394,17 @@ private: // Data typedef FlyWeight< ThresholdResolution, 50 > ThresholdResolutionList; // dg02a typedef FlyWeight< MaskResolution, 50 > MaskResolutionFW; // dg02a - typedef FlyWeight< prdfCalloutConnected, 25 > ConnectedFW; // dg04a - typedef FlyWeight< PrdfAnalyzeConnected, 20 > AnalyzeCFW; // dg05a - typedef FlyWeight< PrdfPluginCallResolution, 10 > PluginCallFW; // dg06a + typedef FlyWeight< CalloutConnected, 25 > ConnectedFW; // dg04a + typedef FlyWeight< AnalyzeConnected, 20 > AnalyzeCFW; // dg05a + typedef FlyWeight< PluginCallResolution, 10 > PluginCallFW; // dg06a typedef FlyWeight< ThresholdSigResolution, 10 > ThresholdSigFW; // dg06a typedef FlyWeight< EregResolution, 50 > EregResolutionFW; // dg06a typedef FlyWeight< TryResolution, 20 > TryResolutionFW; // dg06a typedef FlyWeight< FlagResolution, 5 > FlagResolutionFW; // dg06a typedef FlyWeight< DumpResolution, 5 > DumpResolutionFW; // dg06a typedef FlyWeight< GardResolution, 5 > GardResolutionFW; // dg06a - typedef FlyWeight< PrdfCaptureResolution, 5> CaptureResolutionFW; // pw01 - typedef FlyWeight< PrdfClockResolution, 8 > ClockResolutionFW; // jl01a + typedef FlyWeight< CaptureResolution, 5> CaptureResolutionFW; // pw01 + typedef FlyWeight< ClockResolution, 8 > ClockResolutionFW; // jl01a CalloutFW iv_Callouts; // dg01a ResolutionLinkFW iv_Links; // dg01a @@ -450,4 +453,6 @@ Resolution & ResolutionFactory::LinkResolutions(Resolution &r1, return LinkResolutions(LinkResolutions(r1,r2),LinkResolutions(r3,r4,r5)); } +} // end namespace PRDF + #endif /* iipResolutionFactory_h */ diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolutionList.h b/src/usr/diag/prdf/common/framework/resolution/iipResolutionList.h index 61ceca97c..b774a87f0 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipResolutionList.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipResolutionList.h @@ -52,6 +52,9 @@ #include <vector> +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -173,13 +176,7 @@ ResolutionList::ResolutionList(Resolution * r1,Resolution * r2, resolutionList.push_back(r6); } +} // end namespace PRDF #endif /* iipResolutionList_h */ -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ---- -------- ----- ------------------------------- -// d24758.1 v4r1 05/30/96 DRG Initial Creation -// -// End Change Log ***************************************************** diff --git a/src/usr/diag/prdf/common/framework/resolution/iipTerminateResolution.h b/src/usr/diag/prdf/common/framework/resolution/iipTerminateResolution.h index 0e86c85d9..a5a29cb64 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipTerminateResolution.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipTerminateResolution.h @@ -67,6 +67,9 @@ #include <iipResolution.h> #endif +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -128,12 +131,7 @@ private: // Data inline TerminateResolution::TerminateResolution(): Resolution() {} +} // end namespace PRDF + #endif /* iipResolution_h */ -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ---- -------- ----- ------------------------------- -// V4R1 09/13/96 DRG Created -// -// End Change Log ***************************************************** diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfAnalyzeConnected.H b/src/usr/diag/prdf/common/framework/resolution/prdfAnalyzeConnected.H index c8598f4a8..3c99cb052 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfAnalyzeConnected.H +++ b/src/usr/diag/prdf/common/framework/resolution/prdfAnalyzeConnected.H @@ -37,6 +37,9 @@ #include <iipResolution.h> #include <prdfPlatServices.H> +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -51,13 +54,13 @@ struct STEP_CODE_DATA_STRUCT; dynamic failover and concurrent maintainance - without having to call PRD to re-build itself. */ -class PrdfAnalyzeConnected : public Resolution +class AnalyzeConnected : public Resolution { public: /** default ctor */ - PrdfAnalyzeConnected(void); + AnalyzeConnected(void); /** Constructor @@ -65,7 +68,7 @@ public: @param i_targetType i_targetType of desired unit that's connected to i_psourceHandle @param i_idx: index into getConnected list of chip. */ - PrdfAnalyzeConnected(TARGETING::TargetHandle_t i_psourceHandle , + AnalyzeConnected(TARGETING::TargetHandle_t i_psourceHandle , TARGETING::TYPE i_targetType, uint32_t i_idx =0xffffffff ); @@ -81,7 +84,7 @@ public: */ virtual int32_t Resolve(STEP_CODE_DATA_STRUCT & io_service_data); - virtual bool operator==(const PrdfAnalyzeConnected & r) const; + virtual bool operator==(const AnalyzeConnected & r) const; private: // functions private: // Data @@ -91,14 +94,14 @@ private: // Data uint32_t iv_idx; }; -inline PrdfAnalyzeConnected::PrdfAnalyzeConnected(void) +inline AnalyzeConnected::AnalyzeConnected(void) : iv_psourceHandle(NULL), iv_targetType(TARGETING::TYPE_NA), iv_idx(0xffffffff) { } -inline PrdfAnalyzeConnected::PrdfAnalyzeConnected( +inline AnalyzeConnected::AnalyzeConnected( TARGETING::TargetHandle_t i_psourceHandle, TARGETING::TYPE i_targetType, uint32_t i_idx) @@ -108,18 +111,14 @@ inline PrdfAnalyzeConnected::PrdfAnalyzeConnected( { } -inline bool PrdfAnalyzeConnected::operator==(const PrdfAnalyzeConnected & r) const +inline bool AnalyzeConnected::operator==(const AnalyzeConnected & r) const { return (iv_psourceHandle == r.iv_psourceHandle && iv_targetType == r.iv_targetType && iv_idx == r.iv_idx); } +} // end namespace PRDF + #endif /* PRDFANALYZECONNECTED_H */ -// Change Log ***************************************************************** -// -// Flag Reason Vers Date Coder Description -// ---- --------- ----- -------- -------- ------------------------------------ -// 498293 f310 03/31/05 iawillia Initial Creation -// End Change Log ************************************************************* diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfCalloutConnected.H b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutConnected.H index 3301daf7d..a92f80601 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfCalloutConnected.H +++ b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutConnected.H @@ -37,6 +37,9 @@ #include <prdfPlatServices.H> #include <prdfCallouts.H> +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -50,20 +53,20 @@ struct STEP_CODE_DATA_STRUCT; to determine whats connected. This allows for runtime GARD, dynamic failover and concurrent maintainance - without having to call PRD to re-build itself. @code - prdfCalloutConnected iv_callout(PROC, TYPE_MCS ....); + CalloutConnected iv_callout(PROC, TYPE_MCS ....); // ...... // This will add the MCSs thats connected to this PROC to the callout list iv_callout.Resolve(serviceData); @endcode @note Don't use this class to callout clocks - use prdfClockResolution */ -class prdfCalloutConnected : public Resolution +class CalloutConnected : public Resolution { public: /** default ctor */ - prdfCalloutConnected(void); + CalloutConnected(void); /** Constructor @@ -76,13 +79,13 @@ public: If NULL than source is called out @note Don't use this class to callout clocks - use prdfClockResolution */ - prdfCalloutConnected(TARGETING::TargetHandle_t i_psourceHandle, + CalloutConnected(TARGETING::TargetHandle_t i_psourceHandle, TARGETING::TYPE i_targetType, uint32_t i_idx =0xffffffff , - PRDF::PRDpriority i_priority = PRDF::MRU_MED, + PRDpriority i_priority = MRU_MED, Resolution * i_altResolution = NULL); - // ~prdfCalloutConnected(); default dtor is sufficient + // ~CalloutConnected(); default dtor is sufficient /** Determine callout for current connected unit and add to the service data @@ -95,7 +98,7 @@ public: */ virtual int32_t Resolve(STEP_CODE_DATA_STRUCT & io_service_data); - virtual bool operator==(const prdfCalloutConnected & r) const; + virtual bool operator==(const CalloutConnected & r) const; private: // functions private: // Data @@ -107,15 +110,15 @@ private: // Data Resolution * iv_altResolution; }; -inline prdfCalloutConnected::prdfCalloutConnected(void) +inline CalloutConnected::CalloutConnected(void) : iv_psourceHandle(NULL), iv_targetType(TARGETING::TYPE_NA), iv_idx(0xffffffff ), - iv_priority(PRDF::MRU_LOW), + iv_priority(MRU_LOW), iv_altResolution(NULL) {} -inline prdfCalloutConnected::prdfCalloutConnected(TARGETING::TargetHandle_t i_psourceHandle, +inline CalloutConnected::CalloutConnected(TARGETING::TargetHandle_t i_psourceHandle, TARGETING::TYPE i_targetType, uint32_t i_idx, PRDF::PRDpriority i_priority, @@ -127,7 +130,7 @@ inline prdfCalloutConnected::prdfCalloutConnected(TARGETING::TargetHandle_t i_ps iv_altResolution(i_altResolution) {} -inline bool prdfCalloutConnected::operator==(const prdfCalloutConnected & r) const +inline bool CalloutConnected::operator==(const CalloutConnected & r) const { return (iv_psourceHandle == r.iv_psourceHandle && iv_targetType == r.iv_targetType && @@ -136,4 +139,6 @@ inline bool prdfCalloutConnected::operator==(const prdfCalloutConnected & r) con (iv_altResolution == r.iv_altResolution || &iv_altResolution == &r.iv_altResolution)); } +} // end namespace PRDF + #endif /* PRDFCALLOUTCONNECTED_H */ diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfCallouts.H b/src/usr/diag/prdf/common/framework/resolution/prdfCallouts.H index 183ffb0ad..d36123e40 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfCallouts.H +++ b/src/usr/diag/prdf/common/framework/resolution/prdfCallouts.H @@ -193,6 +193,6 @@ class PRDcallout }; -}; // end namespace PRDF +} // end namespace PRDF #endif /* prdfCallouts_H */ diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.C b/src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.C index 183368389..63e4c942d 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.C +++ b/src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.C @@ -24,7 +24,10 @@ #include <prdfCaptureResolution.H> #include <iipServiceDataCollector.h> -int32_t PrdfCaptureResolution::Resolve(STEP_CODE_DATA_STRUCT & i_error) +namespace PRDF +{ + +int32_t CaptureResolution::Resolve(STEP_CODE_DATA_STRUCT & i_error) { if (NULL != iv_chip) return iv_chip->CaptureErrorData(i_error.service_data->GetCaptureData(), @@ -32,10 +35,5 @@ int32_t PrdfCaptureResolution::Resolve(STEP_CODE_DATA_STRUCT & i_error) return SUCCESS; }; -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ---- -------- -------- ------------------------------- -// f310 08/31/06 iawillia Initial File Creation -// End Change Log ***************************************************** +} // end namespace PRDF diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.H b/src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.H index e00d1cd7b..c6f20394e 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.H +++ b/src/usr/diag/prdf/common/framework/resolution/prdfCaptureResolution.H @@ -24,22 +24,25 @@ #include <iipResolution.h> #include <prdfExtensibleChip.H> +namespace PRDF +{ + /** - * @class PrdfCaptureResolution + * @class CaptureResolution * @brief Adds a capture-group to the capture data when hitting an error. */ -class PrdfCaptureResolution : public Resolution +class CaptureResolution : public Resolution { public: - PrdfCaptureResolution() : iv_chip(NULL), iv_captureGroup(0) {}; + CaptureResolution() : iv_chip(NULL), iv_captureGroup(0) {}; - /** @fn PrdfCaptureResolution + /** @fn CaptureResolution * @brief Typical constructor. * * @param i_chip - Extensible chip object to capture from. * @param i_group - Capture-group to gather. */ - PrdfCaptureResolution(PrdfExtensibleChip * i_chip, + CaptureResolution(ExtensibleChip * i_chip, uint32_t i_captureGroup) : iv_chip(i_chip), iv_captureGroup(i_captureGroup) {}; @@ -52,22 +55,18 @@ class PrdfCaptureResolution : public Resolution /** * Comparison operator to aid in ResolutionFactory. */ - bool operator==(const PrdfCaptureResolution & i_rhs) + bool operator==(const CaptureResolution & i_rhs) { return ((iv_chip == i_rhs.iv_chip) && (iv_captureGroup == i_rhs.iv_captureGroup)); }; private: /** The chip to capture from */ - PrdfExtensibleChip * iv_chip; + ExtensibleChip * iv_chip; /** The group id to capture */ uint32_t iv_captureGroup; }; -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ---- -------- -------- ------------------------------- -// f310 08/31/06 iawillia Initial File Creation -// End Change Log ***************************************************** +} // end namespace PRDF + diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.C b/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.C index e9590a995..73c3447f2 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.C +++ b/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.C @@ -30,15 +30,17 @@ #include <prdfPlatServices.H> #undef prdfClockResolution_C +namespace PRDF +{ + //------------------------------------------------------------------------------ // Member Function Specifications //------------------------------------------------------------------------------ // Find the active clock source and blame it -int32_t PrdfClockResolution::Resolve(STEP_CODE_DATA_STRUCT & serviceData) +int32_t ClockResolution::Resolve(STEP_CODE_DATA_STRUCT & serviceData) { using namespace TARGETING; - using namespace PRDF; uint32_t l_rc = SUCCESS; // Use clock routines for CLOCK_CARD types. @@ -86,3 +88,4 @@ int32_t PrdfClockResolution::Resolve(STEP_CODE_DATA_STRUCT & serviceData) return(l_rc); } +} // end namespace PRDF diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.H b/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.H index 995522197..0cd7e5879 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.H +++ b/src/usr/diag/prdf/common/framework/resolution/prdfClockResolution.H @@ -41,6 +41,10 @@ #endif #include <prdfPlatServices.H> + +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -50,7 +54,7 @@ class ServiceDataCollector; Set dump information in the Service Data Collector @author Mike Kobler */ -class PrdfClockResolution : public Resolution +class ClockResolution : public Resolution { public: /** @@ -65,7 +69,7 @@ public: </ul><br> */ // FIXME: The default target type needs to be set to a PROC clock card. - PrdfClockResolution( TARGETING::TargetHandle_t i_pTargetHandle = NULL, + ClockResolution( TARGETING::TargetHandle_t i_pTargetHandle = NULL, TARGETING::TYPE i_targetType = TARGETING::TYPE_PROC ) : iv_ptargetClock(i_pTargetHandle), iv_targetType(i_targetType) @@ -88,7 +92,7 @@ public: * base class defines operator== so one is needed here * or the base class version will be used (bad) */ - bool operator==(const PrdfClockResolution & r) const + bool operator==(const ClockResolution & r) const { return ((iv_ptargetClock == r.iv_ptargetClock) && (iv_targetType == r.iv_targetType)); } @@ -100,12 +104,7 @@ private: // Data TARGETING::TYPE iv_targetType ; }; +} // end namespace PRDF #endif /* prdfClockResolution_H */ -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ------ -------- ------- ---------------------------- -// D725180 fips720 09/30/09 lukas Initial file creation. -// End Change Log ***************************************************** diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfErrorTypeResolution.H b/src/usr/diag/prdf/common/framework/resolution/prdfErrorTypeResolution.H index 2b917d9fc..570e94a19 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfErrorTypeResolution.H +++ b/src/usr/diag/prdf/common/framework/resolution/prdfErrorTypeResolution.H @@ -21,8 +21,8 @@ /* */ /* IBM_PROLOG_END_TAG */ -#ifndef prdfErrorTypeResolution_H -#define prdfErrorTypeResolution_H +#ifndef ErrorTypeResolution_H +#define ErrorTypeResolution_H //-------------------------------------------------------------------- // Includes //-------------------------------------------------------------------- @@ -34,12 +34,15 @@ #include <iipServiceDataCollector.h> #endif +namespace PRDF +{ + /** - @file prdfErrorTypeResolution.H + @file ErrorTypeResolution.H @brief Set the appropiate error type in the SDC and flag for Gard if necessary. */ -class prdfErrorTypeResolution : public Resolution +class ErrorTypeResolution : public Resolution { public: @@ -63,7 +66,7 @@ public: <br><b>Notes: </b> </ul><br> */ - prdfErrorTypeResolution(ErrorType et) + ErrorTypeResolution(ErrorType et) : xErrorType(et) {} /* @@ -98,13 +101,7 @@ private: // Data }; +} // end namespace PRDF -#endif /* prdfErrorTypeResolution_H */ +#endif /* ErrorTypeResolution_H */ -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ---- -------- ------- ------------------------------- -// 02/26/03 mkobler Initial Creation -// -// End Change Log ***************************************************** diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfPluginCallResolution.H b/src/usr/diag/prdf/common/framework/resolution/prdfPluginCallResolution.H index 95c97fecf..8fe7973be 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfPluginCallResolution.H +++ b/src/usr/diag/prdf/common/framework/resolution/prdfPluginCallResolution.H @@ -28,28 +28,31 @@ #include <prdfExtensibleChip.H> #include <prdfPluginDef.H> -class PrdfPluginCallResolution : public Resolution +namespace PRDF +{ + +class PluginCallResolution : public Resolution { private: - PrdfExtensibleChip * iv_chip; - PrdfExtensibleChipFunction * iv_function; + ExtensibleChip * iv_chip; + ExtensibleChipFunction * iv_function; public: - PrdfPluginCallResolution(void) + PluginCallResolution(void) : iv_chip(NULL), iv_function(NULL) {} - PrdfPluginCallResolution(PrdfExtensibleChip * i_chip, - PrdfExtensibleChipFunction * i_function) + PluginCallResolution(ExtensibleChip * i_chip, + ExtensibleChipFunction * i_function) : iv_chip(i_chip), iv_function(i_function) {}; - PrdfPluginCallResolution & operator=(const PrdfPluginCallResolution & r) + PluginCallResolution & operator=(const PluginCallResolution & r) { iv_chip = r.iv_chip; iv_function = r.iv_function; return *this; } - bool operator==(const PrdfPluginCallResolution & r) + bool operator==(const PluginCallResolution & r) { return (iv_chip == r.iv_chip)&&(iv_function == r.iv_function); } @@ -61,21 +64,14 @@ class PrdfPluginCallResolution : public Resolution return (*iv_function) (iv_chip, - PrdfPluginDef::bindParm<STEP_CODE_DATA_STRUCT&>(i_error) + PluginDef::bindParm<STEP_CODE_DATA_STRUCT&>(i_error) ); //@pw01 }; }; -#endif +} // end namespace PRDF -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ---- -------- -------- ------------------------------- -// iawillia initial creation -// F522283 f300 09/27/05 dgilbert add defaut ctor, operator==, operator= -// pw01 F522638 f300 09/27/05 iawillia Fix possible object strip in bindParm. -// End Change Log ***************************************************** +#endif diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfResolutionList.H b/src/usr/diag/prdf/common/framework/resolution/prdfResolutionList.H index 1436e341b..168346967 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfResolutionList.H +++ b/src/usr/diag/prdf/common/framework/resolution/prdfResolutionList.H @@ -32,16 +32,12 @@ #include<list> -typedef std::list<Resolution *> prdfResolutionList; +namespace PRDF +{ -#define prdfResolution Resolution +typedef std::list<Resolution *> ResolutionList; + +} // end namespace PRDF #endif /* PRDFRESOLUTIONLIST_H */ -// Change Log ***************************************************************** -// -// Flag Reason Vers Date Coder Description -// ---- --------- ----- -------- -------- ------------------------------------ -// dgilbert Initial Creation -// -// End Change Log ************************************************************* diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.C b/src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.C index ced75c0e9..a3abbf2e4 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.C +++ b/src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.C @@ -29,8 +29,6 @@ // Includes //------------------------------------------------------------------------------ -#define prdfResolutionMap_C - #include <string.h> #include <prdfResolutionMap.H> @@ -39,17 +37,17 @@ #include <prdfErrorSignature.H> #include <prdfMain.H> -#undef prdfResolutionMap_C +namespace PRDF +{ //------------------------------------------------------------------------------ -void prdfResolutionMap::Add(uint8_t i_bitPos, - prdfResolution * i_res ) +void ResolutionMap::Add( uint8_t i_bitPos, Resolution * i_res ) { MapList::iterator i = iv_list.begin(); while(i != iv_list.end()) { - if (i->iv_blist == prdfBitKey()) // If empty bit string, skip. + if (i->iv_blist == BitKey()) // If empty bit string, skip. { } else if( (i->iv_res == i_res) || (*(i->iv_res) == *i_res)) @@ -71,8 +69,8 @@ void prdfResolutionMap::Add(uint8_t i_bitPos, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add( uint8_t i_bitPos, prdfResolution * i_r1, - prdfResolution * i_r2 ) +void ResolutionMap::Add( uint8_t i_bitPos, Resolution * i_r1, + Resolution * i_r2 ) { Add(i_bitPos,i_r1); Add(i_bitPos,i_r2); @@ -80,10 +78,10 @@ void prdfResolutionMap::Add( uint8_t i_bitPos, prdfResolution * i_r1, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add(uint8_t i_bitPos, - prdfResolution * i_r1, - prdfResolution * i_r2, - prdfResolution * i_r3) +void ResolutionMap::Add(uint8_t i_bitPos, + Resolution * i_r1, + Resolution * i_r2, + Resolution * i_r3) { Add(i_bitPos,i_r1,i_r2); Add(i_bitPos,i_r3); @@ -91,11 +89,11 @@ void prdfResolutionMap::Add(uint8_t i_bitPos, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add(uint8_t i_bitPos, - prdfResolution * i_r1, - prdfResolution * i_r2, - prdfResolution * i_r3, - prdfResolution * i_r4) +void ResolutionMap::Add(uint8_t i_bitPos, + Resolution * i_r1, + Resolution * i_r2, + Resolution * i_r3, + Resolution * i_r4) { Add(i_bitPos,i_r1,i_r2); Add(i_bitPos,i_r3,i_r4); @@ -103,12 +101,12 @@ void prdfResolutionMap::Add(uint8_t i_bitPos, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add(uint8_t i_bitPos, - prdfResolution * i_r1, - prdfResolution * i_r2, - prdfResolution * i_r3, - prdfResolution * i_r4, - prdfResolution * i_r5) +void ResolutionMap::Add(uint8_t i_bitPos, + Resolution * i_r1, + Resolution * i_r2, + Resolution * i_r3, + Resolution * i_r4, + Resolution * i_r5) { Add(i_bitPos,i_r1,i_r2,i_r3); Add(i_bitPos,i_r4,i_r5); @@ -116,13 +114,13 @@ void prdfResolutionMap::Add(uint8_t i_bitPos, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add(uint8_t i_bitPos, - prdfResolution * i_r1, - prdfResolution * i_r2, - prdfResolution * i_r3, - prdfResolution * i_r4, - prdfResolution * i_r5, - prdfResolution * i_r6) +void ResolutionMap::Add(uint8_t i_bitPos, + Resolution * i_r1, + Resolution * i_r2, + Resolution * i_r3, + Resolution * i_r4, + Resolution * i_r5, + Resolution * i_r6) { Add(i_bitPos,i_r1,i_r2,i_r3); Add(i_bitPos,i_r4,i_r5,i_r6); @@ -130,14 +128,14 @@ void prdfResolutionMap::Add(uint8_t i_bitPos, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add(uint8_t i_bitPos, - prdfResolution * i_r1, - prdfResolution * i_r2, - prdfResolution * i_r3, - prdfResolution * i_r4, - prdfResolution * i_r5, - prdfResolution * i_r6, - prdfResolution * i_r7) +void ResolutionMap::Add(uint8_t i_bitPos, + Resolution * i_r1, + Resolution * i_r2, + Resolution * i_r3, + Resolution * i_r4, + Resolution * i_r5, + Resolution * i_r6, + Resolution * i_r7) { Add(i_bitPos,i_r1,i_r2,i_r3); Add(i_bitPos,i_r4,i_r5,i_r6,i_r7); @@ -145,14 +143,14 @@ void prdfResolutionMap::Add(uint8_t i_bitPos, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add( const uint8_t *i_ble, - uint8_t i_bleLen, - prdfResolution * i_res ) +void ResolutionMap::Add( const uint8_t *i_ble, + uint8_t i_bleLen, + Resolution * i_res ) { MapList::iterator i = iv_list.begin(); while(i != iv_list.end()) { - if ((i->iv_blist == prdfBitKey()) || (0 == i_bleLen)) + if ((i->iv_blist == BitKey()) || (0 == i_bleLen)) { // Empty bit string, skip. } @@ -184,10 +182,10 @@ void prdfResolutionMap::Add( const uint8_t *i_ble, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add(const uint8_t *i_ble, +void ResolutionMap::Add(const uint8_t *i_ble, uint8_t i_bleLen, - prdfResolution * r1, - prdfResolution * r2) + Resolution * r1, + Resolution * r2) { Add(i_ble,i_bleLen,r1); Add(i_ble,i_bleLen,r2); @@ -195,11 +193,11 @@ void prdfResolutionMap::Add(const uint8_t *i_ble, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add(const uint8_t *i_ble, +void ResolutionMap::Add(const uint8_t *i_ble, uint8_t i_bleLen, - prdfResolution * r1, - prdfResolution * r2, - prdfResolution * r3) + Resolution * r1, + Resolution * r2, + Resolution * r3) { Add(i_ble,i_bleLen,r1,r2); Add(i_ble,i_bleLen,r3); @@ -207,12 +205,12 @@ void prdfResolutionMap::Add(const uint8_t *i_ble, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add(const uint8_t *i_ble, +void ResolutionMap::Add(const uint8_t *i_ble, uint8_t i_bleLen, - prdfResolution * r1, - prdfResolution * r2, - prdfResolution * r3, - prdfResolution * r4) + Resolution * r1, + Resolution * r2, + Resolution * r3, + Resolution * r4) { Add(i_ble,i_bleLen,r1,r2); Add(i_ble,i_bleLen,r3,r4); @@ -220,13 +218,13 @@ void prdfResolutionMap::Add(const uint8_t *i_ble, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add(const uint8_t *i_ble, +void ResolutionMap::Add(const uint8_t *i_ble, uint8_t i_bleLen, - prdfResolution * r1, - prdfResolution * r2, - prdfResolution * r3, - prdfResolution * r4, - prdfResolution * r5) + Resolution * r1, + Resolution * r2, + Resolution * r3, + Resolution * r4, + Resolution * r5) { Add(i_ble,i_bleLen,r1,r2); Add(i_ble,i_bleLen,r3,r4,r5); @@ -234,14 +232,14 @@ void prdfResolutionMap::Add(const uint8_t *i_ble, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add(const uint8_t *i_ble, +void ResolutionMap::Add(const uint8_t *i_ble, uint8_t i_bleLen, - prdfResolution * r1, - prdfResolution * r2, - prdfResolution * r3, - prdfResolution * r4, - prdfResolution * r5, - prdfResolution * r6) + Resolution * r1, + Resolution * r2, + Resolution * r3, + Resolution * r4, + Resolution * r5, + Resolution * r6) { Add(i_ble,i_bleLen,r1,r2,r3); Add(i_ble,i_bleLen,r4,r5,r6); @@ -249,11 +247,10 @@ void prdfResolutionMap::Add(const uint8_t *i_ble, //------------------------------------------------------------------------------ -void prdfResolutionMap::LookUp(prdfResolutionList & o_list, - prdfBitKey & io_bitList, - STEP_CODE_DATA_STRUCT & scd) +void ResolutionMap::LookUp( ResolutionList & o_list, + BitKey & io_bitList, + STEP_CODE_DATA_STRUCT & scd ) { - using namespace PRDF; uint32_t lsize = o_list.size(); if(iv_filter != NULL) @@ -299,8 +296,7 @@ void prdfResolutionMap::LookUp(prdfResolutionList & o_list, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add( const char *i_ble, - prdfResolution * res ) +void ResolutionMap::Add( const char *i_ble, Resolution * res ) { uint8_t len = strlen(i_ble); uint8_t * bl = new uint8_t[len]; @@ -312,51 +308,39 @@ void prdfResolutionMap::Add( const char *i_ble, delete [] bl; } -void prdfResolutionMap::Add(const char *i_ble, - prdfResolution * r1, - prdfResolution * r2) +void ResolutionMap::Add( const char *i_ble, + Resolution * r1, Resolution * r2 ) { Add(i_ble,r1); Add(i_ble,r2); } -void prdfResolutionMap::Add(const char *i_ble, - prdfResolution * r1, - prdfResolution * r2, - prdfResolution * r3) +void ResolutionMap::Add( const char *i_ble, + Resolution * r1, Resolution * r2, Resolution * r3 ) { Add(i_ble,r1,r2); Add(i_ble,r3); } -void prdfResolutionMap::Add(const char *i_ble, - prdfResolution * r1, - prdfResolution * r2, - prdfResolution * r3, - prdfResolution * r4) +void ResolutionMap::Add( const char *i_ble, + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4 ) { Add(i_ble,r1,r2); Add(i_ble,r3,r4); } -void prdfResolutionMap::Add(const char *i_ble, - prdfResolution * r1, - prdfResolution * r2, - prdfResolution * r3, - prdfResolution * r4, - prdfResolution * r5) +void ResolutionMap::Add( const char *i_ble, + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4, Resolution * r5 ) { Add(i_ble,r1,r2); Add(i_ble,r3,r4,r5); } -void prdfResolutionMap::Add(const char *i_ble, - prdfResolution * r1, - prdfResolution * r2, - prdfResolution * r3, - prdfResolution * r4, - prdfResolution * r5, - prdfResolution * r6) +void ResolutionMap::Add( const char *i_ble, + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4, Resolution * r5, Resolution * r6 ) { Add(i_ble,r1,r2,r3); @@ -365,17 +349,15 @@ void prdfResolutionMap::Add(const char *i_ble, //------------------------------------------------------------------------------ -void prdfResolutionMap::Add(const char *i_ble, - prdfResolution * r1, - prdfResolution * r2, - prdfResolution * r3, - prdfResolution * r4, - prdfResolution * r5, - prdfResolution * r6, - prdfResolution * r7) +void ResolutionMap::Add( const char *i_ble, + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4, Resolution * r5, Resolution * r6, + Resolution * r7 ) { Add(i_ble,r1,r2,r3); Add(i_ble,r4,r5,r6,r7); } +} // end namespace PRDF + diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.H b/src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.H index 197a5f429..4c83a6fe7 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.H +++ b/src/usr/diag/prdf/common/framework/resolution/prdfResolutionMap.H @@ -24,8 +24,8 @@ /*! /file prdfResolutionMap.H * /brief Map Bit List encodings to Resolutions */ -#ifndef prdfResolutionMap_h -#define prdfResolutionMap_h +#ifndef ResolutionMap_h +#define ResolutionMap_h //-------------------------------------------------------------------- // Includes //-------------------------------------------------------------------- @@ -35,11 +35,14 @@ #include <prdfResolutionList.H> #include <prdfFilters.H> +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- struct STEP_CODE_DATA_STRUCT; //dg04c -//! prdfResolutionMap +//! ResolutionMap /*! This class prvodes mapping of a bitList key to a resolution list @code @@ -58,7 +61,7 @@ struct STEP_CODE_DATA_STRUCT; //dg04c } @endcode */ -class prdfResolutionMap +class ResolutionMap { public: /** @@ -69,12 +72,12 @@ public: @pre None @post Object created & space reserved */ - prdfResolutionMap(int32_t entryCount, prdfResolution &defaultResolution, prdfFilter * i_fltr = NULL); + ResolutionMap(int32_t entryCount, Resolution &defaultResolution, FilterClass * i_fltr = NULL); /* Destructor - compiler default is ok */ - //~prdfprdfResolutionMap(); + //~ResolutionMap(); // DRGDRG - Should we be returning a ResolutionList? or get rid of Default & use no bits on key??? /** @@ -83,13 +86,13 @@ public: @pre None @post None */ - prdfResolution & GetDefault(void) const; + Resolution & GetDefault(void) const; /** Replace the default Resolution @param Reference to new default resolution */ - void ReplaceDefaultWith(prdfResolution & r); + void ReplaceDefaultWith(Resolution & r); /** Add a key,Resolution pair @@ -97,106 +100,107 @@ public: @param 1 to 6 Resolutions */ void Add(uint8_t i_bitPos, - prdfResolution * i_res ); + Resolution * i_res ); void Add(uint8_t i_bitPos, - prdfResolution * i_r1, prdfResolution * i_r2); + Resolution * i_r1, Resolution * i_r2); void Add(uint8_t i_bitPos, - prdfResolution * i_r1, prdfResolution * i_r2, prdfResolution * i_r3); + Resolution * i_r1, Resolution * i_r2, Resolution * i_r3); void Add(uint8_t i_bitPos, - prdfResolution * i_r1, prdfResolution * i_r2, prdfResolution * i_r3, - prdfResolution * i_r4); + Resolution * i_r1, Resolution * i_r2, Resolution * i_r3, + Resolution * i_r4); void Add(uint8_t i_bitPos, - prdfResolution * i_r1, prdfResolution * i_r2, prdfResolution * i_r3, - prdfResolution * i_r4, prdfResolution * i_r5); + Resolution * i_r1, Resolution * i_r2, Resolution * i_r3, + Resolution * i_r4, Resolution * i_r5); void Add(uint8_t i_bitPos, - prdfResolution * i_r1, prdfResolution * i_r2, prdfResolution * i_r3, - prdfResolution * i_r4, prdfResolution * i_r5, prdfResolution * i_r6); + Resolution * i_r1, Resolution * i_r2, Resolution * i_r3, + Resolution * i_r4, Resolution * i_r5, Resolution * i_r6); void Add(uint8_t i_bitPos, - prdfResolution * i_r1, prdfResolution * i_r2, prdfResolution * i_r3, - prdfResolution * i_r4, prdfResolution * i_r5, prdfResolution * i_r6, - prdfResolution * i_r7); + Resolution * i_r1, Resolution * i_r2, Resolution * i_r3, + Resolution * i_r4, Resolution * i_r5, Resolution * i_r6, + Resolution * i_r7); /** - Add a key,prdfResolution pair + Add a key,Resolution pair @param i_ble - bit list encoding (array of bitPos) @param i_bleLen length of bit list - @param 1 to 6 prdfResolutions + @param 1 to 6 Resolutions */ void Add(const uint8_t *i_ble, uint8_t i_bleLen, - prdfResolution * res ); + Resolution * res ); void Add(const uint8_t *i_ble, uint8_t i_bleLen, - prdfResolution * r1, prdfResolution * r2); + Resolution * r1, Resolution * r2); void Add(const uint8_t *i_ble, uint8_t i_bleLen, - prdfResolution * r1, prdfResolution * r2, prdfResolution * r3); + Resolution * r1, Resolution * r2, Resolution * r3); void Add(const uint8_t *i_ble, uint8_t i_bleLen, - prdfResolution * r1, prdfResolution * r2, prdfResolution * r3, - prdfResolution * r4); + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4); void Add(const uint8_t *i_ble, uint8_t i_bleLen, - prdfResolution * r1, prdfResolution * r2, prdfResolution * r3, - prdfResolution * r4, prdfResolution * r5); + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4, Resolution * r5); void Add(const uint8_t *i_ble, uint8_t i_bleLen, - prdfResolution * r1, prdfResolution * r2, prdfResolution * r3, - prdfResolution * r4, prdfResolution * r5, prdfResolution * r6); + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4, Resolution * r5, Resolution * r6); //! Old Add interface /*! */ void Add(const char *i_ble, - prdfResolution * res ); + Resolution * res ); void Add(const char *i_ble, - prdfResolution * r1, prdfResolution * r2); + Resolution * r1, Resolution * r2); void Add(const char *i_ble, - prdfResolution * r1, prdfResolution * r2, prdfResolution * r3); + Resolution * r1, Resolution * r2, Resolution * r3); void Add(const char *i_ble, - prdfResolution * r1, prdfResolution * r2, prdfResolution * r3, - prdfResolution * r4); + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4); void Add(const char *i_ble, - prdfResolution * r1, prdfResolution * r2, prdfResolution * r3, - prdfResolution * r4, prdfResolution * r5); + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4, Resolution * r5); void Add(const char *i_ble, - prdfResolution * r1, prdfResolution * r2, prdfResolution * r3, - prdfResolution * r4, prdfResolution * r5, prdfResolution * r6); + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4, Resolution * r5, Resolution * r6); void Add(const char *i_ble, - prdfResolution * r1, prdfResolution * r2, prdfResolution * r3, - prdfResolution * r4, prdfResolution * r5, prdfResolution * r6, - prdfResolution * r7); + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4, Resolution * r5, Resolution * r6, + Resolution * r7); - void AddRange(const char *i_ble,prdfResolution * res ) { Add(i_ble,res); } - void AddRange(const char *i_ble,prdfResolution * r1, prdfResolution * r2) { Add(i_ble,r1,r2); } + void AddRange(const char *i_ble,Resolution * res ) { Add(i_ble,res); } + void AddRange(const char *i_ble,Resolution * r1, Resolution * r2) { Add(i_ble,r1,r2); } void AddRange(const char *i_ble, - prdfResolution * r1, prdfResolution * r2, prdfResolution * r3) { Add(i_ble,r1,r2,r3); } + Resolution * r1, Resolution * r2, Resolution * r3) { Add(i_ble,r1,r2,r3); } void AddRange(const char *i_ble, - prdfResolution * r1, prdfResolution * r2, prdfResolution * r3, - prdfResolution * r4) { Add(i_ble,r1,r2,r3,r4); } + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4) { Add(i_ble,r1,r2,r3,r4); } void AddRange(const char *i_ble, - prdfResolution * r1, prdfResolution * r2, prdfResolution * r3, - prdfResolution * r4, prdfResolution * r5) { Add(i_ble,r1,r2,r3,r4,r5); } + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4, Resolution * r5) { Add(i_ble,r1,r2,r3,r4,r5); } void AddRange(const char *i_ble, - prdfResolution * r1, prdfResolution * r2, prdfResolution * r3, - prdfResolution * r4, prdfResolution * r5, prdfResolution * r6) { Add(i_ble,r1,r2,r3,r4,r5,r6); } + Resolution * r1, Resolution * r2, Resolution * r3, + Resolution * r4, Resolution * r5, Resolution * r6) { Add(i_ble,r1,r2,r3,r4,r5,r6); } /** - Look up a prdfResolution for a bitlist + Look up a Resolution for a bitlist @param bitList - @returns List of all prdfResolutions that match + @returns List of all Resolutions that match @pre none - @post prdfResolution returned is only valid until the next call to LookUp or this object is destroyed. + @post Resolution returned is only valid until the next call to LookUp or this object is destroyed. i_bitList may be modified - @notes if the bitList does not have a match then the defaultprdfResolution is returned. + @notes if the bitList does not have a match then the defaultResolution is returned. */ - void LookUp(prdfResolutionList & o_list, prdfBitKey & io_bitList, STEP_CODE_DATA_STRUCT & scd); //dg04c + void LookUp( ResolutionList & o_list, BitKey & io_bitList, + STEP_CODE_DATA_STRUCT & scd ); /** * @brief Get the stored filter associated with this resolution map. * @returns Currently assigned filter. */ - prdfFilter * getFilter() { return iv_filter; }; + FilterClass * getFilter() { return iv_filter; }; /** * @brief Store a new filter with this resolution map. * @param i - Filter to store. */ - void setFilter(prdfFilter * i) { iv_filter = i; }; + void setFilter(FilterClass * i) { iv_filter = i; }; protected: // functions @@ -205,54 +209,45 @@ private: // functions /*! Copy prohibited */ - prdfResolutionMap(const prdfResolutionMap &); // Don't allow copy - No defn + ResolutionMap(const ResolutionMap &); // Don't allow copy - No defn /*! Assignment prohibited */ - const prdfResolutionMap &operator=(const prdfResolutionMap &); // Don't allow - no defn + const ResolutionMap &operator=(const ResolutionMap &); // Don't allow - no defn private: // Data struct RmPair { - prdfBitKey iv_blist; - prdfResolution * iv_res; - RmPair(uint8_t i_bitPos, prdfResolution *res) : iv_blist(i_bitPos), iv_res(res) {} + BitKey iv_blist; + Resolution * iv_res; + RmPair(uint8_t i_bitPos, Resolution *res) : iv_blist(i_bitPos), iv_res(res) {} RmPair(void) : iv_blist(), iv_res(NULL) {} }; typedef std::vector<RmPair> MapList; - prdfResolution * defaultRes; - prdfFilter * iv_filter; + Resolution * defaultRes; + FilterClass * iv_filter; MapList iv_list; // MapList iv_rangeList; }; -inline prdfResolutionMap::prdfResolutionMap(int32_t entryCount, - prdfResolution & defaultResolution, - prdfFilter * i_fltr) -: defaultRes(&defaultResolution), iv_filter(i_fltr), iv_list() +inline ResolutionMap::ResolutionMap( int32_t entryCount, + Resolution & defaultResolution, + FilterClass * i_fltr ) : + defaultRes(&defaultResolution), iv_filter(i_fltr), iv_list() { - iv_list.reserve(entryCount); + iv_list.reserve(entryCount); } -inline prdfResolution & prdfResolutionMap::GetDefault(void) const {return *defaultRes; } -inline void prdfResolutionMap::ReplaceDefaultWith(prdfResolution & r) { defaultRes = &r; } +inline Resolution & ResolutionMap::GetDefault(void) const {return *defaultRes; } +inline void ResolutionMap::ReplaceDefaultWith(Resolution & r) { defaultRes = &r; } + +} // end namespace PRDF -#endif /* prdfResolutionMap_h */ +#endif /* ResolutionMap_h */ -// Change Log ************************************************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ------- -------- -------- ------------------------------------------------------- -// v4r1mo 05/02/96 DRG Initial Creation -// D49203.5 v4r3 07/30/97 DRG Add Add() for multiple resolutions -// fips 03/02/04 dgilbert Changes the way lookups are done -// 482244 fips225 11/04/04 dgilbert Add filter -// F544848 f300 04/03/06 iawillia Add multi-bit support for rule code -// dg04 568068 f310 08/29/06 dgilbert Add STEP_CODE_DATA_STRUCT to LookUp -// End Change Log ********************************************************************************* diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.C b/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.C index f89adbbd2..0f59b51a2 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.C +++ b/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.C @@ -45,6 +45,9 @@ // Global Variables //---------------------------------------------------------------------- +namespace PRDF +{ + // This is global varaible for stroring threshold policy instances. // It must be cleared in prdf uninitialize FlyWeight<ThresholdResolution::ThresholdPolicy, 10> g_thresholdPFW; @@ -73,7 +76,6 @@ const ThresholdResolution::ThresholdPolicy ThresholdResolution::cv_pllDefault // Internal Function Prototypes //---------------------------------------------------------------------- - //--------------------------------------------------------------------- // Member Function Specifications //--------------------------------------------------------------------- @@ -132,7 +134,7 @@ ThresholdResolution::ThresholdResolution( uint32_t maskId, int32_t ThresholdResolution::Resolve(STEP_CODE_DATA_STRUCT & error) { int32_t rc = SUCCESS; - PrdTimer curTime = error.service_data->GetTOE(); // get timestamp (Time Of Error) from SDC + Timer curTime = error.service_data->GetTOE(); // get timestamp (Time Of Error) from SDC ++iv_count; error.service_data->SetHits((uint8_t)iv_count); error.service_data->SetThreshold((uint8_t)iv_policy->threshold); @@ -215,7 +217,7 @@ int32_t ThresholdSigResolution::Resolve(STEP_CODE_DATA_STRUCT & error) { int32_t l_rc = SUCCESS; - PrdTimer l_curTime = error.service_data->GetTOE(); + Timer l_curTime = error.service_data->GetTOE(); ErrorSignature l_sig = *error.service_data->GetErrorSignature(); ThresholdCountAndTimer & l_countTime = iv_thresholds[l_sig]; @@ -257,3 +259,5 @@ int32_t ThresholdSigResolution::Resolve(STEP_CODE_DATA_STRUCT & error) return l_rc; } + +} // end namespace PRDF diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.H b/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.H index 9d17a3879..1ea070b94 100755 --- a/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.H +++ b/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.H @@ -33,6 +33,10 @@ // Includes //-------------------------------------------------------------------- +#include <map> + +#include <prdfErrorSignature.H> + #if !defined(iipResolution_h) #include <iipResolution.h> #endif @@ -42,6 +46,9 @@ #include <prdfTimer.H> #endif +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -186,7 +193,7 @@ class ThresholdResolution : public MaskResolution //We take its value from global flyweight which will be freed in prd uninitialise const ThresholdPolicy * iv_policy; uint32_t iv_count; - PrdTimer iv_endTime; + Timer iv_endTime; }; @@ -198,8 +205,6 @@ class ThresholdResolution : public MaskResolution * ThresholdSigResolution class for each policy instead of one * ThresholdResolution for each error for each chip. */ -#include <map> -#include <prdfErrorSignature.H> class ThresholdSigResolution: public Resolution { public: @@ -248,7 +253,7 @@ class ThresholdSigResolution: public Resolution private: // Stores a count/timer pair. - typedef std::pair<uint32_t, PrdTimer> ThresholdCountAndTimer; + typedef std::pair<uint32_t, Timer> ThresholdCountAndTimer; // Policy for this object. // Though this is a pointer, we should never free it in destructor @@ -260,19 +265,7 @@ class ThresholdSigResolution: public Resolution }; +} // end namespace PRDF + #endif /* PRDFTHRESHOLDRESOLUTIONS_H */ -// Change Log ***************************************************************** -// -// Flag Reason Vers Date Coder Description -// ---- ------- ------- -------- -------- ------------------------------------ -// 400647 dgilbert Initial Creation -// wl01 406274 fips 06/27/03 lemmon add support for ThresholdResolution GetCount and ResetCount -// dg02 487035 fips222 12/10/04 dgilbert add operator== to MaskResolution -// 507223 fips310 06/03/05 iawillia Add ThresholdSigResolution -// D515833 fips300 09/19/05 iawillia Use VMap instead of Map. -// F522128 fips300 09/22/05 iawillia Add TwoPerDay policy. -// F523599 fips300 10/11/05 iawillia Add ThirtyThreePerHalfHour policy. -// F548507 fips300 04/21/06 iawillia Add FivePerDay policy. -// zs01 F565934 fips310 08/25/06 zshelle Add SixteenPerDay policy. -// End Change Log ************************************************************* diff --git a/src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.C b/src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.C index dc843396a..fceeb7193 100755 --- a/src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.C +++ b/src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.C @@ -37,6 +37,9 @@ #undef xspprdDumpResolution_C +namespace PRDF +{ + //--------------------------------------------------------------------- // Member Function Specifications //--------------------------------------------------------------------- @@ -53,3 +56,5 @@ int32_t DumpResolution::Resolve(STEP_CODE_DATA_STRUCT & error) return rc; } + +} // end namespace PRDF diff --git a/src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.h b/src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.h index 73400f2d8..caa93156c 100755 --- a/src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.h +++ b/src/usr/diag/prdf/common/framework/resolution/xspprdDumpResolution.h @@ -48,6 +48,9 @@ #include <prdfPlatServices.H> +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -132,6 +135,7 @@ private: // Data TARGETING:: TargetHandle_t iv_pdumpHandle; }; +} // end namespace PRDF #endif /* xspprdDumpResolution_h */ diff --git a/src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.C b/src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.C index 16eb3572f..7549e964b 100755 --- a/src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.C +++ b/src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.C @@ -37,6 +37,9 @@ #undef xspprdFlagResolution_C +namespace PRDF +{ + //--------------------------------------------------------------------- // Member Function Specifications //--------------------------------------------------------------------- @@ -48,10 +51,5 @@ int32_t FlagResolution::Resolve(STEP_CODE_DATA_STRUCT & error) return rc; } -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ---- -------- -------- ------------------------------ -// D49420.9 V5R2 12/04/00 mkobler Initial Creation -// -// End Change Log ***************************************************** +} // end namespace PRDF + diff --git a/src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.h b/src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.h index f1267b994..65f5c8b5b 100755 --- a/src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.h +++ b/src/usr/diag/prdf/common/framework/resolution/xspprdFlagResolution.h @@ -45,6 +45,9 @@ #include <iipServiceDataCollector.h> #endif +namespace PRDF +{ + /** Set a Flag in the Service Data Collector @author Mike Kobler @@ -110,15 +113,7 @@ private: // Data }; +} // end namespace PRDF #endif /* xspprdFlagResolution_h */ -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ---- -------- ------- ------------------------------- -// D49420.9 V5R2 12/04/00 mkobler Initial Creation -// f522283 300 09/27/05 dgilbert make FlyWeight-able -// D608564 f310 05/18/07 dgilbert add operator==() to fix mem leak -// -// End Change Log ***************************************************** diff --git a/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.C b/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.C index 88ea83333..8d6baed85 100755 --- a/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.C +++ b/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.C @@ -60,16 +60,14 @@ // Member Function Specifications //--------------------------------------------------------------------- +namespace PRDF +{ + int32_t GardResolution::Resolve(STEP_CODE_DATA_STRUCT & error) { error.service_data->Gard(xErrorType); return SUCCESS; } -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ---- -------- -------- ------------------------------ -// DGILBERT Initial Creation -// -// End Change Log ***************************************************** +} // end namespace PRDF + diff --git a/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.h b/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.h index 4c1462f9a..74546aecc 100755 --- a/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.h +++ b/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.h @@ -43,6 +43,9 @@ #include <iipResolution.h> #endif +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -125,17 +128,7 @@ private: // Data }; +} // end namespace PRDF #endif /* xspprdGardResolution_h */ -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- -------- ---- -------- ----- ------------------------------- -// 02/18/99 DRG Initial Creation -// D49420.8 v5r2 12/05/00 mak Change to use PRDcallout -// 05/18/07 drg add operator==() to prevent memory leak -// mp01 D672610 f320 08/28/08 plute Add CheckStopOnlyGard -// mp02 f710 08/06/08 plute Add DeconfigNoGard -// -// End Change Log ***************************************************** diff --git a/src/usr/diag/prdf/common/framework/resolution/xspprdTryResolution.h b/src/usr/diag/prdf/common/framework/resolution/xspprdTryResolution.h index 2dcf9cffc..753149ed8 100755 --- a/src/usr/diag/prdf/common/framework/resolution/xspprdTryResolution.h +++ b/src/usr/diag/prdf/common/framework/resolution/xspprdTryResolution.h @@ -42,6 +42,9 @@ #include <iipResolution.h> #endif +namespace PRDF +{ + //-------------------------------------------------------------------- // Forward References //-------------------------------------------------------------------- @@ -121,14 +124,7 @@ inline TryResolution::TryResolution() : xTryResolution(NULL), xDefaultResolution(NULL) {} +} // end namespace PRDF #endif /* xspprdTryResolution_h */ -// Change Log ********************************************************* -// -// Flag Reason Vers Date Coder Description -// ---- --------- ---- -------- -------- ------------------------------- -// d49274.xx v4r5 12/28/99 dgilbert Initial Creation -// f522283 300 09/27/05 dgilbert Make flyweight-able -// -// End Change Log ***************************************************** |
