From dd7a32e1a27ecac1c8decaa958cbca7ef139c6bc Mon Sep 17 00:00:00 2001 From: Mark Wenning Date: Tue, 20 Mar 2012 11:37:13 -0500 Subject: Refactor InitService Finish join() conversion, remove TaskArgs Cleanup Initservice Cleanup ExtInitService Cleanup IStepDisp Add SPLess Halt & Shutdown command. Implements code for Tasks 35508, 3855, 36929 and 38870 . RTC: 38196 Change-Id: I554655412b529ef6cd143fea361a39bd584d18b5 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/794 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III --- src/usr/targeting/attrrp.C | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'src/usr/targeting/attrrp.C') diff --git a/src/usr/targeting/attrrp.C b/src/usr/targeting/attrrp.C index 5bdf42c41..324911778 100644 --- a/src/usr/targeting/attrrp.C +++ b/src/usr/targeting/attrrp.C @@ -54,10 +54,10 @@ namespace TARGETING uint64_t size; }; - void AttrRP::init(TaskArgs* i_taskArgs) + void AttrRP::init( errlHndl_t &io_taskRetErrl ) { // Call startup on singleton instance. - Singleton::instance().startup(i_taskArgs); + Singleton::instance().startup( io_taskRetErrl ); } void AttrRP::startMsgServiceTask(void* i_instance) @@ -78,7 +78,7 @@ namespace TARGETING assert(false); } - void AttrRP::startup(TaskArgs* i_taskArgs) + void AttrRP::startup( errlHndl_t &io_taskRetErrl ) { errlHndl_t l_errl = NULL; @@ -101,18 +101,10 @@ namespace TARGETING if (l_errl) { l_errl->setSev(ERRORLOG::ERRL_SEV_UNRECOVERABLE); - if (i_taskArgs) - { - i_taskArgs->postErrorLog(l_errl); - } - else - { - TRACFCOMP(g_trac_targeting, - ERR_MRK "AttrRP: Critical error in startup and no " - "TaskArgs given by init-service."); - errlCommit(l_errl,TARG_COMP_ID); - } } + + // return any errlogs to _start() + io_taskRetErrl = l_errl; } void AttrRP::msgServiceTask() const -- cgit v1.2.1