From 0fb4ee347957ceb2b58a200551fe6cf2cc212e74 Mon Sep 17 00:00:00 2001
From: "Richard J. Knight" <rjknight@us.ibm.com>
Date: Tue, 16 Oct 2012 00:13:25 -0500
Subject: Return error when procedures fail during istep

Change-Id: I65686d261583ea84c7908f819071bd751fdb0e06
RTC: 39876
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1627
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: Paul Nguyen <nguyenp@us.ibm.com>
Reviewed-by: Mark W. Wenning <wenning@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
---
 src/build/tools/genIStep.pl | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/build/tools/genIStep.pl')

diff --git a/src/build/tools/genIStep.pl b/src/build/tools/genIStep.pl
index 9e1c362b0..f3490432b 100755
--- a/src/build/tools/genIStep.pl
+++ b/src/build/tools/genIStep.pl
@@ -329,6 +329,8 @@ my  $templateCFileHdr   =
 #include    <fapi.H>
 #include    <fapiPlatHwpInvoker.H>
 
+#include    <hwpisteperror.H>
+
 #include    \"\@istepname.H\"
 
 //  Uncomment these files as they become available:
@@ -345,6 +347,7 @@ namespace   \@\@istepname
 {
 
 using   namespace   TARGETING;
+using   namespace   ISTEP_ERROR;
 using   namespace   fapi;
 ";
 #####   end templateCFileNSHdr    #####################################
@@ -361,12 +364,14 @@ my $templateCFileSubStep =
 //
 void*    call_\@substepname( void    *io_pArgs )
 {
-    errlHndl_t  l_errl  =   NULL;
+
+    IStepError  l_StepError;
 
     TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
                \"call_\@substepname entry\" );
 
 #if 0
+    errlHndl_t  l_errl  =   NULL;
     // \@\@\@\@\@    CUSTOM BLOCK:   \@\@\@\@\@
     //  figure out what targets we need
     //  customize any other inputs
@@ -390,6 +395,9 @@ void*    call_\@substepname( void    *io_pArgs )
         TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
                   \"ERROR : \@substepname, errorlog PLID=0x%x\",
                   lerrl->plid()  );
+
+        l_StepError.addErrorDetails( __REASON_CODE__, __MODULE_ID__, l_errl);
+
         errlCommit( l_errl, HWPF_COMP_ID );
     }
     else
@@ -404,7 +412,7 @@ void*    call_\@substepname( void    *io_pArgs )
                \"call_\@substepname exit\" );
 
     // end task, returning any errorlogs to IStepDisp
-    return  l_errl ;
+    return  l_StepError.getErrorHandle();
 }
 ";
 #####   end templateCFileSubStep    #################################
-- 
cgit v1.2.1