towards free-standing crange/gc/ns

a9338ce5 · Nickolai Zeldovich · 875bc53a · a9338ce5 · a9338ce5 · a9338ce5
--- a/include/crange.hh
+++ b/include/crange.hh
@@ -2,8 +2,6 @@
 #include "atomic.hh"
-using std::atomic;
 struct crange;
 struct crange_locked;
 struct range;
@@ -18,7 +16,7 @@ class markptr_mark;
 template<class T>
 class markptr {
 protected:
-  atomic<uptr> _p;
+  std::atomic<uptr> _p;
 public:
  markptr() : _p(0) {}
@@ -88,7 +86,7 @@ struct range : public rcu_freed {
 private:
  const u64 key;
  const u64 size;
-  atomic<int> curlevel;  // the current levels it appears on
+  std::atomic<int> curlevel; // the current levels it appears on
  const int nlevel;      // the number of levels this range should appear
  crange *const cr;      // the crange this range is part of
  markptr<range>* const next; // one next pointer per level

--- a/include/crange_arch.hh
+++ b/include/crange_arch.hh
+#include "types.h"
+#include "kernel.hh"
+#include "spinlock.h"
+#include "condvar.h"
+#include "cpputil.hh"
+#include "atomic.hh"
+#include "proc.hh"
+#include "cpu.hh"
+#include "ns.hh"
--- a/kernel/crange.cc
+++ b/kernel/crange.cc
-#include "types.h"
+#include "crange_arch.hh"
-#include "kernel.hh"
-#include "mmu.h"
-#include "spinlock.h"
-#include "condvar.h"
-#include "queue.h"
-#include "proc.hh"
-#include "cpu.hh"
 #include "gc.hh"
 #include "crange.hh"
-#include "cpputil.hh"
 //
 // Concurrent atomic range operations using skip lists.  An insert may split an
@@ -92,7 +84,7 @@ range::print(int l)
 range::~range()
 {
-  dprintf("%d: range_free: 0x%lx 0x%lx-0x%lx(%ld)\n", myproc()->cpuid, (u64) this, key, key+size, size);
+  //dprintf("%d: range_free: 0x%lx 0x%lx-0x%lx(%ld)\n", myproc()->cpuid, (u64) this, key, key+size, size);
  cr->check(this);
  //    assert(curlevel == -1);
  for (int l = 0; l < nlevel; l++) {
@@ -107,7 +99,7 @@ range::dec_ref(void)
 {
  int n = curlevel--;
  if (n == 0) {    // now removed from all levels.
-    dprintf("%d: free_delayed: 0x%lx 0x%lx-0x%lx(%lu) %lu\n", myproc()->pid, (long) this, key, key + size, size, myproc()->epoch);
+    //dprintf("%d: free_delayed: 0x%lx 0x%lx-0x%lx(%lu) %lu\n", myproc()->pid, (long) this, key, key + size, size, myproc()->epoch);
    cr->check(this);
    assert(curlevel == -1);
    gc_delayed(this);
@@ -206,7 +198,7 @@ crange::check(struct range *absent)
 {
  if (!crange_checking)
    return;
-  int t = mycpu()->id;
+  int t = -1;  //mycpu()->id;
  struct range *e, *s;
  for (int l = 0; l < nlevel; l++) {
    for (e = crange_head->next[l].ptr(); e; e = s) {

--- a/kernel/gc.cc
+++ b/kernel/gc.cc
-#include "types.h"
+#include "crange_arch.hh"
-#include "kernel.hh"
+#include "gc.hh"
-#include "mmu.h"
-#include "amd64.h"
-#include "spinlock.h"
-#include "condvar.h"
-#include "queue.h"
-#include "proc.hh"
-#include "cpu.hh"
-#include "ns.hh"
-#include "atomic.hh"
 extern u64 proc_hash(const u32&);
 extern xns<u32, proc*, proc_hash> *xnspid;