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

reachability: improve support for callbacks

Browse source 
* spot/mc/reachability.hh: here.
This commit is contained in:
Etienne Renault 2016-11-23 11:11:19 +01:00
parent 72948661e9
commit 9208726d97
1 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

32
spot/mc/reachability.hh
View file

@ -41,10 +41,10 @@ namespace spot
} }
~seq_reach_kripke() ~seq_reach_kripke()
{ {
// States will be destroyed by the system, so just clear map // States will be destroyed by the system, so just clear map
visited.clear(); visited.clear();
} }
Visitor& self() Visitor& self()
{ {
@ -55,15 +55,20 @@ namespace spot
{ {
self().setup(); self().setup();
State initial = sys_.initial(tid_); State initial = sys_.initial(tid_);
todo.push_back({initial, sys_.succ(initial, tid_)}); if (SPOT_LIKELY(self().push(initial, dfs_number)))
visited[initial] = ++dfs_number; {
self().push(initial, dfs_number); todo.push_back({initial, sys_.succ(initial, tid_)});
visited[initial] = ++dfs_number;
}
while (!todo.empty()) while (!todo.empty())
{ {
if (todo.back().it->done()) if (todo.back().it->done())
{ {
sys_.recycle(todo.back().it, tid_); if (SPOT_LIKELY(self().pop(todo.back().s)))
todo.pop_back(); {
sys_.recycle(todo.back().it, tid_);
todo.pop_back();
}
} }
else else
{ {
@ -73,10 +78,11 @@ namespace spot
if (it.second) if (it.second)
{ {
++dfs_number; ++dfs_number;
self().push(dst, dfs_number); if (SPOT_LIKELY(self().push(dst, dfs_number)))
self().edge(visited[todo.back().s], dfs_number); {
todo.back().it->next(); todo.back().it->next();
todo.push_back({dst, sys_.succ(dst, tid_)}); todo.push_back({dst, sys_.succ(dst, tid_)});
}
} }
else else
{ {