mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-04 10:20:23 +00:00
Code Activity

Style, whitespace.

Browse source
This commit is contained in:
Christoph M. Wintersteiger 2016-12-16 20:04:29 +00:00
parent a1a662b23f
commit 6ce903b1d6
2 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/util/rlimit.cpp
View file

@ -20,7 +20,7 @@ Revision History:
#include "common_msgs.h" #include "common_msgs.h"
reslimit::reslimit(): reslimit::reslimit():
m_cancel(false), m_cancel(0),
m_count(0), m_count(0),
m_limit(0) { m_limit(0) {
} }
@ -29,7 +29,6 @@ uint64 reslimit::count() const {
return m_count; return m_count;
} }
bool reslimit::inc() { bool reslimit::inc() {
++m_count; ++m_count;
return m_cancel == 0 && (m_limit == 0 || m_count <= m_limit); return m_cancel == 0 && (m_limit == 0 || m_count <= m_limit);
@ -46,7 +45,7 @@ void reslimit::push(unsigned delta_limit) {
new_limit = 0; new_limit = 0;
} }
m_limits.push_back(m_limit); m_limits.push_back(m_limit);
m_limit = m_limit==0?new_limit:std::min(new_limit, m_limit); m_limit = m_limit==0 ? new_limit : std::min(new_limit, m_limit);
m_cancel = 0; m_cancel = 0;
} }
@ -71,14 +70,14 @@ char const* reslimit::get_cancel_msg() const {
void reslimit::push_child(reslimit* r) { void reslimit::push_child(reslimit* r) {
#pragma omp critical (reslimit_cancel) #pragma omp critical (reslimit_cancel)
{ {
m_children.push_back(r); m_children.push_back(r);
} }
} }
void reslimit::pop_child() { void reslimit::pop_child() {
#pragma omp critical (reslimit_cancel) #pragma omp critical (reslimit_cancel)
{ {
m_children.pop_back(); m_children.pop_back();
} }
} }
@ -99,7 +98,7 @@ void reslimit::reset_cancel() {
void reslimit::inc_cancel() { void reslimit::inc_cancel() {
#pragma omp critical (reslimit_cancel) #pragma omp critical (reslimit_cancel)
{ {
set_cancel(m_cancel+1); set_cancel(m_cancel+1);
} }
} }
@ -114,8 +113,8 @@ void reslimit::dec_cancel() {
} }
} }
void reslimit::set_cancel(unsigned f) { void reslimit::set_cancel(unsigned f) {
m_cancel = f; m_cancel = f;
for (unsigned i = 0; i < m_children.size(); ++i) { for (unsigned i = 0; i < m_children.size(); ++i) {
m_children[i]->set_cancel(f); m_children[i]->set_cancel(f);
} }

6
src/util/rlimit.h
View file

@ -29,8 +29,8 @@ class reslimit {
ptr_vector<reslimit> m_children; ptr_vector<reslimit> m_children;
void set_cancel(unsigned f); void set_cancel(unsigned f);
public: public:
reslimit(); reslimit();
void push(unsigned delta_limit); void push(unsigned delta_limit);
void pop(); void pop();
@ -39,7 +39,7 @@ public:
bool inc(); bool inc();
bool inc(unsigned offset); bool inc(unsigned offset);
uint64 count() const; uint64 count() const;
bool get_cancel_flag() const { return m_cancel > 0; } bool get_cancel_flag() const { return m_cancel > 0; }