alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixpool: propose alternative policy

Browse source 
In 3fe74f1c, fixed_size_pool was changed in order to
help memcheck to detect "potential" memory leaks. In a
multithreaded context, this could raise false alarm. To
solve this, we proprose 2 policies for the pool, one with
the check and one without.

* spot/misc/fixpool.cc: deleted ...
* spot/ltsmin/ltsmin.cc, spot/ltsmin/spins_kripke.hh,
spot/mc/deadlock.hh, spot/misc/Makefile.am,
spot/misc/fixpool.cc, spot/misc/fixpool.hh,
spot/priv/allocator.hh, spot/ta/tgtaproduct.cc,
spot/ta/tgtaproduct.hh, spot/twa/twaproduct.cc,
spot/twa/twaproduct.hh, tests/core/mempool.cc: Here.
This commit is contained in:
Etienne Renault 2018-07-11 14:28:34 +00:00
parent fe1be20f09
commit 23edf52dd5
12 changed files with 169 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

31
spot/twa/twaproduct.cc
View file

@ -44,7 +44,7 @@ namespace spot
{
if (--count_)
return;
fixed_size_pool* p = pool_;
fixed_size_pool<pool_type::Safe>* p = pool_;
this->~state_product();
p->deallocate(const_cast<state_product*>(this));
}
@ -83,9 +83,9 @@ namespace spot
{
public:
twa_succ_iterator_product_common(twa_succ_iterator* left,
twa_succ_iterator* right,
const twa_product* prod,
fixed_size_pool* pool)
twa_succ_iterator* right,
const twa_product* prod,
fixed_size_pool<pool_type::Safe>* pool)
: left_(left), right_(right), prod_(prod), pool_(pool)
{
}
@ -141,7 +141,7 @@ namespace spot
twa_succ_iterator* left_;
twa_succ_iterator* right_;
const twa_product* prod_;
fixed_size_pool* pool_;
fixed_size_pool<pool_type::Safe>* pool_;
friend class spot::twa_product;
};
@ -152,9 +152,9 @@ namespace spot
{
public:
twa_succ_iterator_product(twa_succ_iterator* left,
twa_succ_iterator* right,
const twa_product* prod,
fixed_size_pool* pool)
twa_succ_iterator* right,
const twa_product* prod,
fixed_size_pool<pool_type::Safe>* pool)
: twa_succ_iterator_product_common(left, right, prod, pool)
{
}
@ -218,9 +218,9 @@ namespace spot
{
public:
twa_succ_iterator_product_kripke(twa_succ_iterator* left,
twa_succ_iterator* right,
const twa_product* prod,
fixed_size_pool* pool)
twa_succ_iterator* right,
const twa_product* prod,
fixed_size_pool<pool_type::Safe>* pool)
: twa_succ_iterator_product_common(left, right, prod, pool)
{
}
@ -327,7 +327,8 @@ namespace spot
const state*
twa_product::get_init_state() const
{
fixed_size_pool* p = const_cast<fixed_size_pool*>(&pool_);
fixed_size_pool<pool_type::Safe>* p =
const_cast<fixed_size_pool<pool_type::Safe>*>(&pool_);
return new(p->allocate()) state_product(left_->get_init_state(),
right_->get_init_state(), p);
}
@ -348,7 +349,8 @@ namespace spot
return it;
}
fixed_size_pool* p = const_cast<fixed_size_pool*>(&pool_);
fixed_size_pool<pool_type::Safe>* p =
const_cast<fixed_size_pool<pool_type::Safe>*>(&pool_);
if (left_kripke_)
return new twa_succ_iterator_product_kripke(li, ri, this, p);
else
@ -403,7 +405,8 @@ namespace spot
const state*
twa_product_init::get_init_state() const
{
fixed_size_pool* p = const_cast<fixed_size_pool*>(&pool_);
fixed_size_pool<pool_type::Safe>* p =
const_cast<fixed_size_pool<pool_type::Safe>*>(&pool_);
return new(p->allocate()) state_product(left_init_->clone(),
right_init_->clone(), p);
}

6
spot/twa/twaproduct.hh
View file

@ -44,7 +44,7 @@ namespace spot
/// be destroyed on destruction.
state_product(const state* left,
const state* right,
fixed_size_pool* pool)
fixed_size_pool<pool_type::Safe>* pool)
: left_(left), right_(right), count_(1), pool_(pool)
{
}
@ -71,7 +71,7 @@ namespace spot
const state* left_; ///< State from the left automaton.
const state* right_; ///< State from the right automaton.
mutable unsigned count_;
fixed_size_pool* pool_;
fixed_size_pool<pool_type::Safe>* pool_;
virtual ~state_product();
state_product(const state_product& o) = delete;
@ -107,7 +107,7 @@ namespace spot
const_twa_ptr left_;
const_twa_ptr right_;
bool left_kripke_;
fixed_size_pool pool_;
fixed_size_pool<pool_type::Safe> pool_;
private:
// Disallow copy.