include/atomic.h: whitespace cleanup

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/include/atomic.h b/src/include/atomic.h
index fd13588a06bbcc859f888945b792ff60a4b8c03b..28cc7df095183064a8c9da47cc06a7834efe3e97 100644 (file)
--- a/src/include/atomic.h
+++ b/src/include/atomic.h
@@ -1,15 +1,16 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 /*
  * Ceph - scalable distributed file system
  *
- * Copyright (C) 2004-2006 Sage Weil <sage@newdream.net>
+ * Copyright (C) 2004-2011 New Dream Network
  *
  * This is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software 
+ * License version 2.1, as published by the Free Software
  * Foundation.  See file COPYING.
- * 
+ *
+ * @author Sage Weil <sage@newdream.net>
  */
 
 #ifndef CEPH_ATOMIC_H
@@ -24,31 +25,30 @@
 //libatomic_ops implementation
 #include <atomic_ops.h>
 namespace ceph {
-
-class atomic_t {
-  AO_t val;
-public:
-  atomic_t(AO_t i=0) : val(i) {}
-  void inc() {
-    AO_fetch_and_add1(&val);
-  }
-  AO_t dec() {
-    return AO_fetch_and_sub1_write(&val) - 1;
-  }
-  void add(AO_t add_me) {
-    AO_fetch_and_add(&val, add_me);
-  }
-  void sub(int sub_me) {
-    int negsub = 0 - sub_me;
-    AO_fetch_and_add_write(&val, (AO_t)negsub);
-  }
-  AO_t read() const {
-    // cast away const on the pointer.  this is only needed to build
-    // on lenny, but not newer debians, so the atomic_ops.h got fixed
-    // at some point.  this hack can go away someday...
-    return AO_load_full((AO_t *)&val);  
-  }
-};
+  class atomic_t {
+    AO_t val;
+  public:
+    atomic_t(AO_t i=0) : val(i) {}
+    void inc() {
+      AO_fetch_and_add1(&val);
+    }
+    AO_t dec() {
+      return AO_fetch_and_sub1_write(&val) - 1;
+    }
+    void add(AO_t add_me) {
+      AO_fetch_and_add(&val, add_me);
+    }
+    void sub(int sub_me) {
+      int negsub = 0 - sub_me;
+      AO_fetch_and_add_write(&val, (AO_t)negsub);
+    }
+    AO_t read() const {
+      // cast away const on the pointer.  this is only needed to build
+      // on lenny, but not newer debians, so the atomic_ops.h got fixed
+      // at some point.  this hack can go away someday...
+      return AO_load_full((AO_t *)&val);
+    }
+  };
 }
 #else
 /*
@@ -58,42 +58,40 @@ public:
 #include "include/assert.h"
 
 namespace ceph {
-
-class atomic_t {
-  Spinlock lock;
-  long nref;
-public:
-  atomic_t(int i=0) : lock("atomic_t::lock", false /* no lockdep */), nref(i) {}
-  atomic_t(const atomic_t& other);
-  int inc() { 
-    lock.lock();
-    int r = ++nref;
-    lock.unlock();
-    return r;
-  }
-  int dec() {
-    lock.lock();
-    assert(nref > 0);
-    int r = --nref; 
-    lock.unlock();
-    return r;
-  }
-  void add(int d) {
-    lock.lock();
-    nref += d;
-    lock.unlock();
-  }
-  void sub(int d) {
-    lock.lock();
-    assert(nref >= d);
-    nref -= d;
-    lock.unlock();
-  }
-  int read() const {
-    return nref;
-  }
-};
-
+  class atomic_t {
+    Spinlock lock;
+    long nref;
+  public:
+    atomic_t(int i=0) : lock("atomic_t::lock", false /* no lockdep */), nref(i) {}
+    atomic_t(const atomic_t& other);
+    int inc() {
+      lock.lock();
+      int r = ++nref;
+      lock.unlock();
+      return r;
+    }
+    int dec() {
+      lock.lock();
+      assert(nref > 0);
+      int r = --nref;
+      lock.unlock();
+      return r;
+    }
+    void add(int d) {
+      lock.lock();
+      nref += d;
+      lock.unlock();
+    }
+    void sub(int d) {
+      lock.lock();
+      assert(nref >= d);
+      nref -= d;
+      lock.unlock();
+    }
+    int read() const {
+      return nref;
+    }
+  };
 }
 #endif
 #endif