Tiny bit of cleanup

09a84995 · Frans Kaashoek · 2d159fd0 · 09a84995 · 09a84995
--- a/crange.cc
+++ b/crange.cc
@@ -91,38 +91,21 @@ range::~range()
 {
  if (crange_debug)
    cprintf("%d: range_free: 0x%lx 0x%lx-0x%lx(%ld)\n", myproc()->cpuid, (u64) this, this->key, this->key+this->size, this->size);
-  //crange_check(e->cr, e);
+  this->cr->check(this);
  //    assert(this->curlevel == -1);
  for (int l = 0; l < this->nlevel; l++) {
    this->next[l] = (struct range *) 0xDEADBEEF;
  }
  kmalignfree(this->lock);
  kmfree(this->next);
-  // delete this;
 }

-#if 0
-class range_delayed : public rcu_freed {
- private:
-  crange::range *_e;
-
- public:
-  range_delayed(crange::range *e) : rcu_freed("range_delayed"), _e(e) {}
-  virtual void do_gc() {
-    range_free(_e);
-    delete this;
-  }
-};
-#endif
-
 void range::free_delayed(void)
 {
  if (crange_debug)
    cprintf("%d: free_delayed: 0x%lx 0x%lx-0x%lx(%lu) %lu\n", myproc()->pid, (long) this, this->key, this->key + this->size, this->size, myproc()->epoch);
-  //  crange_check(this->cr, e);
+  this->cr->check(this);
  assert(this->curlevel == -1);
-
-  //range_delayed *rd = new range_delayed(e);
  gc_delayed(this);
 }


--- a/crange.hh
+++ b/crange.hh
@@ -26,8 +26,6 @@ public:
 struct crange {
 private:
  range *crange_head;    // a crange skip list starts with a sentinel range (key 0, sz 0)
-  //crange_check(struct range *absent);
-  //crange_replace(u64, u64, void*, range*, range*, range*);
 public:
  int nlevel;                  // number of levels in the crange skip list
  crange(int nlevel);