mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 14:13:23 +00:00
Code Activity

ensure limit children are safe for race conditions

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-12-12 10:23:56 -08:00 • committed by Christoph M. Wintersteiger
parent a134a079b1
commit 17bbaa06dc
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/nlsat/nlsat_solver.cpp
View file

@ -217,10 +217,7 @@ namespace nlsat {
} }
void checkpoint() { void checkpoint() {
if (!m_rlimit.inc()) { if (!m_rlimit.inc()) throw solver_exception(m_rlimit.get_cancel_msg());
if (m_rlimit.cancel_flag_set()) throw solver_exception(Z3_CANCELED_MSG);
throw solver_exception(Z3_MAX_RESOURCE_MSG);
}
if (memory::get_allocation_size() > m_max_memory) throw solver_exception(Z3_MAX_MEMORY_MSG); if (memory::get_allocation_size() > m_max_memory) throw solver_exception(Z3_MAX_MEMORY_MSG);
} }

3
src/util/rlimit.cpp
View file

@ -17,6 +17,7 @@ Revision History:
--*/ --*/
#include "rlimit.h" #include "rlimit.h"
#include "common_msgs.h"
reslimit::reslimit(): reslimit::reslimit():
m_cancel(false), m_cancel(false),
@ -57,7 +58,7 @@ void reslimit::pop() {
m_cancel = false; m_cancel = false;
} }
char const* get_cancel_msg() const { char const* reslimit::get_cancel_msg() const {
if (m_cancel) { if (m_cancel) {
return Z3_CANCELED_MSG; return Z3_CANCELED_MSG;
} }