From b201169eeae76a7697f4f207dd583d40a2f07f66 Mon Sep 17 00:00:00 2001 From: Bill Schwartz Date: Wed, 10 Oct 2012 10:36:29 -0500 Subject: Memory Leak task_end Change-Id: Idb7a2d8d72a55f644efd0b2548eca5df5d062e6d RTC: 47491 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2011 Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III --- src/usr/hwpf/hwp/dram_training/dram_training.C | 43 +++++++++++++------------- src/usr/hwpf/hwp/dram_training/dram_training.H | 41 ++++++++++++------------ 2 files changed, 43 insertions(+), 41 deletions(-) (limited to 'src/usr/hwpf/hwp/dram_training') diff --git a/src/usr/hwpf/hwp/dram_training/dram_training.C b/src/usr/hwpf/hwp/dram_training/dram_training.C index 5bc590dd9..f0efc125e 100644 --- a/src/usr/hwpf/hwp/dram_training/dram_training.C +++ b/src/usr/hwpf/hwp/dram_training/dram_training.C @@ -90,7 +90,7 @@ using namespace fapi; // // Wrapper function to call 13.1 : host_disable_vddr // -void call_host_disable_vddr( void *io_pArgs ) +void* call_host_disable_vddr( void *io_pArgs ) { errlHndl_t l_err = NULL; @@ -143,7 +143,7 @@ void call_host_disable_vddr( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_disable_vddr exit" ); - task_end2( l_err ); + return l_err; } @@ -151,7 +151,7 @@ void call_host_disable_vddr( void *io_pArgs ) // // Wrapper function to call 13.2 : mem_pll_setup // -void call_mem_pll_setup( void *io_pArgs ) +void* call_mem_pll_setup( void *io_pArgs ) { errlHndl_t l_err = NULL; TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_pll_setup entry" ); @@ -163,7 +163,8 @@ void call_mem_pll_setup( void *io_pArgs ) TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "WARNING: mem_pll_setup HWP is disabled in SIMICS run!"); // end task - task_end2( l_err ); + return l_err; + } @@ -222,7 +223,7 @@ void call_mem_pll_setup( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_pll_setup exit" ); - task_end2( l_err ); + return l_err; } @@ -230,7 +231,7 @@ void call_mem_pll_setup( void *io_pArgs ) // // Wrapper function to call 13.3 : mem_startclocks // -void call_mem_startclocks( void *io_pArgs ) +void* call_mem_startclocks( void *io_pArgs ) { errlHndl_t l_err = NULL; @@ -277,7 +278,7 @@ void call_mem_startclocks( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mem_startclocks exit" ); - task_end2( l_err ); + return l_err; } @@ -285,7 +286,7 @@ void call_mem_startclocks( void *io_pArgs ) // // Wrapper function to call 13.4 : host_enable_vddr // -void call_host_enable_vddr( void *io_pArgs ) +void* call_host_enable_vddr( void *io_pArgs ) { errlHndl_t l_err = NULL; @@ -338,7 +339,7 @@ void call_host_enable_vddr( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_enable_vddr exit" ); - task_end2( l_err ); + return l_err; } @@ -346,7 +347,7 @@ void call_host_enable_vddr( void *io_pArgs ) // // Wrapper function to call 13.5 : mss_scominit // -void call_mss_scominit( void *io_pArgs ) +void* call_mss_scominit( void *io_pArgs ) { errlHndl_t l_err = NULL; @@ -394,13 +395,13 @@ void call_mss_scominit( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_scominit exit" ); - task_end2( l_err ); + return l_err; } // // Wrapper function to call 13.6 : mss_ddr_phy_reset // -void call_mss_ddr_phy_reset( void *io_pArgs ) +void* call_mss_ddr_phy_reset( void *io_pArgs ) { errlHndl_t l_err = NULL; @@ -453,14 +454,14 @@ void call_mss_ddr_phy_reset( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_ddr_phy_reset exit" ); - task_end2( l_err ); + return l_err; } // // Wrapper function to call 13.7 : mss_draminit // -void call_mss_draminit( void *io_pArgs ) +void* call_mss_draminit( void *io_pArgs ) { errlHndl_t l_err = NULL; @@ -514,14 +515,14 @@ void call_mss_draminit( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_draminit exit" ); - task_end2( l_err ); + return l_err; } // // Wrapper function to call 13.8 : mss_draminit_training // -void call_mss_draminit_training( void *io_pArgs ) +void* call_mss_draminit_training( void *io_pArgs ) { errlHndl_t l_err = NULL; @@ -576,13 +577,13 @@ void call_mss_draminit_training( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_draminit_training exit" ); - task_end2( l_err ); + return l_err; } // // Wrapper function to call 13.9 : mss_draminit_trainadv // -void call_mss_draminit_trainadv( void *io_pArgs ) +void* call_mss_draminit_trainadv( void *io_pArgs ) { errlHndl_t l_err = NULL; @@ -635,13 +636,13 @@ void call_mss_draminit_trainadv( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_draminit_trainadv exit" ); - task_end2( l_err ); + return l_err; } // // Wrapper function to call 13.10 : mss_draminit_mc // -void call_mss_draminit_mc( void *io_pArgs ) +void* call_mss_draminit_mc( void *io_pArgs ) { errlHndl_t l_err = NULL; @@ -695,7 +696,7 @@ void call_mss_draminit_mc( void *io_pArgs ) TRACDCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_mss_draminit_mc exit" ); - task_end2( l_err ); + return l_err; } diff --git a/src/usr/hwpf/hwp/dram_training/dram_training.H b/src/usr/hwpf/hwp/dram_training/dram_training.H index 7421c76ad..e7039c5f7 100644 --- a/src/usr/hwpf/hwp/dram_training/dram_training.H +++ b/src/usr/hwpf/hwp/dram_training/dram_training.H @@ -124,10 +124,10 @@ namespace DRAM_TRAINING * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. - * return none + * return any errlogs to istep * */ -void call_host_disable_vddr( void * io_pArgs ); +void* call_host_disable_vddr( void * io_pArgs ); @@ -138,10 +138,10 @@ void call_host_disable_vddr( void * io_pArgs ); * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. - * return none + * return any errlogs to istep * */ -void call_mem_pll_setup( void * io_pArgs ); +void* call_mem_pll_setup( void * io_pArgs ); @@ -152,10 +152,10 @@ void call_mem_pll_setup( void * io_pArgs ); * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. - * return none + * return any errlogs to istep * */ -void call_mem_startclocks( void * io_pArgs ); +void* call_mem_startclocks( void * io_pArgs ); @@ -166,10 +166,11 @@ void call_mem_startclocks( void * io_pArgs ); * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. - * return none + * return any errlogs to istep + * */ -void call_host_enable_vddr( void * io_pArgs ); +void* call_host_enable_vddr( void * io_pArgs ); @@ -180,10 +181,10 @@ void call_host_enable_vddr( void * io_pArgs ); * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. - * return none + * return any errlogs to istep * */ -void call_mss_scominit( void * io_pArgs ); +void* call_mss_scominit( void * io_pArgs ); @@ -194,10 +195,10 @@ void call_mss_scominit( void * io_pArgs ); * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. - * return none + * return any errlogs to istep * */ -void call_mss_ddr_phy_reset( void * io_pArgs ); +void* call_mss_ddr_phy_reset( void * io_pArgs ); @@ -208,10 +209,10 @@ void call_mss_ddr_phy_reset( void * io_pArgs ); * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. - * return none + * return any errlogs to istep * */ -void call_mss_draminit( void * io_pArgs ); +void* call_mss_draminit( void * io_pArgs ); /** @@ -221,10 +222,10 @@ void call_mss_draminit( void * io_pArgs ); * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. - * return none + * return any errlogs to istep * */ -void call_mss_draminit_training( void * io_pArgs ); +void* call_mss_draminit_training( void * io_pArgs ); @@ -235,10 +236,10 @@ void call_mss_draminit_training( void * io_pArgs ); * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. - * return none + * return any errlogs to istep * */ -void call_mss_draminit_trainadv( void * io_pArgs ); +void* call_mss_draminit_trainadv( void * io_pArgs ); @@ -249,10 +250,10 @@ void call_mss_draminit_trainadv( void * io_pArgs ); * * param[in,out] io_pArgs - (normally) a pointer to a TaskArgs struct, * or NULL. - * return none + * return any errlogs to istep * */ -void call_mss_draminit_mc( void * io_pArgs ); +void* call_mss_draminit_mc( void * io_pArgs ); }; // end namespace -- cgit v1.2.1