diff options
author | Tim King <taking@google.com> | 2016-01-28 12:35:45 -0800 |
---|---|---|
committer | Tim King <taking@google.com> | 2016-01-28 12:35:45 -0800 |
commit | 2ba8bb701ce289ba60afec01b653b0930cc59298 (patch) | |
tree | 46df365b7b41ce662a0f94de5b11c3ed20829851 /src/main/util.cpp | |
parent | 42b665f2a00643c81b42932fab1441987628c5a5 (diff) |
Adding listeners to Options.
- Options
-- Added the new option attribute :notify. One can get a notify() call on the Listener after a the option's value is updated. This is the new preferred way to achieve dynamic dispatch for options.
-- Removed SmtOptionsHandler and pushed its functionality into OptionsHandler and Listeners.
-- Added functions to Options for registering listeners of the notify calls.
-- Changed a number of options to use the new listener infrastructure.
-- Fixed a number of warnings in options.
-- Added the ArgumentExtender class to better capture how arguments are inserted while parsing options and ease memory management. Previously this was the "preemptGetopt" procedure.
-- Moved options/options_handler_interface.{cpp,h} to options/options_handler.{cpp,h}.
- Theories
-- Reimplemented alternative theories to use a datastructure stored on TheoryEngine instead of on Options.
- Ostream Handling:
-- Added new functionality that generalized how ostreams are opened, options/open_stream.h.
-- Simplified the memory management for different ostreams, smt/managed_ostreams.h.
-- Had the SmtEnginePrivate manage the memory for the ostreams set by options.
-- Simplified how the setting of ostreams are updated, smt/update_ostream.h.
- Configuration and Tags:
-- Configuration can now be used during predicates and handlers for options.
-- Moved configuration.{cpp,h,i} and configuration_private.h from util/ into base/.
-- Moved {Debug,Trace}_tags.* from being generated in options/ into base/.
- cvc4_private.h
-- Upgraded #warning's in cvc4_private.h and cvc4_private_library.h to #error's.
-- Added public first-order (non-templatized) member functions for options get and set the value of options outside of libcvc4. Fixed all of the use locations.
-- Made lib/lib/clock_gettime.h a cvc4_private_library.h header.
- Antlr
-- Fixed antlr and cvc4 macro definition conflicts that caused warnings.
- SmtGlobals
-- Refactored replayStream and replayLog out of SmtGlobals.
-- Renamed SmtGlobals to LemmaChannels and moved the implementation into smt_util/lemma_channels.{h,cpp}.
Diffstat (limited to 'src/main/util.cpp')
-rw-r--r-- | src/main/util.cpp | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/main/util.cpp b/src/main/util.cpp index abcdcc7c5..71b46e67a 100644 --- a/src/main/util.cpp +++ b/src/main/util.cpp @@ -33,7 +33,6 @@ #include "cvc4autoconfig.h" #include "main/command_executor.h" #include "main/main.h" -#include "options/base_options.h" #include "options/options.h" #include "smt/smt_engine.h" #include "util/statistics.h" @@ -42,11 +41,6 @@ using CVC4::Exception; using namespace std; namespace CVC4 { - -#ifdef CVC4_DEBUG -//extern CVC4_THREADLOCAL(const char*) s_debugLastException; -#endif /* CVC4_DEBUG */ - namespace main { /** @@ -64,7 +58,7 @@ void* cvc4StackBase; /** Handler for SIGXCPU, i.e., timeout. */ void timeout_handler(int sig, siginfo_t* info, void*) { fprintf(stderr, "CVC4 interrupted by timeout.\n"); - if((*pOptions)[options::statistics] && pExecutor != NULL) { + if(pOptions->getStatistics() && pExecutor != NULL) { pTotalTime->stop(); pExecutor->flushStatistics(cerr); } @@ -74,7 +68,7 @@ void timeout_handler(int sig, siginfo_t* info, void*) { /** Handler for SIGINT, i.e., when the user hits control C. */ void sigint_handler(int sig, siginfo_t* info, void*) { fprintf(stderr, "CVC4 interrupted by user.\n"); - if((*pOptions)[options::statistics] && pExecutor != NULL) { + if(pOptions->getStatistics() && pExecutor != NULL) { pTotalTime->stop(); pExecutor->flushStatistics(cerr); } @@ -99,7 +93,7 @@ void segv_handler(int sig, siginfo_t* info, void* c) { } if(!segvSpin) { - if((*pOptions)[options::statistics] && pExecutor != NULL) { + if(pOptions->getStatistics() && pExecutor != NULL) { pTotalTime->stop(); pExecutor->flushStatistics(cerr); } @@ -121,7 +115,7 @@ void segv_handler(int sig, siginfo_t* info, void* c) { } else if(addr < 10*1024) { cerr << "Looks like a NULL pointer was dereferenced." << endl; } - if((*pOptions)[options::statistics] && pExecutor != NULL) { + if(pOptions->getStatistics() && pExecutor != NULL) { pTotalTime->stop(); pExecutor->flushStatistics(cerr); } @@ -134,7 +128,7 @@ void ill_handler(int sig, siginfo_t* info, void*) { #ifdef CVC4_DEBUG fprintf(stderr, "CVC4 executed an illegal instruction in DEBUG mode.\n"); if(!segvSpin) { - if((*pOptions)[options::statistics] && pExecutor != NULL) { + if(pOptions->getStatistics() && pExecutor != NULL) { pTotalTime->stop(); pExecutor->flushStatistics(cerr); } @@ -149,7 +143,7 @@ void ill_handler(int sig, siginfo_t* info, void*) { } #else /* CVC4_DEBUG */ fprintf(stderr, "CVC4 executed an illegal instruction.\n"); - if((*pOptions)[options::statistics] && pExecutor != NULL) { + if(pOptions->getStatistics() && pExecutor != NULL) { pTotalTime->stop(); pExecutor->flushStatistics(cerr); } @@ -177,7 +171,7 @@ void cvc4unexpected() { fprintf(stderr, "The exception is:\n%s\n\n", lastContents); } if(!segvSpin) { - if((*pOptions)[options::statistics] && pExecutor != NULL) { + if(pOptions->getStatistics() && pExecutor != NULL) { pTotalTime->stop(); pExecutor->flushStatistics(cerr); } @@ -192,7 +186,7 @@ void cvc4unexpected() { } #else /* CVC4_DEBUG */ fprintf(stderr, "CVC4 threw an \"unexpected\" exception.\n"); - if((*pOptions)[options::statistics] && pExecutor != NULL) { + if(pOptions->getStatistics() && pExecutor != NULL) { pTotalTime->stop(); pExecutor->flushStatistics(cerr); } @@ -211,7 +205,7 @@ void cvc4terminate() { "CVC4 was terminated by the C++ runtime.\n" "Perhaps an exception was thrown during stack unwinding. " "(Don't do that.)\n"); - if((*pOptions)[options::statistics] && pExecutor != NULL) { + if(pOptions->getStatistics() && pExecutor != NULL) { pTotalTime->stop(); pExecutor->flushStatistics(cerr); } @@ -220,7 +214,7 @@ void cvc4terminate() { fprintf(stderr, "CVC4 was terminated by the C++ runtime.\n" "Perhaps an exception was thrown during stack unwinding.\n"); - if((*pOptions)[options::statistics] && pExecutor != NULL) { + if(pOptions->getStatistics() && pExecutor != NULL) { pTotalTime->stop(); pExecutor->flushStatistics(cerr); } |