riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Disabled ezminisat timeout feature for Win32

This commit is contained in:
Clifford Wolf 2014-10-11 10:24:46 +02:00
parent df537a216b
commit 93e6ebe771
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/ezsat/ezminisat.cc
View File

@ -77,6 +77,7 @@ bool ezMiniSAT::eliminated(int idx)
} }
#endif #endif
#ifndef _WIN32
ezMiniSAT *ezMiniSAT::alarmHandlerThis = NULL; ezMiniSAT *ezMiniSAT::alarmHandlerThis = NULL;
clock_t ezMiniSAT::alarmHandlerTimeout = 0; clock_t ezMiniSAT::alarmHandlerTimeout = 0;
@ -88,6 +89,7 @@ void ezMiniSAT::alarmHandler(int)
} else } else
alarm(1); alarm(1);
} }
#endif
bool ezMiniSAT::solver(const std::vector<int> &modelExpressions, std::vector<bool> &modelValues, const std::vector<int> &assumptions) bool ezMiniSAT::solver(const std::vector<int> &modelExpressions, std::vector<bool> &modelValues, const std::vector<int> &assumptions)
{ {
@ -174,6 +176,7 @@ contradiction:
#endif #endif
} }
#ifndef _WIN32
struct sigaction sig_action; struct sigaction sig_action;
struct sigaction old_sig_action; struct sigaction old_sig_action;
int old_alarm_timeout = 0; int old_alarm_timeout = 0;
@ -188,9 +191,11 @@ contradiction:
sigaction(SIGALRM, &sig_action, &old_sig_action); sigaction(SIGALRM, &sig_action, &old_sig_action);
alarm(1); alarm(1);
} }
#endif
bool foundSolution = minisatSolver->solve(assumps); bool foundSolution = minisatSolver->solve(assumps);
#ifndef _WIN32
if (solverTimeout > 0) { if (solverTimeout > 0) {
if (alarmHandlerTimeout == 0) if (alarmHandlerTimeout == 0)
solverTimoutStatus = true; solverTimoutStatus = true;
@ -198,6 +203,7 @@ contradiction:
sigaction(SIGALRM, &old_sig_action, NULL); sigaction(SIGALRM, &old_sig_action, NULL);
alarm(old_alarm_timeout); alarm(old_alarm_timeout);
} }
#endif
if (!foundSolution) { if (!foundSolution) {
#if !EZMINISAT_INCREMENTAL #if !EZMINISAT_INCREMENTAL

2
libs/ezsat/ezminisat.h
View File

@ -51,9 +51,11 @@ private:
std::set<int> cnfFrozenVars; std::set<int> cnfFrozenVars;
#endif #endif
#ifndef _WIN32
static ezMiniSAT *alarmHandlerThis; static ezMiniSAT *alarmHandlerThis;
static clock_t alarmHandlerTimeout; static clock_t alarmHandlerTimeout;
static void alarmHandler(int); static void alarmHandler(int);
#endif
public: public:
ezMiniSAT(); ezMiniSAT();