4c98318 Optimize SAT solving slightly. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Optimize SAT solving slightly.

Vsevolod Stakhov committed 12 years ago

commit 4c98318cb5ed01a4b28be0cb8a7abe9b99f4aa07
parent 02fd8b9

1 file changed +7 -2

modified libpkg/pkg_solve.c

@@ -160,8 +160,10 @@ check_again:

 					ret = false;
 					LL_FOREACH(unresolved, it) {
 						if (it->var->resolved) {
 							if (PKG_SOLVE_CHECK_ITEM(it))
 							if (PKG_SOLVE_CHECK_ITEM(it)) {
 								ret = true;
 								break;
 							}
 						}
 					}
 					if (!ret) {

@@ -188,12 +190,15 @@ check_again:

 					ret = false;
 					LL_FOREACH(unresolved, it) {
 						if (it->var->resolved) {
 							if (PKG_SOLVE_CHECK_ITEM(it))
 							if (PKG_SOLVE_CHECK_ITEM(it)) {
 								ret = true;
 								break;
 							}
 						}
 					}
 					if (!ret) {
 						/* This is a unit */
 						int resolved = 0;
 						LL_FOREACH(unresolved, it) {
 							if (!it->var->resolved) {
 								it->var->to_install = (!it->inverse);