From 3464764f7db09e16b8eba63249819cb7bdde9e74 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Fri, 19 Apr 2013 18:35:47 -0400 Subject: [PATCH] Cleanup, no functional change. --- .../controllers/DebugReportGenerator.cpp | 36 +++++++++---------- .../controllers/DebugReportGenerator.h | 3 ++ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/apps/debugger/controllers/DebugReportGenerator.cpp b/src/apps/debugger/controllers/DebugReportGenerator.cpp index 580507b9f1..6abebe164c 100644 --- a/src/apps/debugger/controllers/DebugReportGenerator.cpp +++ b/src/apps/debugger/controllers/DebugReportGenerator.cpp @@ -182,15 +182,7 @@ DebugReportGenerator::ThreadStackTraceChanged(const ::Team::ThreadEvent& event) void DebugReportGenerator::MemoryBlockRetrieved(TeamMemoryBlock* block) { - if (fCurrentBlock != NULL) { - fCurrentBlock->ReleaseReference(); - fCurrentBlock = NULL; - } - - fBlockRetrievalStatus = B_OK; - - fCurrentBlock = block; - release_sem(fTeamDataSem); + _HandleMemoryBlockRetrieved(block, B_OK); } @@ -198,15 +190,7 @@ void DebugReportGenerator::MemoryBlockRetrievalFailed(TeamMemoryBlock* block, status_t result) { - if (fCurrentBlock != NULL) { - fCurrentBlock->ReleaseReference(); - fCurrentBlock = NULL; - } - - fBlockRetrievalStatus = result; - - fCurrentBlock = block; - release_sem(fTeamDataSem); + _HandleMemoryBlockRetrieved(block, result); } @@ -554,3 +538,19 @@ DebugReportGenerator::_ResolveValueIfNeeded(ValueNode* node, StackFrame* frame, return result; } + + +void +DebugReportGenerator::_HandleMemoryBlockRetrieved(TeamMemoryBlock* block, + status_t result) +{ + if (fCurrentBlock != NULL) { + fCurrentBlock->ReleaseReference(); + fCurrentBlock = NULL; + } + + fBlockRetrievalStatus = result; + + fCurrentBlock = block; + release_sem(fTeamDataSem); +} diff --git a/src/apps/debugger/controllers/DebugReportGenerator.h b/src/apps/debugger/controllers/DebugReportGenerator.h index 4b4f0100c5..f19fa1bf97 100644 --- a/src/apps/debugger/controllers/DebugReportGenerator.h +++ b/src/apps/debugger/controllers/DebugReportGenerator.h @@ -74,6 +74,9 @@ private: status_t _ResolveValueIfNeeded(ValueNode* node, StackFrame* frame, int32 maxDepth); + void _HandleMemoryBlockRetrieved( + TeamMemoryBlock* block, status_t result); + private: ::Team* fTeam; Architecture* fArchitecture;