diff options
| author | Bill Schwartz <whs@us.ibm.com> | 2012-10-10 10:36:29 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2012-10-12 16:29:17 -0500 |
| commit | b201169eeae76a7697f4f207dd583d40a2f07f66 (patch) | |
| tree | a05fa3da99dddab0491623aebc1110e73d430bf7 /src/usr/diag/mdia | |
| parent | 3536e96bd3a1d490cec900617fab6703fb7798ea (diff) | |
| download | talos-hostboot-b201169eeae76a7697f4f207dd583d40a2f07f66.tar.gz talos-hostboot-b201169eeae76a7697f4f207dd583d40a2f07f66.zip | |
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 <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/diag/mdia')
| -rwxr-xr-x | src/usr/diag/mdia/mdiamonitor.C | 47 | ||||
| -rwxr-xr-x | src/usr/diag/mdia/mdiamonitor.H | 2 | ||||
| -rw-r--r-- | src/usr/diag/mdia/test/mdiatestsm.H | 3 |
3 files changed, 27 insertions, 25 deletions
diff --git a/src/usr/diag/mdia/mdiamonitor.C b/src/usr/diag/mdia/mdiamonitor.C index 3d0a15fdb..dc715aa51 100755 --- a/src/usr/diag/mdia/mdiamonitor.C +++ b/src/usr/diag/mdia/mdiamonitor.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/diag/mdia/mdiamonitor.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 +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/diag/mdia/mdiamonitor.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 otherwise */ +/* divested of its trade secrets, irrespective of what has been */ +/* deposited with the U.S. Copyright Office. */ +/* */ +/* Origin: 30 */ +/* */ +/* IBM_PROLOG_END_TAG */ #include <sys/time.h> #include <targeting/common/util.H> #include <targeting/common/target.H> @@ -250,7 +250,7 @@ void CommandMonitor::shutdown() task_wait_tid(tid, 0, 0); } -void CommandMonitor::staticMain(void * i_args) +void* CommandMonitor::staticMain(void * i_args) { using namespace CommandMonitorImpl; @@ -263,6 +263,7 @@ void CommandMonitor::staticMain(void * i_args) delete args; args = NULL; } + return NULL; } CommandMonitor::CommandMonitor() : diff --git a/src/usr/diag/mdia/mdiamonitor.H b/src/usr/diag/mdia/mdiamonitor.H index 7ba686b8f..fa785933b 100755 --- a/src/usr/diag/mdia/mdiamonitor.H +++ b/src/usr/diag/mdia/mdiamonitor.H @@ -122,7 +122,7 @@ class CommandMonitor /** * @brief main thread function */ - static void staticMain(void *); + static void* staticMain(void *); /** * @brief main thread function diff --git a/src/usr/diag/mdia/test/mdiatestsm.H b/src/usr/diag/mdia/test/mdiatestsm.H index a11da7501..3874c2f57 100644 --- a/src/usr/diag/mdia/test/mdiatestsm.H +++ b/src/usr/diag/mdia/test/mdiatestsm.H @@ -58,9 +58,10 @@ class MdiaSmTest : public CxxTest::TestSuite } } - static void startSm(void * i_sm) + static void* startSm(void * i_sm) { static_cast<MDIA::StateMachine *>(i_sm)->start(); + return NULL; } public: |
