fix userspace version

ec5fed9f · Nickolai Zeldovich · 1c77c3b0 · ec5fed9f · ec5fed9f · ec5fed9f
--- a/include/crange.hh
+++ b/include/crange.hh
@@ -100,9 +100,9 @@ struct range : public rcu_freed {

 protected:
  ~range();
+  range(crange *cr, u64 k, u64 sz, int nlevel = 0);

 public:
-  range(crange *cr, u64 k, u64 sz, int nlevel = 0);
  bool deleted() { return next[0].mark(); }
 } __mpalign__;


--- a/user/crange_arch.hh
+++ b/user/crange_arch.hh
@@ -20,6 +20,7 @@ typedef uintptr_t uptr;
 #define panic(...) do { printf(__VA_ARGS__); assert(0); } while (0)
 #define LOCKSTAT_CRANGE 0
 #define LOCKSTAT_GC     0
+#define NEW_DELETE_OPS(type)

 struct spinlock {
  pthread_mutex_t mu;
@@ -89,7 +90,7 @@ kmalign(void **ptr, size_t align, size_t size)
 }

 static inline void
-kmalignfree(void *ptr)
+kmalignfree(void *ptr, size_t align, size_t size)
 {
  free(ptr);
 }

--- a/user/umain.cc
+++ b/user/umain.cc
@@ -80,6 +80,11 @@ threadpin(void (*fn)(void*), void *arg, const char *name, int cpu)
  makeproc(p);
 }

+struct my_range : public range {
+  my_range(crange *cr, u64 k, u64 sz) : range(cr, k, sz) {}
+  virtual void do_gc() { delete this; }
+};
+
 static pthread_barrier_t worker_b, populate_b;

 enum { iter_total = 1000000 };
@@ -99,7 +104,7 @@ worker(void *arg)
      span.replace(0);
    } else {
      ANON_REGION("worker add", &perfgroup);
-      span.replace(new range(cr, k, 1));
+      span.replace(new my_range(cr, k, 1));
    }
  }

@@ -111,7 +116,7 @@ populate(void *arg)
 {
  crange *cr = (crange*) arg;
  for (u32 i = 0; i < crange_items; i++)
-    cr->search_lock(1 + 2*i, 1).replace(new range(cr, 1+2*i, 1));
+    cr->search_lock(1 + 2*i, 1).replace(new my_range(cr, 1+2*i, 1));
  pthread_barrier_wait(&populate_b);
 }