inline range::lock

0538397f · Nickolai Zeldovich · 1c96fd2f · 0538397f · 0538397f
--- a/include/crange.hh
+++ b/include/crange.hh
@@ -88,7 +88,7 @@ struct range : public rcu_freed {
  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
-  spinlock *lock;        // on separate cache line?
+  spinlock lock;         // on separate cache line?

  void print(int l);
  void dec_ref(void);
@@ -166,7 +166,7 @@ struct crange_locked {
      for (range *e = prev_; e && e != succ_; e = n) {
        // as soon a we release, the next pointer can change, so read it first
        n = e->next[0].ptr();
-        release(e->lock);
+        release(&e->lock);
      }
    }
  }

--- a/kernel/crange.cc
+++ b/kernel/crange.cc
@@ -91,8 +91,7 @@ range::~range()
  for (int l = 0; l < nlevel; l++) {
    next[l] = (struct range *) 0xDEADBEEF;
  }
-  destroylock(lock);
-  kmalignfree(lock, CACHELINE, sizeof(struct spinlock));
+  destroylock(&lock);
  delete[] next;
 }

@@ -118,9 +117,7 @@ range::range(crange *crarg, u64 k, u64 sz, int nl)
  assert(cr->nlevel > 0);
  assert(next);
  for (int l = 0; l < nlevel; l++) next[l] = 0;
-  assert(kmalign((void **) &lock, CACHELINE, 
-			   sizeof(struct spinlock)) == 0);
-  initlock(lock, "crange", LOCKSTAT_CRANGE);
+  initlock(&lock, "crange", LOCKSTAT_CRANGE);
 }

 // 
@@ -132,11 +129,11 @@ int
 range::lockif(markptr<range> e)
 {
  assert(!e.mark());
-  acquire(lock);
+  acquire(&lock);
  if (next[0] == e) {
      return 1;
  } 
-  release(lock);
+  release(&lock);
  // cprintf("%d: range_lock_pred: retry %u\n", mycpu()->id, key);
  return 0;
 }
@@ -329,7 +326,7 @@ crange::lock_range(u64 k, u64 sz, int l, range **er, range **pr, range **fr, ran
    assert(*fr);
    *lr = e;
    if (l == 0) {
-      acquire(e->lock);    // lock all ranges in the sequence
+      acquire(&e->lock);    // lock all ranges in the sequence
    }
    e = e->next[l].ptr();
  }
@@ -444,7 +441,7 @@ crange_locked::replace(range *prev, range *repl)
  range *newlast = 0;
  for (range *e = repl; e; e = e->next[0].ptr()) {
    assert(e->key >= base_ && e->key + e->size <= base_ + size_);
-    acquire(e->lock);
+    acquire(&e->lock);
    newlast = e;
  }

@@ -458,7 +455,7 @@ crange_locked::replace(range *prev, range *repl)
  crange::mark(replaced, succ_);

  for (range *e = replaced; e && e != succ_; e = e->next[0].ptr()) {
-    release(e->lock);
+    release(&e->lock);
    e->dec_ref();
  }
 }