make valgrind understand our memory pools

Annotate pools with valgrind macros so that it detects errors in pool
usage. Typically, we wish valgrind to detect a leak when the user fails
to call proper deallocation function.

* spot/misc/fixpool.hh, spot/misc/mspool.hh: here
* configure.ac: ensure that valgrind header exists
* tests/Makefile.am, tests/core/mempool.cc, tests/core/mempool.test,
  tests/core/.gitignore: add tests to ensure valgrind accurately detects
  leaks
This commit is contained in:
Maximilien Colange 2016-12-03 11:44:14 +01:00
parent b7e77743db
commit 3fe74f1cb9
7 changed files with 234 additions and 10 deletions

View file

@ -40,6 +40,7 @@ lunabbrev
Makefile
Makefile.in
maskacc
mempool
mixprod
nequals
nenoform

160
tests/core/mempool.cc Normal file
View file

@ -0,0 +1,160 @@
// -*- coding: utf-8 -*-
// Copyright (C) 2016, 2018 Laboratoire de Recherche et Développement
// de l'Epita.
//
// This file is part of Spot, a model checking library.
//
// Spot is free software; you can redistribute it and/or modify it
// under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 3 of the License, or
// (at your option) any later version.
//
// Spot is distributed in the hope that it will be useful, but WITHOUT
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
// or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
// License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config.h"
#define SPOT_DEBUG 1
#include <spot/misc/fixpool.hh>
#include <spot/misc/mspool.hh>
namespace
{
struct boxint
{
int i;
};
class foo
{
boxint* b;
public:
foo(int i): b(new boxint{i}) {}
~foo() { delete b; }
void incr() { ++b->i; }
};
// use a fixpool for allocation
class bar
{
int i;
static spot::fixed_size_pool& pool()
{
static spot::fixed_size_pool p{sizeof(bar)};
return p;
}
public:
bar(int i): i(i) {}
static void* operator new(size_t)
{
return pool().allocate();
}
static void operator delete(void* ptr)
{
pool().deallocate(ptr);
}
void incr() { ++i; }
};
// use a mspool for allocation
class baz
{
int i;
static spot::multiple_size_pool& pool()
{
static spot::multiple_size_pool p{};
return p;
}
public:
baz(int i): i(i) {}
static void* operator new(size_t)
{
return pool().allocate(sizeof(baz));
}
static void operator delete(void* ptr)
{
pool().deallocate(ptr, sizeof(baz));
}
void incr() { ++i; }
};
} // anonymous namespace
int main()
{
#ifndef HAVE_VALGRIND_MEMCHECK_H
return 77;
#endif
{
spot::fixed_size_pool p(sizeof(foo));
foo* a = new (p.allocate()) foo(1);
a->incr();
// delete and deallocate, no problem
a->~foo();
p.deallocate(a);
a = new (p.allocate()) foo(2);
a->incr();
// delete but do not deallocate: valgrind should find a leak
a->~foo();
a = new (p.allocate()) foo(3);
a->incr();
// deallocate but do not delete: valgrind should find a leak
p.deallocate(a);
}
{
spot::multiple_size_pool p;
foo* a = new (p.allocate(sizeof(foo))) foo(1);
a->incr();
// delete and deallocate, no problem
a->~foo();
p.deallocate(a, sizeof(foo));
a = new (p.allocate(sizeof(foo))) foo(2);
a->incr();
// delete but do not deallocate: valgrind should find a leak
a->~foo();
a = new (p.allocate(sizeof(foo))) foo(3);
a->incr();
// deallocate but do not delete: valgrind should find a leak
p.deallocate(a, sizeof(foo));
}
{
bar* b = new bar(1);
b->incr();
// no delete: valgrind should find a leak
}
{
baz* c = new baz(1);
c->incr();
// no delete: valgrind should find a leak
}
return 0;
}

34
tests/core/mempool.test Normal file
View file

@ -0,0 +1,34 @@
#!/bin/sh
# -*- coding: utf-8 -*-
# Copyright (C) 2018 Laboratoire de Recherche et Développement de l'Epita.
#
# This file is part of Spot, a model checking library.
#
# Spot is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Spot is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
# License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
. ./defs
set -e
cat >exp <<EOF
ERROR SUMMARY: 6 errors from 6 contexts (suppressed: 0 from 0)
EOF
if test -n "$VALGRIND"; then
$top_builddir/libtool --mode=execute \
$VALGRIND --tool=memcheck --leak-check=yes ../mempool 2> err
grep "ERROR SUMMARY" err | sed 's/^==[0-9]*==\s*//' > out
diff exp out
fi