diff options
Diffstat (limited to 'src/usr/diag/prdf/common/framework/resolution')
4 files changed, 6 insertions, 83 deletions
diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.C b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.C index 4ce761867..10d0de2e2 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.C +++ b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.C @@ -251,7 +251,7 @@ Resolution & ResolutionFactory::GetDumpResolution( } #endif -Resolution & ResolutionFactory::GetGardResolution(GardResolution::ErrorType et) +Resolution & ResolutionFactory::GetGardResolution(GardAction::ErrorType et) { return iv_gardResolutionFW.get(GardResolution(et)); } diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h index 980b9dbbc..8d883ccba 100755 --- a/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h +++ b/src/usr/diag/prdf/common/framework/resolution/iipResolutionFactory.h @@ -240,7 +240,7 @@ public: * @return reference to a resolution * @post only one instance of this object with this param will exist */ - Resolution & GetGardResolution( GardResolution::ErrorType i_gardErrorType ); + Resolution & GetGardResolution( GardAction::ErrorType i_gardErrorType ); // dg06a - end diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfCalloutsData.H b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutsData.H deleted file mode 100644 index f85f6eb3d..000000000 --- a/src/usr/diag/prdf/common/framework/resolution/prdfCalloutsData.H +++ /dev/null @@ -1,52 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/diag/prdf/common/framework/resolution/prdfCalloutsData.H $ */ -/* */ -/* IBM CONFIDENTIAL */ -/* */ -/* COPYRIGHT International Business Machines Corp. 2013 */ -/* */ -/* p1 */ -/* */ -/* Object Code Only (OCO) source materials */ -/* Licensed Internal Code Source Materials */ -/* IBM HostBoot Licensed Internal Code */ -/* */ -/* The source code for this program is not published or otherwise */ -/* divested of its trade secrets, irrespective of what has been */ -/* deposited with the U.S. Copyright Office. */ -/* */ -/* Origin: 30 */ -/* */ -/* IBM_PROLOG_END_TAG */ - -/** @file prdfCalloutsData.H - * @brief This is specifically designed to be included in both functional and - * error log parsing code (i.e. must be able to compile in PPC and - * x86.nfp contexts). - */ - -#ifndef __prdfCalloutsData_H -#define __prdfCalloutsData_H - -namespace PRDF -{ - -namespace PRDcalloutData -{ - -enum MruType -{ - TYPE_NONE, - TYPE_TARGET, - TYPE_MEMMRU, - TYPE_SYMFRU, -}; - -} // end namespace PRDcalloutData - -} // end namespace PRDF - -#endif // __prdfCalloutsData_H - diff --git a/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.h b/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.h index 05750444b..f10b7fb39 100755 --- a/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.h +++ b/src/usr/diag/prdf/common/framework/resolution/xspprdGardResolution.h @@ -40,6 +40,7 @@ //-------------------------------------------------------------------- #include <iipResolution.h> +#include <prdfGardType.H> namespace PRDF { @@ -55,38 +56,12 @@ class GardResolution : public Resolution { public: - enum ErrorType - { - // No Gard is possible - NoGard = 0, - // Recovered error at threshold - Predictive = 1, - // Checkstop, failing resources can be removed to prevent future occurances - Fatal = 2, - // This is NoGard unless attn type is CheckStop, then it is Fatal (Func) - CheckStopOnlyGard = 3, - //This is to allow Deferred Deconfig, with No Garding - DeconfigNoGard = 4 - }; - - inline static const char* ToString( uint32_t i_type ) - { - switch (i_type) - { - case NoGard: return "NoGard"; - case Predictive: return "Predictive"; - case Fatal: return "Fatal"; - case CheckStopOnlyGard: return "CheckStopOnlyGard"; - case DeconfigNoGard: return "DeconfigNoGard"; - default: return "Undefined"; - } - } - /** * @brief Constructor * @param[in] i_et error type */ - GardResolution( ErrorType i_et = NoGard ) : xErrorType( i_et ) + GardResolution( GardAction::ErrorType i_et = GardAction::NoGard ) + : xErrorType( i_et ) { } /* @@ -117,7 +92,7 @@ public: private: // functions private: // Data - ErrorType xErrorType; + GardAction::ErrorType xErrorType; }; |
