This commit is a merge from the "betterstats" branch, which:
authorMorgan Deters <mdeters@gmail.com>
Fri, 1 Apr 2011 00:56:42 +0000 (00:56 +0000)
committerMorgan Deters <mdeters@gmail.com>
Fri, 1 Apr 2011 00:56:42 +0000 (00:56 +0000)
commit159cb7ee8b6f28f3784a3f24b371760c2ab77f86
treed510bfa3e4977b5c532d9ab82b6cd5d9581365a3
parentceca24424da629db2e133f7864b0bac03ad44829
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.
32 files changed:
src/expr/declaration_scope.cpp
src/expr/declaration_scope.h
src/expr/expr_manager_scope.h
src/expr/expr_manager_template.cpp
src/expr/node_builder.h
src/expr/node_manager.cpp
src/expr/node_manager.h
src/expr/type.cpp
src/main/main.cpp
src/main/main.h
src/main/util.cpp
src/prop/minisat/CVC4-README
src/prop/prop_engine.cpp
src/prop/prop_engine.h
src/prop/sat.h
src/smt/smt_engine.cpp
src/smt/smt_engine.h
src/theory/arith/arith_priority_queue.cpp
src/theory/arith/arith_priority_queue.h
src/theory/arith/arith_rewriter.cpp
src/theory/arith/simplex.h
src/theory/arith/theory_arith.h
src/theory/theory.h
src/theory/theory_engine.cpp
src/theory/theory_engine.h
src/util/options.cpp
src/util/options.h
src/util/stats.cpp
src/util/stats.h
test/system/boilerplate.cpp
test/unit/theory/shared_term_manager_black.h
test/unit/theory/theory_engine_white.h