3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00

fixes to mostly solver arith/euf and backtracking scopes

This commit is contained in:
Nikolaj Bjorner 2020-10-26 11:06:34 -07:00
parent 1ee2ba2a9b
commit 8d76470a8a
25 changed files with 189 additions and 93 deletions

View file

@ -12,6 +12,7 @@ Copyright (c) 2015 Microsoft Corporation
#include "util/memory_manager.h"
#include "util/error_codes.h"
#include "util/debug.h"
#include "util/scoped_timer.h"
// The following two function are automatically generated by the mk_make.py script.
// The script collects ADD_INITIALIZER and ADD_FINALIZER commands in the .h files.
// For example, rational.h contains
@ -27,7 +28,6 @@ Copyright (c) 2015 Microsoft Corporation
// rational::finalize();
void mem_initialize();
void mem_finalize();
void finalize_scoped_timer();
// If PROFILE_MEMORY is defined, Z3 will display the amount of memory used, and the number of synchronization steps during finalization
// #define PROFILE_MEMORY
@ -142,7 +142,7 @@ void memory::finalize(bool shutdown) {
g_finalizing = false;
if (shutdown) {
finalize_scoped_timer();
scoped_timer::finalize();
}
}
}

View file

@ -116,7 +116,7 @@ scoped_timer::~scoped_timer() {
dealloc(m_imp);
}
void finalize_scoped_timer() {
void scoped_timer::finalize() {
unsigned deleted = 0;
while (deleted < num_workers) {

View file

@ -26,4 +26,5 @@ class scoped_timer {
public:
scoped_timer(unsigned ms, event_handler * eh);
~scoped_timer();
static void finalize();
};