PRD: removed obsolete FLOODING code

Change-Id: I0faa48c0c43a864d9047c2e7f6068067de0a12d5
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/12399
Tested-by: Jenkins Server
Reviewed-by: Prem Shanker Jha <premjha2@in.ibm.com>
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13424

9 files changed, 21 insertions, 127 deletions

diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolution.C b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C
index 7eda29f73..3808b5759 100755
--- a/src/usr/diag/prdf/common/framework/resolution/iipResolution.C
+++ b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 1996,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -151,24 +153,6 @@ int32_t ResolutionList::Resolve( STEP_CODE_DATA_STRUCT & io_serviceData )
 }
 
 //--------------------------------------------------------------------
-// ThresholdResolution Member Functions
-//--------------------------------------------------------------------
-
-//int32_t ThresholdResolution::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
-//  }
-//  int32_t rc = SUCCESS;
-//  if(xRes != NULL) rc = xRes->Resolve(error);
-//  return rc;
-//}
-
-//--------------------------------------------------------------------
 // Call all chips raising attention as reported by sp sysdebug area
 //--------------------------------------------------------------------
 int32_t CallAttnResolution::Resolve( STEP_CODE_DATA_STRUCT & io_serviceData )
diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.C b/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.C
index fa775f3fe..35a224f03 100755
--- a/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.C
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfThresholdResolutions.C
@@ -143,8 +143,7 @@ int32_t ThresholdResolution::Resolve(STEP_CODE_DATA_STRUCT & error)
   if (iv_count == 1)                                  // Interval begins at the 1st occurrence
   {
     iv_endTime = curTime + iv_policy->interval;       // Project the end of interval (in sec)
-    if((iv_count == iv_policy->threshold) ||
-            (error.service_data->IsFlooding()))       // We've hit threshold within the interval
+    if ( iv_count == iv_policy->threshold )
     {
       error.service_data->SetThresholdMaskId(iv_maskId);  // threshold, degraded YES
       iv_count = 0;                                       // Reset the counter on threshold
@@ -158,8 +157,7 @@ int32_t ThresholdResolution::Resolve(STEP_CODE_DATA_STRUCT & error)
         error.service_data->SetHits((uint8_t)iv_count); // pw01
         iv_endTime = curTime + iv_policy->interval;     // Project the new end of interval
     }
-    else if((iv_count == iv_policy->threshold) ||
-            (error.service_data->IsFlooding()))       // We've hit threshold within the interval
+    else if ( iv_count == iv_policy->threshold )
     {
       error.service_data->SetThresholdMaskId(iv_maskId);  // threshold, degraded YES
       iv_count = 0;                                       // Reset the counter on threshold
@@ -232,8 +230,7 @@ int32_t ThresholdSigResolution::Resolve(STEP_CODE_DATA_STRUCT & error)
     if (1 == l_count) // first time: set end timer.
     {
         l_countTime.second = l_curTime + iv_policy->interval;
-        if ((l_countTime.first == iv_policy->threshold) ||
-                 (error.service_data->IsFlooding()))
+        if ( l_countTime.first == iv_policy->threshold )
         {
             // set overthreshold flag / maskid, clear count.
             error.service_data->SetThresholdMaskId(l_sig.getSigId());
@@ -249,8 +246,7 @@ int32_t ThresholdSigResolution::Resolve(STEP_CODE_DATA_STRUCT & error)
             l_countTime.second = l_curTime + iv_policy->interval;
         }
         // Check over threshold and under time interval.
-        else if ((l_countTime.first == iv_policy->threshold) ||
-                 (error.service_data->IsFlooding()))
+        else if ( l_countTime.first == iv_policy->threshold )
         {
             // set overthreshold flag / maskid, clear count.
             error.service_data->SetThresholdMaskId(l_sig.getSigId());
diff --git a/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h b/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h
index 6eecfadb9..94d410ace 100755
--- a/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h
+++ b/src/usr/diag/prdf/common/framework/service/iipServiceDataCollector.h
@@ -134,7 +134,6 @@ public:
     PRDF_SDC_FLAG(TRACKIT,                 0x00010)
     PRDF_SDC_FLAG(TERMINATE,               0x00008)
     PRDF_SDC_FLAG(LOGIT,                   0x00004)
-    PRDF_SDC_FLAG(FLOODING,                0x00001)
   PRDF_SDC_FLAGS_MAP_END
 
    /** Defines Analysis pass related properties.
@@ -555,30 +554,6 @@ public:
    */
   uint8_t GetThreshold(void) const { return threshold; }
 
-  /**
-   Indicate that PRD is being called faster than SP can send error logs
-   <ul>
-   <br><b>Parameters:  </b> None.
-   <br><b>Returns:     </b> None.
-   <br><b>Requirements:</b> None.
-   <br><b>Promises:    </b> IsFlooding() == true
-   <br><b>Exceptions:  </b> None.
-   </ul><br>
-   */
-  void SetFlooding(void) { flags |= FLOODING; }
-
-  /**
-   Query for flooding
-   <ul>
-   <br><b>Parameters:  </b> None.
-   <br><b>Returns:     </b> [true | false]
-   <br><b>Requirements:</b> None.
-   <br><b>Promises:    </b> None.
-   <br><b>Exceptions:  </b> None.
-   </ul><br>
-   */
-  bool IsFlooding(void) const { return (flags & FLOODING)!=0 ? true:false; }
-
     /**
      * @brief returns true if code is in isolation only pass.
      */
diff --git a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
index efc9376fc..f60a6c9fa 100644
--- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
@@ -23,7 +23,7 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 
-/** @file  prdfRasServices_common.H
+/** @file  prdfRasServices_common.C
  *  @brief Utility code to parse an SDC and produce the appropriate error log.
  */
 
@@ -147,18 +147,6 @@ void RasServices::SetErrorTod(ATTENTION_TYPE the_attention,
 
 //------------------------------------------------------------------------------
 
-bool ErrDataService::QueryLoggingBufferFull(void) const
-{
-    return (loggingBufferFull);
-}
-
-bool RasServices::QueryLoggingBufferFull(void) const
-{
-    return iv_ErrDataService->QueryLoggingBufferFull();
-}
-
-//------------------------------------------------------------------------------
-
 void ErrDataService ::SaveRcForSrc(int32_t the_rc)
 {
     savedPrdReturnCode = the_rc;
@@ -934,7 +922,6 @@ void ErrDataService::initPfaData( ServiceDataCollector & i_sdc,
     o_pfa.TRACKIT             = i_sdc.IsMfgTracking()   ? 1 : 0;
     o_pfa.TERMINATE           = i_sdc.Terminate()       ? 1 : 0;
     o_pfa.LOGIT               = i_sdc.IsLogging()       ? 1 : 0;
-    o_pfa.FLOODING            = i_sdc.IsFlooding()      ? 1 : 0;
     o_pfa.UNIT_CHECKSTOP      = i_sdc.IsUnitCS()        ? 1 : 0;
     o_pfa.LAST_CORE_TERMINATE = 0; // Will be set later, if needed.
     o_pfa.USING_SAVED_SDC     = i_sdc.IsUsingSavedSdc() ? 1 : 0;
@@ -1087,7 +1074,6 @@ void ErrDataService::printDebugTraces( )
     if( sdc.IsMfgTracking() ) PRDF_DTRAC( "PRDTRACE: Track this error" );
     if( sdc.Terminate() )     PRDF_DTRAC( "PRDTRACE: BRING DOWN MACHINE" );
     if( sdc.IsLogging() )     PRDF_DTRAC( "PRDTRACE: Create history log entry");
-    if( sdc.IsFlooding() )    PRDF_DTRAC( "PRDTRACE: Flooding detected" );
 
     #undef PRDF_FUNC
 
diff --git a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.H b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.H
index 913561986..14f561966 100644
--- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.H
+++ b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.H
@@ -35,10 +35,6 @@
 #include <iipServiceDataCollector.h>
 #include <prdfPfa5Data.h>
 
-#ifndef __HOSTBOOT_MODULE
-  #include <tmgt.H>
-#endif
-
 namespace PRDF
 {
 
@@ -62,7 +58,6 @@ class ErrDataService
      * @brief ctor
      */
     inline ErrDataService() :
-        loggingBufferFull(false),
         iv_serviceActionCounter(0),
         savedPrdReturnCode(0),
         iv_errl(NULL)
@@ -111,14 +106,6 @@ class ErrDataService
                               ServiceDataCollector & sdc );
 
     /**
-      @brief Query if logging buffer full - indicates attention flooding
-      @return [true | false]
-      @pre None.
-      @post None.
-      */
-    virtual bool QueryLoggingBufferFull(void) const;
-
-    /**
       @brief Save a return code for inclusion in the SRC (something failed)
       @param[in] a return code
       @return none.
@@ -298,8 +285,6 @@ class ErrDataService
 
   private:
 
-    bool loggingBufferFull;
-
     uint32_t iv_serviceActionCounter;
 
     int32_t savedPrdReturnCode;
@@ -352,15 +337,6 @@ public:
                             ServiceDataCollector & sdc );
 
   /**
-   @brief Query if logging buffer full - indicates attention flooding
-   @param none.
-   @return [true | false]
-   @pre None.
-   @post None.
-   */
-  virtual bool QueryLoggingBufferFull(void) const;
-
-  /**
    @brief Save a return code for inclusion in the SRC (something failed)
    @param[in] a return code
    @return none.
diff --git a/src/usr/diag/prdf/common/framework/service/xspprdService.h b/src/usr/diag/prdf/common/framework/service/xspprdService.h
index b2119f378..6513a5b6f 100755
--- a/src/usr/diag/prdf/common/framework/service/xspprdService.h
+++ b/src/usr/diag/prdf/common/framework/service/xspprdService.h
@@ -33,11 +33,6 @@
 //  ServiceGenerator serv_generator
 //  ATTENTION_TYPE attentionType = MACHINE_CHECK;  (see iipsdbug.h)
 //
-//
-//  ///// Query for flooding condition
-//  if(serv_generator.QueryLoggingBufferFull())
-//  {  WE ARE FLOODING.... mask errors }
-//
 //  ///// Save a bad return code to be in th SRC
 //  serv_generator.SaveRcForSrc((int32_t)analyzeRc);
 //
@@ -141,17 +136,6 @@ public:
                             ServiceDataCollector & sdc)=0;
 
   /**
-   Query if logging buffer full - indicates attention flooding
-   <ul>
-   <br><b>Parameters:  </b> none.
-   <br><b>Returns:     </b> [true | false]
-   <br><b>Requirements:</b> None.
-   <br><b>Promises:    </b> None.
-   </ul><br>
-   */
-  virtual bool QueryLoggingBufferFull(void) const=0;
-
-  /**
    Save a return code for inclusion in the SRC (something failed)
    <ul>
    <br><b>Parameters:  </b> a return code
diff --git a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
index 05ac519f9..20471ff5c 100644
--- a/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
+++ b/src/usr/diag/prdf/common/plugins/prdfLogParse_common.C
@@ -477,7 +477,6 @@ bool parsePfaData( void * i_buffer, uint32_t i_buflen,
         i_parser.PrintBool("  TRACKIT",                pfa.TRACKIT            );
         i_parser.PrintBool("  TERMINATE",              pfa.TERMINATE          );
         i_parser.PrintBool("  LOGIT",                  pfa.LOGIT              );
-        i_parser.PrintBool("  FLOODING",               pfa.FLOODING           );
         i_parser.PrintBool("  Unit CS",                pfa.UNIT_CHECKSTOP     );
         i_parser.PrintBool("  Using Sync'd Saved Sdc", pfa.USING_SAVED_SDC    );
         i_parser.PrintBool("  Last Core Termination",  pfa.LAST_CORE_TERMINATE);
diff --git a/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h b/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h
index c8376cc17..196647d4c 100644
--- a/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h
+++ b/src/usr/diag/prdf/common/plugins/prdfPfa5Data.h
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2003,2014              */
+/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -156,12 +158,11 @@ struct PfaData
              TRACKIT              :1,
              TERMINATE            :1,
              LOGIT                :1,
-             FLOODING             :1,
              UNIT_CHECKSTOP       :1,
              USING_SAVED_SDC      :1,
              LAST_CORE_TERMINATE  :1,
              DEFER_DECONFIG       :1,
-             Reserved             :18;
+             Reserved             :19;
 
     // Thresholding
     uint32_t errorCount :16, // Number of occurrences of this attention
@@ -206,12 +207,11 @@ struct PfaData
                     (i_right.TRACKIT              << 25) |
                     (i_right.TERMINATE            << 24) |
                     (i_right.LOGIT                << 23) |
-                    (i_right.FLOODING             << 22) |
-                    // FYI, a deprecated entry was removed. To make the parser
-                    // compatible with older or newer error logs, this bit must
-                    // remain a hole (i.e. it can be reused, but subsequent data
-                    // must remain in the bit positions that they are currently
-                    // in).
+                    // FYI, two deprecated entries were removed. To make the
+                    // parser compatible with older or newer error logs, these
+                    // bits must remain a hole (i.e. it can be reused, but
+                    // subsequent data must remain in the bit positions that
+                    // they are currently in).
                     (i_right.UNIT_CHECKSTOP       << 20) |
                     (i_right.USING_SAVED_SDC      << 19) |
                     (i_right.LAST_CORE_TERMINATE  << 18) |
@@ -260,11 +260,10 @@ struct PfaData
         i_right.TRACKIT             = (l_tmp[2] >> 25) & 0x01;
         i_right.TERMINATE           = (l_tmp[2] >> 24) & 0x01;
         i_right.LOGIT               = (l_tmp[2] >> 23) & 0x01;
-        i_right.FLOODING            = (l_tmp[2] >> 22) & 0x01;
-        // FYI, a deprecated entry was removed. To make the parser compatible
-        // with older or newer error logs, this bit must remain a hole (i.e. it
-        // can be reused, but subsequent data must remain in the bit positions
-        // that they are currently in).
+        // FYI, two deprecated entries were removed. To make the parser
+        // compatible with older or newer error logs, these bits must remain a
+        // hole (i.e. it can be reused, but subsequent data must remain in the
+        // bit positions that they are currently in).
         i_right.UNIT_CHECKSTOP      = (l_tmp[2] >> 20) & 0x01;
         i_right.USING_SAVED_SDC     = (l_tmp[2] >> 19) & 0x01;
         i_right.LAST_CORE_TERMINATE = (l_tmp[2] >> 18) & 0x01;
diff --git a/src/usr/diag/prdf/common/prdfMain_common.C b/src/usr/diag/prdf/common/prdfMain_common.C
index 1546316af..d375c2b9d 100755
--- a/src/usr/diag/prdf/common/prdfMain_common.C
+++ b/src/usr/diag/prdf/common/prdfMain_common.C
@@ -250,11 +250,6 @@ errlHndl_t main( ATTENTION_VALUE_TYPE i_attentionType,
         // capture time of day
         serviceGenerator.SetErrorTod( i_attentionType, serviceData );
 
-        if(serviceGenerator.QueryLoggingBufferFull())
-        {
-            serviceData.SetFlooding();
-        }
-
         int32_t analyzeRc = systemPtr->Analyze(sdc, i_attentionType);
         // flush Cache to free up the memory
         RegDataCache::getCachedRegisters().flush();