onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-23 19:57:21 +01:00
Code Issues Releases Wiki Activity

working on memory leaks; added initialization to class RCS

Browse Source
This commit is contained in:
Vadim Kurland 2010-03-03 01:04:24 +00:00
parent 5108346af0
commit 35b6747396
8 changed files with 4313 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_num
View File

@ -1 +1 @@
#define BUILD_NUM 2641
#define BUILD_NUM 2643

7
doc/ChangeLog
View File

@ -1,3 +1,10 @@
2010-03-02 glitch.vk.crocodile.org <vadim@vk.crocodile.org>
* RCS.cpp (RCS::init): checking if RCS tools are installed on the
system once in the beginning. This helps avoid unnecessary
QProcess starts that make working with valgrind more difficult
because of subprocess starts/stops.
2010-03-01 vadim <vadim@vk.crocodile.org>
* PolicyCompiler_PrintRule.cpp (PrintRule::_printTimeInterval):

17
src/gui/ProjectPanel_file_ops.cpp
View File

@ -72,6 +72,9 @@
#include <libxml/tree.h>
#include "memcheck.h"
#define LONG_ERROR_CUTOFF 1024
using namespace Ui;
@ -943,7 +946,11 @@ void ProjectPanel::loadStandardObjects()
{
// need to drop read-only flag on the database before I load new objects
if (objdb) delete objdb;
if (objdb)
{
objdb->destroyChildren();
delete objdb;
}
objdb = new FWObjectDatabase();
objdb->setReadOnly( false );
@ -960,6 +967,7 @@ void ProjectPanel::loadStandardObjects()
if (fwbdebug) qDebug("ProjectPanel::load(): create User library");
FWObject *userLib = FWBTree().createNewLibrary(objdb);
userLib->setName("User");
userLib->setStr("color","#d2ffd0");
@ -1009,7 +1017,11 @@ bool ProjectPanel::loadFromRCS(RCS *_rcs)
clearObjects();
if (objdb) delete objdb;
if (objdb)
{
objdb->destroyChildren();
delete objdb;
}
objdb = new FWObjectDatabase();
@ -1064,6 +1076,7 @@ bool ProjectPanel::loadFromRCS(RCS *_rcs)
MergeConflictRes mcr(mainW);
objdb->merge(ndb, &mcr);
ndb->destroyChildren();
delete ndb;
objdb->setFileName(rcs->getFileName().toLocal8Bit().constData());

88
src/gui/RCS.cpp
View File

@ -69,13 +69,13 @@
using namespace std;
using namespace libfwbuilder;
QString RCS::rcs_file_name = "";
QString RCS::rlog_file_name = "";
QString RCS::rcs_file_name = "";
QString RCS::rlog_file_name = "";
QString RCS::rcsdiff_file_name = "";
QString RCS::ci_file_name = "";
QString RCS::co_file_name = "";
RCSEnvFix* RCS::rcsenvfix = NULL;
QString RCS::ci_file_name = "";
QString RCS::co_file_name = "";
RCSEnvFix* RCS::rcsenvfix = NULL;
bool RCS::rcs_available = false;
/***********************************************************************
*
@ -243,10 +243,9 @@ QStringList* RCSEnvFix::getEnv()
* class RCS
*
***********************************************************************/
RCS::RCS(const QString &file)
{
if (rcsenvfix==NULL) rcsenvfix = new RCSEnvFix();
void RCS::init()
{
if (rcs_file_name=="")
{
#ifdef _WIN32
@ -274,6 +273,34 @@ RCS::RCS(const QString &file)
#endif
}
// now check if rcs tools are available. To test, try to run rlog
// with no arguments
QStringList arglist;
QProcess rcs_proc;
rcs_proc.start( rlog_file_name, arglist );
rcs_proc.waitForStarted();
if (rcs_proc.state() != QProcess::Running)
{
rcs_proc.close();
// rlog (and probably other RCS tools) are unavailable
if (fwbdebug) qDebug() << "RCS tools unavailable";
rcs_available = false;
return;
}
rcs_proc.waitForFinished();
rcs_proc.close();
rcs_available = true;
}
RCS::RCS(const QString &file)
{
if (rcsenvfix==NULL) rcsenvfix = new RCSEnvFix();
QFileInfo fi(file);
if (fi.exists()) filename = fi.canonicalFilePath();
else filename = file;
@ -292,6 +319,13 @@ RCS::RCS(const QString &file)
connect(proc, SIGNAL(readyReadStandardError()),
this, SLOT(readFromStderr() ) );
if (!fi.exists())
{
inrcs = false;
tracking_file = true;
return;
}
try
{
QString rcspath = filename.left( filename.lastIndexOf("/") );
@ -442,7 +476,7 @@ void RCS::setFileName(const QString &fn)
void RCS::abandon()
{
if (!isInRCS()) return;
if (!isInRCS() || !rcs_available) return;
/* check out head revision and unlock it */
QStringList arglist;
@ -493,9 +527,19 @@ void RCS::abandon()
*/
void RCS::add() throw(libfwbuilder::FWException)
{
int i=filename.lastIndexOf("/");
QString rcspath=filename.left(i);
QDir rcsdir;
int i = filename.lastIndexOf("/");
QString rcspath = filename.left(i);
QDir rcsdir;
if (!rcs_available)
{
QString err = QObject::tr("RCS tools are unavailable");
if (fwbdebug) qDebug() << err;
throw(FWException(err.toStdString()));
}
if (fwbdebug) qDebug() << "RCS::add() will run " << rcs_file_name;
rcsdir.cd(rcspath);
if (!rcsdir.exists("RCS")) rcsdir.mkdir("RCS");
@ -541,13 +585,15 @@ void RCS::add() throw(libfwbuilder::FWException)
}
}
QByteArray outp = proc->readAllStandardOutput();
QString msg=QObject::tr("Fatal error during initial RCS checkin of file %1 :\n %2\nExit status %3")
.arg(filename).arg(outp.data()).arg(proc->exitCode());
QString msg = QObject::tr("Fatal error during initial RCS checkin of file %1 :\n %2\nExit status %3")
.arg(filename).arg(outp.data()).arg(proc->exitCode());
throw(FWException( msg.toLatin1().constData() ));
}
bool RCS::isInRCS()
{
if (!rcs_available) return false;
if (tracking_file) return inrcs;
QStringList arglist;
@ -618,7 +664,7 @@ bool RCS::co(const QString &rev,bool force) throw(libfwbuilder::FWException)
{
/* first check if filename is already in RCS */
if (!isInRCS()) return false;
if (!rcs_available || !isInRCS()) return false;
if (ro)
{
@ -807,7 +853,7 @@ bool RCS::ci( const QString &_lm,
bool unlock) throw(libfwbuilder::FWException)
{
/* first check if filename is already in RCS */
if (!isInRCS()) return false;
if (!rcs_available || !isInRCS()) return false;
QString logmsg = _lm;
@ -907,6 +953,9 @@ bool RCS::ci( const QString &_lm,
*/
QString RCS::rlog() throw(libfwbuilder::FWException)
{
if (!rcs_available)
throw(FWException(QObject::tr("RCS tools are unavailable").toStdString()));
QStringList arglist;
arglist << QString("-z") + rcsenvfix->getTZOffset() << filename;
@ -953,8 +1002,11 @@ QStringList RCS::rcsdiff(const QString&) throw(libfwbuilder::FWException)
return temp.split("\n");
}
bool RCS::isDiff(const QString &rev) throw(libfwbuilder::FWException)
bool RCS::isDiff(const QString &rev) throw(libfwbuilder::FWException)
{
if (!rcs_available)
throw(FWException(QObject::tr("RCS tools are unavailable").toStdString()));
QStringList arglist;
arglist << "-q";

16
src/gui/RCS.h
View File

@ -77,7 +77,7 @@ class RCS : public QObject {
friend class RCSFilePreview;
Q_OBJECT
Q_OBJECT;
/*
* RCSEnvFix object should be initialized in constructor of RCS so
@ -86,12 +86,12 @@ class RCS : public QObject {
* Windows.
*/
static RCSEnvFix *rcsenvfix;
static QString rcs_file_name ;
static QString rcsdiff_file_name ;
static QString rlog_file_name ;
static QString ci_file_name ;
static QString co_file_name ;
static QString rcs_file_name;
static QString rcsdiff_file_name;
static QString rlog_file_name;
static QString ci_file_name;
static QString co_file_name;
static bool rcs_available;
QString stdoutBuffer;
QString stderrBuffer;
@ -123,6 +123,8 @@ class RCS : public QObject {
RCS( const QString &filename );
virtual ~RCS();
static void init();
/**
* returns head revision of the file
*/

2
src/gui/main.cpp
View File

@ -60,6 +60,7 @@
#include "ObjectEditor.h"
#include "findDialog.h"
#include "ProjectPanel.h"
#include "RCS.h"
#include "fwbuilder/FWObject.h"
#include "fwbuilder/Tools.h"
@ -162,6 +163,7 @@ int main( int argc, char *argv[] )
/* need to initialize in order to be able to use FWBSettings */
init(argv);
init_platforms();
RCS::init();
if (fwbdebug) qDebug("Reading settings ...");
st = new FWBSettings();

285
src/gui/memcheck.h Normal file
View File

@ -0,0 +1,285 @@
/*
----------------------------------------------------------------
Notice that the following BSD-style license applies to this one
file (memcheck.h) only. The rest of Valgrind is licensed under the
terms of the GNU General Public License, version 2, unless
otherwise indicated. See the COPYING file in the source
distribution for details.
----------------------------------------------------------------
This file is part of MemCheck, a heavyweight Valgrind tool for
detecting memory errors.
Copyright (C) 2000-2008 Julian Seward. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. The origin of this software must not be misrepresented; you must
not claim that you wrote the original software. If you use this
software in a product, an acknowledgment in the product
documentation would be appreciated but is not required.
3. Altered source versions must be plainly marked as such, and must
not be misrepresented as being the original software.
4. The name of the author may not be used to endorse or promote
products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
----------------------------------------------------------------
Notice that the above BSD-style license applies to this one file
(memcheck.h) only. The entire rest of Valgrind is licensed under
the terms of the GNU General Public License, version 2. See the
COPYING file in the source distribution for details.
----------------------------------------------------------------
*/
#ifndef __MEMCHECK_H
#define __MEMCHECK_H
/* This file is for inclusion into client (your!) code.
You can use these macros to manipulate and query memory permissions
inside your own programs.
See comment near the top of valgrind.h on how to use them.
*/
#include "valgrind.h"
/* !! ABIWARNING !! ABIWARNING !! ABIWARNING !! ABIWARNING !!
This enum comprises an ABI exported by Valgrind to programs
which use client requests. DO NOT CHANGE THE ORDER OF THESE
ENTRIES, NOR DELETE ANY -- add new ones at the end. */
typedef
enum {
VG_USERREQ__MAKE_MEM_NOACCESS = VG_USERREQ_TOOL_BASE('M','C'),
VG_USERREQ__MAKE_MEM_UNDEFINED,
VG_USERREQ__MAKE_MEM_DEFINED,
VG_USERREQ__DISCARD,
VG_USERREQ__CHECK_MEM_IS_ADDRESSABLE,
VG_USERREQ__CHECK_MEM_IS_DEFINED,
VG_USERREQ__DO_LEAK_CHECK,
VG_USERREQ__COUNT_LEAKS,
VG_USERREQ__GET_VBITS,
VG_USERREQ__SET_VBITS,
VG_USERREQ__CREATE_BLOCK,
VG_USERREQ__MAKE_MEM_DEFINED_IF_ADDRESSABLE,
/* This is just for memcheck's internal use - don't use it */
_VG_USERREQ__MEMCHECK_RECORD_OVERLAP_ERROR
= VG_USERREQ_TOOL_BASE('M','C') + 256
} Vg_MemCheckClientRequest;
/* Client-code macros to manipulate the state of memory. */
/* Mark memory at _qzz_addr as unaddressable for _qzz_len bytes. */
#define VALGRIND_MAKE_MEM_NOACCESS(_qzz_addr,_qzz_len) \
(__extension__({unsigned long _qzz_res; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
VG_USERREQ__MAKE_MEM_NOACCESS, \
_qzz_addr, _qzz_len, 0, 0, 0); \
_qzz_res; \
}))
/* Similarly, mark memory at _qzz_addr as addressable but undefined
for _qzz_len bytes. */
#define VALGRIND_MAKE_MEM_UNDEFINED(_qzz_addr,_qzz_len) \
(__extension__({unsigned long _qzz_res; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
VG_USERREQ__MAKE_MEM_UNDEFINED, \
_qzz_addr, _qzz_len, 0, 0, 0); \
_qzz_res; \
}))
/* Similarly, mark memory at _qzz_addr as addressable and defined
for _qzz_len bytes. */
#define VALGRIND_MAKE_MEM_DEFINED(_qzz_addr,_qzz_len) \
(__extension__({unsigned long _qzz_res; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
VG_USERREQ__MAKE_MEM_DEFINED, \
_qzz_addr, _qzz_len, 0, 0, 0); \
_qzz_res; \
}))
/* Similar to VALGRIND_MAKE_MEM_DEFINED except that addressability is
not altered: bytes which are addressable are marked as defined,
but those which are not addressable are left unchanged. */
#define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(_qzz_addr,_qzz_len) \
(__extension__({unsigned long _qzz_res; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
VG_USERREQ__MAKE_MEM_DEFINED_IF_ADDRESSABLE, \
_qzz_addr, _qzz_len, 0, 0, 0); \
_qzz_res; \
}))
/* Create a block-description handle. The description is an ascii
string which is included in any messages pertaining to addresses
within the specified memory range. Has no other effect on the
properties of the memory range. */
#define VALGRIND_CREATE_BLOCK(_qzz_addr,_qzz_len, _qzz_desc) \
(__extension__({unsigned long _qzz_res; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
VG_USERREQ__CREATE_BLOCK, \
_qzz_addr, _qzz_len, _qzz_desc, \
0, 0); \
_qzz_res; \
}))
/* Discard a block-description-handle. Returns 1 for an
invalid handle, 0 for a valid handle. */
#define VALGRIND_DISCARD(_qzz_blkindex) \
(__extension__ ({unsigned long _qzz_res; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0 /* default return */, \
VG_USERREQ__DISCARD, \
0, _qzz_blkindex, 0, 0, 0); \
_qzz_res; \
}))
/* Client-code macros to check the state of memory. */
/* Check that memory at _qzz_addr is addressable for _qzz_len bytes.
If suitable addressibility is not established, Valgrind prints an
error message and returns the address of the first offending byte.
Otherwise it returns zero. */
#define VALGRIND_CHECK_MEM_IS_ADDRESSABLE(_qzz_addr,_qzz_len) \
(__extension__({unsigned long _qzz_res; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \
VG_USERREQ__CHECK_MEM_IS_ADDRESSABLE,\
_qzz_addr, _qzz_len, 0, 0, 0); \
_qzz_res; \
}))
/* Check that memory at _qzz_addr is addressable and defined for
_qzz_len bytes. If suitable addressibility and definedness are not
established, Valgrind prints an error message and returns the
address of the first offending byte. Otherwise it returns zero. */
#define VALGRIND_CHECK_MEM_IS_DEFINED(_qzz_addr,_qzz_len) \
(__extension__({unsigned long _qzz_res; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \
VG_USERREQ__CHECK_MEM_IS_DEFINED, \
_qzz_addr, _qzz_len, 0, 0, 0); \
_qzz_res; \
}))
/* Use this macro to force the definedness and addressibility of an
lvalue to be checked. If suitable addressibility and definedness
are not established, Valgrind prints an error message and returns
the address of the first offending byte. Otherwise it returns
zero. */
#define VALGRIND_CHECK_VALUE_IS_DEFINED(__lvalue) \
VALGRIND_CHECK_MEM_IS_DEFINED( \
(volatile unsigned char *)&(__lvalue), \
(unsigned long)(sizeof (__lvalue)))
/* Do a memory leak check mid-execution. */
#define VALGRIND_DO_LEAK_CHECK \
{unsigned long _qzz_res; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \
VG_USERREQ__DO_LEAK_CHECK, \
0, 0, 0, 0, 0); \
}
/* Just display summaries of leaked memory, rather than all the
details */
#define VALGRIND_DO_QUICK_LEAK_CHECK \
{unsigned long _qzz_res; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \
VG_USERREQ__DO_LEAK_CHECK, \
1, 0, 0, 0, 0); \
}
/* Return number of leaked, dubious, reachable and suppressed bytes found by
all previous leak checks. They must be lvalues. */
#define VALGRIND_COUNT_LEAKS(leaked, dubious, reachable, suppressed) \
/* For safety on 64-bit platforms we assign the results to private
unsigned long variables, then assign these to the lvalues the user
specified, which works no matter what type 'leaked', 'dubious', etc
are. We also initialise '_qzz_leaked', etc because
VG_USERREQ__COUNT_LEAKS doesn't mark the values returned as
initialised. */ \
{unsigned long _qzz_res; \
unsigned long _qzz_leaked = 0, _qzz_dubious = 0; \
unsigned long _qzz_reachable = 0, _qzz_suppressed = 0; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \
VG_USERREQ__COUNT_LEAKS, \
&_qzz_leaked, &_qzz_dubious, \
&_qzz_reachable, &_qzz_suppressed, 0); \
leaked = _qzz_leaked; \
dubious = _qzz_dubious; \
reachable = _qzz_reachable; \
suppressed = _qzz_suppressed; \
}
/* Get the validity data for addresses [zza..zza+zznbytes-1] and copy it
into the provided zzvbits array. Return values:
0 if not running on valgrind
1 success
2 [previously indicated unaligned arrays; these are now allowed]
3 if any parts of zzsrc/zzvbits are not addressable.
The metadata is not copied in cases 0, 2 or 3 so it should be
impossible to segfault your system by using this call.
*/
#define VALGRIND_GET_VBITS(zza,zzvbits,zznbytes) \
(__extension__({unsigned long _qzz_res; \
char* czza = (char*)zza; \
char* czzvbits = (char*)zzvbits; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \
VG_USERREQ__GET_VBITS, \
czza, czzvbits, zznbytes, 0, 0 ); \
_qzz_res; \
}))
/* Set the validity data for addresses [zza..zza+zznbytes-1], copying it
from the provided zzvbits array. Return values:
0 if not running on valgrind
1 success
2 [previously indicated unaligned arrays; these are now allowed]
3 if any parts of zza/zzvbits are not addressable.
The metadata is not copied in cases 0, 2 or 3 so it should be
impossible to segfault your system by using this call.
*/
#define VALGRIND_SET_VBITS(zza,zzvbits,zznbytes) \
(__extension__({unsigned int _qzz_res; \
char* czza = (char*)zza; \
char* czzvbits = (char*)zzvbits; \
VALGRIND_DO_CLIENT_REQUEST(_qzz_res, 0, \
VG_USERREQ__SET_VBITS, \
czza, czzvbits, zznbytes, 0, 0 ); \
_qzz_res; \
}))
#endif

3924
src/gui/valgrind.h Normal file
View File

File diff suppressed because it is too large Load Diff