change path.dump() calls to trace HUID

also, some other general cleanup
 - replace loop counters with iterators
 - made more code consistant
 - fixed bug where errl wasn't getting committed

Change-Id: I7acdda17b1b116675ce84de8c22f87395e0fee91
RTC: 59413
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2949
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 51 insertions, 23 deletions

diff --git a/src/usr/hwpf/hwp/start_payload/start_payload.C b/src/usr/hwpf/hwp/start_payload/start_payload.C
index 4b62e5243..544499b21 100644
--- a/src/usr/hwpf/hwp/start_payload/start_payload.C
+++ b/src/usr/hwpf/hwp/start_payload/start_payload.C
@@ -1,26 +1,25 @@
-/*  IBM_PROLOG_BEGIN_TAG
- *  This is an automatically generated prolog.
- *
- *  $Source: src/usr/hwpf/hwp/start_payload/start_payload.C $
- *
- *  IBM CONFIDENTIAL
- *
- *  COPYRIGHT International Business Machines Corp. 2012
- *
- *  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 other-
- *  wise divested of its trade secrets, irrespective of what has
- *  been deposited with the U.S. Copyright Office.
- *
- *  Origin: 30
- *
- *  IBM_PROLOG_END_TAG
- */
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/hwpf/hwp/start_payload/start_payload.C $              */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* COPYRIGHT International Business Machines Corp. 2012,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 start_payload.C
  *
@@ -136,6 +135,13 @@ void*    call_host_runtime_setup( void    *io_pArgs )
 
         // Write the HostServices attributes into mainstore
         l_err = RUNTIME::populate_attributes();
+        if ( l_err )
+        {
+            TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+                    "Could not populate attributes" );
+            // break from do loop if error occured
+            break;
+        }
 
         //  - Update HDAT with tpmd logs
 
@@ -146,6 +152,17 @@ void*    call_host_runtime_setup( void    *io_pArgs )
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                 "istep start_payload_failed see plid 0x%x", l_err->plid());
 
+        /*@
+         * @errortype
+         * @reasoncode  ISTEP_START_PAYLOAD_FAILED
+         * @severity    ERRORLOG::ERRL_SEV_UNRECOVERABLE
+         * @moduleid    ISTEP_HOST_RUNTIME_SETUP
+         * @userdata1   bytes 0-1: plid identifying first error
+         *              bytes 2-3: reason code of first error
+         * @userdata2   bytes 0-1: total number of elogs included
+         *              bytes 2-3: N/A
+         * @devdesc     host_runtime_setup failed
+         */
         l_StepError.addErrorDetails(ISTEP_START_PAYLOAD_FAILED,
                 ISTEP_HOST_RUNTIME_SETUP, l_err );
 
@@ -213,6 +230,17 @@ void*    call_host_start_payload( void    *io_pArgs )
         TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                 "istep start_payload_failed see plid 0x%x", l_errl->plid());
 
+        /*@
+         * @errortype
+         * @reasoncode  ISTEP_START_PAYLOAD_FAILED
+         * @severity    ERRORLOG::ERRL_SEV_UNRECOVERABLE
+         * @moduleid    ISTEP_HOST_START_PAYLOAD
+         * @userdata1   bytes 0-1: plid identifying first error
+         *              bytes 2-3: reason code of first error
+         * @userdata2   bytes 0-1: total number of elogs included
+         *              bytes 2-3: N/A
+         * @devdesc     host_start_payload failed
+         */
         l_StepError.addErrorDetails(ISTEP_START_PAYLOAD_FAILED,
                                     ISTEP_HOST_START_PAYLOAD, l_errl );