diff options
| author | Morgan Deters <mdeters@gmail.com> | 2010-04-06 06:39:01 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2010-04-06 06:39:01 +0000 |
| commit | 4143f662e0c5ef311e98dbd554500b98cd02ecdb (patch) | |
| tree | 79abe3f9393d41450ada658dbd3f0914680048c9 /src/expr/node_manager.h | |
| parent | 6ad21b68e654b940d97caea6d34404d0a6b6e628 (diff) | |
* Add some protected ContextObj accessors for ContextObj-derived classes:
+ Context* getContext() -- gets the context
+ ContextMemoryManager* getCMM() -- gets the CMM
+ int getLevel() -- the scope level of the ContextObj's most recent update
+ bool isCurrent() -- true iff the most recent update is the current top level
In particular, the ContextObj::getCMM() call cleans up by TheoryUF's
ECData::addPredecessor() function substantially (re: code review bug #64).
* Fix serious bugs in context operations that corrupted the ContextObj
linked lists. Closes bug #85.
* Identified a bug in the way objects of the "Link" class are
allocated; see bug #96.
* Re-enable context white-box tests that ensure proper links in linked
lists. Closes bug #86.
* Re-enable CDMap<>::emptyTrash(). Closes bug #87.
* Add a tracing option (-t foo or --trace foo) to the driver to enable
Trace("foo") output stream. -d foo implies -t foo.
* Minor clean-up of some TheoryUF code; addition of some documentation
(re: code review bug #64).
* Address some things that caused Doxygen discomfort.
* Address an issue raised in NodeManager's code review (bug #65).
* Remove an inaccurate comment in Attribute code (re: code review bug #61).
Diffstat (limited to 'src/expr/node_manager.h')
| -rw-r--r-- | src/expr/node_manager.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/expr/node_manager.h b/src/expr/node_manager.h index 3f7196178..0f8938397 100644 --- a/src/expr/node_manager.h +++ b/src/expr/node_manager.h @@ -159,19 +159,16 @@ class NodeManager { */ inline void markForDeletion(expr::NodeValue* nv) { Assert(nv->d_rc == 0); + // if d_reclaiming is set, make sure we don't call // reclaimZombies(), because it's already running. - if(d_reclaiming) {// FIXME multithreading - // currently reclaiming zombies; just push onto the list - Debug("gc") << "zombifying node value " << nv - << " [" << nv->d_id << "]: " << *nv - << " [CURRENTLY-RECLAIMING]\n"; - d_zombies.insert(nv);// FIXME multithreading - } else { - Debug("gc") << "zombifying node value " << nv - << " [" << nv->d_id << "]: " << *nv << "\n"; - d_zombies.insert(nv);// FIXME multithreading + Debug("gc") << "zombifying node value " << nv + << " [" << nv->d_id << "]: " << *nv + << (d_reclaiming ? " [CURRENTLY-RECLAIMING]" : "") + << std::endl; + d_zombies.insert(nv);// FIXME multithreading + if(!d_reclaiming) {// FIXME multithreading // for now, collect eagerly. can add heuristic here later.. reclaimZombies(); } |