diff options
| author | Mark Wenning <wenning@us.ibm.com> | 2013-06-07 12:07:02 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-06-10 08:52:42 -0500 |
| commit | 010bcdda0141c373bdfc11e600bfe0e3fa48f0c9 (patch) | |
| tree | f89cd296fae1daf6e9c8da106815e1d1332d8b41 | |
| parent | 04426108aa5349f6a2c512ec7459b6711bba2a8b (diff) | |
| download | talos-hostboot-010bcdda0141c373bdfc11e600bfe0e3fa48f0c9.tar.gz talos-hostboot-010bcdda0141c373bdfc11e600bfe0e3fa48f0c9.zip | |
Reopen RTC 70657
Change-Id: I7f8bf0d3e065813d041d6a6230eda9f9db53c096
RTC: 70657
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4895
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
| -rw-r--r-- | src/usr/initservice/istepdispatcher/istepWorker.C | 7 | ||||
| -rw-r--r-- | src/usr/initservice/istepdispatcher/istepdispatcher.C | 16 |
2 files changed, 22 insertions, 1 deletions
diff --git a/src/usr/initservice/istepdispatcher/istepWorker.C b/src/usr/initservice/istepdispatcher/istepWorker.C index 1f67d6364..c2684ebd4 100644 --- a/src/usr/initservice/istepdispatcher/istepWorker.C +++ b/src/usr/initservice/istepdispatcher/istepWorker.C @@ -237,6 +237,11 @@ void iStepWorkerThread ( void * i_msgQ ) } else { +#if 1 + TRACFCOMP( g_trac_initsvc, + "istepWorker: Empty Istep, nothing to do!" ); +#else + // @TODO reopen issue 70657 // Invalid istep sent from FSP or spless, return error. TRACFCOMP( g_trac_initsvc, "istepWorker: ERROR: " @@ -266,6 +271,8 @@ void iStepWorkerThread ( void * i_msgQ ) istep, substep, err->plid() ); +#endif + } diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C index afaa9761e..0f7792836 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.C +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C @@ -299,11 +299,15 @@ errlHndl_t IStepDispatcher::executeAllISteps ( void ) istep < MaxISteps; istep++ ) { + // Run until num items +1, to be sure we know the last step + // finished for( size_t substep = 0; - substep < g_isteps[istep].numitems ; + substep < (g_isteps[istep].numitems+1) ; substep++ ) { +#if 0 + // @TODO reopen issue 70657 // Check to see if this is a valid istep, if not, don't // send it to istepWorker. IstepWorker treats invalid // isteps as an error. @@ -315,6 +319,7 @@ errlHndl_t IStepDispatcher::executeAllISteps ( void ) istep, substep ); continue; } +#endif // Before we can do anything, we need to be sure that // the worker thread is ready to start @@ -333,6 +338,15 @@ errlHndl_t IStepDispatcher::executeAllISteps ( void ) continue; } + // If we just got the msg that the last step finished, break + // out + if( substep == (g_isteps[istep].numitems + 1) ) + { + TRACFCOMP( g_trac_initsvc, + INFO_MRK"Last Step, exit" ); + break; + } + // Look for an errlog in extra_data if( NULL != theMsg->extra_data ) { |
