Menu
▾
▴
valgrind-valkyrie-dev — Discussion list for developers of Valkyrie, a GUI for Valgrind
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
(2) |
Apr
(3) |
May
|
Jun
(45) |
Jul
(4) |
Aug
|
Sep
(7) |
Oct
(1) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(4) |
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(1) |
Nov
|
Dec
(7) |
| 2010 |
Jan
(9) |
Feb
(5) |
Mar
(22) |
Apr
(1) |
May
(5) |
Jun
|
Jul
(2) |
Aug
|
Sep
(22) |
Oct
(6) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(17) |
Jul
(5) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <sv...@va...> - 2008-06-30 07:20:14
|
Author: sewardj
Date: 2008-06-30 08:20:18 +0100 (Mon, 30 Jun 2008)
New Revision: 447
Log:
More vk_logmerge/tests build system unbreakage.
Added:
trunk/vk_logmerge/tests/Makefile.am
Modified:
trunk/configure.in
trunk/tests/Makefile.am
trunk/vk_logmerge/Makefile.am
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-06-30 06:45:36 UTC (rev 446)
+++ trunk/configure.in 2008-06-30 07:20:18 UTC (rev 447)
@@ -220,6 +220,7 @@
Makefile
valkyrie/Makefile
vk_logmerge/Makefile
+ vk_logmerge/tests/Makefile
doc/Makefile
doc/images/Makefile
tests/Makefile
Modified: trunk/tests/Makefile.am
===================================================================
--- trunk/tests/Makefile.am 2008-06-30 06:45:36 UTC (rev 446)
+++ trunk/tests/Makefile.am 2008-06-30 07:20:18 UTC (rev 447)
@@ -2,7 +2,7 @@
noinst_SCRIPTS = \
vk_regtest \
- filter_addresses
+ filter_addresses \
filter_libc \
filter_sink \
filter_test_paths \
Modified: trunk/vk_logmerge/Makefile.am
===================================================================
--- trunk/vk_logmerge/Makefile.am 2008-06-30 06:45:36 UTC (rev 446)
+++ trunk/vk_logmerge/Makefile.am 2008-06-30 07:20:18 UTC (rev 447)
@@ -8,6 +8,8 @@
QT_UIC = @QT_UIC@
QT_DIR = @QT_DIR@
+SUBDIRS = tests
+
########################################################################
# Build vk_logmerge
#
Added: trunk/vk_logmerge/tests/Makefile.am
===================================================================
--- trunk/vk_logmerge/tests/Makefile.am (rev 0)
+++ trunk/vk_logmerge/tests/Makefile.am 2008-06-30 07:20:18 UTC (rev 447)
@@ -0,0 +1,5 @@
+noinst_SCRIPTS = filter_stderr
+
+EXTRA_DIST = $(noinst_SCRIPTS) \
+ singlelogfile singlelogfile.vgtest \
+ singlelogfile.stderr.exp singlelogfile.stdout.exp
|
|
From: <sv...@va...> - 2008-06-30 06:45:29
|
Author: sewardj
Date: 2008-06-30 07:45:36 +0100 (Mon, 30 Jun 2008)
New Revision: 446
Log:
Include test framework in the tarball.
Modified:
trunk/Makefile.am
trunk/configure.in
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2008-06-30 06:44:51 UTC (rev 445)
+++ trunk/Makefile.am 2008-06-30 06:45:36 UTC (rev 446)
@@ -7,8 +7,7 @@
AC_AUX_DIR = m4
AC_MACRO_DIR = m4
-SUBDIRS = valkyrie vk_logmerge doc
-# . tests
+SUBDIRS = valkyrie vk_logmerge doc tests
## Preprend @PERL@ because tests/vk_regtest isn't executable
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-06-30 06:44:51 UTC (rev 445)
+++ trunk/configure.in 2008-06-30 06:45:36 UTC (rev 446)
@@ -222,6 +222,7 @@
vk_logmerge/Makefile
doc/Makefile
doc/images/Makefile
+ tests/Makefile
)
# tests/Makefile
|
|
From: <sv...@va...> - 2008-06-30 06:44:46
|
Author: sewardj Date: 2008-06-30 07:44:51 +0100 (Mon, 30 Jun 2008) New Revision: 445 Log: Bring this directory properly into the build system. Added: trunk/tests/Makefile.am Added: trunk/tests/Makefile.am =================================================================== --- trunk/tests/Makefile.am (rev 0) +++ trunk/tests/Makefile.am 2008-06-30 06:44:51 UTC (rev 445) @@ -0,0 +1,13 @@ +## Makefile.am -- Process this file with automake to produce Makefile.in + +noinst_SCRIPTS = \ + vk_regtest \ + filter_addresses + filter_libc \ + filter_sink \ + filter_test_paths \ + filter_discards \ + filter_numbers \ + filter_stderr_basic + +EXTRA_DIST = $(noinst_SCRIPTS) README.txt |
|
From: <sv...@va...> - 2008-06-29 22:13:20
|
Author: sewardj Date: 2008-06-29 23:13:25 +0100 (Sun, 29 Jun 2008) New Revision: 444 Log: Make top level 'make regtest' work. Modified: trunk/Makefile.am trunk/configure.in trunk/vk_logmerge/tests/singlelogfile Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2008-06-29 22:13:00 UTC (rev 443) +++ trunk/Makefile.am 2008-06-29 22:13:25 UTC (rev 444) @@ -12,9 +12,9 @@ ## Preprend @PERL@ because tests/vk_regtest isn't executable -#regtest: check -# @PERL@ tests/vk_regtest $(TOOLS) +regtest: check + @PERL@ tests/vk_regtest vk_logmerge EXTRA_DIST = \ - README_DEVELOPERS + README_DEVELOPERS Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2008-06-29 22:13:00 UTC (rev 443) +++ trunk/configure.in 2008-06-29 22:13:25 UTC (rev 444) @@ -140,6 +140,7 @@ AC_PROG_CPP AC_PROG_CXX AC_PROG_RANLIB +AC_PATH_PROG(PERL, perl) ######################################################################## Modified: trunk/vk_logmerge/tests/singlelogfile =================================================================== --- trunk/vk_logmerge/tests/singlelogfile 2008-06-29 22:13:00 UTC (rev 443) +++ trunk/vk_logmerge/tests/singlelogfile 2008-06-29 22:13:25 UTC (rev 444) @@ -1,4 +1,4 @@ #!/bin/bash # 'merge' a single xml file - output should be identical to input -../../bin/vk_logmerge ./singlelogfile.stdout.exp +../vk_logmerge ./singlelogfile.stdout.exp |
|
From: <sv...@va...> - 2008-06-29 22:12:53
|
Author: sewardj
Date: 2008-06-29 23:13:00 +0100 (Sun, 29 Jun 2008)
New Revision: 443
Log:
Update expected output.
Modified:
trunk/vk_logmerge/tests/singlelogfile.stdout.exp
Modified: trunk/vk_logmerge/tests/singlelogfile.stdout.exp
===================================================================
--- trunk/vk_logmerge/tests/singlelogfile.stdout.exp 2008-06-29 21:44:01 UTC (rev 442)
+++ trunk/vk_logmerge/tests/singlelogfile.stdout.exp 2008-06-29 22:13:00 UTC (rev 443)
@@ -1,6 +1,9 @@
<?xml version = '1.0'?>
+
<valgrindoutput>
+
<protocolversion>2</protocolversion>
+
<preamble>
<line>Memcheck, a memory error detector.</line>
<line>Copyright (C) 2002-2008, and GNU GPL'd, by Julian Seward et al.</line>
@@ -9,9 +12,13 @@
<line>Using valgrind-3.3.0, a dynamic binary instrumentation framework.</line>
<line>Copyright (C) 2000-2008, and GNU GPL'd, by Julian Seward et al.</line>
</preamble>
+
<pid>6961</pid>
+
<ppid>5324</ppid>
+
<tool>memcheck</tool>
+
<args>
<vargv>
<exe>/home/cerion/Work/Valgrind/trunk/Inst/bin/valgrind</exe>
@@ -22,18 +29,22 @@
<exe>/bin/ls</exe>
</argv>
</args>
+
<status>
<state>RUNNING</state>
<time>00:00:00:00.102</time>
</status>
+
<status>
<state>FINISHED</state>
<time>00:00:00:01.368</time>
</status>
+
<suppcounts>
<pair>
<count>23</count>
<name>Ugly strchr error in /lib/ld-2.3.3.so</name>
</pair>
</suppcounts>
+
</valgrindoutput>
|
|
From: <sv...@va...> - 2008-06-29 21:43:56
|
Author: de Date: 2008-06-29 22:44:01 +0100 (Sun, 29 Jun 2008) New Revision: 442 Log: Updated documentation for 1.3 release Modified: trunk/AUTHORS trunk/NEWS trunk/README Modified: trunk/AUTHORS =================================================================== --- trunk/AUTHORS 2008-06-29 21:41:49 UTC (rev 441) +++ trunk/AUTHORS 2008-06-29 21:44:01 UTC (rev 442) @@ -3,5 +3,5 @@ Cerion Armour-Brown designed/wrote the XML gathering/processing/display, vk_logmerge, and generally abstracted and solidified the code. -And lots of people sent bug reports, patches, and very helpful feedback. -Thank you all. +And lots and lots of other people sent bug reports, patches, and very +helpful feedback. Thank you all. Modified: trunk/NEWS =================================================================== --- trunk/NEWS 2008-06-29 21:41:49 UTC (rev 441) +++ trunk/NEWS 2008-06-29 21:44:01 UTC (rev 442) @@ -1,4 +1,51 @@ +Release 1.3.0 (30 June 2008) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +1.3.0 has focused on stability with a view to the forthcoming support +for Helgrind, Valgrind's new thread-checking tool. Valkyrie now supports +Valgrind 3.3.0. And, of course, the usually collection of bug fixes. + +OTHER NEW STUFF: +- Added option to set working directory (via cmdline and vk config) +- Allow for multiple suppressions on the command line + +BUGS and PROBLEMS FIXED: + +- Cleanup compiler warnings. + Thanks to Diego Petten + +- Better editor support in configure: gvim, gview, kate + Thanks to Pim Nijdamd, Anton Dudarenko + +- Clicking valgrind options item the first time would lead to a crash; init() + executed updates to the page, which tried to update the page before it had + been setup completely. + Thanks to Pengcheng Zou + +- Fixed null ptr defef, which happened if memcheck finished before expected + while reading logfile. + Thanks to Gert Steenssens + +- Do not prevent horizontal scrolling for log window + Thanks to Anton Dudarenko. + +- Fixed log dir setup (as requested by many!) Temporary logs are now always + written to /tmp/valkyrie_logs (configured value). Added a user configurable + "Log Dir", which is used as the default dir when saving logs. + +- Compile errors for Slackware 10.1 + +- Various compiler warnings + +- Fixed open/close items buttons + - open current item: only worked once item had been opened once already + - open all items: didn't open leak errors (stopped at suppressions) + - open all items: remained 'pushed' even if all items were closed + + + + Release 1.2.0 (02 June 2006) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1.2.0 fixes a bunch of bugs from 1.1.0. There is no major new Modified: trunk/README =================================================================== --- trunk/README 2008-06-29 21:41:49 UTC (rev 441) +++ trunk/README 2008-06-29 21:44:01 UTC (rev 442) @@ -1,12 +1,20 @@ Release Notes for Valkyrie ~~~~~~~~~~~~~~~~~~~~~~~~~~ -Valkyrie supports Valgrind 3.0.0 or higher, as that is the first release -to support XML output, which Valkyrie requires. +Valkyrie version 1.3.0 supports Valgrind 3.3.x. For instructions on how to build/install, see the INSTALL file. +Support for other versions of Valgrind +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Valgrind 3.2.x is not supported - you will need Valkyrie 1.2.x. + +The upcoming Valgrind 3.4.x series will have xml changes for +which you will need Valkyrie version 1.4.x - Valkyrie 1.3.x does not, +and will not, support Valgrind 3.4.x. + + How to get Valkyrie ~~~~~~~~~~~~~~~~~~~ To check out Valkyrie via anonymous, read-only svn access: |
Author: de
Date: 2008-06-29 22:41:49 +0100 (Sun, 29 Jun 2008)
New Revision: 441
Log:
Updated copyright year to 2008.
Changed LICENSE.GPL (which doesn't exist) to COPYING (which does)
Modified:
trunk/configure.in
trunk/doc/about_vk.html
trunk/doc/index.html
trunk/doc/support.html
trunk/doc/xml/about_vk.xml
trunk/doc/xml/support.xml
trunk/doc/xml/vk-entities.xml
trunk/utils/update_copyright.sh
trunk/valkyrie/core/cachegrind_object.cpp
trunk/valkyrie/core/cachegrind_object.h
trunk/valkyrie/core/massif_object.cpp
trunk/valkyrie/core/massif_object.h
trunk/valkyrie/core/memcheck_object.cpp
trunk/valkyrie/core/memcheck_object.h
trunk/valkyrie/core/tool_object.cpp
trunk/valkyrie/core/tool_object.h
trunk/valkyrie/core/valgrind_object.cpp
trunk/valkyrie/core/valgrind_object.h
trunk/valkyrie/core/valkyrie_object.cpp
trunk/valkyrie/core/valkyrie_object.h
trunk/valkyrie/core/vk_objects.cpp
trunk/valkyrie/core/vk_objects.h
trunk/valkyrie/help/context_help.cpp
trunk/valkyrie/help/context_help.h
trunk/valkyrie/help/hand_book.cpp
trunk/valkyrie/help/hand_book.h
trunk/valkyrie/help/help_about.cpp
trunk/valkyrie/help/help_about.h
trunk/valkyrie/help/html_urls.cpp
trunk/valkyrie/help/html_urls.h
trunk/valkyrie/help/vk_messages.cpp
trunk/valkyrie/help/vk_messages.h
trunk/valkyrie/main.cpp
trunk/valkyrie/main_window.cpp
trunk/valkyrie/main_window.h
trunk/valkyrie/options/cachegrind_options_page.cpp
trunk/valkyrie/options/cachegrind_options_page.h
trunk/valkyrie/options/intspinbox.cpp
trunk/valkyrie/options/intspinbox.h
trunk/valkyrie/options/massif_options_page.cpp
trunk/valkyrie/options/massif_options_page.h
trunk/valkyrie/options/memcheck_options_page.cpp
trunk/valkyrie/options/memcheck_options_page.h
trunk/valkyrie/options/options_page.cpp
trunk/valkyrie/options/options_page.h
trunk/valkyrie/options/options_widgets.cpp
trunk/valkyrie/options/options_widgets.h
trunk/valkyrie/options/options_window.cpp
trunk/valkyrie/options/options_window.h
trunk/valkyrie/options/parse_cmd_args.cpp
trunk/valkyrie/options/parse_cmd_args.h
trunk/valkyrie/options/valgrind_options_page.cpp
trunk/valkyrie/options/valgrind_options_page.h
trunk/valkyrie/options/valkyrie_options_page.cpp
trunk/valkyrie/options/valkyrie_options_page.h
trunk/valkyrie/options/vk_option.cpp
trunk/valkyrie/options/vk_option.h
trunk/valkyrie/options/vk_popt.cpp
trunk/valkyrie/options/vk_popt.h
trunk/valkyrie/tool_utils/async_process.cpp
trunk/valkyrie/tool_utils/async_process.h
trunk/valkyrie/tool_utils/vglog.cpp
trunk/valkyrie/tool_utils/vglog.h
trunk/valkyrie/tool_utils/vglogreader.cpp
trunk/valkyrie/tool_utils/vglogreader.h
trunk/valkyrie/tool_utils/vk_logpoller.cpp
trunk/valkyrie/tool_utils/vk_logpoller.h
trunk/valkyrie/tool_utils/vk_process.cpp
trunk/valkyrie/tool_utils/vk_process.h
trunk/valkyrie/tool_views/cachegrind_view.cpp
trunk/valkyrie/tool_views/cachegrind_view.h
trunk/valkyrie/tool_views/massif_view.cpp
trunk/valkyrie/tool_views/massif_view.h
trunk/valkyrie/tool_views/memcheck_view.cpp
trunk/valkyrie/tool_views/memcheck_view.h
trunk/valkyrie/tool_views/tool_view.cpp
trunk/valkyrie/tool_views/tool_view.h
trunk/valkyrie/tool_views/vglogview.cpp
trunk/valkyrie/tool_views/vglogview.h
trunk/valkyrie/vk_config.cpp
trunk/valkyrie/vk_config.h
trunk/valkyrie/vk_file_utils.cpp
trunk/valkyrie/vk_file_utils.h
trunk/valkyrie/vk_utils.cpp
trunk/valkyrie/vk_utils.h
trunk/vk_logmerge/tests/singlelogfile.stdout.exp
trunk/vk_logmerge/vklm_main.cpp
trunk/vk_logmerge/vklm_main.h
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/configure.in 2008-06-29 21:41:49 UTC (rev 441)
@@ -18,7 +18,7 @@
BNV_HAVE_QT
if test x$have_qt != xyes; then
- AC_MSG_ERROR([Can't build without QT.])
+ AC_MSG_ERROR([Cannot build without QT.])
fi
Modified: trunk/doc/about_vk.html
===================================================================
--- trunk/doc/about_vk.html 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/doc/about_vk.html 2008-06-29 21:41:49 UTC (rev 441)
@@ -97,7 +97,7 @@
<p>For more information on Valkyrie and/or Valgrind, contact
<a href="mailto:in...@op..." target="_top">in...@op...</a>.</p>
<table class="nav" width="100%"><tbody><tr>
- <td align="center">Copyright (c) 2000-2006 OpenWorks LLP<br>
+ <td align="center">Copyright (C) 2000-2008 OpenWorks LLP<br>
<a href="http://www.open-works.co.uk" target="_top">www.open-works.co.uk</a>
</td>
</tr></tbody></table>
Modified: trunk/doc/index.html
===================================================================
--- trunk/doc/index.html 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/doc/index.html 2008-06-29 21:41:49 UTC (rev 441)
@@ -16,7 +16,7 @@
<a name="index"></a>Valkyrie Documentation</h1></div>
<div align="center"><h2 class="subtitle">A front end for Valgrind</h2></div>
<div align="center"><p class="releaseinfo">Release version 1.2.0 June 02 2007</p></div>
-<div align="center"><p class="copyright">Copyright 2000-2006
+<div align="center"><p class="copyright">Copyright (C) 2000-2008
<a href="http://www.open-works.co.uk" target="_top">OpenWorks LLP</a>
</p></div>
<div align="center"><div class="legalnotice"><p>Permission is granted to copy, distribute and/or
Modified: trunk/doc/support.html
===================================================================
--- trunk/doc/support.html 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/doc/support.html 2008-06-29 21:41:49 UTC (rev 441)
@@ -96,7 +96,7 @@
a Valgrind tool extended, contact OpenWorks LLP at
<a href="mailto:in...@op..." target="_top">in...@op...</a>.</p>
<table class="nav" width="100%"><tbody><tr>
- <td align="center">Copyright (c) 2000-2006 OpenWorks LLP<br>
+ <td align="center">Copyright (C) 2000-2008 OpenWorks LLP<br>
<a href="http://www.open-works.co.uk" target="_top">www.open-works.co.uk</a>
</td>
</tr></tbody></table>
Modified: trunk/doc/xml/about_vk.xml
===================================================================
--- trunk/doc/xml/about_vk.xml 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/doc/xml/about_vk.xml 2008-06-29 21:41:49 UTC (rev 441)
@@ -23,7 +23,7 @@
<informaltable class="nav" width="100%">
<tbody><tr>
- <td align="center">Copyright (c) &vk-lifespan; &vk-author;<br/>
+ <td align="center">Copyright (C) &vk-lifespan; &vk-author;<br/>
<ulink url="http://&ow-url;">&ow-url;</ulink></td>
</tr></tbody>
</informaltable>
Modified: trunk/doc/xml/support.xml
===================================================================
--- trunk/doc/xml/support.xml 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/doc/xml/support.xml 2008-06-29 21:41:49 UTC (rev 441)
@@ -21,7 +21,7 @@
<informaltable class="nav" width="100%">
<tbody><tr>
- <td align="center">Copyright (c) &vk-lifespan; &vk-author;<br/>
+ <td align="center">Copyright (C) &vk-lifespan; &vk-author;<br/>
<ulink url="http://&ow-url;">&ow-url;</ulink></td>
</tr></tbody>
</informaltable>
Modified: trunk/doc/xml/vk-entities.xml
===================================================================
--- trunk/doc/xml/vk-entities.xml 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/doc/xml/vk-entities.xml 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,10 +3,10 @@
<!ENTITY vk-url "www.open-works.co.uk/projects/valkyrie.html">
<!ENTITY vk-author "OpenWorks LLP">
<!ENTITY vk-email "in...@op...">
-<!ENTITY vk-lifespan "2000-2006">
+<!ENTITY vk-lifespan "2000-2008">
<!-- valkyrie release + version stuff -->
<!ENTITY rel-type "Release version">
-<!ENTITY rel-version "1.2.0">
-<!ENTITY rel-date "June 02 2007">
+<!ENTITY rel-version "1.3.0">
+<!ENTITY rel-date "June 30 2008">
Modified: trunk/utils/update_copyright.sh
===================================================================
--- trunk/utils/update_copyright.sh 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/utils/update_copyright.sh 2008-06-29 21:41:49 UTC (rev 441)
@@ -25,9 +25,9 @@
# Expected copyright notice:
RE_COPYRIGHT=" \* This file is part of Valkyrie, a front-end for Valgrind
- \* Copyright \(c\) [1|2][9|0][0-9][0-9]-[0-9]*, OpenWorks LLP <info\@open-works.co.uk>
+ \* Copyright \(C\) [1|2][9|0][0-9][0-9]-[0-9]*, OpenWorks LLP <info\@open-works.co.uk>
\* This program is released under the terms of the GNU GPL v.2
- \* See the file LICENSE.GPL for the full license details."
+ \* See the file COPYING for the full license details."
# All files that don't contain $RE_COPYRIGHT
# gotta be a nicer way of doing this...
Modified: trunk/valkyrie/core/cachegrind_object.cpp
===================================================================
--- trunk/valkyrie/core/cachegrind_object.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/cachegrind_object.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Cachegrind-specific options / flags / fns
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "cachegrind_object.h"
Modified: trunk/valkyrie/core/cachegrind_object.h
===================================================================
--- trunk/valkyrie/core/cachegrind_object.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/cachegrind_object.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Cachegrind-specific options / flags / fns
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __CACHEGRIND_OBJECT_H
Modified: trunk/valkyrie/core/massif_object.cpp
===================================================================
--- trunk/valkyrie/core/massif_object.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/massif_object.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Massif-specific options / flags / fns
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "massif_object.h"
Modified: trunk/valkyrie/core/massif_object.h
===================================================================
--- trunk/valkyrie/core/massif_object.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/massif_object.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Massif-specific options / flags / fns
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __MASSIF_OBJECT_H
Modified: trunk/valkyrie/core/memcheck_object.cpp
===================================================================
--- trunk/valkyrie/core/memcheck_object.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/memcheck_object.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Memcheck-specific options / flags / fns
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "config.h"
Modified: trunk/valkyrie/core/memcheck_object.h
===================================================================
--- trunk/valkyrie/core/memcheck_object.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/memcheck_object.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Memcheck-specific options / flags / fns
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __MEMCHECK_OBJECT_H
Modified: trunk/valkyrie/core/tool_object.cpp
===================================================================
--- trunk/valkyrie/core/tool_object.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/tool_object.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -7,9 +7,9 @@
* See vk_objects.cpp for information on how to add a new valgrind tool.
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "tool_object.h"
Modified: trunk/valkyrie/core/tool_object.h
===================================================================
--- trunk/valkyrie/core/tool_object.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/tool_object.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -5,9 +5,9 @@
* Each ToolObject has an associated ToolView for displaying output.
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
/* TODO: don't have enum values for the objOpts; instead, init an int
Modified: trunk/valkyrie/core/valgrind_object.cpp
===================================================================
--- trunk/valkyrie/core/valgrind_object.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/valgrind_object.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Valgrind-specific options / flags / fns
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "valgrind_object.h"
Modified: trunk/valkyrie/core/valgrind_object.h
===================================================================
--- trunk/valkyrie/core/valgrind_object.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/valgrind_object.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Valgrind-specific options / flags / fns
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VALGRIND_OBJECT_H
Modified: trunk/valkyrie/core/valkyrie_object.cpp
===================================================================
--- trunk/valkyrie/core/valkyrie_object.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/valkyrie_object.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Valkyrie-specific options / flags / fns
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "valkyrie_object.h"
Modified: trunk/valkyrie/core/valkyrie_object.h
===================================================================
--- trunk/valkyrie/core/valkyrie_object.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/valkyrie_object.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Valkyrie-specific options / flags / fns
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VALKYRIE_OBJECT_H
Modified: trunk/valkyrie/core/vk_objects.cpp
===================================================================
--- trunk/valkyrie/core/vk_objects.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/vk_objects.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -15,9 +15,9 @@
* That's all, folks.
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "vk_objects.h"
Modified: trunk/valkyrie/core/vk_objects.h
===================================================================
--- trunk/valkyrie/core/vk_objects.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/core/vk_objects.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -4,9 +4,9 @@
* Essential functionality is contained within a VkObject.
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
/* TODO: don't have enum values for the objOpts; instead, init an int
@@ -36,7 +36,7 @@
{
Q_OBJECT
public:
- /* VkObject id's: tool id's begin from ID_TOOL0 */
+ /* VkObject ids: tool ids begin from ID_TOOL0 */
enum { ID_VALKYRIE=0, ID_VALGRIND, ID_TOOL0/*first tool*/ };
VkObject( const QString& capt, const QString& txt,
Modified: trunk/valkyrie/help/context_help.cpp
===================================================================
--- trunk/valkyrie/help/context_help.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/help/context_help.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Context-sensitive help
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "context_help.h"
Modified: trunk/valkyrie/help/context_help.h
===================================================================
--- trunk/valkyrie/help/context_help.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/help/context_help.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Context-sensitive help button
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_CONTEXT_HELP_H
Modified: trunk/valkyrie/help/hand_book.cpp
===================================================================
--- trunk/valkyrie/help/hand_book.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/help/hand_book.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Context-sensitive help browser
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "hand_book.h"
Modified: trunk/valkyrie/help/hand_book.h
===================================================================
--- trunk/valkyrie/help/hand_book.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/help/hand_book.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -4,9 +4,9 @@
* TODO: add search + index facility
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_HAND_BOOK_H
Modified: trunk/valkyrie/help/help_about.cpp
===================================================================
--- trunk/valkyrie/help/help_about.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/help/help_about.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* small tab dialog showing various information re license etc.
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "valkyrie_xpm.h"
Modified: trunk/valkyrie/help/help_about.h
===================================================================
--- trunk/valkyrie/help/help_about.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/help/help_about.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Small tabbed dialog showing misc. info re license etc.
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_HELP_ABOUT_H
Modified: trunk/valkyrie/help/html_urls.cpp
===================================================================
--- trunk/valkyrie/help/html_urls.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/help/html_urls.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -4,9 +4,9 @@
* what is probably going to be a maintenance nightmare.
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "html_urls.h"
Modified: trunk/valkyrie/help/html_urls.h
===================================================================
--- trunk/valkyrie/help/html_urls.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/help/html_urls.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -4,9 +4,9 @@
* what is probably going to be a maintenance nightmare.
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_HELP_URLS_H
Modified: trunk/valkyrie/help/vk_messages.cpp
===================================================================
--- trunk/valkyrie/help/vk_messages.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/help/vk_messages.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Various types of messages: Query, Warn, Fatal, Info ...
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "vk_messages.h"
Modified: trunk/valkyrie/help/vk_messages.h
===================================================================
--- trunk/valkyrie/help/vk_messages.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/help/vk_messages.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Various types of messages: Query, Warn, Fatal, Info ...
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_MESSAGES_H
Modified: trunk/valkyrie/main.cpp
===================================================================
--- trunk/valkyrie/main.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/main.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -2,9 +2,9 @@
* startup: the main program entry point main.cpp
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include <qapplication.h>
Modified: trunk/valkyrie/main_window.cpp
===================================================================
--- trunk/valkyrie/main_window.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/main_window.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Application's top-level window
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include <qapplication.h>
Modified: trunk/valkyrie/main_window.h
===================================================================
--- trunk/valkyrie/main_window.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/main_window.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Application's top-level window
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_MAIN_WINDOW_H
Modified: trunk/valkyrie/options/cachegrind_options_page.cpp
===================================================================
--- trunk/valkyrie/options/cachegrind_options_page.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/cachegrind_options_page.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Subclass of OptionsPage to hold cachegrind-specific options | flags.
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "cachegrind_options_page.h"
Modified: trunk/valkyrie/options/cachegrind_options_page.h
===================================================================
--- trunk/valkyrie/options/cachegrind_options_page.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/cachegrind_options_page.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Subclass of OptionsPage to hold cachegrind-specific options | flags
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __CACHEGRIND_OPTIONS_PAGE_H
Modified: trunk/valkyrie/options/intspinbox.cpp
===================================================================
--- trunk/valkyrie/options/intspinbox.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/intspinbox.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -2,9 +2,9 @@
* Implemention of class SpinWidget intspinbox.cpp
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include <qapplication.h>
Modified: trunk/valkyrie/options/intspinbox.h
===================================================================
--- trunk/valkyrie/options/intspinbox.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/intspinbox.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -2,9 +2,9 @@
* Definition of class SpinWidget intspinbox.h
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_INT_SPINBOX_H
Modified: trunk/valkyrie/options/massif_options_page.cpp
===================================================================
--- trunk/valkyrie/options/massif_options_page.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/massif_options_page.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Subclass of OptionsPage to hold massif-specific options | flags.
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "massif_options_page.h"
Modified: trunk/valkyrie/options/massif_options_page.h
===================================================================
--- trunk/valkyrie/options/massif_options_page.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/massif_options_page.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Subclass of OptionsPage to hold massif-specific options | flags.
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __MASSIF_OPTIONS_PAGE_H
Modified: trunk/valkyrie/options/memcheck_options_page.cpp
===================================================================
--- trunk/valkyrie/options/memcheck_options_page.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/memcheck_options_page.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Subclass of OptionsPage to hold memcheck-specific options | flags.
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "memcheck_options_page.h"
Modified: trunk/valkyrie/options/memcheck_options_page.h
===================================================================
--- trunk/valkyrie/options/memcheck_options_page.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/memcheck_options_page.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Subclass of OptionsPage to hold memcheck-specific options | flags.
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __MEMCHECK_OPTIONS_PAGE_H
Modified: trunk/valkyrie/options/options_page.cpp
===================================================================
--- trunk/valkyrie/options/options_page.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/options_page.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -6,9 +6,9 @@
* The 'page' is contained within the top-level Options Window.
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include <qpopupmenu.h>
Modified: trunk/valkyrie/options/options_page.h
===================================================================
--- trunk/valkyrie/options/options_page.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/options_page.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -6,9 +6,9 @@
* The 'page' is contained within the top-level Options Window.
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_OPTIONS_PAGE_H
Modified: trunk/valkyrie/options/options_widgets.cpp
===================================================================
--- trunk/valkyrie/options/options_widgets.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/options_widgets.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Various widgets used on the 'pages' to control user input
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include <qcursor.h>
Modified: trunk/valkyrie/options/options_widgets.h
===================================================================
--- trunk/valkyrie/options/options_widgets.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/options_widgets.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Various widgets used on the 'pages' to control user input
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_OPTION_WIDGETS_H
Modified: trunk/valkyrie/options/options_window.cpp
===================================================================
--- trunk/valkyrie/options/options_window.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/options_window.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -4,9 +4,9 @@
* Not modal, so user can keep it open and change flags as they work.
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include <qapplication.h>
Modified: trunk/valkyrie/options/options_window.h
===================================================================
--- trunk/valkyrie/options/options_window.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/options_window.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -4,9 +4,9 @@
* Not modal, so user can keep it open and change flags as they work.
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_OPTIONS_WINDOW_H
Modified: trunk/valkyrie/options/parse_cmd_args.cpp
===================================================================
--- trunk/valkyrie/options/parse_cmd_args.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/parse_cmd_args.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Called from main()
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "vk_objects.h"
Modified: trunk/valkyrie/options/parse_cmd_args.h
===================================================================
--- trunk/valkyrie/options/parse_cmd_args.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/parse_cmd_args.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Called from main()
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __PARSE_CMD_ARGS_H
Modified: trunk/valkyrie/options/valgrind_options_page.cpp
===================================================================
--- trunk/valkyrie/options/valgrind_options_page.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/valgrind_options_page.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Subclass of OptionsPage to hold valgrind-specific options | flags.
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include <qtabwidget.h>
Modified: trunk/valkyrie/options/valgrind_options_page.h
===================================================================
--- trunk/valkyrie/options/valgrind_options_page.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/valgrind_options_page.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Subclass of OptionsPage to hold valgrind-specific options | flags
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VALGRIND_OPTIONS_PAGE_H
Modified: trunk/valkyrie/options/valkyrie_options_page.cpp
===================================================================
--- trunk/valkyrie/options/valkyrie_options_page.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/valkyrie_options_page.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Subclass of OptionsPage to hold valkyrie-specific options | flags.
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include <qfontdialog.h>
Modified: trunk/valkyrie/options/valkyrie_options_page.h
===================================================================
--- trunk/valkyrie/options/valkyrie_options_page.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/valkyrie_options_page.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Subclass of OptionsPage to hold valkyrie-specific options | flags
* ----------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VALKYRIE_OPTIONS_PAGE_H
Modified: trunk/valkyrie/options/vk_option.cpp
===================================================================
--- trunk/valkyrie/options/vk_option.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/vk_option.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -2,9 +2,9 @@
* Implementation of class Option vk_option.cpp
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "vk_option.h"
Modified: trunk/valkyrie/options/vk_option.h
===================================================================
--- trunk/valkyrie/options/vk_option.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/vk_option.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -2,9 +2,9 @@
* Definition of class Option vk_option.h
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_OPTION_H
Modified: trunk/valkyrie/options/vk_popt.cpp
===================================================================
--- trunk/valkyrie/options/vk_popt.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/vk_popt.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -5,7 +5,8 @@
* ---------------------------------------------------------------------
* popt is Copyright (c) 1998 Red Hat Software and distributed under
* an X11-style license, which is in turn compatible the GNU GPL v.2.
- */
+ * See the file COPYING for the full license details.
+*/
#include "vk_popt.h"
#include "vk_option.h" /* namespace VkOPTION */
Modified: trunk/valkyrie/options/vk_popt.h
===================================================================
--- trunk/valkyrie/options/vk_popt.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/options/vk_popt.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,10 @@
* This is a seriously hacked version of the popt libraries.
* No credit to me, all thanks and many apologies to the Red Hat team
* ---------------------------------------------------------------------
- * popt is Copyright (c) 1998 Red Hat Software and distributed under
+ * popt is Copyright (C) 1998 Red Hat Software and distributed under
* an X11-style license, which is in turn compatible the GNU GPL v.2.
- */
+ * See the file COPYING for the full license details.
+*/
#ifndef __VK_POPT_H
#define __VK_POPT_H
Modified: trunk/valkyrie/tool_utils/async_process.cpp
===================================================================
--- trunk/valkyrie/tool_utils/async_process.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/tool_utils/async_process.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -14,9 +14,9 @@
* pass the SEARCH_PATH flag.
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include <errno.h> /* Fedora Core needs this */
Modified: trunk/valkyrie/tool_utils/async_process.h
===================================================================
--- trunk/valkyrie/tool_utils/async_process.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/tool_utils/async_process.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -14,9 +14,9 @@
* pass the SEARCH_PATH flag.
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_ASYNC_PROCESS_H
Modified: trunk/valkyrie/tool_utils/vglog.cpp
===================================================================
--- trunk/valkyrie/tool_utils/vglog.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/tool_utils/vglog.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* VgLog: QDomDocument based representation of a valgrind xml log.
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "vglog.h"
Modified: trunk/valkyrie/tool_utils/vglog.h
===================================================================
--- trunk/valkyrie/tool_utils/vglog.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/tool_utils/vglog.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* VgLog: QDomDocument based representation of a valgrind xml log.
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_VGLOG_H
Modified: trunk/valkyrie/tool_utils/vglogreader.cpp
===================================================================
--- trunk/valkyrie/tool_utils/vglogreader.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/tool_utils/vglogreader.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -2,9 +2,9 @@
* vglogreader: reads xml log into a VgLog vglogreader.h
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "vglogreader.h"
Modified: trunk/valkyrie/tool_utils/vglogreader.h
===================================================================
--- trunk/valkyrie/tool_utils/vglogreader.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/tool_utils/vglogreader.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -2,9 +2,9 @@
* vglogreader: reads xml log into a VgLog vglogreader.h
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef __VK_XMLPARSER_H
Modified: trunk/valkyrie/tool_utils/vk_logpoller.cpp
===================================================================
--- trunk/valkyrie/tool_utils/vk_logpoller.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/tool_utils/vk_logpoller.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Polls a log for updates
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#include "vk_logpoller.h"
Modified: trunk/valkyrie/tool_utils/vk_logpoller.h
===================================================================
--- trunk/valkyrie/tool_utils/vk_logpoller.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/tool_utils/vk_logpoller.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -3,9 +3,9 @@
* Polls a log for updates
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2000-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2000-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
*/
#ifndef VK_LOGPOLLER_H
Modified: trunk/valkyrie/tool_utils/vk_process.cpp
===================================================================
--- trunk/valkyrie/tool_utils/vk_process.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/tool_utils/vk_process.cpp 2008-06-29 21:41:49 UTC (rev 441)
@@ -2,9 +2,9 @@
* Implementation of class VKProcess vk_process.h
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2005-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2005-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
* ---------------------------------------------------------------------
* This file is a re-implementation of QProcess:
* ** ($Id: qt/qprocess_unix.cpp 3.3.4 edited Dec 23 11:57 $)
@@ -14,7 +14,7 @@
* **
* ** This file may be distributed and/or modified under the terms of the
* ** GNU General Public License version 2 as published by the Free Software
- * ** Foundation and appearing in the file LICENSE.GPL included in the
+ * ** Foundation and appearing in the file COPYING included in the
* ** packaging of this file.
*/
Modified: trunk/valkyrie/tool_utils/vk_process.h
===================================================================
--- trunk/valkyrie/tool_utils/vk_process.h 2008-06-29 15:07:04 UTC (rev 440)
+++ trunk/valkyrie/tool_utils/vk_process.h 2008-06-29 21:41:49 UTC (rev 441)
@@ -2,9 +2,9 @@
* Definition of class VKProcess vk_process.h
* ---------------------------------------------------------------------
* This file is part of Valkyrie, a front-end for Valgrind
- * Copyright (c) 2005-2006, OpenWorks LLP <in...@op...>
+ * Copyright (C) 2005-2008, OpenWorks LLP <in...@op...>
* This program is released under the terms of the GNU GPL v.2
- * See the file LICENSE.GPL for the full license details.
+ * See the file COPYING for the full license details.
* ---------------------------------------------------------------------
* This file is a re-implementation of QProcess:
* ** $Id: qt/qprocess.h 3.3.4 edited May 27 2003 $
@@ -14,7 +14,7 @@
* **
* ** This file may be distributed and/or modified under the terms of the
* ** GNU General Public License version 2 as published by the Free Software
- * ** Foundation and appearing in the file LICENSE.GPL included in the
+ * ** Foundation and appearing in the file COPYING included in the
* ** packaging of this file.
*/
Modified: trunk/valkyrie/tool_views/cachegrind_view.cpp
===================================================================
--- trunk/valkyrie/tool_views/cachegrind_view.cpp 2008-06-29 15:07:04 UTC (rev 440)
+++ ...
[truncated message content] |
|
From: <sv...@va...> - 2008-06-29 15:07:01
|
Author: de
Date: 2008-06-29 16:07:04 +0100 (Sun, 29 Jun 2008)
New Revision: 440
Log:
trivial white-space mods
Modified:
trunk/valkyrie/core/memcheck_object.cpp
trunk/valkyrie/main.cpp
trunk/valkyrie/options/options_widgets.cpp
trunk/valkyrie/options/valgrind_options_page.cpp
trunk/valkyrie/options/vk_option.cpp
trunk/valkyrie/vk_config.cpp
trunk/valkyrie/vk_utils.cpp
Modified: trunk/valkyrie/core/memcheck_object.cpp
===================================================================
--- trunk/valkyrie/core/memcheck_object.cpp 2008-06-28 18:56:26 UTC (rev 439)
+++ trunk/valkyrie/core/memcheck_object.cpp 2008-06-29 15:07:04 UTC (rev 440)
@@ -57,7 +57,7 @@
connect( m_logpoller, SIGNAL(logUpdated()),
this, SLOT(readVgLog()) );
- /* these opts should be kept in exactly the same order as valgrind
+ /* these opts should be kept in exactly the same order as valgrind
outputs them, as it makes keeping up-to-date a lot easier. */
addOpt( LEAK_CHECK, VkOPTION::ARG_STRING, VkOPTION::WDG_COMBO,
"memcheck", '\0', "leak-check",
Modified: trunk/valkyrie/main.cpp
===================================================================
--- trunk/valkyrie/main.cpp 2008-06-28 18:56:26 UTC (rev 439)
+++ trunk/valkyrie/main.cpp 2008-06-29 15:07:04 UTC (rev 440)
@@ -125,10 +125,10 @@
QString toolname = vkConfig->rdEntry("tool", "valgrind");
ToolObjList tools = valkyrie.valgrind()->toolObjList();
for ( ToolObject* tool=tools.first(); tool; tool=tools.next() ) {
- if ( tool->name() == toolname ) {
- vkWin->showToolView( tool->objId() );
- break;
- }
+ if ( tool->name() == toolname ) {
+ vkWin->showToolView( tool->objId() );
+ break;
+ }
}
}
Modified: trunk/valkyrie/options/options_widgets.cpp
===================================================================
--- trunk/valkyrie/options/options_widgets.cpp 2008-06-28 18:56:26 UTC (rev 439)
+++ trunk/valkyrie/options/options_widgets.cpp 2008-06-29 15:07:04 UTC (rev 440)
@@ -72,11 +72,11 @@
void OptionWidget::setEnabled( bool enable )
{
- if ( m_wLabel != 0 )
- m_wLabel->setEnabled( enable );
- if ( m_widg != 0 ) {
- m_widg->setEnabled( enable );
- }
+ if ( m_wLabel != 0 )
+ m_wLabel->setEnabled( enable );
+ if ( m_widg != 0 ) {
+ m_widg->setEnabled( enable );
+ }
}
Modified: trunk/valkyrie/options/valgrind_options_page.cpp
===================================================================
--- trunk/valkyrie/options/valgrind_options_page.cpp 2008-06-28 18:56:26 UTC (rev 439)
+++ trunk/valkyrie/options/valgrind_options_page.cpp 2008-06-29 15:07:04 UTC (rev 440)
@@ -257,7 +257,7 @@
/* These widgets are disabled because Valkyrie uses
--log-file-exactly internally: logging options would interfere
with this. */
- // error reporting tab
+ // error reporting tab
m_itemList[Valgrind::LOG_FD ]->setEnabled( false );
m_itemList[Valgrind::LOG_FILE ]->setEnabled( false );
m_itemList[Valgrind::LOG_SOCKET ]->setEnabled( false );
Modified: trunk/valkyrie/options/vk_option.cpp
===================================================================
--- trunk/valkyrie/options/vk_option.cpp 2008-06-28 18:56:26 UTC (rev 439)
+++ trunk/valkyrie/options/vk_option.cpp 2008-06-29 15:07:04 UTC (rev 440)
@@ -272,7 +272,7 @@
}
/* ARG_UINT options */
- if (m_argType == VkOPTION::ARG_UINT) {
+ if ( m_argType == VkOPTION::ARG_UINT ) {
/* except don't test cachegrind's horrible cache options */
bool dontTest = ( m_configGroup == "cachegrind" &&
( m_longFlag == "I1" ||
Modified: trunk/valkyrie/vk_config.cpp
===================================================================
--- trunk/valkyrie/vk_config.cpp 2008-06-28 18:56:26 UTC (rev 439)
+++ trunk/valkyrie/vk_config.cpp 2008-06-29 15:07:04 UTC (rev 440)
@@ -34,38 +34,38 @@
called by user from menu 'Options::Save as Default' ---------------------- */
bool VkConfig::sync( Valkyrie* vk )
{
- if ( !m_dirty )
- return true;
+ if ( !m_dirty )
+ return true;
- /* read config file from disk, and fill the temporary structure
- with entries from the file */
- EntryMap rcMap;
- if ( !parseFile( vk, rcMap )) {
- VK_DEBUG( "failed to parse config file" );
- return false;
- }
+ /* read config file from disk, and fill the temporary structure
+ with entries from the file */
+ EntryMap rcMap;
+ if ( !parseFile( vk, rcMap )) {
+ VK_DEBUG( "failed to parse config file" );
+ return false;
+ }
- /* augment this structure with the dirty entries from the
- config object */
- EntryMapIterator aIt;
- for ( aIt = m_EntryMap.begin(); aIt != m_EntryMap.end(); ++aIt) {
- const EntryData &dirtyEntry = aIt.data();
- if ( !dirtyEntry.mDirty )
- continue;
- /* put dirty entries from the config object into the temporary map.
- if the entry exists, replaces the data
- if is a new entry (i.e old rc file), insert new key:data */
- rcMap.insert( aIt.key(), dirtyEntry );
- }
+ /* augment this structure with the dirty entries from the
+ config object */
+ EntryMapIterator aIt;
+ for ( aIt = m_EntryMap.begin(); aIt != m_EntryMap.end(); ++aIt) {
+ const EntryData &dirtyEntry = aIt.data();
+ if ( !dirtyEntry.mDirty )
+ continue;
+ /* put dirty entries from the config object into the temporary map.
+ if the entry exists, replaces the data
+ if is a new entry (i.e old rc file), insert new key:data */
+ rcMap.insert( aIt.key(), dirtyEntry );
+ }
- /* write out updated config */
- if ( !writeConfig( rcMap ) ) {
- VK_DEBUG( "failed to write updated config file" );
- return false;
- }
+ /* write out updated config */
+ if ( !writeConfig( rcMap ) ) {
+ VK_DEBUG( "failed to write updated config file" );
+ return false;
+ }
- m_dirty = false;
- return true;
+ m_dirty = false;
+ return true;
}
@@ -453,12 +453,12 @@
VK_DEBUG( "failed to backup rc file" );
return;
}
- if ( !QFile::exists(m_rcFileName) ) {
+ if ( !QFile::exists(m_rcFileName) ) {
/* not much we can do about that... */
VK_DEBUG( "no rc file to backup!" );
- return;
- }
- if ( !QDir().rename( m_rcFileName, bakfile ) ) {
+ return;
+ }
+ if ( !QDir().rename( m_rcFileName, bakfile ) ) {
/* oh well... */
VK_DEBUG( "rename failed: couldn't backup rc file" );
return;
@@ -472,29 +472,29 @@
{
QFile rFile( m_rcFileName );
if ( !rFile.open( IO_ReadOnly ) ) {
- /* Error: Failed to open file. */
- vkError( 0, "Parsing Config File",
+ /* Error: Failed to open file. */
+ vkError( 0, "Parsing Config File",
"<p>Failed to open config file '%s' for reading.<br>"
"%s cannot run without this file.</p>",
m_rcFileName.latin1(), vkName() );
return false;
}
- /* beam me up, scotty */
- QTextStream stream( &rFile );
- EntryMap fileMap = parseConfigToMap( stream );
- rFile.close();
+ /* beam me up, scotty */
+ QTextStream stream( &rFile );
+ EntryMap fileMap = parseConfigToMap( stream );
+ rFile.close();
QString defaultConfig = mkConfigDefaults( vk );
QTextStream strm( &defaultConfig, IO_ReadOnly );
EntryMap defaultMap = parseConfigToMap( strm );
- /* Check for correct rc version number
- - if mismatch, print warning, update entries */
- QString vk_ver_rc = fileMap[ EntryKey( "valkyrie", "version" ) ].mValue;
- QString vk_ver = vkVersion();
+ /* Check for correct rc version number
+ - if mismatch, print warning, update entries */
+ QString vk_ver_rc = fileMap[ EntryKey( "valkyrie", "version" ) ].mValue;
+ QString vk_ver = vkVersion();
- if (vk_ver_rc != vk_ver) { /* Version mismatch - fix rc file */
+ if (vk_ver_rc != vk_ver) { /* Version mismatch - fix rc file */
vkInfo( 0, "Parsing Config File",
"<p>Valkyrie version mismatch<br/>"
"Config file: %s<br/>"
@@ -534,7 +534,7 @@
}
}
- /* fileMap is fine: use that */
+ /* fileMap is fine: use that */
dstMap = fileMap;
return true;
}
@@ -603,37 +603,37 @@
EntryKey entryKey( aGroup, key );
EntryData entryData( value, false );
- /* insert into the temporary scratchpad map */
- rcMap.insert( entryKey, entryData );
+ /* insert into the temporary scratchpad map */
+ rcMap.insert( entryKey, entryData );
}
}
- return rcMap;
+ return rcMap;
}
bool VkConfig::writeConfig( EntryMap rcMap, bool backup/*=false*/ )
{
- if (backup) {
- /* move old config file, if it exists */
- backupConfigFile();
- }
+ if (backup) {
+ /* move old config file, if it exists */
+ backupConfigFile();
+ }
/* The temporary map should now be full of ALL entries.
Write it out to disk. */
QFile outF( m_rcFileName );
if ( !outF.open( IO_WriteOnly ) ) {
- vkError( 0, "Writing Config File",
+ vkError( 0, "Writing Config File",
"<p>Failed to open config file '%s' for writing.</p>",
m_rcFileName.latin1() );
- return false;
- }
- QTextStream aStream( &outF );
-
- /* Write comment header */
- QString hdr = mkConfigHeader();
- aStream << hdr.latin1();
+ return false;
+ }
+ QTextStream aStream( &outF );
+
+ /* Write comment header */
+ QString hdr = mkConfigHeader();
+ aStream << hdr.latin1();
- /* Write out map entries under relevant group sections */
+ /* Write out map entries under relevant group sections */
QString currGroup;
EntryMapIterator aIt;
for ( aIt = rcMap.begin(); aIt != rcMap.end(); ++aIt) {
@@ -648,11 +648,11 @@
}
/* group data */
- aStream << currKey.mKey << "=" << currEntry.mValue << "\n";
+ aStream << currKey.mKey << "=" << currEntry.mValue << "\n";
}
- outF.close();
- return true;
+ outF.close();
+ return true;
}
@@ -660,21 +660,21 @@
*/
QString VkConfig::mkConfigHeader( void )
{
- QDateTime dt = QDateTime::currentDateTime();
- QString hdr = QString("# %1 configuration file\n").arg(vkName());
- hdr += "# " + dt.toString( "MMMM d hh:mm yyyy" ) + "\n";
- hdr += "# Warning: This file is auto-generated, edits may be lost!\n";
- return hdr;
+ QDateTime dt = QDateTime::currentDateTime();
+ QString hdr = QString("# %1 configuration file\n").arg(vkName());
+ hdr += "# " + dt.toString( "MMMM d hh:mm yyyy" ) + "\n";
+ hdr += "# Warning: This file is auto-generated, edits may be lost!\n";
+ return hdr;
}
QString VkConfig::mkConfigDefaults( Valkyrie* vk )
{
- QString str;
- QTextStream ts( &str, IO_WriteOnly );
+ QString str;
+ QTextStream ts( &str, IO_WriteOnly );
- QString header = mkConfigHeader();
+ QString header = mkConfigHeader();
- const char * window_colors = "[Colors]\n\
+ const char * window_colors = "[Colors]\n\
background=214,205,187\n\
base=255,255,255\n\
dkgray=128,128,128\n\
@@ -683,13 +683,13 @@
nullColor=239,227,211\n\
text=0,0,0\n\n";
- const char * mainwin_size_pos = "[MainWin]\n\
+ const char * mainwin_size_pos = "[MainWin]\n\
height=600\n\
width=550\n\
x-pos=400\n\
y-pos=0\n\n";
- const char * dbase = "[Database]\n\
+ const char * dbase = "[Database]\n\
user=auser\n\
host=localhost\n\
pword=123\n\
@@ -697,18 +697,18 @@
logging=true\n\
logfile=\n\n";
- ts << header << "\n" << window_colors << mainwin_size_pos << dbase;
+ ts << header << "\n" << window_colors << mainwin_size_pos << dbase;
- /* a new tool might have been added, or other changes made, in
- which case this fn wouldn't contain the correct options=values
- if it were hard-wired in. Better safe than sorry: just get all
- tools that are present to spew their options/flags out to disk. */
- VkObject* vkobj;
- VkObjectList vkObjecList = vk->vkObjList();
- for ( vkobj = vkObjecList.first(); vkobj; vkobj = vkObjecList.next() ) {
- ts << vkobj->configEntries();
- }
- return str;
+ /* a new tool might have been added, or other changes made, in
+ which case this fn wouldn't contain the correct options=values
+ if it were hard-wired in. Better safe than sorry: just get all
+ tools that are present to spew their options/flags out to disk. */
+ VkObject* vkobj;
+ VkObjectList vkObjecList = vk->vkObjList();
+ for ( vkobj = vkObjecList.first(); vkobj; vkobj = vkObjecList.next() ) {
+ ts << vkobj->configEntries();
+ }
+ return str;
}
Modified: trunk/valkyrie/vk_utils.cpp
===================================================================
--- trunk/valkyrie/vk_utils.cpp 2008-06-28 18:56:26 UTC (rev 439)
+++ trunk/valkyrie/vk_utils.cpp 2008-06-29 15:07:04 UTC (rev 440)
@@ -118,27 +118,27 @@
/* Create a unique filename, with an optional extension ---------------- */
QString vk_mkstemp( QString filepath, QString ext/*=QString::null*/ )
{
- /* create tempfiles with datetime, so can sort easily if they stay around */
+ /* create tempfiles with datetime, so can sort easily if they stay around */
- QString datetime = QDateTime::currentDateTime().toString( "-yyyy.MM.dd-hh.mm.ss");
- QString unique = filepath + datetime;
- if (!ext.isNull()) unique += "." + ext;
+ QString datetime = QDateTime::currentDateTime().toString( "-yyyy.MM.dd-hh.mm.ss");
+ QString unique = filepath + datetime;
+ if (!ext.isNull()) unique += "." + ext;
- if ( QFile::exists(unique) ) {
- /* fall back on mkstemp */
- char* tmpname = vk_str_malloc( unique.length() + 10 );
- sprintf( tmpname, "%s.XXXXXX", unique.latin1() );
- int fd = mkstemp( tmpname );
- if ( fd == -1 ) {
- /* something went wrong */
- VK_DEBUG("failed to create unique filename from '%s'.",
- filepath.latin1() );
- return QString::null;
- }
- unique = QString( tmpname );
- tmpname = vk_str_free( tmpname );
- }
- return unique;
+ if ( QFile::exists(unique) ) {
+ /* fall back on mkstemp */
+ char* tmpname = vk_str_malloc( unique.length() + 10 );
+ sprintf( tmpname, "%s.XXXXXX", unique.latin1() );
+ int fd = mkstemp( tmpname );
+ if ( fd == -1 ) {
+ /* something went wrong */
+ VK_DEBUG("failed to create unique filename from '%s'.",
+ filepath.latin1() );
+ return QString::null;
+ }
+ unique = QString( tmpname );
+ tmpname = vk_str_free( tmpname );
+ }
+ return unique;
}
|
|
From: <sv...@va...> - 2008-06-28 18:56:23
|
Author: sewardj
Date: 2008-06-28 19:56:26 +0100 (Sat, 28 Jun 2008)
New Revision: 439
Log:
Minor changes to get a warning-free build with gcc-4.3. (nothing serious)
Modified:
trunk/valkyrie/help/hand_book.cpp
trunk/valkyrie/options/intspinbox.cpp
trunk/valkyrie/options/vk_option.cpp
Modified: trunk/valkyrie/help/hand_book.cpp
===================================================================
--- trunk/valkyrie/help/hand_book.cpp 2008-06-15 13:32:14 UTC (rev 438)
+++ trunk/valkyrie/help/hand_book.cpp 2008-06-28 18:56:26 UTC (rev 439)
@@ -112,7 +112,7 @@
QStringList browsers = QStringList::split( ':', env_browser );
QStringList::iterator it;
for (it=browsers.begin(); it != browsers.end(); ++it ) {
- if (ok = try_launch_browser(*it, link))
+ if ( (ok = try_launch_browser(*it, link)) )
break;
}
if (!ok) {
@@ -130,7 +130,7 @@
browsers << "firefox" << "mozilla" << "konqueror" << "netscape";
QStringList::iterator it;
for (it=browsers.begin(); it != browsers.end(); ++it ) {
- if (ok = try_launch_browser(*it, link))
+ if ( (ok = try_launch_browser(*it, link)) )
break;
}
}
Modified: trunk/valkyrie/options/intspinbox.cpp
===================================================================
--- trunk/valkyrie/options/intspinbox.cpp 2008-06-15 13:32:14 UTC (rev 438)
+++ trunk/valkyrie/options/intspinbox.cpp 2008-06-28 18:56:26 UTC (rev 439)
@@ -230,7 +230,7 @@
QStyle::SFlags flags = QStyle::Style_Default;
if ( isEnabled() )
flags |= QStyle::Style_Enabled;
- if ( hasFocus() || focusProxy() && focusProxy()->hasFocus() )
+ if ( hasFocus() || (focusProxy() && focusProxy()->hasFocus()) )
flags |= QStyle::Style_HasFocus;
QStyle::SCFlags active;
Modified: trunk/valkyrie/options/vk_option.cpp
===================================================================
--- trunk/valkyrie/options/vk_option.cpp 2008-06-15 13:32:14 UTC (rev 438)
+++ trunk/valkyrie/options/vk_option.cpp 2008-06-28 18:56:26 UTC (rev 439)
@@ -275,8 +275,8 @@
if (m_argType == VkOPTION::ARG_UINT) {
/* except don't test cachegrind's horrible cache options */
bool dontTest = ( m_configGroup == "cachegrind" &&
- ( m_longFlag == "I1" |
- m_longFlag == "D1" |
+ ( m_longFlag == "I1" ||
+ m_longFlag == "D1" ||
m_longFlag == "L2" ) );
if (!dontTest) {
/* min|max */
|
|
From: <sv...@va...> - 2008-06-15 13:32:08
|
Author: cerion
Date: 2008-06-15 14:32:14 +0100 (Sun, 15 Jun 2008)
New Revision: 438
Log:
when updating valkyrie config file, use configured value for valgrind
binary, instead of the old value.
Modified:
trunk/valkyrie/vk_config.cpp
Modified: trunk/valkyrie/vk_config.cpp
===================================================================
--- trunk/valkyrie/vk_config.cpp 2008-06-15 13:04:52 UTC (rev 437)
+++ trunk/valkyrie/vk_config.cpp 2008-06-15 13:32:14 UTC (rev 438)
@@ -555,8 +555,9 @@
/* but keep the new version! */
newMap[ EntryKey( "valkyrie", "version" ) ].mValue = vkVersion();
- /* ... and keep the new path to vk_logmerge */
+ /* ... and set the binaries to configured values: */
newMap[ EntryKey( "valkyrie", "merge-exec" ) ].mValue = BIN_LOGMERGE;
+ newMap[ EntryKey( "valkyrie", "vg-exec" ) ].mValue = BIN_VALGRIND;
/* write out new config */
if ( !writeConfig( newMap, true ) ) {
|
|
From: <sv...@va...> - 2008-06-15 13:04:46
|
Author: cerion
Date: 2008-06-15 14:04:52 +0100 (Sun, 15 Jun 2008)
New Revision: 437
Log:
- Update supported Valgrind version: >=3.3.0
- reverse r423,424 - complete backwards compatibility is unmaintainable.
- Update supported valgrind flags:
+ --child-silent-after-fork=no|yes omit child output between fork & exec
- --log-file=<file> log messages to <file>.<pid>
- --log-file-exactly=<file> log messages to <file>
- --log-file-qualifier=<VAR> incorporate $VAR in logfile name [none]
+ --log-file=<file> log messages to <file>
Modified:
trunk/configure.in
trunk/doc/introduction.html
trunk/doc/vg-manual-core.html
trunk/doc/xml/introduction.xml
trunk/valkyrie/core/memcheck_object.cpp
trunk/valkyrie/core/valgrind_object.cpp
trunk/valkyrie/core/valgrind_object.h
trunk/valkyrie/core/valkyrie_object.cpp
trunk/valkyrie/help/html_urls.cpp
trunk/valkyrie/help/html_urls.h
trunk/valkyrie/options/valgrind_options_page.cpp
trunk/valkyrie/vk_utils.cpp
trunk/valkyrie/vk_utils.h
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-06-14 20:30:51 UTC (rev 436)
+++ trunk/configure.in 2008-06-15 13:04:52 UTC (rev 437)
@@ -49,8 +49,9 @@
AC_MSG_WARN([Valgrind not found: may be configured at runtime.])
else
# Valgrind found: check is ok
- AC_MSG_CHECKING([valgrind version (need >= 3.0.0)])
- VG_VERSION_MAJOR_MIN=3
+ AC_MSG_CHECKING([valgrind version (need >= 3.3.0)])
+ VG_VERSION_MIN1=3
+ VG_VERSION_MIN2=3
VG_VERSION=`$VALGRIND --version | sed "s/^valgrind-//"`
if test x"$VG_VERSION" = x; then
# failed to start valgrind
@@ -58,10 +59,12 @@
VALGRIND=""
else
AC_MSG_RESULT([$VG_VERSION])
- VG_VERSION_MAJOR=`echo $VG_VERSION | sed "s/^\([[0-9\]]*\)\..*/\1/"`
- if test $VG_VERSION_MAJOR -lt $VG_VERSION_MAJOR_MIN ; then
+ VG_VERSION_1=`echo $VG_VERSION | sed "s/^\([[0-9]]\+\)\..*/\1/"`
+ VG_VERSION_2=`echo $VG_VERSION | sed "s/^[[0-9]]\+\.\([[0-9]]\+\)\..*/\1/"`
+ if { test $VG_VERSION_1 -lt $VG_VERSION_MIN1 || \
+ test $VG_VERSION_2 -lt $VG_VERSION_MIN2; }; then
VALGRIND=""
- AC_MSG_WARN([Not configuring for valgrind: need minimum version of 3.0.0. Please configure with a more recent version of Valgrind (may be done at runtime).])
+ AC_MSG_WARN([Not configuring for valgrind: need minimum version of 3.3.0. Please configure with a more recent version of Valgrind (may be done at runtime).])
fi
fi
fi
Modified: trunk/doc/introduction.html
===================================================================
--- trunk/doc/introduction.html 2008-06-14 20:30:51 UTC (rev 436)
+++ trunk/doc/introduction.html 2008-06-15 13:04:52 UTC (rev 437)
@@ -37,15 +37,15 @@
<div></div>
</div>
<p>Valkyrie is a graphical front-end to the Valgrind suite of tools for
-debugging and profiling Linux executables. Valgrind versions from 3.0.0
-(the first release to output XML) are supported. Currently, the
-only supported Valgrind tool is Memcheck.</p>
+debugging and profiling Linux executables. The current version supports
+Valgrind from version 3.3.0. Currently, the only supported Valgrind tool
+is Memcheck.</p>
<p>Valkyrie uses the Qt widget library, and should run on most reasonably
recent Linux setups. The only sine qua non is that you must have:</p>
<div class="itemizedlist"><ul type="bullet">
<li style="list-style-type: disc"><p>Qt v.3.2.0 or higher (but not Qt v.4 as yet),
and</p></li>
-<li style="list-style-type: disc"><p>Valgrind v.3.0.0 or higher.</p></li>
+<li style="list-style-type: disc"><p>Valgrind v.3.3.0 or higher.</p></li>
</ul></div>
<p>Valkyrie also contains a program <span><b class="command">vk_logmerge</b></span>.
Given multiple log files (in xml format) generated by multiple runs on
Modified: trunk/doc/vg-manual-core.html
===================================================================
--- trunk/doc/vg-manual-core.html 2008-06-14 20:30:51 UTC (rev 436)
+++ trunk/doc/vg-manual-core.html 2008-06-15 13:04:52 UTC (rev 437)
@@ -588,6 +588,14 @@
disabled by default.</p>
</li>
<li>
+<p><a name="silent_child"></a><code class="computeroutput">--child-silent-after-fork=yes</code>
+ [default]</p>
+<p><code class="computeroutput">--child-silent-after-fork=yes</code></p>
+<p>When enabled, Valgrind will omit child output between fork
+ and exec. This is normally disabled in Valgrind, but it
+ must be enabled for clean XML, which Valkyrie requires.</p>
+</li>
+<li>
<p><a name="track_fds"></a><code class="computeroutput">--track-fds=no</code> [default]</p>
<p><code class="computeroutput">--track-fds=yes</code></p>
<p>When enabled, Valgrind will print out a list of open
@@ -613,33 +621,13 @@
interfere with the client's own use of stderr.</p>
</li>
<li>
-<p><a name="log2file_pid"></a><code class="computeroutput">--log-file=<filename></code></p>
-<p>Specifies that Valgrind should send all of its messages
- to the specified file. In fact, the file name used is
- created by concatenating the text
- <code class="computeroutput">filename</code>, "." and the
- process ID, so as to create a file per process. The
- specified file name may not be the empty string.</p>
+<p><a name="log2file"></a><code class="computeroutput">--log-file=<filename></code></p>
+<p>Specifies that Valgrind should send all of its messages to
+ the specified file. The specified file name may not be an
+ empty string. If you trace multiple processes with Valgrind
+ when using this option the log file may get all messed up.
</li>
<li>
-<p><a name="log2file"></a><code class="computeroutput">--log-file-exactly=<filename></code></p>
-<p>Just like <code class="computeroutput">--log-file</code>, but
- the "." suffix is not added. If you trace multiple processes
- with Valgrind when using this option the log file may get all messed
- up.
- </p>
-</li>
-<li>
-<p><a name="log2file_qualifier"></a><code class="computeroutput">--log-file-qualifer=<VAR></code></p>
-<p>When used in conjunction with
- <code class="computeroutput">--log-file=</code>, causes the log file
- name to be qualified using the contents of environment variable
- <code class="computeroutput">VAR</code>. This is useful when running
- MPI programs.
- For further details, see <a href="manual-core.html#manual-core.comment">The commentary</a>.
- </p>
-</li>
-<li>
<p><a name="log2socket"></a><code class="computeroutput">--log-socket=<ip-address:port-number></code></p>
<p>Specifies that Valgrind should send all of its messages
to the specified port at the specified IP address. The port
Modified: trunk/doc/xml/introduction.xml
===================================================================
--- trunk/doc/xml/introduction.xml 2008-06-14 20:30:51 UTC (rev 436)
+++ trunk/doc/xml/introduction.xml 2008-06-15 13:04:52 UTC (rev 437)
@@ -9,16 +9,16 @@
<title>An Overview of Valkyrie</title>
<para>Valkyrie is a graphical front-end to the Valgrind suite of tools for
-debugging and profiling Linux executables. Valgrind versions from 3.0.0
-(the first release to output XML) are supported. Currently, the
-only supported Valgrind tool is Memcheck.</para>
+debugging and profiling Linux executables. The current version supports
+Valgrind from version 3.3.0. Currently, the only supported Valgrind tool
+is Memcheck.</para>
<para>Valkyrie uses the Qt widget library, and should run on most reasonably
recent Linux setups. The only sine qua non is that you must have:</para>
<itemizedlist mark='bullet'>
<listitem><para>Qt v.3.2.0 or higher (but not Qt v.4 as yet),
and</para></listitem>
- <listitem><para>Valgrind v.3.0.0 or higher.</para></listitem>
+ <listitem><para>Valgrind v.3.3.0 or higher.</para></listitem>
</itemizedlist>
Modified: trunk/valkyrie/core/memcheck_object.cpp
===================================================================
--- trunk/valkyrie/core/memcheck_object.cpp 2008-06-14 20:30:51 UTC (rev 436)
+++ trunk/valkyrie/core/memcheck_object.cpp 2008-06-15 13:04:52 UTC (rev 437)
@@ -333,38 +333,15 @@
{
m_saveFname = vk_mkstemp( QString( VK_LOGS_DIR ) + "mc_log", "xml" );
vk_assert( !m_saveFname.isEmpty() );
-
- /* check valgrind version:
- - supported version
- - version dependent code
- */
- int v1=0, v2=0, v3=0;
- bool ok = Valgrind::getVersionBinary( vgflags.first(), v1, v2, v3 );
- if ( !ok ) {
- vkError( view(), "Valgrind start error",
- "Failure running valgrind version test" );
- } else {
- // valgrind version dependent code
- QString log_param;
-
- if ( v1 == 3 && v2 < 3 ) { // < 3.3.0
- log_param = "--log-file-exactly=";
- } else { // >= 3.3.0
- log_param = "--log-file=";
- }
- log_param += m_saveFname;
-
- vgflags.insert( ++(vgflags.begin()), log_param );
- }
-
- if ( ok ) {
- setRunState( VkRunState::VALGRIND );
- m_fileSaved = false;
- statusMsg( "Memcheck", "Running ... " );
-
- ok = startProcess( vgflags );
- }
+ vgflags.insert( ++(vgflags.begin()), ("--log-file=" + m_saveFname) );
+
+ setRunState( VkRunState::VALGRIND );
+ m_fileSaved = false;
+ statusMsg( "Memcheck", "Running ... " );
+
+ bool ok = startProcess( vgflags );
+
if (!ok) {
statusMsg( "Memcheck", "Failed" );
m_fileSaved = true;
Modified: trunk/valkyrie/core/valgrind_object.cpp
===================================================================
--- trunk/valkyrie/core/valgrind_object.cpp 2008-06-14 20:30:51 UTC (rev 436)
+++ trunk/valkyrie/core/valgrind_object.cpp 2008-06-15 13:04:52 UTC (rev 437)
@@ -56,8 +56,14 @@
"valgrind", '\0', "trace-children",
"<yes|no>", "yes|no", "no",
"Trace child processes: ",
- "Valgrind-ise child processes?",
+ "Valgrind-ise child processes (follow execve)?",
urlVgCore::traceChild );
+ addOpt( SILENT_CH, VkOPTION::ARG_BOOL, VkOPTION::WDG_CHECK,
+ "valgrind", '\0', "child-silent-after-fork",
+ "<yes|no>", "yes|no", "yes", /* currently necessary for clean XML output */
+ "Omit child output between fork and exec: ",
+ "omit child output between fork & exec?",
+ urlVgCore::silentChild );
addOpt( TRACK_FDS, VkOPTION::ARG_BOOL, VkOPTION::WDG_CHECK,
"valgrind", '\0', "track-fds",
"<yes|no>", "yes|no", "no",
@@ -76,23 +82,12 @@
"Log to file descriptor:",
"log messages to file descriptor (1=stdout, 2=stderr)",
urlVgCore::logToFd );
- addOpt( LOG_PID, VkOPTION::ARG_STRING, VkOPTION::WDG_LEDIT,
- "valgrind", '\0', "log-file",
+ addOpt( LOG_FILE, VkOPTION::ARG_STRING, VkOPTION::WDG_LEDIT,
+ "valgrind", '\0', "log-file",
"<file>", "", "",
- "Log to <file>.pid<pid>:",
- "Log messages to <file>.pid<pid>",
- urlVgCore::logToFilePid );
- addOpt( LOG_FILE, VkOPTION::ARG_STRING, VkOPTION::WDG_LEDIT,
- "valgrind", '\0', "log-file-exactly",
- "<file>", "", "",
"Log to file:",
"log messages to <file>",
urlVgCore::logToFile );
- addOpt( LOG_QUAL, VkOPTION::ARG_STRING, VkOPTION::WDG_NONE,
- "valgrind", '\0', "log-file-qualifier",
- "VAR", "", "",
- "<VAR>", "incorporate $VAR in logfile name",
- urlVgCore::logFileQual );
addOpt( LOG_SOCKET, VkOPTION::ARG_STRING, VkOPTION::WDG_LEDIT,
"valgrind", '\0', "log-socket",
"<ipaddr:port>", "", "",
@@ -326,6 +321,13 @@
#endif
} break;
+ case SILENT_CH: {
+ /* Disabled for now - output between fork and exec is confusing for the XML output */
+ /* Note: Also disabled in ValgrindOptionsPage() */
+ errval = PERROR_BADOPT;
+ vkPrintErr("Option disabled '--%s'", opt->m_longFlag.latin1());
+ vkPrintErr(" - Necessary, to get clean XML output from Valgrind.");
+ } break;
case XML_OUTPUT:
/* Note: gui option disabled, so only reaches here from cmdline */
@@ -362,8 +364,6 @@
all logging options are therefore ignored */
case LOG_FILE:
case LOG_FD:
- case LOG_PID:
- case LOG_QUAL:
case LOG_SOCKET:
/* Note: gui options disabled, so only reaches here from cmdline */
errval = PERROR_BADOPT;
@@ -431,6 +431,15 @@
modFlags << "--" + opt->cfgKey() + "=" + cfgVal;
break;
+ /* for memcheck we needs this enabled to keep the xml clean */
+ case SILENT_CH:
+ if ( tool_obj->name() == "memcheck")
+ modFlags << "--" + opt->cfgKey() + "=yes";
+ else
+ if ( defVal != cfgVal )
+ modFlags << "--" + opt->cfgKey() + "=" + cfgVal;
+ break;
+
case VERBOSITY:
case TRACK_FDS:
case TIME_STAMP:
@@ -455,8 +464,6 @@
all logging options should therefore not be used */
case LOG_FILE:
case LOG_FD:
- case LOG_PID:
- case LOG_QUAL:
case LOG_SOCKET:
/* ignore these opts */
break;
@@ -474,63 +481,6 @@
-/* Get valgrind version */
-bool Valgrind::getVersionBinary( QString& vg_bin, int& v1, int& v2, int& v3 )
-{
- bool ok = true;
- QString vg_version;
-
- QString exec = vg_bin + " --version | sed 's/^valgrind-//'";
- FILE* fd = popen( exec.latin1(), "r");
- if (!fd) { // start error?
- perror("popen");
- ok = false;
- vkPrintErr( "Valgrind start error: Failure starting valgrind version test" );
- } else {
- char buf[1024];
- fgets(buf, sizeof(buf), fd);
- vg_version = buf;
- vg_version = vg_version.left( vg_version.length() - 1 );
-
- int result = pclose(fd);
- if ( !WIFEXITED( result ) ) { // exit error?
- ok = false;
- vkPrintErr( "Valgrind start error: Failure running valgrind version test" );
- }
- }
-
- if ( ok ) {
- // parse valgrind version
- QStringList slst_vg_ver = QStringList::split( '.', vg_version );
- if ( slst_vg_ver.count() != 3 ) {
- ok = false;
- }
- if ( ok ) {
- v1 = slst_vg_ver[0].toUInt( &ok );
- }
- if ( ok ) {
- v2 = slst_vg_ver[1].toUInt( &ok );
- }
- if ( ok ) {
- v3 = slst_vg_ver[2].toUInt( &ok );
- }
- if ( !ok ) {
- vkPrintErr( "Valgrind start error: Failure reading valgrind version: '%s'",
- vg_version.latin1() );
- } else {
- // check version supported
- if ( v1 < 3 ) { // < 3.0.0: unsupported
- ok = false;
- vkPrintErr( "Valgrind start error: Unsupported version: %s < 3.0.0",
- vg_version.latin1() );
- }
- }
- }
- return ok;
-}
-
-
-
/* Register tools */
void Valgrind::initToolObjects()
{
Modified: trunk/valkyrie/core/valgrind_object.h
===================================================================
--- trunk/valkyrie/core/valgrind_object.h 2008-06-14 20:30:51 UTC (rev 436)
+++ trunk/valkyrie/core/valgrind_object.h 2008-06-15 13:04:52 UTC (rev 437)
@@ -36,12 +36,11 @@
/* common options relevant to all tools */
VERBOSITY, // --verbosity
TRACE_CH, // --trace-children
+ SILENT_CH, // --child-silent-after-fork
TRACK_FDS, // --track-fds
TIME_STAMP, // --time-stamp
LOG_FD, // --log-fd
- LOG_PID, // --log-file
- LOG_FILE, // --log-file-exactly
- LOG_QUAL, // --log-file-qualifier
+ LOG_FILE, // --log-file
LOG_SOCKET, // --log-socket
/* uncommon options relevant to all tools */
@@ -85,9 +84,6 @@
ToolObject* toolObj( int tid );
ToolObject* toolObj( const QString& name );
- /* Get valgrind version */
- static bool getVersionBinary( QString& vg_bin, int& v1, int& v2, int& v3 );
-
private:
/* creates the various VkObjects and initialises their options,
ready for cmd-line parsing (if any). */
Modified: trunk/valkyrie/core/valkyrie_object.cpp
===================================================================
--- trunk/valkyrie/core/valkyrie_object.cpp 2008-06-14 20:30:51 UTC (rev 436)
+++ trunk/valkyrie/core/valkyrie_object.cpp 2008-06-15 13:04:52 UTC (rev 437)
@@ -24,7 +24,10 @@
#include <qapplication.h>
+ // Minimum version of Valgrind required
+const char* pchVersionVgMin = "3.3.0";
+
/* class Valkyrie --------------------------------------------------- */
Valkyrie:: ~Valkyrie()
{
@@ -195,14 +198,25 @@
return PERROR_BADFILE;
}
fgets( line, sizeof(line), fp );
- pclose(fp);
+ int result = pclose(fp);
+ if ( !WIFEXITED( result ) ) { // cmd exit error?
+ return PERROR_BADFILE;
+ }
+
QString vg_version = QString(line).simplifyWhiteSpace();
- if ( !vg_version.startsWith("valgrind") )
+ if ( !vg_version.startsWith("valgrind") ) {
return PERROR_BADFILE;
+ }
/* compare with minimum req'd version: */
- if ( str2hex(vg_version) < str2hex("3.0.0") )
+ int versionVg = strVersion2hex( vg_version );
+ int versionVgReqd = strVersion2hex( pchVersionVgMin );
+ if ( versionVg == -1 || versionVgReqd == -1) {
+ return PERROR_BADFILE;
+ }
+ if ( versionVg < versionVgReqd ) {
return PERROR_BADVERSION;
+ }
/* looking good... */
} break;
Modified: trunk/valkyrie/help/html_urls.cpp
===================================================================
--- trunk/valkyrie/help/html_urls.cpp 2008-06-14 20:30:51 UTC (rev 436)
+++ trunk/valkyrie/help/html_urls.cpp 2008-06-15 13:04:52 UTC (rev 437)
@@ -71,6 +71,7 @@
const char* mainTool = "vg-manual-core.html#tool_name";
const char* verbosity = "vg-manual-core.html#verbosity";
const char* traceChild = "vg-manual-core.html#trace_children";
+ const char* silentChild = "vg-manual-core.html#silent_child";
const char* trackFds = "vg-manual-core.html#track_fds";
const char* timeStamp = "vg-manual-core.html#time_stamp";
const char* xmlOutput = "vg-manual-core.html#xml_output";
@@ -83,9 +84,7 @@
/* valgrind's options page: tab Error Reporting */
const char* logToFd = "vg-manual-core.html#log2fd";
- const char* logToFilePid = "vg-manual-core.html#log2file_pid";
const char* logToFile = "vg-manual-core.html#log2file";
- const char* logFileQual = "vg-manual-core.html#log2file_qualifier";
const char* logToSocket = "vg-manual-core.html#log2socket";
const char* autoDemangle = "vg-manual-core.html#auto_demangle";
const char* numCallers = "vg-manual-core.html#num_callers";
Modified: trunk/valkyrie/help/html_urls.h
===================================================================
--- trunk/valkyrie/help/html_urls.h 2008-06-14 20:30:51 UTC (rev 436)
+++ trunk/valkyrie/help/html_urls.h 2008-06-15 13:04:52 UTC (rev 437)
@@ -69,6 +69,7 @@
extern const char* xmlOutput;
extern const char* xmlComment;
extern const char* traceChild;
+ extern const char* silentChild;
extern const char* trackFds;
extern const char* timeStamp;
extern const char* freeGlibc;
@@ -87,10 +88,8 @@
extern const char* whichDebugger;
extern const char* inputFd;
extern const char* logToFd;
- extern const char* logToFilePid;
extern const char* logToFile;
extern const char* logToSocket;
- extern const char* logFileQual;
/* only used by Memcheck and Massif */
extern const char* Alignment;
}
Modified: trunk/valkyrie/options/valgrind_options_page.cpp
===================================================================
--- trunk/valkyrie/options/valgrind_options_page.cpp 2008-06-14 20:30:51 UTC (rev 436)
+++ trunk/valkyrie/options/valgrind_options_page.cpp 2008-06-15 13:04:52 UTC (rev 437)
@@ -55,7 +55,7 @@
QGroupBox* cgroup1 = new QGroupBox(" Common Options ", tabCore, "cgroup1");
core_vbox->addWidget( cgroup1, m_space );
/* tabCore - group box 1 - grid layout */
- int rows = 7;
+ int rows = 8;
int cols = 2;
QGridLayout* cgrid1 = new QGridLayout( cgroup1, rows, cols, m_margin, m_space );
#if (QT_VERSION-0 >= 0x030200)
@@ -73,6 +73,8 @@
optionWidget( Valgrind::XML_OUTPUT, cgroup1, false ) );
m_itemList.insert( Valgrind::TRACE_CH, /* checkbox */
optionWidget( Valgrind::TRACE_CH, cgroup1, false ) );
+ m_itemList.insert( Valgrind::SILENT_CH, /* checkbox */
+ optionWidget( Valgrind::SILENT_CH, cgroup1, false ) );
m_itemList.insert( Valgrind::TRACK_FDS, /* checkbox */
optionWidget( Valgrind::TRACK_FDS, cgroup1, false ) );
m_itemList.insert( Valgrind::TIME_STAMP, /* checkbox */
@@ -82,8 +84,9 @@
cgrid1->addLayout( m_itemList[Valgrind::VERBOSITY ]->hlayout(), 2, 0 );
cgrid1->addWidget( m_itemList[Valgrind::XML_OUTPUT]->widget(), 3, 0 );
cgrid1->addWidget( m_itemList[Valgrind::TRACE_CH ]->widget(), 4, 0 );
- cgrid1->addWidget( m_itemList[Valgrind::TRACK_FDS ]->widget(), 5, 0 );
- cgrid1->addWidget( m_itemList[Valgrind::TIME_STAMP]->widget(), 6, 0 );
+ cgrid1->addWidget( m_itemList[Valgrind::SILENT_CH ]->widget(), 5, 0 );
+ cgrid1->addWidget( m_itemList[Valgrind::TRACK_FDS ]->widget(), 6, 0 );
+ cgrid1->addWidget( m_itemList[Valgrind::TIME_STAMP]->widget(), 7, 0 );
/* tabCore - group box 2 */
@@ -133,7 +136,7 @@
QGroupBox* egroup1 = new QGroupBox( " Options ", tabErep, "egroup1" );
erep_vbox->addWidget( egroup1, m_space );
/* tabErep - group box 1 - grid layout */
- rows = 14; cols = 2;
+ rows = 13; cols = 2;
QGridLayout* egrid1 = new QGridLayout( egroup1, rows, cols, m_margin, m_space );
#if (QT_VERSION-0 >= 0x030200)
egrid1->setRowSpacing( 0, m_topSpace ); /* blank top row */
@@ -165,8 +168,6 @@
optionWidget( Valgrind::INPUT_FD, egroup1, true ) );
m_itemList.insert( Valgrind::LOG_FD, /* spinbox */
optionWidget( Valgrind::LOG_FD, egroup1, true ) );
- m_itemList.insert( Valgrind::LOG_PID, /* ledit */
- optionWidget(Valgrind::LOG_PID, egroup1, true ) );
m_itemList.insert( Valgrind::LOG_FILE, /* ledit */
optionWidget(Valgrind::LOG_FILE, egroup1, true ) );
m_itemList.insert( Valgrind::LOG_SOCKET, /* ledit */
@@ -195,9 +196,8 @@
hBox->addLayout( m_itemList[Valgrind::LOG_FD]->hlayout() );
egrid1->addLayout( hBox, 10, 0 );
//------------
- egrid1->addLayout( m_itemList[Valgrind::LOG_PID ]->hlayout(), 11, 0 );
- egrid1->addLayout( m_itemList[Valgrind::LOG_FILE ]->hlayout(), 12, 0 );
- egrid1->addLayout( m_itemList[Valgrind::LOG_SOCKET ]->hlayout(), 13, 0 );
+ egrid1->addLayout( m_itemList[Valgrind::LOG_FILE ]->hlayout(), 11, 0 );
+ egrid1->addLayout( m_itemList[Valgrind::LOG_SOCKET ]->hlayout(), 12, 0 );
erep_vbox->addStretch( m_space );
@@ -259,10 +259,8 @@
with this. */
// error reporting tab
m_itemList[Valgrind::LOG_FD ]->setEnabled( false );
- m_itemList[Valgrind::LOG_PID ]->setEnabled( false );
m_itemList[Valgrind::LOG_FILE ]->setEnabled( false );
m_itemList[Valgrind::LOG_SOCKET ]->setEnabled( false );
-// m_itemList[Valgrind::LOG_QUAL ]->setEnabled( false );
/* Disabled because Valkyrie always requires xml output from Valgrind */
m_itemList[Valgrind::XML_OUTPUT ]->setEnabled( false );
@@ -274,6 +272,10 @@
/* Note: Also disabled in Valgrind::checkOptArg() */
m_itemList[Valgrind::TRACE_CH ]->setEnabled( false );
+ /* Disabled - must be left on to generate clean XML */
+ /* Note: Also disabled in Valgrind::checkOptArg() */
+ m_itemList[Valgrind::SILENT_CH ]->setEnabled( false );
+
/* Disabled for now - not yet implemented */
m_itemList[Valgrind::INPUT_FD ]->setEnabled( false );
@@ -408,4 +410,3 @@
VG_CLO_MAX_SFILES );
}
}
-
Modified: trunk/valkyrie/vk_utils.cpp
===================================================================
--- trunk/valkyrie/vk_utils.cpp 2008-06-14 20:30:51 UTC (rev 436)
+++ trunk/valkyrie/vk_utils.cpp 2008-06-15 13:04:52 UTC (rev 437)
@@ -143,10 +143,10 @@
/* Version check -------------------------------------------------------
- Given version string of "major.minor.patch" (e.g. 3.0.0),
+ Given version string of "major.minor.patch" (e.g. 3.3.0),
hex version = (major << 16) + (minor << 8) + patch
*/
-int str2hex( QString ver_str )
+int strVersion2hex( QString ver_str )
{
QRegExp rxver(".*(\\d{1,2})\\.(\\d{1,2})\\.(\\d{1,2}).*");
if ( rxver.search( ver_str ) == -1)
Modified: trunk/valkyrie/vk_utils.h
===================================================================
--- trunk/valkyrie/vk_utils.h 2008-06-14 20:30:51 UTC (rev 436)
+++ trunk/valkyrie/vk_utils.h 2008-06-15 13:04:52 UTC (rev 437)
@@ -85,8 +85,8 @@
/* create a unique filename -------------------------------------------- */
QString vk_mkstemp( QString filepath, QString ext=QString::null );
-/* 3.0.5 --> 0x030005 -------------------------------------------------- */
-int str2hex( QString ver_str );
+/* "valgrind 3.0.5" --> 0x030005 --------------------------------------- */
+int strVersion2hex( QString ver_str );
/* escape html entities
* current list: '<', '>', '&' ----------------------------------------- */
|
|
From: <sv...@va...> - 2008-06-14 20:30:49
|
Author: cerion Date: 2008-06-14 21:30:51 +0100 (Sat, 14 Jun 2008) New Revision: 436 Log: bump valkyrie version to 1.3.0.SVN Modified: trunk/configure.in Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2008-06-12 06:57:43 UTC (rev 435) +++ trunk/configure.in 2008-06-14 20:30:51 UTC (rev 436) @@ -2,7 +2,7 @@ ######################################################################## # ? AC_PREREQ(2.59) -AC_INIT(Valkyrie, 1.2.2, in...@op...) +AC_INIT(Valkyrie, 1.3.0.SVN, in...@op...) AC_CONFIG_SRCDIR([valkyrie/main.cpp]) AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR(m4) @@ -204,9 +204,9 @@ AC_DEFINE_UNQUOTED(BIN_EDITOR, "$VK_EDITOR", [source code editor]) # misc -AC_DEFINE_UNQUOTED(VK_COPYRIGHT, "(c) 2003-2006", [copyright]) +AC_DEFINE_UNQUOTED(VK_COPYRIGHT, "(c) 2003-2008", [copyright]) AC_DEFINE_UNQUOTED(VK_AUTHOR, "OpenWorks LLP", [author]) -AC_DEFINE_UNQUOTED(VG_COPYRIGHT, "(c) 2000-2006 and GNU GPL'd by Julian Seward et al.", [valgrind copyright]) +AC_DEFINE_UNQUOTED(VG_COPYRIGHT, "(c) 2000-2008 and GNU GPL'd by Julian Seward et al.", [valgrind copyright]) |
|
From: <sv...@va...> - 2008-06-12 06:57:37
|
Author: cerion
Date: 2008-06-12 07:57:43 +0100 (Thu, 12 Jun 2008)
New Revision: 435
Log:
Update user manual for added options
- log dir
- working dir
Modified:
trunk/doc/options_dialog.html
trunk/valkyrie/core/valkyrie_object.cpp
trunk/valkyrie/help/html_urls.cpp
trunk/valkyrie/help/html_urls.h
Modified: trunk/doc/options_dialog.html
===================================================================
--- trunk/doc/options_dialog.html 2008-06-11 20:40:46 UTC (rev 434)
+++ trunk/doc/options_dialog.html 2008-06-12 06:57:43 UTC (rev 435)
@@ -109,6 +109,24 @@
the "%s" string is replaced with the targed url.<br>
Example: "mozilla -remote openUrl(%s,new-tab)".</p></dd>
<dt>
+<a name="log_dir"></a><span><b class="command">Log Dir:</b></span>
+</dt>
+<dd><p>This determines the default directory for the user to save
+ their log files.<br>
+ Note: When running, Valkyrie generates temporary log files. These
+ are stored under /tmp/valkyrie_logs (this can be changed when building Valkyrie).<br>
+ Example: "./".<br>
+ Example: "/home/myself/valkyrie_logs".</p></dd>
+<dt>
+<a name="working_dir"></a><span><b class="command">Working Dir:</b></span>
+</dt>
+<dd><p>This determines the working directory under which valgrind runs
+ (and therefore also the program being run by Valgrind). This does
+ not change the current working directory of Valkyrie itself, but the
+ that of the program being run.<br>
+ Example: "./".<br>
+ Example: "/home/myself/valkyrie_working_dir".</p></dd>
+<dt>
<a name="user_font_general"></a><span><b class="command">General Font:</b></span>
</dt>
<dd><p>This is the general application font.
Modified: trunk/valkyrie/core/valkyrie_object.cpp
===================================================================
--- trunk/valkyrie/core/valkyrie_object.cpp 2008-06-11 20:40:46 UTC (rev 434)
+++ trunk/valkyrie/core/valkyrie_object.cpp 2008-06-12 06:57:43 UTC (rev 435)
@@ -100,11 +100,11 @@
addOpt( DFLT_LOGDIR, VkOPTION::NOT_POPT, VkOPTION::WDG_LEDIT,
"valkyrie", '\0', "default-logdir",
"", "", VK_LOGS_DIR,
- "Log Dir:", "", "" );
+ "Log Dir:", "", urlValkyrie::logDir );
addOpt( WORKING_DIR, VkOPTION::ARG_STRING, VkOPTION::WDG_LEDIT,
"valkyrie", '\0', "working-dir",
"<dir>", "", "./",
- "Working Dir:", "dir under which to run valgrind", "" );
+ "Working Dir:", "dir under which to run valgrind", urlValkyrie::workingDir );
/* path to valgrind executable (maybe found by configure) */
addOpt( VG_EXEC, VkOPTION::NOT_POPT, VkOPTION::WDG_LEDIT,
Modified: trunk/valkyrie/help/html_urls.cpp
===================================================================
--- trunk/valkyrie/help/html_urls.cpp 2008-06-11 20:40:46 UTC (rev 434)
+++ trunk/valkyrie/help/html_urls.cpp 2008-06-12 06:57:43 UTC (rev 435)
@@ -38,6 +38,8 @@
const char* toolTips = "options_dialog.html#tool_tips";
const char* toolLabels = "options_dialog.html#tool_label";
const char* browser = "options_dialog.html#browser";
+ const char* logDir = "options_dialog.html#log_dir";
+ const char* workingDir = "options_dialog.html#working_dir";
const char* userFontGen = "options_dialog.html#user_font_general";
const char* userFontTool = "options_dialog.html#user_font_tool";
const char* palette = "options_dialog.html#palette";
Modified: trunk/valkyrie/help/html_urls.h
===================================================================
--- trunk/valkyrie/help/html_urls.h 2008-06-11 20:40:46 UTC (rev 434)
+++ trunk/valkyrie/help/html_urls.h 2008-06-12 06:57:43 UTC (rev 435)
@@ -36,6 +36,8 @@
extern const char* toolTips;
extern const char* toolLabels;
extern const char* browser;
+ extern const char* logDir;
+ extern const char* workingDir;
extern const char* userFontGen;
extern const char* userFontTool;
extern const char* palette;
|
|
From: <sv...@va...> - 2008-06-11 20:40:41
|
Author: cerion
Date: 2008-06-11 21:40:46 +0100 (Wed, 11 Jun 2008)
New Revision: 434
Log:
Fix open/close items buttons
- open current item: only worked once item had been opened once already
- open all items: didn't open leak errors (stopped at suppressions)
- open all items: remained 'pushed' even if all items were closed
Modified:
trunk/valkyrie/tool_views/memcheck_view.cpp
trunk/valkyrie/tool_views/memcheck_view.h
trunk/valkyrie/tool_views/vglogview.cpp
Modified: trunk/valkyrie/tool_views/memcheck_view.cpp
===================================================================
--- trunk/valkyrie/tool_views/memcheck_view.cpp 2008-06-10 01:44:12 UTC (rev 433)
+++ trunk/valkyrie/tool_views/memcheck_view.cpp 2008-06-11 20:40:46 UTC (rev 434)
@@ -189,9 +189,8 @@
openAllButton = new QToolButton( mcToolBar, "tb_open_all" );
openAllButton->setIconSet( QPixmap( open_all_items_xpm ) );
openAllButton->setAutoRaise( true );
- openAllButton->setToggleButton( true );
- connect( openAllButton, SIGNAL( toggled(bool) ),
- this, SLOT( openAllItems(bool) ) );
+ connect( openAllButton, SIGNAL( clicked() ),
+ this, SLOT( openAllItems() ) );
QToolTip::add( openAllButton,
"Open / Close all errors" );
ContextHelp::add( openAllButton, urlValkyrie::openAllButton );
@@ -370,7 +369,7 @@
/* opens all error items plus their children.
ignores the status, preamble, et al. items. */
-void MemcheckView::openAllItems( bool open )
+void MemcheckView::openAllItems()
{
if (!lView->firstChild()) /* listview populated at all? */
return;
@@ -383,11 +382,31 @@
op_item = op_item->nextSibling();
}
+ /* is any top-level item open? */
+ bool anItemIsOpen = false;
+ VgOutputItem* op_item2 = op_item;
+ while ( op_item2 ) {
+ /* skip suppressions */
+ if ( ((VgOutputItem*)op_item2)->elemType() == VgElement::SUPPCOUNTS ) {
+ op_item2 = op_item2->nextSibling();
+ continue;
+ }
+ if ( op_item2->isOpen() ) {
+ anItemIsOpen = true;
+ break;
+ }
+ op_item2 = op_item2->nextSibling();
+ }
+
+ /* iterate over all items, opening as we go */
QListViewItemIterator it( op_item );
while ( it.current() ) {
- if ( ((VgOutputItem*)it.current())->elemType() == VgElement::SUPPCOUNTS )
- break; /* stop when we hit suppressions */
- it.current()->setOpen( open );
+ /* skip suppressions */
+ if ( ((VgOutputItem*)it.current())->elemType() == VgElement::SUPPCOUNTS ) {
+ ++it;
+ continue;
+ }
+ it.current()->setOpen( !anItemIsOpen );
++it;
}
}
@@ -455,15 +474,7 @@
openOneButton->setEnabled( false );
} else {
/* if item openable and within an error: enable openOneButton */
- bool isOpenable = (lv_item->firstChild() != 0);
- bool withinError = false;
- VgOutputItem* curr_item = (VgOutputItem*)lv_item;
- for (; curr_item; curr_item = curr_item->parent() ) {
- if ( curr_item->elemType() == VgElement::ERROR ) {
- withinError = true;
- break;
- }
- }
- openOneButton->setEnabled( isOpenable && withinError );
+ bool isOpenable = lv_item->isExpandable();
+ openOneButton->setEnabled( isOpenable );
}
}
Modified: trunk/valkyrie/tool_views/memcheck_view.h
===================================================================
--- trunk/valkyrie/tool_views/memcheck_view.h 2008-06-10 01:44:12 UTC (rev 433)
+++ trunk/valkyrie/tool_views/memcheck_view.h 2008-06-11 20:40:46 UTC (rev 434)
@@ -50,7 +50,7 @@
void showSuppEditor();
void itemSelected();
- void openAllItems(bool);
+ void openAllItems();
void openOneItem();
void showSrcPath();
void launchEditor( QListViewItem* );
Modified: trunk/valkyrie/tool_views/vglogview.cpp
===================================================================
--- trunk/valkyrie/tool_views/vglogview.cpp 2008-06-10 01:44:12 UTC (rev 433)
+++ trunk/valkyrie/tool_views/vglogview.cpp 2008-06-11 20:40:46 UTC (rev 434)
@@ -366,6 +366,7 @@
}
}
VgOutputItem::setOpen( open );
+ setExpandable( true );
}
@@ -383,9 +384,10 @@
{
if ( open && childCount() == 0 ) {
VgOutputItem* item = new VgOutputItem( this, elem );
- item->setText( elem.text() );
+ item->setText( elem.text() );
}
VgOutputItem::setOpen( open );
+ setExpandable( true );
}
@@ -397,6 +399,7 @@
: VgOutputItem( parent, after, args )
{
setText( "args" );
+ setExpandable( true );
}
void ArgsItem::setOpen( bool open )
|
|
From: <sv...@va...> - 2008-06-10 20:14:23
|
Author: cerion
Date: 2008-06-10 02:44:12 +0100 (Tue, 10 Jun 2008)
New Revision: 433
Log:
Fix xml parsing of <dir>/<file>
In particular:
- <dir> may be null, and dir be within <file>
- allow for different ordering of fields
Modified:
trunk/valkyrie/tool_utils/vglog.cpp
trunk/valkyrie/tool_views/vglogview.cpp
Modified: trunk/valkyrie/tool_utils/vglog.cpp
===================================================================
--- trunk/valkyrie/tool_utils/vglog.cpp 2008-06-10 00:30:28 UTC (rev 432)
+++ trunk/valkyrie/tool_utils/vglog.cpp 2008-06-10 01:44:12 UTC (rev 433)
@@ -226,21 +226,21 @@
{
QDomNodeList frame_details1 = childNodes();
assert( frame_details1.count() >= 1 ); /* only ip guaranteed */
- QDomElement iptr1 = frame_details1.item( 0 ).toElement();
- QDomElement objt1 = frame_details1.item( 1 ).toElement();
- QDomElement func1 = frame_details1.item( 2 ).toElement();
- QDomElement diry1 = frame_details1.item( 3 ).toElement();
- QDomElement file1 = frame_details1.item( 4 ).toElement();
- QDomElement line1 = frame_details1.item( 5 ).toElement();
+ QDomElement iptr1 = getFirstElem( "ip" );
+ QDomElement objt1 = getFirstElem( "obj" );
+ QDomElement func1 = getFirstElem( "fn" );
+ QDomElement diry1 = getFirstElem( "dir" );
+ QDomElement file1 = getFirstElem( "file" );
+ QDomElement line1 = getFirstElem( "line" );
QDomNodeList frame_details2 = frame2.childNodes();
assert( frame_details2.count() >= 1 ); /* only ip guaranteed */
- QDomElement iptr2 = frame_details2.item( 0 ).toElement();
- QDomElement objt2 = frame_details2.item( 1 ).toElement();
- QDomElement func2 = frame_details2.item( 2 ).toElement();
- QDomElement diry2 = frame_details2.item( 3 ).toElement();
- QDomElement file2 = frame_details2.item( 4 ).toElement();
- QDomElement line2 = frame_details2.item( 5 ).toElement();
+ QDomElement iptr2 = frame2.getFirstElem( "ip" );
+ QDomElement objt2 = frame2.getFirstElem( "obj" );
+ QDomElement func2 = frame2.getFirstElem( "fn" );
+ QDomElement diry2 = frame2.getFirstElem( "dir" );
+ QDomElement file2 = frame2.getFirstElem( "file" );
+ QDomElement line2 = frame2.getFirstElem( "line" );
/* a frame may be the 'same' as another even if it is
missing some data - do the best comparison we can */
@@ -299,12 +299,12 @@
{
QDomNodeList frame_details = childNodes();
assert( frame_details.count() >= 1 ); /* only ip guaranteed */
- QDomElement ip = frame_details.item( 0 ).toElement();
- QDomElement obj = frame_details.item( 1 ).toElement();
- QDomElement fn = frame_details.item( 2 ).toElement();
- QDomElement dir = frame_details.item( 3 ).toElement();
- QDomElement srcloc = frame_details.item( 4 ).toElement();
- QDomElement line = frame_details.item( 5 ).toElement();
+ QDomElement ip = getFirstElem( "ip" );
+ QDomElement obj = getFirstElem( "obj" );
+ QDomElement fn = getFirstElem( "fn" );
+ QDomElement dir = getFirstElem( "dir" );
+ QDomElement srcloc = getFirstElem( "file" );
+ QDomElement line = getFirstElem( "line" );
bool know_fnname = !fn.isNull();
bool know_objname = !obj.isNull();
Modified: trunk/valkyrie/tool_views/vglogview.cpp
===================================================================
--- trunk/valkyrie/tool_views/vglogview.cpp 2008-06-10 00:30:28 UTC (rev 432)
+++ trunk/valkyrie/tool_views/vglogview.cpp 2008-06-10 01:44:12 UTC (rev 433)
@@ -565,12 +565,15 @@
: VgOutputItem( parent, after, frm )
{
/* check what perms the user has w.r.t. this file */
- QDomNodeList frame_details = frm.childNodes();
- QDomElement srcdir = frame_details.item( 3 ).toElement();
- QDomElement srcfile = frame_details.item( 4 ).toElement();
+ QDomElement srcdir = frm.getFirstElem( "dir" );
+ QDomElement srcfile = frm.getFirstElem( "file" );
- if (!srcdir.isNull() && !srcfile.isNull()) {
- QString path = srcdir.text() + "/" + srcfile.text();
+ if ( !srcfile.isNull() ) {
+ QString path;
+ if ( !srcdir.isNull() )
+ path = srcdir.text() + "/";
+ path += srcfile.text();
+
QFileInfo fi( path );
if ( fi.exists() && fi.isFile() && !fi.isSymLink() ) {
isReadable = fi.isReadable();
@@ -585,16 +588,21 @@
void FrameItem::setOpen( bool open )
{
if ( open && childCount() == 0 && isReadable ) {
+ QDomElement srcdir = elem.getFirstElem( "dir" );
+ QDomElement srcfile = elem.getFirstElem( "file" );
+ QDomElement line = elem.getFirstElem( "line" );
- QDomNodeList frame_details = elem.childNodes();
- QDomElement srcdir = frame_details.item( 3 ).toElement();
- QDomElement srcfile = frame_details.item( 4 ).toElement();
- QDomElement line = frame_details.item( 5 ).toElement();
+ if ( srcfile.isNull() )
+ return;
- if (srcdir.isNull() || srcfile.isNull())
+ QString path;
+ if ( !srcdir.isNull() )
+ path = srcdir.text() + "/";
+ path += srcfile.text();
+
+ if ( !QFile::exists( path ) )
return;
- QString path = srcdir.text() + "/" + srcfile.text();
VgElement srcline = (VgElement&)line;
/* create the item for the src lines */
|
|
From: <sv...@va...> - 2008-06-10 20:14:17
|
Author: cerion
Date: 2008-06-10 01:30:28 +0100 (Tue, 10 Jun 2008)
New Revision: 432
Log:
Allow for multiple suppressions on the command line
Modified:
trunk/valkyrie/options/parse_cmd_args.cpp
Modified: trunk/valkyrie/options/parse_cmd_args.cpp
===================================================================
--- trunk/valkyrie/options/parse_cmd_args.cpp 2008-06-09 22:52:09 UTC (rev 431)
+++ trunk/valkyrie/options/parse_cmd_args.cpp 2008-06-10 00:30:28 UTC (rev 432)
@@ -179,11 +179,19 @@
goto done;
}
- /* else ok: write option to config (but not to disk yet) */
+ /* else ok: write option to config
+ Note: not written to disk. The user can do this via option config */
vk_opt = obj->findOption( opt->optKey );
vk_assert(vk_opt != NULL);
- vkConfig->wrEntry( qs_argval, vk_opt->cfgKey(), vk_opt->cfgGroup() );
+ if ( opt->objectId == VkObject::ID_VALGRIND &&
+ opt->optKey == Valgrind::SUPPS_SEL ) {
+ /* exception: multiple suppressions are allowed */
+ vkConfig->addEntry( qs_argval, vk_opt->cfgKey(), vk_opt->cfgGroup() );
+ } else {
+ vkConfig->wrEntry( qs_argval, vk_opt->cfgKey(), vk_opt->cfgGroup() );
+ }
+
} /* end while ... */
/* rc == 1 for the first non-valkyrie/valgrind option */
|
|
From: <sv...@va...> - 2008-06-10 20:14:11
|
Author: cerion
Date: 2008-06-09 23:52:09 +0100 (Mon, 09 Jun 2008)
New Revision: 431
Log:
Added option to set working directory (via cmdline and vk config)
Modified:
trunk/configure.in
trunk/valkyrie/core/memcheck_object.cpp
trunk/valkyrie/core/valgrind_object.cpp
trunk/valkyrie/core/valkyrie_object.cpp
trunk/valkyrie/core/valkyrie_object.h
trunk/valkyrie/options/valkyrie_options_page.cpp
trunk/valkyrie/options/valkyrie_options_page.h
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-06-09 22:01:23 UTC (rev 430)
+++ trunk/configure.in 2008-06-09 22:52:09 UTC (rev 431)
@@ -2,7 +2,7 @@
########################################################################
# ? AC_PREREQ(2.59)
-AC_INIT(Valkyrie, 1.2.1, in...@op...)
+AC_INIT(Valkyrie, 1.2.2, in...@op...)
AC_CONFIG_SRCDIR([valkyrie/main.cpp])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR(m4)
Modified: trunk/valkyrie/core/memcheck_object.cpp
===================================================================
--- trunk/valkyrie/core/memcheck_object.cpp 2008-06-09 22:01:23 UTC (rev 430)
+++ trunk/valkyrie/core/memcheck_object.cpp 2008-06-09 22:52:09 UTC (rev 431)
@@ -496,6 +496,10 @@
so don't let it hijack stdin/out/err for socket fd's */
m_vgproc->setCommunication( 0 );
+ /* set working directory */
+ m_vgproc->setWorkingDirectory(
+ QDir( vkConfig->rdEntry( "working-dir", "valkyrie" ) ) );
+
if ( !m_vgproc->start() ) {
VK_DEBUG("process failed to start");
QString path_errmsg = (runState() == VkRunState::VALGRIND)
Modified: trunk/valkyrie/core/valgrind_object.cpp
===================================================================
--- trunk/valkyrie/core/valgrind_object.cpp 2008-06-09 22:01:23 UTC (rev 430)
+++ trunk/valkyrie/core/valgrind_object.cpp 2008-06-09 22:52:09 UTC (rev 431)
@@ -116,7 +116,7 @@
urlVgCore::simHints );
addOpt( KERN_VAR, VkOPTION::ARG_STRING, VkOPTION::WDG_COMBO,
"valgrind", '\0', "kernel-variant",
- "<variant1,variant2,...>", "none|bproc", "none",
+ "<variant1,...>", "none|bproc", "none",
"Kernel Variants:",
"Handle non-standard kernel variants. Recognised variants are: bproc. Use with caution!",
urlVgCore::kernelVariant );
Modified: trunk/valkyrie/core/valkyrie_object.cpp
===================================================================
--- trunk/valkyrie/core/valkyrie_object.cpp 2008-06-09 22:01:23 UTC (rev 430)
+++ trunk/valkyrie/core/valkyrie_object.cpp 2008-06-09 22:52:09 UTC (rev 431)
@@ -59,7 +59,7 @@
addOpt( VGHELP, VkOPTION::ARG_NONE, VkOPTION::WDG_NONE,
"valkyrie", 'V', "valgrind-opts",
"", "", "",
- "", "Show valgrind options too, and exit", urlNone );
+ "", "show valgrind options too, and exit", urlNone );
addOpt( TOOLTIP, VkOPTION::NOT_POPT, VkOPTION::WDG_CHECK,
"valkyrie", '\0', "show-tooltips",
"", "true|false", "true",
@@ -101,6 +101,10 @@
"valkyrie", '\0', "default-logdir",
"", "", VK_LOGS_DIR,
"Log Dir:", "", "" );
+ addOpt( WORKING_DIR, VkOPTION::ARG_STRING, VkOPTION::WDG_LEDIT,
+ "valkyrie", '\0', "working-dir",
+ "<dir>", "", "./",
+ "Working Dir:", "dir under which to run valgrind", "" );
/* path to valgrind executable (maybe found by configure) */
addOpt( VG_EXEC, VkOPTION::NOT_POPT, VkOPTION::WDG_LEDIT,
@@ -159,7 +163,8 @@
return errval;
break;
- case DFLT_LOGDIR: {
+ case DFLT_LOGDIR:
+ case WORKING_DIR: {
/* see if we have an dir with rx permissions */
(void) dirCheck( &errval, argval, true, true );
} break;
Modified: trunk/valkyrie/core/valkyrie_object.h
===================================================================
--- trunk/valkyrie/core/valkyrie_object.h 2008-06-09 22:01:23 UTC (rev 430)
+++ trunk/valkyrie/core/valkyrie_object.h 2008-06-09 22:52:09 UTC (rev 431)
@@ -49,7 +49,7 @@
TOOLTIP, PALETTE, ICONTXT,
FNT_GEN_SYS, FNT_GEN_USR, FNT_TOOL_USR,
SRC_EDITOR, SRC_LINES, BROWSER,
- DFLT_LOGDIR,
+ DFLT_LOGDIR, WORKING_DIR,
VG_EXEC, /* path to valgrind executable */
/* FIRST_CMD_OPT */
BINARY, BIN_FLAGS, VIEW_LOG, MERGE_EXEC, MERGE_LOGS,
Modified: trunk/valkyrie/options/valkyrie_options_page.cpp
===================================================================
--- trunk/valkyrie/options/valkyrie_options_page.cpp 2008-06-09 22:01:23 UTC (rev 430)
+++ trunk/valkyrie/options/valkyrie_options_page.cpp 2008-06-09 22:52:09 UTC (rev 431)
@@ -24,7 +24,7 @@
: OptionsPage( parent, obj, "valkyrie_options_page" )
{
/* init the QIntDict list, resizing if necessary */
- unsigned int numItems = 13;
+ unsigned int numItems = 14;
m_itemList.resize( numItems );
QVBoxLayout* vbox = new QVBoxLayout( this, m_margin, -1, "vbox" );
@@ -55,6 +55,12 @@
dirLogSave->addButton( group1, this, SLOT(getDfltLogDir()) );
connect(dirLogSave, SIGNAL(returnPressed()), this, SIGNAL(apply()));
+ m_itemList.insert( Valkyrie::WORKING_DIR, /* ledit + button */
+ optionWidget(Valkyrie::WORKING_DIR, group1, false ) );
+ LeWidget* dirWorking = ((LeWidget*)m_itemList[Valkyrie::WORKING_DIR]);
+ dirWorking->addButton( group1, this, SLOT(getWorkingDir()) );
+ connect(dirWorking, SIGNAL(returnPressed()), this, SIGNAL(apply()));
+
/* fonts --------------------------------------------------------- */
m_itemList.insert( Valkyrie::FNT_GEN_SYS, /* checkbox */
optionWidget( Valkyrie::FNT_GEN_SYS, group1, false ));
@@ -129,6 +135,10 @@
grid->addMultiCellWidget( dirLogSave->widget(), i,i, 1,3 );
i++;
+ grid->addWidget( dirWorking->button(), i, 0 );
+ grid->addMultiCellWidget( dirWorking->widget(), i,i, 1,3 );
+ i++;
+
grid->addMultiCellWidget( sep(group1,"sep0"), i,i, 0,3 );
#if (QT_VERSION-0 >= 0x030200)
grid->setRowSpacing( i++, 8 );
@@ -372,8 +382,7 @@
}
-/* RM: allows user to specify which valgrind version to use. the guts
- of this fn are essentially the same as the one in config.tests/valgrind.test */
+/* RM: allows user to specify which default log dir to use */
void ValkyrieOptionsPage::getDfltLogDir()
{
QString currdir = m_itemList[Valkyrie::DFLT_LOGDIR]->currValue();
@@ -386,3 +395,17 @@
checkOption( Valkyrie::DFLT_LOGDIR );
}
}
+
+/* RM: allows user to specify which default log dir to use */
+void ValkyrieOptionsPage::getWorkingDir()
+{
+ QString currdir = m_itemList[Valkyrie::WORKING_DIR]->currValue();
+ QString dir_working =
+ QFileDialog::getExistingDirectory( currdir, this,
+ "get default working dir",
+ "Choose a directory", TRUE );
+ if ( !dir_working.isEmpty() ) { /* user might have clicked Cancel */
+ ((LeWidget*)m_itemList[Valkyrie::WORKING_DIR])->setCurrValue( dir_working );
+ checkOption( Valkyrie::WORKING_DIR );
+ }
+}
Modified: trunk/valkyrie/options/valkyrie_options_page.h
===================================================================
--- trunk/valkyrie/options/valkyrie_options_page.h 2008-06-09 22:01:23 UTC (rev 430)
+++ trunk/valkyrie/options/valkyrie_options_page.h 2008-06-09 22:52:09 UTC (rev 431)
@@ -28,6 +28,7 @@
void getBinary();
void getBrowser();
void getDfltLogDir();
+ void getWorkingDir();
void getVgExec();
};
|
|
From: <sv...@va...> - 2008-06-10 20:14:06
|
Author: cerion
Date: 2008-06-09 23:01:23 +0100 (Mon, 09 Jun 2008)
New Revision: 430
Log:
Whoops: set tmp log dir correct for merging too.
Modified:
trunk/valkyrie/core/memcheck_object.cpp
Modified: trunk/valkyrie/core/memcheck_object.cpp
===================================================================
--- trunk/valkyrie/core/memcheck_object.cpp 2008-06-09 21:25:32 UTC (rev 429)
+++ trunk/valkyrie/core/memcheck_object.cpp 2008-06-09 22:01:23 UTC (rev 430)
@@ -428,14 +428,16 @@
/* if --merge=<file_list> was specified on the cmd-line, called by
valkyrie->runTool(); if set via the open-file-dialog in the gui,
called by MemcheckView::openMergeFile(). either way, the value in
- [valkyrie:merge] is what we need to know */
+ [valkyrie:merge] is what we need to know
+
+ Auto-generated logs always saved in hard-coded (configured) log dir
+*/
bool Memcheck::mergeLogFiles()
{
QString fname_logList = vkConfig->rdEntry( "merge", "valkyrie" );
statusMsg( "Merging logs in file-list", fname_logList );
- QString logDir = vkConfig->rdEntry( "default-logdir", "valkyrie" );
- m_saveFname = vk_mkstemp( logDir + "mc_merged", "xml" );
+ m_saveFname = vk_mkstemp( QString( VK_LOGS_DIR ) + "mc_merged", "xml" );
vk_assert( !m_saveFname.isEmpty() );
QStringList flags;
|
|
From: <sv...@va...> - 2008-06-10 20:14:00
|
Author: cerion
Date: 2008-06-09 22:25:32 +0100 (Mon, 09 Jun 2008)
New Revision: 429
Log:
Clarify error message suggesting 'Save Log', when first the modal dialog
must be closed.
Modified:
trunk/valkyrie/core/memcheck_object.cpp
Modified: trunk/valkyrie/core/memcheck_object.cpp
===================================================================
--- trunk/valkyrie/core/memcheck_object.cpp 2008-06-09 21:18:36 UTC (rev 428)
+++ trunk/valkyrie/core/memcheck_object.cpp 2008-06-09 21:25:32 UTC (rev 429)
@@ -603,8 +603,8 @@
"<p>Process exited with return value %d.<br> \
This is likely to simply be the client program \
return value. If, however, you suspect Valgrind \
- itself may have crashed, please 'Save Log' and \
- examine for details.</p>", exitStatus);
+ itself may have crashed, please click 'OK', then \
+ 'Save Log' and examine for details.</p>", exitStatus);
} else {
vkError( view(), "Parse Error",
"<p>Merge process exited with return value %d.<br> \
|
|
From: <sv...@va...> - 2008-06-10 20:13:56
|
Author: cerion
Date: 2008-06-09 22:18:36 +0100 (Mon, 09 Jun 2008)
New Revision: 428
Log:
Fix log dir setup (as requested by many!)
Temporary logs are now always written to /tmp/valkyrie_logs (configured value)
Added a user configurable "Log Dir", which is used as the default dir
when saving logs.
Modified:
trunk/configure.in
trunk/valkyrie/core/memcheck_object.cpp
trunk/valkyrie/core/valkyrie_object.cpp
trunk/valkyrie/core/valkyrie_object.h
trunk/valkyrie/options/valkyrie_options_page.cpp
trunk/valkyrie/options/valkyrie_options_page.h
trunk/valkyrie/options/vk_option.cpp
trunk/valkyrie/vk_config.cpp
trunk/valkyrie/vk_config.h
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2008-06-09 21:09:38 UTC (rev 427)
+++ trunk/configure.in 2008-06-09 21:18:36 UTC (rev 428)
@@ -2,7 +2,7 @@
########################################################################
# ? AC_PREREQ(2.59)
-AC_INIT(Valkyrie, 1.2.0, in...@op...)
+AC_INIT(Valkyrie, 1.2.1, in...@op...)
AC_CONFIG_SRCDIR([valkyrie/main.cpp])
AC_CONFIG_HEADER([config.h])
AC_CONFIG_MACRO_DIR(m4)
@@ -193,10 +193,10 @@
AC_DEFINE_UNQUOTED(VK_DOC_PATH, "/doc/", [valkyrie install doc path])
# valkyrie config paths
-AC_DEFINE_UNQUOTED(VK_CFG_DIR, ".$PACKAGE", [valkyrie config dir])
-AC_DEFINE_UNQUOTED(VK_DBASE_DIR, "/dbase/", [valkyrie config dbase dir])
-AC_DEFINE_UNQUOTED(VK_LOGS_DIR, "/logs/", [valkyrie config logs dir])
-AC_DEFINE_UNQUOTED(VK_SUPPS_DIR, "/suppressions/", [valkyrie config supps dir])
+AC_DEFINE_UNQUOTED(VK_CFG_DIR, ".$PACKAGE", [valkyrie config dir])
+AC_DEFINE_UNQUOTED(VK_DBASE_DIR, "dbase/", [valkyrie config dbase dir])
+AC_DEFINE_UNQUOTED(VK_SUPPS_DIR, "suppressions/", [valkyrie config supps dir])
+AC_DEFINE_UNQUOTED(VK_LOGS_DIR, "/tmp/valkyrie_logs/", [valkyrie config logs dir])
# programs
AC_DEFINE_UNQUOTED(BIN_VALGRIND, "$VALGRIND", [valgrind executable])
Modified: trunk/valkyrie/core/memcheck_object.cpp
===================================================================
--- trunk/valkyrie/core/memcheck_object.cpp 2008-06-09 21:09:38 UTC (rev 427)
+++ trunk/valkyrie/core/memcheck_object.cpp 2008-06-09 21:18:36 UTC (rev 428)
@@ -8,6 +8,7 @@
* See the file LICENSE.GPL for the full license details.
*/
+#include "config.h"
#include "memcheck_object.h"
#include "valkyrie_object.h"
#include "vk_config.h"
@@ -322,12 +323,15 @@
}
-/* if --vg-opt=<arg> was specified on the cmd-line, called by
+/* If --vg-opt=<arg> was specified on the cmd-line, called by
valkyrie->runTool(); if set via the run-button in the gui,
- then MainWindow::run() calls valkyrie->runTool(). */
+ then MainWindow::run() calls valkyrie->runTool().
+
+ Auto-generated logs always saved in hard-coded (configured) log dir
+*/
bool Memcheck::runValgrind( QStringList vgflags )
{
- m_saveFname = vk_mkstemp( vkConfig->logsDir() + "mc_log", "xml" );
+ m_saveFname = vk_mkstemp( QString( VK_LOGS_DIR ) + "mc_log", "xml" );
vk_assert( !m_saveFname.isEmpty() );
/* check valgrind version:
@@ -430,7 +434,8 @@
QString fname_logList = vkConfig->rdEntry( "merge", "valkyrie" );
statusMsg( "Merging logs in file-list", fname_logList );
- m_saveFname = vk_mkstemp( vkConfig->logsDir() + "mc_merged", "xml" );
+ QString logDir = vkConfig->rdEntry( "default-logdir", "valkyrie" );
+ m_saveFname = vk_mkstemp( logDir + "mc_merged", "xml" );
vk_assert( !m_saveFname.isEmpty() );
QStringList flags;
@@ -653,10 +658,12 @@
}
-/* brings up a fileSaveDialog until successfully saved,
+/* Brings up a fileSaveDialog until successfully saved,
or user pressed Cancel.
- if fname.isEmpty, ask user for a name first.
+ If fname.isEmpty, ask user for a name first.
returns false on user pressing Cancel, else true.
+
+ Save-dialog started in user-configured default log dir
*/
bool Memcheck::fileSaveDialog( QString fname/*=QString()*/ )
{
@@ -669,8 +676,8 @@
/* Ask fname if don't have one already */
if ( fname.isEmpty() ) {
- /* start dlg in dir of last saved logfile */
- QString start_path = QFileInfo( m_saveFname ).dirPath();
+ /* Start save-dialog in User-configured default log dir*/
+ QString start_path = vkConfig->rdEntry( "default-logdir", "valkyrie" );
fname = dlg.getSaveFileName( start_path, flt, view(), "fsdlg", cptn );
if ( fname.isEmpty() )
return false;
Modified: trunk/valkyrie/core/valkyrie_object.cpp
===================================================================
--- trunk/valkyrie/core/valkyrie_object.cpp 2008-06-09 21:09:38 UTC (rev 427)
+++ trunk/valkyrie/core/valkyrie_object.cpp 2008-06-09 21:18:36 UTC (rev 428)
@@ -96,7 +96,11 @@
addOpt( BROWSER, VkOPTION::NOT_POPT, VkOPTION::WDG_LEDIT,
"valkyrie", '\0', "browser",
"", "", "",
- "Browser", "", urlValkyrie::browser );
+ "Browser:", "", urlValkyrie::browser );
+ addOpt( DFLT_LOGDIR, VkOPTION::NOT_POPT, VkOPTION::WDG_LEDIT,
+ "valkyrie", '\0', "default-logdir",
+ "", "", VK_LOGS_DIR,
+ "Log Dir:", "", "" );
/* path to valgrind executable (maybe found by configure) */
addOpt( VG_EXEC, VkOPTION::NOT_POPT, VkOPTION::WDG_LEDIT,
@@ -155,6 +159,11 @@
return errval;
break;
+ case DFLT_LOGDIR: {
+ /* see if we have an dir with rx permissions */
+ (void) dirCheck( &errval, argval, true, true );
+ } break;
+
case SRC_EDITOR: {
QString ed_file = QStringList::split(" ", argval).first();
QString ed = binaryCheck( &errval, ed_file );
Modified: trunk/valkyrie/core/valkyrie_object.h
===================================================================
--- trunk/valkyrie/core/valkyrie_object.h 2008-06-09 21:09:38 UTC (rev 427)
+++ trunk/valkyrie/core/valkyrie_object.h 2008-06-09 21:18:36 UTC (rev 428)
@@ -49,6 +49,7 @@
TOOLTIP, PALETTE, ICONTXT,
FNT_GEN_SYS, FNT_GEN_USR, FNT_TOOL_USR,
SRC_EDITOR, SRC_LINES, BROWSER,
+ DFLT_LOGDIR,
VG_EXEC, /* path to valgrind executable */
/* FIRST_CMD_OPT */
BINARY, BIN_FLAGS, VIEW_LOG, MERGE_EXEC, MERGE_LOGS,
Modified: trunk/valkyrie/options/valkyrie_options_page.cpp
===================================================================
--- trunk/valkyrie/options/valkyrie_options_page.cpp 2008-06-09 21:09:38 UTC (rev 427)
+++ trunk/valkyrie/options/valkyrie_options_page.cpp 2008-06-09 21:18:36 UTC (rev 428)
@@ -24,7 +24,7 @@
: OptionsPage( parent, obj, "valkyrie_options_page" )
{
/* init the QIntDict list, resizing if necessary */
- unsigned int numItems = 12;
+ unsigned int numItems = 13;
m_itemList.resize( numItems );
QVBoxLayout* vbox = new QVBoxLayout( this, m_margin, -1, "vbox" );
@@ -49,6 +49,12 @@
brwsrLedit->addButton( group1, this, SLOT(getBrowser()) );
connect(brwsrLedit, SIGNAL(returnPressed()), this, SIGNAL(apply()));
+ m_itemList.insert( Valkyrie::DFLT_LOGDIR, /* ledit + button */
+ optionWidget(Valkyrie::DFLT_LOGDIR, group1, false ) );
+ LeWidget* dirLogSave = ((LeWidget*)m_itemList[Valkyrie::DFLT_LOGDIR]);
+ dirLogSave->addButton( group1, this, SLOT(getDfltLogDir()) );
+ connect(dirLogSave, SIGNAL(returnPressed()), this, SIGNAL(apply()));
+
/* fonts --------------------------------------------------------- */
m_itemList.insert( Valkyrie::FNT_GEN_SYS, /* checkbox */
optionWidget( Valkyrie::FNT_GEN_SYS, group1, false ));
@@ -119,6 +125,10 @@
grid->addMultiCellWidget( brwsrLedit->widget(), i,i, 1,3 );
i++;
+ grid->addWidget( dirLogSave->button(), i, 0 );
+ grid->addMultiCellWidget( dirLogSave->widget(), i,i, 1,3 );
+ i++;
+
grid->addMultiCellWidget( sep(group1,"sep0"), i,i, 0,3 );
#if (QT_VERSION-0 >= 0x030200)
grid->setRowSpacing( i++, 8 );
@@ -360,3 +370,19 @@
checkOption( Valkyrie::VG_EXEC );
}
}
+
+
+/* RM: allows user to specify which valgrind version to use. the guts
+ of this fn are essentially the same as the one in config.tests/valgrind.test */
+void ValkyrieOptionsPage::getDfltLogDir()
+{
+ QString currdir = m_itemList[Valkyrie::DFLT_LOGDIR]->currValue();
+ QString dir_logsave =
+ QFileDialog::getExistingDirectory( currdir, this,
+ "get default log-save dir",
+ "Choose a directory", TRUE );
+ if ( !dir_logsave.isEmpty() ) { /* user might have clicked Cancel */
+ ((LeWidget*)m_itemList[Valkyrie::DFLT_LOGDIR])->setCurrValue( dir_logsave );
+ checkOption( Valkyrie::DFLT_LOGDIR );
+ }
+}
Modified: trunk/valkyrie/options/valkyrie_options_page.h
===================================================================
--- trunk/valkyrie/options/valkyrie_options_page.h 2008-06-09 21:09:38 UTC (rev 427)
+++ trunk/valkyrie/options/valkyrie_options_page.h 2008-06-09 21:18:36 UTC (rev 428)
@@ -27,6 +27,7 @@
void getEditor();
void getBinary();
void getBrowser();
+ void getDfltLogDir();
void getVgExec();
};
Modified: trunk/valkyrie/options/vk_option.cpp
===================================================================
--- trunk/valkyrie/options/vk_option.cpp 2008-06-09 21:09:38 UTC (rev 427)
+++ trunk/valkyrie/options/vk_option.cpp 2008-06-09 21:18:36 UTC (rev 428)
@@ -129,6 +129,7 @@
if ( rd_perms ) {
if ( !fi.isReadable() ) {
*err_val = PERROR_BADFILERD;
+ goto bye;
}
}
@@ -136,6 +137,7 @@
if ( wr_perms ) {
if ( !fi.isWritable() ) {
*err_val = PERROR_BADFILEWR;
+ goto bye;
}
}
@@ -182,6 +184,7 @@
if ( rd_perms ) {
if ( !fi.isReadable() ) {
*err_val = PERROR_BADFILERD;
+ goto bye;
}
}
@@ -189,6 +192,7 @@
if ( wr_perms ) {
if ( !fi.isWritable() ) {
*err_val = PERROR_BADFILEWR;
+ goto bye;
}
}
Modified: trunk/valkyrie/vk_config.cpp
===================================================================
--- trunk/valkyrie/vk_config.cpp 2008-06-09 21:09:38 UTC (rev 427)
+++ trunk/valkyrie/vk_config.cpp 2008-06-09 21:18:36 UTC (rev 428)
@@ -58,7 +58,7 @@
rcMap.insert( aIt.key(), dirtyEntry );
}
- /* write out updated config */
+ /* write out updated config */
if ( !writeConfig( rcMap ) ) {
VK_DEBUG( "failed to write updated config file" );
return false;
@@ -88,12 +88,10 @@
m_vg_copyright = VG_COPYRIGHT;
/* set full rc paths (see config.h) */
- m_rcPath.sprintf( "%s/.%s", QDir::homeDirPath().latin1(), vkname() );
- m_rcFileName.sprintf( "%s/%src", m_rcPath.latin1(), vkname() );
- m_dbasePath = m_rcPath + VK_DBASE_DIR;
- m_logsPath = m_rcPath + VK_LOGS_DIR;
- m_suppPath = m_rcPath + VK_SUPPS_DIR;
- m_rcPath += "/";
+ m_rcPath = QDir::homeDirPath() + "/." + vkname() + "/";
+ m_rcFileName = m_rcPath + vkname() + "rc";
+ m_dbasePath = m_rcPath + VK_DBASE_DIR;
+ m_suppPath = m_rcPath + VK_SUPPS_DIR;
m_defaultAppFont = QApplication::font();
}
@@ -130,7 +128,6 @@
QString VkConfig::vkdocDir() { return m_vkdocPath; }
QString VkConfig::rcDir() { return m_rcPath; }
QString VkConfig::dbaseDir() { return m_dbasePath; }
-QString VkConfig::logsDir() { return m_logsPath; }
QString VkConfig::suppDir() { return m_suppPath; }
/* valkyrie's default palette */
@@ -720,15 +717,15 @@
relevant data to ~/.PACKAGE/PACKAGErc */
bool VkConfig::writeConfigDefaults( Valkyrie* vk )
{
- QString default_config = mkConfigDefaults( vk );
- QTextStream strm( &default_config, IO_ReadOnly );
- EntryMap rcMap = parseConfigToMap( strm );
-
- /* Set valkyrie version: used for rc upgrading */
- rcMap[ EntryKey( "valkyrie", "version" ) ].mValue
- = PACKAGE_VERSION;
+ QString default_config = mkConfigDefaults( vk );
+ QTextStream strm( &default_config, IO_ReadOnly );
+ EntryMap rcMap = parseConfigToMap( strm );
+
+ /* Set valkyrie version: used for rc upgrading */
+ rcMap[ EntryKey( "valkyrie", "version" ) ].mValue
+ = PACKAGE_VERSION;
- /* Set our 'configured' valgrind paths, if we have them */
+ /* Set our 'configured' valgrind paths, if we have them */
{
rcMap[ EntryKey( "valkyrie", "merge-exec" ) ].mValue
= BIN_LOGMERGE;
@@ -743,11 +740,11 @@
= suppDir();
}
- /* write out new config */
- if ( !writeConfig( rcMap, true ) ) {
+ /* write out new config */
+ if ( !writeConfig( rcMap, true ) ) {
VK_DEBUG( "failed to write default config file" );
- return false;
- }
+ return false;
+ }
return true;
}
@@ -809,7 +806,7 @@
{
QStringList entries;
entries << m_rcPath << m_rcFileName
- << m_dbasePath << m_logsPath << m_suppPath;
+ << m_dbasePath << m_suppPath;
/* Note: don't just run through and test/fix: want to tell the user
if there was a problem with a previous config dir tree.
@@ -830,7 +827,7 @@
if (!ok) { /* rc tree !exists or !well */
/* this an existing tree?
if so, tell the user there was a problem */
- if (QFile::exists(m_rcPath)) {
+ if ( QFile::exists(m_rcPath) ) {
vkInfo( 0, "Checking Config Setup",
"<p>Detected missing configuration files/dirs.<br/>"
"Attempting to recreate from defaults...</p>" );
@@ -846,5 +843,12 @@
}
}
+ /* Further, check for temporary log dir (VK_LOGS_DIR), make if !exists */
+ if ( !QFile::exists( VK_LOGS_DIR ) ) {
+ if ( !checkRCEntry( VK_LOGS_DIR, vk) ) {
+ return false;
+ }
+ }
+
return true;
}
Modified: trunk/valkyrie/vk_config.h
===================================================================
--- trunk/valkyrie/vk_config.h 2008-06-09 21:09:38 UTC (rev 427)
+++ trunk/valkyrie/vk_config.h 2008-06-09 21:18:36 UTC (rev 428)
@@ -88,7 +88,6 @@
/* these fns return values held in private vars ---------------------- */
QString vkdocDir();
QString rcDir();
- QString logsDir();
QString dbaseDir();
QString suppDir();
QChar sepChar() { return m_sep; }
@@ -152,7 +151,6 @@
QString m_vkdocPath; /* path to valkyrie docs dir */
QString m_rcPath; /* path to ~/valkyrie=X.X.X dir */
QString m_rcFileName; /* where valkyrierc lives */
- QString m_logsPath; /* path to log dir */
QString m_dbasePath; /* path to dbase dir */
/* path to user's suppression files dir.
default is ~/.valkyrie/suppressions */
|
|
From: <sv...@va...> - 2008-06-10 20:13:49
|
Author: cerion
Date: 2008-06-09 22:09:38 +0100 (Mon, 09 Jun 2008)
New Revision: 427
Log:
removed unused icons/filedlg_icons.h
Removed:
trunk/icons/filedlg_icons.h
Modified:
trunk/valkyrie/Makefile.am
Deleted: trunk/icons/filedlg_icons.h
===================================================================
--- trunk/icons/filedlg_icons.h 2008-06-08 18:06:50 UTC (rev 426)
+++ trunk/icons/filedlg_icons.h 2008-06-09 21:09:38 UTC (rev 427)
@@ -1,376 +0,0 @@
-/* XPM */
-static const char* back_xpm[] = {
-"13 11 3 1",
-"a c #00ffff",
-"# c #000000",
-". c None",
-".....#.......",
-"....##.......",
-"...#a#.......",
-"..#aa########",
-".#aaaaaaaaaa#",
-"#aaaaaaaaaaa#",
-".#aaaaaaaaaa#",
-"..#aa########",
-"...#a#.......",
-"....##.......",
-".....#......."};
-
-
-
-/* XPM */
-static const char* start_xpm[] = {
-"16 15 8 1",
-"a c #cec6bd",
-"# c #000000",
-"e c #ffff00",
-"b c #999999",
-"f c #cccccc",
-"d c #dcdcdc",
-"c c #ffffff",
-". c None",
-".....######aaaaa",
-"...bb#cccc##aaaa",
-"..bcc#cccc#d#aaa",
-".bcef#cccc#dd#aa",
-".bcfe#cccc#####a",
-".bcef#ccccccccc#",
-"bbbbbbbbbbbbccc#",
-"bccccccccccbbcc#",
-"bcefefefefee#bc#",
-".bcefefefefef#c#",
-".bcfefefefefe#c#",
-"..bcfefefefeeb##",
-"..bbbbbbbbbbbbb#",
-"...#############",
-"................"};
-
-
-/* XPM */
-static const char* end_xpm[] = {
-"16 15 9 1",
-"d c #a0a0a0",
-"c c #c3c3c3",
-"# c #cec6bd",
-". c #000000",
-"f c #ffff00",
-"e c #999999",
-"g c #cccccc",
-"b c #ffffff",
-"a c None",
-"......####aaaaaa",
-".bbbb..###aaaaaa",
-".bbbb.c.##aaaaaa",
-".bbbb....ddeeeea",
-".bbbbbbb.bbbbbe.",
-".bbbbbbb.bcfgfe.",
-"eeeeeeeeeeeeefe.",
-"ebbbbbbbbbbeege.",
-"ebfgfgfgfgff.ee.",
-"aebfgfgfgfgfg.e.",
-"aebgfgfgfgfgf.e.",
-"aaebgfgfgfgffe..",
-"aaeeeeeeeeeeeee.",
-"aaa.............",
-"aaaaaaaaaaaaaaaa"};
-
-
-/* XPM */
-static const char* open_xpm[] = {
-"16 16 6 1",
-". c None",
-"b c #ffff00",
-"d c #000000",
-"* c #999999",
-"c c #cccccc",
-"a c #ffffff",
-"................",
-"................",
-"...*****........",
-"..*aaaaa*.......",
-".*abcbcba******.",
-".*acbcbcaaaaaa*d",
-".*abcbcbcbcbcb*d",
-"*************b*d",
-"*aaaaaaaaaa**c*d",
-"*abcbcbcbcbbd**d",
-".*abcbcbcbcbcd*d",
-".*acbcbcbcbcbd*d",
-"..*acbcbcbcbb*dd",
-"..*************d",
-"...ddddddddddddd",
-"................"};
-
-
-/* XPM */
-static const char* link_dir_xpm[] = {
-"16 16 10 1",
-"h c #808080",
-"g c #a0a0a0",
-"d c #000000",
-"b c #ffff00",
-"f c #303030",
-"# c #999999",
-"a c #cccccc",
-"e c #585858",
-"c c #ffffff",
-". c None",
-"................",
-"................",
-"..#####.........",
-".#ababa#........",
-"#abababa######..",
-"#cccccccccccc#d.",
-"#cbababababab#d.",
-"#cabababababa#d.",
-"#cbababdddddddd.",
-"#cababadccccccd.",
-"#cbababdcececcd.",
-"#cababadcefdfcd.",
-"#cbababdccgdhcd.",
-"#######dccchccd.",
-".dddddddddddddd.",
-"................"};
-
-
-
-/* XPM */
-static const char* link_file_xpm[] = {
-"16 16 10 1",
-"h c #808080",
-"g c #a0a0a0",
-"d c #c3c3c3",
-". c #7f7f7f",
-"c c #000000",
-"b c #bfbfbf",
-"f c #303030",
-"e c #585858",
-"a c #ffffff",
-"# c None",
-"################",
-"..........######",
-".aaaaaaaab.#####",
-".aaaaaaaaba.####",
-".aaaaaaaacccc###",
-".aaaaaaaaaabc###",
-".aaaaaaaaaabc###",
-".aaaaaaaaaadc###",
-".aaaaaaaaaadc###",
-".aaaacccccccc###",
-".aaaacaaaaaac###",
-".aaaacaeaeaac###",
-".aaaacaefcfac###",
-".aaaacaagchac###",
-".ddddcaaahaac###",
-"ccccccccccccc###"};
-
-
-
-/* XPM */
-static const char* file_xpm[] = {
-"16 16 5 1",
-". c #7f7f7f",
-"# c None",
-"c c #000000",
-"b c #bfbfbf",
-"a c #ffffff",
-"################",
-"..........######",
-".aaaaaaaab.#####",
-".aaaaaaaaba.####",
-".aaaaaaaacccc###",
-".aaaaaaaaaabc###",
-".aaaaaaaaaabc###",
-".aaaaaaaaaabc###",
-".aaaaaaaaaabc###",
-".aaaaaaaaaabc###",
-".aaaaaaaaaabc###",
-".aaaaaaaaaabc###",
-".aaaaaaaaaabc###",
-".aaaaaaaaaabc###",
-".bbbbbbbbbbbc###",
-"ccccccccccccc###"};
-
-
-
-/* XPM */
-static const char* closed_xpm[] = {
-"16 16 6 1",
-". c None",
-"b c #ffff00",
-"d c #000000",
-"* c #999999",
-"a c #cccccc",
-"c c #ffffff",
-"................",
-"................",
-"..*****.........",
-".*ababa*........",
-"*abababa******..",
-"*cccccccccccc*d.",
-"*cbababababab*d.",
-"*cabababababa*d.",
-"*cbababababab*d.",
-"*cabababababa*d.",
-"*cbababababab*d.",
-"*cabababababa*d.",
-"*cbababababab*d.",
-"**************d.",
-".dddddddddddddd.",
-"................"};
-
-
-
-/* XPM */
-static const char* cdtoparent_xpm[] = {
-"15 13 3 1",
-". c None",
-"* c #000000",
-"a c #ffff99",
-"..*****........",
-".*aaaaa*.......",
-"***************",
-"*aaaaaaaaaaaaa*",
-"*aaaa*aaaaaaaa*",
-"*aaa***aaaaaaa*",
-"*aa*****aaaaaa*",
-"*aaaa*aaaaaaaa*",
-"*aaaa*aaaaaaaa*",
-"*aaaa******aaa*",
-"*aaaaaaaaaaaaa*",
-"*aaaaaaaaaaaaa*",
-"***************"};
-
-
-/* XPM
-static const char* newfolder_xpm[] = {
-"15 14 4 1",
-" c None",
-". c #000000",
-"+ c #FFFF00",
-"@ c #FFFFFF",
-" .",
-" ",
-" .",
-" . . ",
-" .... . . . ",
-" .+@+@. . . ",
-".......... . .",
-".@+@+@+@+@.. ",
-".+@+@+@+@+. . ",
-".@+@+@+@+@. . ",
-".+@+@+@+@+.",
-".@+@+@+@+@. ",
-".+@+@+@+@+. ",
-"........... "};
-*/
-/* XPM */
-static const char* go_home_xpm[] = {
-"16 15 4 1",
-"# c #000000",
-"a c #FFFF00",
-"b c #c0c0c0",
-". c None",
-".......##.......",
-"..#...####......",
-"..#..#aabb#.....",
-"..#.#aaaabb#....",
-"..##aaaaaabb#...",
-"..#aaaaaaaabb#..",
-".#aaaaaaaaabbb#.",
-"###aaaaaaaabb###",
-"..#aaaaaaaabb#..",
-"..#aaa###aabb#..",
-"..#aaa#.#aabb#..",
-"..#aaa#.#aabb#..",
-"..#aaa#.#aabb#..",
-"..#aaa#.#aabb#..",
-"..#####.######.."
-};
-
-
-
-
-/* XPM */
-static const char* detailedview_xpm[] = {
-"14 11 3 1",
-". c None",
-"* c #000000",
-"a c #000099",
-".****.***.***.",
-"..............",
-"aaaaaaaaaaaaaa",
-"..............",
-".****.***.***.",
-"..............",
-".****.***.***.",
-"..............",
-".****.***.***.",
-"..............",
-".****.***.***."};
-
-
-/* XPM
-static const char* previewinfoview_xpm[] = {
-"13 13 4 1",
-". c #00007f",
-"a c black",
-"# c #cec6bd",
-"b c #000000",
-"..#####aaaaaa",
-".#.#bb#a#####",
-"...####a#bbb#",
-"#######a#####",
-"#######a#bb##",
-"..#####a#####",
-".#.#bb#a#bbb#",
-"...####a#####",
-"#######a#bb##",
-"#######a#####",
-"..#####a#bbb#",
-".#.#bb#a#####",
-"...####aaaaaa"};
-*/
-
-/* XPM */
-static const char* previewcontentsview_xpm[] = {
-"14 13 5 1",
-". c #00007f",
-"a c black",
-"c c #7f007f",
-"# c #cec6bd",
-"b c #000000",
-"..#####aaaaaaa",
-".#.#bb#a#####a",
-"...####a#ccc#a",
-"#######a#ccc#a",
-"#######a#####a",
-"..#####a#bbb#a",
-".#.#bb#a#####a",
-"...####a#bbb#a",
-"#######a#####a",
-"#######a#bbb#a",
-"..#####a#####a",
-".#.#bb#a#####a",
-"...####aaaaaaa"};
-
-
-/* XPM */
-static const char* mclistview_xpm[] = {
-"15 11 4 1",
-"* c None",
-"b c #000000",
-". c #000099",
-"a c #ffffff",
-"...*****...****",
-".a.*bbb*.a.*bbb",
-"...*****...****",
-"***************",
-"...*****...****",
-".a.*bbb*.a.*bbb",
-"...*****...****",
-"***************",
-"...*****...****",
-".a.*bbb*.a.*bbb",
-"...*****...****"};
-
Modified: trunk/valkyrie/Makefile.am
===================================================================
--- trunk/valkyrie/Makefile.am 2008-06-08 18:06:50 UTC (rev 426)
+++ trunk/valkyrie/Makefile.am 2008-06-09 21:09:38 UTC (rev 427)
@@ -91,7 +91,6 @@
vk_config.h \
vk_file_utils.h \
vk_utils.h \
- ../icons/filedlg_icons.h \
../icons/memcheck_icons.h \
../icons/msgbox_icons.h \
../icons/tb_handbook_icons.h \
|
|
From: <sv...@va...> - 2008-06-10 20:13:45
|
Author: cerion Date: 2008-06-08 09:41:53 +0100 (Sun, 08 Jun 2008) New Revision: 425 Log: stop compiler complaining about const strings Modified: trunk/valkyrie/vk_config.cpp Modified: trunk/valkyrie/vk_config.cpp =================================================================== --- trunk/valkyrie/vk_config.cpp 2008-06-07 20:51:19 UTC (rev 424) +++ trunk/valkyrie/vk_config.cpp 2008-06-08 08:41:53 UTC (rev 425) @@ -676,7 +676,7 @@ QString header = mkConfigHeader(); - char * window_colors = "[Colors]\n\ + const char * window_colors = "[Colors]\n\ background=214,205,187\n\ base=255,255,255\n\ dkgray=128,128,128\n\ @@ -685,13 +685,13 @@ nullColor=239,227,211\n\ text=0,0,0\n\n"; - char * mainwin_size_pos = "[MainWin]\n\ + const char * mainwin_size_pos = "[MainWin]\n\ height=600\n\ width=550\n\ x-pos=400\n\ y-pos=0\n\n"; - char * dbase = "[Database]\n\ + const char * dbase = "[Database]\n\ user=auser\n\ host=localhost\n\ pword=123\n\ |
|
From: <sv...@va...> - 2008-06-10 20:13:44
|
Author: cerion Date: 2008-06-08 19:06:50 +0100 (Sun, 08 Jun 2008) New Revision: 426 Log: Remove old FileDialog experiment Modified: trunk/valkyrie/Makefile.am trunk/valkyrie/tool_views/memcheck_view.cpp trunk/valkyrie/vk_file_utils.cpp trunk/valkyrie/vk_file_utils.h [... diff too large to include ...] |
|
From: <sv...@va...> - 2008-06-10 20:13:34
|
Author: cerion
Date: 2008-06-07 21:51:19 +0100 (Sat, 07 Jun 2008)
New Revision: 424
Log:
urgh. need more coffee.
Modified:
trunk/valkyrie/core/memcheck_object.cpp
Modified: trunk/valkyrie/core/memcheck_object.cpp
===================================================================
--- trunk/valkyrie/core/memcheck_object.cpp 2008-06-07 20:33:15 UTC (rev 423)
+++ trunk/valkyrie/core/memcheck_object.cpp 2008-06-07 20:51:19 UTC (rev 424)
@@ -348,11 +348,8 @@
} else { // >= 3.3.0
log_param = "--log-file=";
}
- v3=v3; // stop compiler complaining
log_param += m_saveFname;
- printf("param: '%s'\n", log_param.latin1() );
-
vgflags.insert( ++(vgflags.begin()), log_param );
}
|
|
From: <sv...@va...> - 2008-06-10 20:13:28
|
Author: cerion
Date: 2008-06-07 21:33:15 +0100 (Sat, 07 Jun 2008)
New Revision: 423
Log:
Support valgrind >= 3.3.0 (at last!), so now:
v3.0.0 to < v3.3.0 => use log parameter "--log-file-exactly"
>=v3.3.0 => use log parameter "--log-file"
Modified:
trunk/valkyrie/core/memcheck_object.cpp
trunk/valkyrie/core/valgrind_object.cpp
trunk/valkyrie/core/valgrind_object.h
trunk/valkyrie/core/valkyrie_object.cpp
trunk/valkyrie/options/vk_option.cpp
trunk/valkyrie/tool_utils/async_process.cpp
trunk/valkyrie/tool_utils/vk_process.h
trunk/vk_logmerge/vklm_main.cpp
Modified: trunk/valkyrie/core/memcheck_object.cpp
===================================================================
--- trunk/valkyrie/core/memcheck_object.cpp 2008-06-07 15:44:20 UTC (rev 422)
+++ trunk/valkyrie/core/memcheck_object.cpp 2008-06-07 20:33:15 UTC (rev 423)
@@ -329,22 +329,41 @@
{
m_saveFname = vk_mkstemp( vkConfig->logsDir() + "mc_log", "xml" );
vk_assert( !m_saveFname.isEmpty() );
+
+ /* check valgrind version:
+ - supported version
+ - version dependent code
+ */
+ int v1=0, v2=0, v3=0;
+ bool ok = Valgrind::getVersionBinary( vgflags.first(), v1, v2, v3 );
+ if ( !ok ) {
+ vkError( view(), "Valgrind start error",
+ "Failure running valgrind version test" );
+ } else {
+ // valgrind version dependent code
+ QString log_param;
+
+ if ( v1 == 3 && v2 < 3 ) { // < 3.3.0
+ log_param = "--log-file-exactly=";
+ } else { // >= 3.3.0
+ log_param = "--log-file=";
+ }
+ v3=v3; // stop compiler complaining
+ log_param += m_saveFname;
+
+ printf("param: '%s'\n", log_param.latin1() );
+
+ vgflags.insert( ++(vgflags.begin()), log_param );
+ }
+
+ if ( ok ) {
+ setRunState( VkRunState::VALGRIND );
+ m_fileSaved = false;
+ statusMsg( "Memcheck", "Running ... " );
+
+ ok = startProcess( vgflags );
+ }
- /* fill in filename in flags list */
-#if (QT_VERSION-0 >= 0x030200)
- vgflags.gres( "--log-file-exactly", "--log-file-exactly=" + m_saveFname );
-#else // QT_VERSION < 3.2
- QStringList::iterator it_str = vgflags.find("--log-file-exactly");
- if (it_str != vgflags.end())
- (*it_str) += ("=" + m_saveFname);
-#endif
-
- setRunState( VkRunState::VALGRIND );
- m_fileSaved = false;
- statusMsg( "Memcheck", "Running ... " );
-
- bool ok = startProcess( vgflags );
-
if (!ok) {
statusMsg( "Memcheck", "Failed" );
m_fileSaved = true;
Modified: trunk/valkyrie/core/valgrind_object.cpp
===================================================================
--- trunk/valkyrie/core/valgrind_object.cpp 2008-06-07 15:44:20 UTC (rev 422)
+++ trunk/valkyrie/core/valgrind_object.cpp 2008-06-07 20:33:15 UTC (rev 423)
@@ -358,8 +358,7 @@
break;
/* logging options */
- /* for all tools we use --log-file-exactly=xyz.
- this is set in Valkyrie::runTool(), and updated by the tool.
+ /* all tools use an internal logging option,
all logging options are therefore ignored */
case LOG_FILE:
case LOG_FD:
@@ -452,8 +451,7 @@
}
break;
- /* for all tools we use --log-file-exactly=xyz.
- this is set in Valkyrie::runTool(), and updated by the tool.
+ /* all tools use an internal logging option,
all logging options should therefore not be used */
case LOG_FILE:
case LOG_FD:
@@ -476,7 +474,63 @@
+/* Get valgrind version */
+bool Valgrind::getVersionBinary( QString& vg_bin, int& v1, int& v2, int& v3 )
+{
+ bool ok = true;
+ QString vg_version;
+ QString exec = vg_bin + " --version | sed 's/^valgrind-//'";
+ FILE* fd = popen( exec.latin1(), "r");
+ if (!fd) { // start error?
+ perror("popen");
+ ok = false;
+ vkPrintErr( "Valgrind start error: Failure starting valgrind version test" );
+ } else {
+ char buf[1024];
+ fgets(buf, sizeof(buf), fd);
+ vg_version = buf;
+ vg_version = vg_version.left( vg_version.length() - 1 );
+
+ int result = pclose(fd);
+ if ( !WIFEXITED( result ) ) { // exit error?
+ ok = false;
+ vkPrintErr( "Valgrind start error: Failure running valgrind version test" );
+ }
+ }
+
+ if ( ok ) {
+ // parse valgrind version
+ QStringList slst_vg_ver = QStringList::split( '.', vg_version );
+ if ( slst_vg_ver.count() != 3 ) {
+ ok = false;
+ }
+ if ( ok ) {
+ v1 = slst_vg_ver[0].toUInt( &ok );
+ }
+ if ( ok ) {
+ v2 = slst_vg_ver[1].toUInt( &ok );
+ }
+ if ( ok ) {
+ v3 = slst_vg_ver[2].toUInt( &ok );
+ }
+ if ( !ok ) {
+ vkPrintErr( "Valgrind start error: Failure reading valgrind version: '%s'",
+ vg_version.latin1() );
+ } else {
+ // check version supported
+ if ( v1 < 3 ) { // < 3.0.0: unsupported
+ ok = false;
+ vkPrintErr( "Valgrind start error: Unsupported version: %s < 3.0.0",
+ vg_version.latin1() );
+ }
+ }
+ }
+ return ok;
+}
+
+
+
/* Register tools */
void Valgrind::initToolObjects()
{
Modified: trunk/valkyrie/core/valgrind_object.h
===================================================================
--- trunk/valkyrie/core/valgrind_object.h 2008-06-07 15:44:20 UTC (rev 422)
+++ trunk/valkyrie/core/valgrind_object.h 2008-06-07 20:33:15 UTC (rev 423)
@@ -85,6 +85,9 @@
ToolObject* toolObj( int tid );
ToolObject* toolObj( const QString& name );
+ /* Get valgrind version */
+ static bool getVersionBinary( QString& vg_bin, int& v1, int& v2, int& v3 );
+
private:
/* creates the various VkObjects and initialises their options,
ready for cmd-line parsing (if any). */
Modified: trunk/valkyrie/core/valkyrie_object.cpp
===================================================================
--- trunk/valkyrie/core/valkyrie_object.cpp 2008-06-07 15:44:20 UTC (rev 422)
+++ trunk/valkyrie/core/valkyrie_object.cpp 2008-06-07 20:33:15 UTC (rev 423)
@@ -350,12 +350,7 @@
ToolObject* activeTool = valgrind()->toolObj( tId );
vk_assert( activeTool != 0 );
- /* Adding user-invisible flags to capture valgrind output
- --log-file-exactly must be given a filename by the tool */
- QStringList vgFlags = m_flags;
- vgFlags.insert( ++(vgFlags.begin()), "--log-file-exactly" );
-
- return activeTool->start( runState, vgFlags );
+ return activeTool->start( runState, m_flags );
}
Modified: trunk/valkyrie/options/vk_option.cpp
===================================================================
--- trunk/valkyrie/options/vk_option.cpp 2008-06-07 15:44:20 UTC (rev 422)
+++ trunk/valkyrie/options/vk_option.cpp 2008-06-07 20:33:15 UTC (rev 423)
@@ -13,7 +13,7 @@
#include <ctype.h>
#include <math.h>
#include <malloc.h>
-#include <stdlib.h> /* exit */
+#include <stdlib.h> // getenv
#include <qdir.h>
Modified: trunk/valkyrie/tool_utils/async_process.cpp
===================================================================
--- trunk/valkyrie/tool_utils/async_process.cpp 2008-06-07 15:44:20 UTC (rev 422)
+++ trunk/valkyrie/tool_utils/async_process.cpp 2008-06-07 20:33:15 UTC (rev 423)
@@ -22,7 +22,7 @@
#include <errno.h> /* Fedora Core needs this */
#include <fcntl.h> /* open(), O_RDONLY, O_WRONLY */
#include <signal.h>
-#include <stdlib.h> /* exit */
+#include <stdlib.h> /* getenv */
#include <sys/types.h> /* waitpid() */
#include <sys/wait.h> /* waitpid() */
#include <unistd.h> /* dup2(), _exit(), */
Modified: trunk/valkyrie/tool_utils/vk_process.h
===================================================================
--- trunk/valkyrie/tool_utils/vk_process.h 2008-06-07 15:44:20 UTC (rev 422)
+++ trunk/valkyrie/tool_utils/vk_process.h 2008-06-07 20:33:15 UTC (rev 423)
@@ -28,7 +28,7 @@
#include <qsocketnotifier.h>
#include <signal.h>
-#include <stdlib.h> // exit
+#include <stdlib.h> // ssize_t
class VKMembuf
Modified: trunk/vk_logmerge/vklm_main.cpp
===================================================================
--- trunk/vk_logmerge/vklm_main.cpp 2008-06-07 15:44:20 UTC (rev 422)
+++ trunk/vk_logmerge/vklm_main.cpp 2008-06-07 20:33:15 UTC (rev 423)
@@ -9,7 +9,7 @@
#include <sys/types.h> // getpid
#include <unistd.h> // getpid
-#include <stdlib.h> // exit
+#include <stdlib.h> // abort
#include <qfileinfo.h>
#include <qdom.h>
|
