mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-12 02:04:43 +00:00
Code Activity

cleanup cancelation logic

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-12-11 12:35:35 -08:00
parent 4e155887b2
commit 61dbb6168e
37 changed files with 93 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/util/rlimit.cpp
View file

@ -19,35 +19,36 @@ Revision History:
#include "rlimit.h"
reslimit::reslimit():
m_cancel(false),
m_count(0),
m_limit(UINT_MAX) {
m_limit(0) {
}
unsigned reslimit::count() const {
uint64 reslimit::count() const {
return m_count;
}
bool reslimit::inc() {
++m_count;
return m_count <= m_limit;
return !m_cancel && (m_limit == 0 || m_count <= m_limit);
}
bool reslimit::inc(unsigned offset) {
m_count += offset;
return m_count <= m_limit;
return !m_cancel && (m_limit == 0 || m_count <= m_limit);
}
void reslimit::push(unsigned delta_limit) {
unsigned new_limit = delta_limit + m_count;
uint64 new_limit = delta_limit + m_count;
if (new_limit <= m_count) {
new_limit = UINT_MAX;
new_limit = 0;
}
m_limits.push_back(m_limit);
m_limit = std::min(new_limit, m_limit);
m_limit = m_limit==0?new_limit:std::min(new_limit, m_limit);
}
void reslimit::pop() {
if (m_count > m_limit) {
if (m_count > m_limit && m_limit > 0) {
m_count = m_limit;
}
m_limit = m_limits.back();