PRD: cleaned getConnected() and systemPtr->GetChip()

Change-Id: I87a3d3ee0a8e9f674890191857883aee61d6f303
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4370
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Tested-by: Jenkins Server
Squashed: I85a11aa02f63e4ad43bca1d69b94e1a69bf37fa9
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4514

3 files changed, 36 insertions, 48 deletions

diff --git a/src/usr/diag/prdf/common/framework/resolution/iipResolution.C b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C
index a1248bc4f..2aa11b790 100755
--- a/src/usr/diag/prdf/common/framework/resolution/iipResolution.C
+++ b/src/usr/diag/prdf/common/framework/resolution/iipResolution.C
@@ -58,6 +58,8 @@
 namespace PRDF
 {
 
+using namespace PlatServices;
+
 //----------------------------------------------------------------------
 //  User Types
 //----------------------------------------------------------------------
@@ -226,47 +228,44 @@ int32_t CalloutConnected::Resolve( STEP_CODE_DATA_STRUCT & io_serviceData )
 {
     using namespace TARGETING;
 
-    TargetHandle_t l_pconnectedTarget = NULL;
-    TARGETING::TargetHandle_t l_psourceTarget =
-                            ServiceDataCollector::getTargetAnalyzed( ) ;
-    TargetHandleList l_connectedTargetList;
-    l_connectedTargetList = PlatServices::getConnected( l_psourceTarget,
-                                                        iv_targetType );
-    if( 0xffffffff == iv_idx )
+    TargetHandle_t sourceTrgt = ServiceDataCollector::getTargetAnalyzed();
+    TargetHandle_t connTrgt   = NULL;
+
+    TargetHandleList list = getConnected( sourceTrgt, iv_targetType );
+
+    if ( 0xffffffff == iv_idx )
     {
-        if( l_connectedTargetList.size()>0 )
-        {
-            l_pconnectedTarget = l_connectedTargetList[0];
-        }
+        if ( 0 < list.size() )
+            connTrgt = list[0];
     }
     else
     {
-        for( TargetHandleList::iterator itrTarget =
-            l_connectedTargetList.begin();
-            itrTarget!= l_connectedTargetList.end();itrTarget++ )
+        for (TargetHandleList::iterator i = list.begin(); i != list.end(); i++)
         {
-            if( iv_idx == PlatServices::getTargetPosition( *itrTarget ) )
+            if ( iv_idx == getTargetPosition(*i) )
             {
-                l_pconnectedTarget = *itrTarget ;
+                connTrgt = *i;
                 break;
             }
         }
     }
 
-    if ( l_pconnectedTarget != NULL )
+    if ( NULL != connTrgt )
     {
-        io_serviceData.service_data->SetCallout( l_pconnectedTarget,
-                                                 iv_priority );
+        io_serviceData.service_data->SetCallout( connTrgt, iv_priority );
     }
     else
     {
-        if(iv_altResolution != NULL)
+        if ( NULL != iv_altResolution )
         {
             iv_altResolution->Resolve( io_serviceData );
         }
         else
         {
-            io_serviceData.service_data->SetCallout( l_psourceTarget );
+            PRDF_ERR( "[CalloutConnected::Resolve] No connected chip found: "
+                      "sourceTrgt=0x%08x iv_targetType=0x%x",
+                      getHuid(sourceTrgt), iv_targetType );
+            io_serviceData.service_data->SetCallout( sourceTrgt );
         }
     }
 
@@ -280,49 +279,38 @@ int32_t AnalyzeConnected::Resolve( STEP_CODE_DATA_STRUCT & io_serviceData )
 {
     using namespace TARGETING;
 
-    CHIP_CLASS * l_connChipObj = NULL;
-    TARGETING::TargetHandle_t l_pconnChipTarget = NULL;
-    TARGETING::TargetHandle_t l_psourceHandle =
-                            ServiceDataCollector::getTargetAnalyzed( ) ;
-    // Get connected list.
-    TargetHandleList l_connectedTargetList = PlatServices::getConnected(
-                                                            l_psourceHandle,
-                                                            iv_targetType );
+    TargetHandle_t sourceTrgt = ServiceDataCollector::getTargetAnalyzed();
+    TargetHandle_t connTrgt   = NULL;
+
+    TargetHandleList list = getConnected( sourceTrgt, iv_targetType );
 
-    // If ID = 0xffffffff, find first valid.
     if ( 0xffffffff == iv_idx )
     {
-        if( l_connectedTargetList.size()>0 )
-        {
-            //First valid handle. we don't allow invalid things in list
-            l_pconnChipTarget = l_connectedTargetList[0] ;
-        }
+        if ( 0 < list.size() )
+            connTrgt = list[0];
     }
-    // Otherwise, grab from correct index.
     else
     {
-        for( TargetHandleList::iterator itrTarget =
-            l_connectedTargetList.begin();
-            itrTarget!= l_connectedTargetList.end();itrTarget++ )
+        for (TargetHandleList::iterator i = list.begin(); i != list.end(); i++)
         {
-            if( iv_idx == PlatServices::getTargetPosition( *itrTarget ) )
+            if ( iv_idx == getTargetPosition(*i) )
             {
-                l_pconnChipTarget = *itrTarget ;
+                connTrgt = *i;
                 break;
-
             }
         }
     }
 
     // If valid chip found, look up in global system container.
-    if ( NULL != l_pconnChipTarget )
+    CHIP_CLASS * connChip = NULL;
+    if ( NULL != connTrgt )
     {
-        l_connChipObj = systemPtr->GetChip( l_pconnChipTarget );
+        connChip = systemPtr->GetChip( connTrgt );
     }
 
     // Analyze chip.
-    if (NULL != l_connChipObj)
-        return l_connChipObj->Analyze( io_serviceData,
+    if ( NULL != connChip )
+        return connChip->Analyze( io_serviceData,
                         io_serviceData.service_data->GetCauseAttentionType() );
     else
         return PRD_UNRESOLVED_CHIP_CONNECTION;
diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfAnalyzeConnected.H b/src/usr/diag/prdf/common/framework/resolution/prdfAnalyzeConnected.H
index 607a3bfe4..f994cb809 100755
--- a/src/usr/diag/prdf/common/framework/resolution/prdfAnalyzeConnected.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfAnalyzeConnected.H
@@ -78,7 +78,7 @@ public:
    *            analyze func.
    * @param[io] io_service_data Refernce to STEP_CODE_DATA_STRUCT
    * @return    SUCCESS | non-zero if chip not found.
-   * @note      if the call to getConnected yeilds NULL  than the
+   * @note      if the call to getConnected yields NULL  than the
    *            altResolution is called. If the altResolution is NULL than the
    *            source is added to the callout list.
    */
diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfCalloutConnected.H b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutConnected.H
index 8535ea0a1..4b8173687 100755
--- a/src/usr/diag/prdf/common/framework/resolution/prdfCalloutConnected.H
+++ b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutConnected.H
@@ -94,7 +94,7 @@ public:
    * @param[io] io_service_data  Reference to STEP_CODE_DATA_STRUCT
    * @post      service_data is complete
    * @return    SUCCESS | non-zero
-   * @note      if the call to getConnected yeilds an invalid  target then
+   * @note      if the call to getConnected yields an invalid  target then
    *            altResolution is called. If the altResolution is NULL than the
    *            source is added to the callout list.
    */