diff options
| author | Kshitij Bansal <kshitij@cs.nyu.edu> | 2014-12-03 12:09:14 -0500 |
|---|---|---|
| committer | Kshitij Bansal <kshitij@cs.nyu.edu> | 2014-12-03 12:09:14 -0500 |
| commit | 2121eaac7e63875f1e6ba53076535d25fd561c04 (patch) | |
| tree | bbfba9957b3d64d43604e645c7b42b77a8baa530 /src/util | |
| parent | 160134dc043c28308865d2b91648ba412d0749d4 (diff) | |
| parent | fa6ac807d931518790df89206c4f3aeceff8e395 (diff) | |
Merge branch 'master' of https://github.com/CVC4/CVC4
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/resource_manager.cpp | 2 | ||||
| -rw-r--r-- | src/util/resource_manager.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/util/resource_manager.cpp b/src/util/resource_manager.cpp index b0fd37fd2..7aeb2fc0f 100644 --- a/src/util/resource_manager.cpp +++ b/src/util/resource_manager.cpp @@ -172,10 +172,10 @@ unsigned long ResourceManager::getTimeRemaining() const { void ResourceManager::spendResource() throw (UnsafeInterruptException) { ++d_spendResourceCalls; + ++d_cumulativeResourceUsed; if (!d_on) return; Debug("limit") << "ResourceManager::spendResource()" << std::endl; - ++d_cumulativeResourceUsed; ++d_thisCallResourceUsed; if(out()) { Trace("limit") << "ResourceManager::spendResource: interrupt!" << std::endl; diff --git a/src/util/resource_manager.h b/src/util/resource_manager.h index a16f60910..94e7dbba2 100644 --- a/src/util/resource_manager.h +++ b/src/util/resource_manager.h @@ -150,7 +150,7 @@ public: void endCall(); static unsigned long getFrequencyCount() { return s_resourceCount; } - + friend class SmtEngine; };/* class ResourceManager */ }/* CVC4 namespace */ |