diff options
author | Liana Hadarean <lianahady@gmail.com> | 2015-05-28 15:03:10 +0100 |
---|---|---|
committer | Liana Hadarean <lianahady@gmail.com> | 2015-05-28 15:03:10 +0100 |
commit | b4aaa40ca834958130a8ee5a922ac45c6de84ce1 (patch) | |
tree | d0ce340446271c56909bcac8b1697ca18b7d5773 /src/util | |
parent | 3df7ea65b701a9ab054179af7efb4be120d280f2 (diff) |
added options for controlling resource step-count for various solving stages
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/resource_manager.cpp | 6 | ||||
-rw-r--r-- | src/util/resource_manager.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/util/resource_manager.cpp b/src/util/resource_manager.cpp index 6d32120d9..37fea2c67 100644 --- a/src/util/resource_manager.cpp +++ b/src/util/resource_manager.cpp @@ -170,13 +170,13 @@ uint64_t ResourceManager::getTimeRemaining() const { return d_thisCallTimeBudget - time_passed; } -void ResourceManager::spendResource() throw (UnsafeInterruptException) { +void ResourceManager::spendResource(uint64_t ammount) throw (UnsafeInterruptException) { ++d_spendResourceCalls; - ++d_cumulativeResourceUsed; + d_cumulativeResourceUsed += ammount; if (!d_on) return; Debug("limit") << "ResourceManager::spendResource()" << std::endl; - ++d_thisCallResourceUsed; + d_thisCallResourceUsed += ammount; if(out()) { Trace("limit") << "ResourceManager::spendResource: interrupt!" << std::endl; Trace("limit") << " on call " << d_spendResourceCalls << std::endl; diff --git a/src/util/resource_manager.h b/src/util/resource_manager.h index d1ec0456a..9c2812f0f 100644 --- a/src/util/resource_manager.h +++ b/src/util/resource_manager.h @@ -128,7 +128,7 @@ public: return d_thisCallResourceBudget; } - void spendResource() throw(UnsafeInterruptException); + void spendResource(uint64_t ammount) throw(UnsafeInterruptException); void setHardLimit(bool value); void setResourceLimit(uint64_t units, bool cumulative = false); |