cleanup cancelation logic

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/util/rlimit.cpp

@@ -19,35 +19,36 @@ Revision History:
 #include "rlimit.h"
 
 reslimit::reslimit():
+    m_cancel(false),
     m_count(0),
-    m_limit(UINT_MAX) {
+    m_limit(0) {
 }
 
-unsigned reslimit::count() const {
+uint64 reslimit::count() const {
     return m_count;
 }
 
 bool reslimit::inc() {
     ++m_count;
-    return m_count <= m_limit;
+    return !m_cancel && (m_limit == 0 || m_count <= m_limit);
 }
 
 bool reslimit::inc(unsigned offset) {
     m_count += offset;
-    return m_count <= m_limit;
+    return !m_cancel && (m_limit == 0 || m_count <= m_limit);
 }
 
 void reslimit::push(unsigned delta_limit) {
-    unsigned new_limit = delta_limit + m_count;
+    uint64 new_limit = delta_limit + m_count;
     if (new_limit <= m_count) {
-        new_limit = UINT_MAX;
+        new_limit = 0;
     }
     m_limits.push_back(m_limit);
-    m_limit = std::min(new_limit, m_limit);
+    m_limit = m_limit==0?new_limit:std::min(new_limit, m_limit);
 }
 
 void reslimit::pop() {
-    if (m_count > m_limit) {
+    if (m_count > m_limit && m_limit > 0) {
         m_count = m_limit;
     }
     m_limit = m_limits.back();

src/util/rlimit.h

@@ -22,16 +22,21 @@ Revision History:
 #include "vector.h"
 
 class reslimit {
-    unsigned        m_count;
-    unsigned        m_limit;
-    unsigned_vector m_limits;
+    volatile bool   m_cancel;
+    uint64          m_count;
+    uint64          m_limit;
+    svector<uint64> m_limits;
+
 public:    
     reslimit();
-    bool inc();
-    bool inc(unsigned offset);
     void push(unsigned delta_limit);
     void pop();
-    unsigned count() const; 
+    bool inc();
+    bool inc(unsigned offset);
+    uint64 count() const; 
+
+    void cancel() { m_cancel = true; }
+    void reset_cancel() { m_cancel = false; }
 };
 
 class scoped_rlimit {

src/util/statistics.cpp

@@ -238,5 +238,5 @@ void get_memory_statistics(statistics& st) {
 }
 
 void get_rlimit_statistics(reslimit& l, statistics& st) {
-    st.update("rlimit count",     l.count());
+    st.update("rlimit count",     static_cast<double>(l.count()));
 }