Menu
▾
▴
[Valgrind-valkyrie-dev] valkyrie: r474 - in branches/valkyrie_qt4port: . objects toolview
|
From: <sv...@va...> - 2010-02-03 00:54:13
|
Author: cerion
Date: 2010-02-03 00:45:34 +0000 (Wed, 03 Feb 2010)
New Revision: 474
Log:
simplify some enums
- tool-ids, tool-processes
Modified:
branches/valkyrie_qt4port/mainwindow.cpp
branches/valkyrie_qt4port/objects/memcheck_object.cpp
branches/valkyrie_qt4port/objects/memcheck_object.h
branches/valkyrie_qt4port/objects/tool_object.cpp
branches/valkyrie_qt4port/objects/tool_object.h
branches/valkyrie_qt4port/toolview/memcheckview.cpp
branches/valkyrie_qt4port/toolview/memcheckview.h
branches/valkyrie_qt4port/toolview/toolview.h
Modified: branches/valkyrie_qt4port/mainwindow.cpp
===================================================================
--- branches/valkyrie_qt4port/mainwindow.cpp 2010-02-03 00:34:08 UTC (rev 473)
+++ branches/valkyrie_qt4port/mainwindow.cpp 2010-02-03 00:45:34 UTC (rev 474)
@@ -726,7 +726,7 @@
return;
}
- runTool( TOOL::PROC_VALGRIND );
+ runTool( VGTOOL::PROC_VALGRIND );
}
Modified: branches/valkyrie_qt4port/objects/memcheck_object.cpp
===================================================================
--- branches/valkyrie_qt4port/objects/memcheck_object.cpp 2010-02-03 00:34:08 UTC (rev 473)
+++ branches/valkyrie_qt4port/objects/memcheck_object.cpp 2010-02-03 00:45:34 UTC (rev 474)
@@ -274,10 +274,10 @@
this, SLOT(fileSaveDialog()) );
// signals tool_obj --> tool_view
- connect( this, SIGNAL(running(bool)),
+ connect( this, SIGNAL(running(bool)),
toolView, SLOT(setState(bool)) );
- setProcessId( TOOL::PROC_NONE );
+ setProcessId( VGTOOL::PROC_NONE );
return toolView;
}
@@ -359,13 +359,13 @@
{
cerr << "Memcheck::start(): " << procId << endl;
- vk_assert( procId > MEMCHECK_VIEW::PROC_NOPROC );
- vk_assert( procId > TOOL::PROC_NONE );
+ vk_assert( procId > VGTOOL::PROC_NONE );
+ vk_assert( procId < VGTOOL::PROC_MAX );
vk_assert( !isRunning() );
bool ok = false;
switch ( procId ) {
- case TOOL::PROC_VALGRIND:
+ case VGTOOL::PROC_VALGRIND:
ok = runValgrind( vgflags );
break;
case MEMCHECK::PROC_PARSE_LOG:
@@ -396,7 +396,7 @@
logpoller->stop();
switch ( getProcessId() ) {
- case TOOL::PROC_VALGRIND: {
+ case VGTOOL::PROC_VALGRIND: {
if ( vgproc && ( vgproc->state() != QProcess::NotRunning ) ) {
vkPrint("Memcheck::stop(): process starting/running: terminate.");
@@ -461,7 +461,7 @@
vgflags.insert( ++(vgflags.begin()), ("--log-file=" + saveFname) );
vgflags.insert( ++(vgflags.begin()), "--xml=yes" );
- setProcessId( TOOL::PROC_VALGRIND );
+ setProcessId( VGTOOL::PROC_VALGRIND );
fileSaved = false;
statusMsg( "Memcheck", "Running ... " );
@@ -470,7 +470,7 @@
if (!ok) {
statusMsg( "Memcheck", "Failed" );
fileSaved = true;
- setProcessId( TOOL::PROC_NONE );
+ setProcessId( VGTOOL::PROC_NONE );
}
return ok;
@@ -528,7 +528,7 @@
} else {
statusMsg( "Parse failed", log_file );
}
- setProcessId( TOOL::PROC_NONE );
+ setProcessId( VGTOOL::PROC_NONE );
return success;
}
@@ -685,7 +685,7 @@
runError = true;
// vkPrint(" - Memcheck::processDone(): fatal error");
- if (getProcessId() == TOOL::PROC_VALGRIND) {
+ if (getProcessId() == VGTOOL::PROC_VALGRIND) {
statusMsg( "Memcheck", "Error parsing output log" );
vkError( getToolView(), "XML Parse Error",
"<p>Error parsing Valgrind XML output:<br>%s</p>",
@@ -706,7 +706,7 @@
runError = true;
// vkPrint(" - Memcheck::processDone(): parsing STILL not finished");
- if (getProcessId() == TOOL::PROC_VALGRIND) {
+ if (getProcessId() == VGTOOL::PROC_VALGRIND) {
statusMsg( "Memcheck", "Error - incomplete output log" );
vkError( getToolView(), "XML Parse Error",
"<p>Valgrind XML output is incomplete</p>" );
@@ -727,7 +727,7 @@
// vkPrint(" - Memcheck::processDone(): process exited ok");
} else {
// vkPrint(" - Memcheck::processDone(): process failed (%d)", exitStatus);
- if (getProcessId() == TOOL::PROC_VALGRIND) {
+ if (getProcessId() == VGTOOL::PROC_VALGRIND) {
vkError( getToolView(), "Run Error",
"<p>Process %s, with return value %d.<br> \
This is likely to simply be the client program \
@@ -757,7 +757,7 @@
// we're done. ---------------------------------------------------
if (!runError) { // (else we've already set an status error message)
- if (getProcessId() == TOOL::PROC_VALGRIND) {
+ if (getProcessId() == VGTOOL::PROC_VALGRIND) {
statusMsg( "Memcheck", "Finished" );
} else {
vk_assert_never_reached();
@@ -766,7 +766,7 @@
}
}
-// setProcessId( TOOL::PROC_NONE );
+ setProcessId( VGTOOL::PROC_NONE );
// vkPrint("Memcheck::processDone(): DONE.\n");
}
Modified: branches/valkyrie_qt4port/objects/memcheck_object.h
===================================================================
--- branches/valkyrie_qt4port/objects/memcheck_object.h 2010-02-03 00:34:08 UTC (rev 473)
+++ branches/valkyrie_qt4port/objects/memcheck_object.h 2010-02-03 00:45:34 UTC (rev 474)
@@ -51,16 +51,6 @@
ALIGNMENT,
NUM_OPTS
};
-
-
-/*!
- Tools can run different processes
-*/
- enum mcProcessId {
- PROC_PARSE_LOG = TOOL::PROC_TOOL_NONE+1,
- // Any other process id's go here.
- PROC_MAX = TOOL::PROC_MAX
- };
}
Modified: branches/valkyrie_qt4port/objects/tool_object.cpp
===================================================================
--- branches/valkyrie_qt4port/objects/tool_object.cpp 2010-02-03 00:34:08 UTC (rev 473)
+++ branches/valkyrie_qt4port/objects/tool_object.cpp 2010-02-03 00:45:34 UTC (rev 474)
@@ -37,7 +37,7 @@
*/
ToolObject::ToolObject( const QString& objectName, VGTOOL::ToolID id )
: VkObject( objectName ),
- toolView(0), fileSaved(true), processId(TOOL::PROC_NONE), toolId(id)
+ toolView(0), fileSaved(true), processId(VGTOOL::PROC_NONE), toolId(id)
{
}
@@ -47,20 +47,19 @@
bool ToolObject::isRunning()
{
- return (processId > TOOL::PROC_NONE);
+ return (processId > VGTOOL::PROC_NONE);
}
/*!
Set the process id.
- Emits signal for subsequent state: 'running(true|false)'
+ Emits signal for subsequent state: 'running(true|false)' - updates toolview
*/
void ToolObject::setProcessId( int procId )
{
- vk_assert( procId >= TOOL::PROC_NONE );
- vk_assert( procId != TOOL::PROC_TOOL_NONE );
- vk_assert( procId < TOOL::PROC_MAX);
+ vk_assert( procId >= VGTOOL::PROC_NONE );
+ vk_assert( procId < VGTOOL::PROC_MAX);
processId = procId;
emit running( isRunning() );
@@ -71,9 +70,8 @@
*/
int ToolObject::getProcessId()
{
- vk_assert( processId >= TOOL::PROC_NONE );
- vk_assert( processId != TOOL::PROC_TOOL_NONE );
- vk_assert( processId < TOOL::PROC_MAX );
+ vk_assert( processId >= VGTOOL::PROC_NONE );
+ vk_assert( processId < VGTOOL::PROC_MAX );
return processId;
}
Modified: branches/valkyrie_qt4port/objects/tool_object.h
===================================================================
--- branches/valkyrie_qt4port/objects/tool_object.h 2010-02-03 00:34:08 UTC (rev 473)
+++ branches/valkyrie_qt4port/objects/tool_object.h 2010-02-03 00:45:34 UTC (rev 474)
@@ -34,19 +34,8 @@
#include <QList>
-namespace TOOL {
- // Tools may extend this enum with their own process id's.
- enum toolProcessId {
- PROC_NONE=-1, // no process running
- PROC_VALGRIND=0, // run valgrind for given tool
- PROC_TOOL_NONE=1, // tool defined proc id's start here + 1
- // tool defined processes may take up this block
- PROC_MAX=4 // reasonable number of processes per tool
- };
-}
-
// ============================================================
// forward decls
class ToolView;
Modified: branches/valkyrie_qt4port/toolview/memcheckview.cpp
===================================================================
--- branches/valkyrie_qt4port/toolview/memcheckview.cpp 2010-02-03 00:34:08 UTC (rev 473)
+++ branches/valkyrie_qt4port/toolview/memcheckview.cpp 2010-02-03 00:45:34 UTC (rev 474)
@@ -100,7 +100,7 @@
return;
vkConfig->setValue( "valkyrie/view-log", log_file );
- emit run( MEMCHECK_VIEW::PROC_PARSE_LOGFILE );
+ emit run( MEMCHECK::PROC_PARSE_LOG );
}
Modified: branches/valkyrie_qt4port/toolview/memcheckview.h
===================================================================
--- branches/valkyrie_qt4port/toolview/memcheckview.h 2010-02-03 00:34:08 UTC (rev 473)
+++ branches/valkyrie_qt4port/toolview/memcheckview.h 2010-02-03 00:45:34 UTC (rev 474)
@@ -30,15 +30,13 @@
// ============================================================
-namespace MEMCHECK_VIEW {
-/*!
- Define the processes this tool can run
-*/
- enum mcProcessId {
- PROC_NOPROC = -1,
- PROC_RUN_VALGRIND,
- PROC_PARSE_LOGFILE,
- NUM_PROCS
+namespace MEMCHECK {
+
+ // Define the processes this tool can run
+ enum McProcessId {
+ PROC_PARSE_LOG = VGTOOL::PROC_TOOL_FIRST,
+ // Any other process id's go here.
+ PROC_MAX = VGTOOL::PROC_MAX
};
}
Modified: branches/valkyrie_qt4port/toolview/toolview.h
===================================================================
--- branches/valkyrie_qt4port/toolview/toolview.h 2010-02-03 00:34:08 UTC (rev 473)
+++ branches/valkyrie_qt4port/toolview/toolview.h 2010-02-03 00:45:34 UTC (rev 474)
@@ -37,11 +37,23 @@
// ============================================================
// type definitions
namespace VGTOOL {
- enum ToolID { ID_NULL=-1,
- ID_MEMCHECK=0,
- ID_HELGRIND,
- NUM_TOOLS
- };
+
+ // Valgrind Tools
+ enum ToolID {
+ ID_NULL=-1,
+ ID_MEMCHECK=0,
+ ID_HELGRIND,
+ ID_MAX
+ };
+
+ // Tool Processes: Tools may extend this enum with their own process id's.
+ enum ToolProcessId {
+ PROC_NONE=-1, // no process running
+ PROC_VALGRIND=0, // run valgrind for given tool
+ PROC_TOOL_FIRST=1, // tool defined proc id's start here,
+ // and fill this block,
+ PROC_MAX=4 // to a reasonable max number of processes per tool
+ };
}
|
