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

* src/tgba/bdddict.cc, src/tgba/bdddict.hh (free_annonymous_list_of):

Browse source 
Rename as ...
(free_anonymous_list_of): ... this, and correct their update on
release.  Also correct yesterday's the correction (ahem!).
(dump): Improve verbosity.
* src/misc/freelist.cc (free_list::remove, free_list::insert): Fix
longstanding thinkos.
(free_list::free_count): New function.
This commit is contained in:
Alexandre Duret-Lutz 2006-07-14 15:30:23 +00:00
parent 064319b3e4
commit 9e97543e33
5 changed files with 123 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

74
src/tgba/bdddict.cc
View file

@ -33,7 +33,7 @@ namespace spot
next_to_now(bdd_newpair()),
now_to_next(bdd_newpair())
{
free_annonymous_list_of[0] = annon_free_list(this);
free_anonymous_list_of[0] = anon_free_list(this);
}
bdd_dict::~bdd_dict()
@ -143,18 +143,20 @@ namespace spot
int
bdd_dict::register_anonymous_variables(int n, const void* for_me)
{
free_annonymous_list_of_type::iterator i =
free_annonymous_list_of.find(for_me);
free_anonymous_list_of_type::iterator i =
free_anonymous_list_of.find(for_me);
if (i == free_annonymous_list_of.end())
if (i == free_anonymous_list_of.end())
{
typedef free_annonymous_list_of_type fal;
i = (free_annonymous_list_of.insert
(fal::value_type(for_me, free_annonymous_list_of[0]))).first;
typedef free_anonymous_list_of_type fal;
i = (free_anonymous_list_of.insert
(fal::value_type(for_me, free_anonymous_list_of[0]))).first;
}
int res = i->second.register_n(n);
while (n--)
var_refs[res + n].insert(for_me);
return res;
}
@ -170,7 +172,11 @@ namespace spot
if (s.find(from_other) != s.end())
s.insert(for_me);
}
free_annonymous_list_of[for_me] = free_annonymous_list_of[from_other];
free_anonymous_list_of_type::const_iterator j =
free_anonymous_list_of.find(from_other);
if (j != free_anonymous_list_of.end())
free_anonymous_list_of[for_me] = j->second;
}
void
@ -188,14 +194,23 @@ namespace spot
ref_set::iterator si = s.find(me);
if (si == s.end())
return;
s.erase(si);
int var = cur->first;
// If var is anonymous, we should reinsert it into the free list
// of ME's anonymous variables.
if (var_formula_map.find(var) == var_formula_map.end()
&& now_formula_map.find(var) == now_formula_map.end()
&& acc_formula_map.find(var) == acc_formula_map.end())
free_anonymous_list_of[me].release_n(var, 1);
if (!s.empty())
return;
// ME was the last user of this variable.
// Let's free it. First, we need to find
// if this is a Now, a Var, or an Acc variable.
int var = cur->first;
int n = 1;
const ltl::formula* f = 0;
vf_map::iterator vi = var_formula_map.find(var);
@ -228,10 +243,13 @@ namespace spot
}
else
{
free_annonymous_list_of_type::iterator i;
for (i = free_annonymous_list_of.begin();
i != free_annonymous_list_of.end(); ++i)
i->second.release_n(var, n);
free_anonymous_list_of_type::iterator i;
// Nobody use this variable as an anonymous variable
// anymore, so remove it entirely from the anonymous
// free list so it can be used for something else.
for (i = free_anonymous_list_of.begin();
i != free_anonymous_list_of.end(); ++i)
i->second.remove(var, n);
}
}
}
@ -254,7 +272,7 @@ namespace spot
vr_map::iterator cur = i++;
unregister_variable(cur, me);
}
free_annonymous_list_of.erase(me);
free_anonymous_list_of.erase(me);
}
bool
@ -315,6 +333,24 @@ namespace spot
<< var_refs.find(fi->second)->second.size() << "): Acc[";
to_string(fi->first, os) << "]" << std::endl;
}
os << "Ref counts:" << std::endl;
vr_map::const_iterator ri;
for (ri = var_refs.begin(); ri != var_refs.end(); ++ri)
{
os << " " << ri->first << " :";
for (ref_set::const_iterator si = ri->second.begin();
si != ri->second.end(); ++si)
os << " " << *si;
os << std::endl;
}
os << "Anonymous lists:" << std::endl;
free_anonymous_list_of_type::const_iterator ai;
for (ai = free_anonymous_list_of.begin();
ai != free_anonymous_list_of.end(); ++ai)
{
os << " [" << ai->first << "] ";
ai->second.dump_free_list(os) << std::endl;
}
os << "Free list:" << std::endl;
dump_free_list(os);
os << std::endl;
@ -368,20 +404,20 @@ namespace spot
}
bdd_dict::annon_free_list::annon_free_list(bdd_dict* d)
bdd_dict::anon_free_list::anon_free_list(bdd_dict* d)
: dict_(d)
{
}
int
bdd_dict::annon_free_list::extend(int n)
bdd_dict::anon_free_list::extend(int n)
{
assert(dict_);
int b = dict_->allocate_variables(n);
free_annonymous_list_of_type::iterator i;
for (i = dict_->free_annonymous_list_of.begin();
i != dict_->free_annonymous_list_of.end(); ++i)
free_anonymous_list_of_type::iterator i;
for (i = dict_->free_anonymous_list_of.begin();
i != dict_->free_anonymous_list_of.end(); ++i)
if (&i->second != this)
i->second.insert(b, n);
return b;

10
src/tgba/bdddict.hh
View file

@ -1,4 +1,4 @@
// Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
// Copyright (C) 2003, 2004, 2006 Laboratoire d'Informatique de Paris 6 (LIP6),
// département Systèmes Répartis Coopératifs (SRC), Université Pierre
// et Marie Curie.
//
@ -172,13 +172,13 @@ namespace spot
// SWIG does not grok the following definition, no idea why.
// It's not important for the Python interface anyway.
#ifndef SWIG
class annon_free_list : public spot::free_list
class anon_free_list : public spot::free_list
{
public:
// WARNING: We need a default constructor so this can be used in
// a hash; but we should ensure that no object in the hash is
// constructed with d==0.
annon_free_list(bdd_dict* d = 0);
anon_free_list(bdd_dict* d = 0);
virtual int extend(int n);
private:
bdd_dict* dict_;
@ -186,8 +186,8 @@ namespace spot
#endif
/// List of unused anonymous variable number for each automaton.
typedef std::map<const void*, annon_free_list> free_annonymous_list_of_type;
free_annonymous_list_of_type free_annonymous_list_of;
typedef std::map<const void*, anon_free_list> free_anonymous_list_of_type;
free_anonymous_list_of_type free_anonymous_list_of;
private:
// Disallow copy.