diff options
author | Morgan Deters <mdeters@gmail.com> | 2011-04-01 00:56:42 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2011-04-01 00:56:42 +0000 |
commit | 159cb7ee8b6f28f3784a3f24b371760c2ab77f86 (patch) | |
tree | d510bfa3e4977b5c532d9ab82b6cd5d9581365a3 /test/unit | |
parent | ceca24424da629db2e133f7864b0bac03ad44829 (diff) |
This commit is a merge from the "betterstats" branch, which:
* Makes Options an "omnipresent thread-local global" (like the notion
of the "current NodeManager" was already). Options::current() accesses
this structure.
* Removes Options from constructors and data structures everywhere
(this cleans up a lot of things).
* No longer uses StatisticsRegistry statically. An instance of the
registry is created and linked to a NodeManager.
* StatisticsRegistry::current() is similar to Options::current(), but
the pointer is stowed in the NodeManager (rather than stored)
* The static functions of StatisticsRegistry have been left, for backward
compatibility; they now use the "current" statistics registry.
* SmtEngine::getStatisticsRegistry() is a public accessor for the
registry; this is needed by main() to reach in and get the registry,
for flushing statistics at the end.
Diffstat (limited to 'test/unit')
-rw-r--r-- | test/unit/theory/shared_term_manager_black.h | 3 | ||||
-rw-r--r-- | test/unit/theory/theory_engine_white.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/test/unit/theory/shared_term_manager_black.h b/test/unit/theory/shared_term_manager_black.h index 76f3712f0..e88f11673 100644 --- a/test/unit/theory/shared_term_manager_black.h +++ b/test/unit/theory/shared_term_manager_black.h @@ -59,8 +59,7 @@ public: d_nm = new NodeManager(d_ctxt); d_scope = new NodeManagerScope(d_nm); - Options options; - d_theoryEngine = new TheoryEngine(d_ctxt, options); + d_theoryEngine = new TheoryEngine(d_ctxt); } void tearDown() { diff --git a/test/unit/theory/theory_engine_white.h b/test/unit/theory/theory_engine_white.h index f99698204..26908ec6e 100644 --- a/test/unit/theory/theory_engine_white.h +++ b/test/unit/theory/theory_engine_white.h @@ -242,8 +242,7 @@ public: d_nullChannel = new FakeOutputChannel; // create the TheoryEngine - Options options; - d_theoryEngine = new TheoryEngine(d_ctxt, options); + d_theoryEngine = new TheoryEngine(d_ctxt); d_theoryEngine->addTheory< FakeTheory<THEORY_BUILTIN> >(); d_theoryEngine->addTheory< FakeTheory<THEORY_BOOL> >(); |