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 /src/main/main.h | |
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 'src/main/main.h')
-rw-r--r-- | src/main/main.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/main.h b/src/main/main.h index 2c2773a92..7e0bf6b65 100644 --- a/src/main/main.h +++ b/src/main/main.h @@ -21,6 +21,7 @@ #include "util/options.h" #include "util/exception.h" +#include "util/stats.h" #include "cvc4autoconfig.h" #ifndef __CVC4__MAIN__MAIN_H @@ -31,10 +32,13 @@ namespace CVC4 { namespace main { /** Full argv[0] */ -extern const char *progPath; +extern const char* progPath; /** Just the basename component of argv[0] */ -extern const char *progName; +extern const char* progName; + +/** A reference to the StatisticsRegistry for use by the signal handlers */ +extern CVC4::StatisticsRegistry* pStatistics; /** * If true, will not spin on segfault even when CVC4_DEBUG is on. |