From: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Date: Wed, 6 Apr 2011 20:48:02 +0000 (-0700)
Subject: buffer: Move functions touching buffer::raw internals into buffer.cc
X-Git-Tag: v0.27~148
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4878575076b767da0880c9179b4f6726bb6ac092;p=ceph.git

buffer: Move functions touching buffer::raw internals into buffer.cc

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
---

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index a792777fec3..a1eee29e693 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -44,6 +44,36 @@ bool buffer_track_alloc = true;
   int buffer::get_total_alloc() {
     return buffer_total_alloc.read();
   }
+
+  buffer::raw* buffer::copy(const char *c, unsigned len) {
+    raw* r = new raw_char(len);
+    memcpy(r->data, c, len);
+    return r;
+  }
+  buffer::raw* buffer::create(unsigned len) {
+    return new raw_char(len);
+  }
+  buffer::raw* buffer::claim_char(unsigned len, char *buf) {
+    return new raw_char(len, buf);
+  }
+  buffer::raw* buffer::create_malloc(unsigned len) {
+    return new raw_malloc(len);
+  }
+  buffer::raw* buffer::claim_malloc(unsigned len, char *buf) {
+    return new raw_malloc(len, buf);
+  }
+  buffer::raw* buffer::create_static(unsigned len, char *buf) {
+    return new raw_static(buf, len);
+  }
+  buffer::raw* buffer::create_page_aligned(unsigned len) {
+#ifndef __CYGWIN__
+    //return new raw_mmap_pages(len);
+    return new raw_posix_aligned(len);
+#else
+    return new raw_hack_aligned(len);
+#endif
+  }
+
 void buffer::list::encode_base64(buffer::list& o)
 {
   bufferptr bp(length() * 4 / 3 + 3);
diff --git a/src/include/buffer.h b/src/include/buffer.h
index 5089364b2ca..7f12f3d368b 100644
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -297,35 +297,13 @@ public:
    * named constructors 
    */
 
-  static raw* copy(const char *c, unsigned len) {
-    raw* r = new raw_char(len);
-    memcpy(r->data, c, len);
-    return r;
-  }
-  static raw* create(unsigned len) {
-    return new raw_char(len);
-  }
-  static raw* claim_char(unsigned len, char *buf) {
-    return new raw_char(len, buf);
-  }
-  static raw* create_malloc(unsigned len) {
-    return new raw_malloc(len);
-  }
-  static raw* claim_malloc(unsigned len, char *buf) {
-    return new raw_malloc(len, buf);
-  }
-  static raw* create_static(unsigned len, char *buf) {
-    return new raw_static(buf, len);
-  }
-
-  static raw* create_page_aligned(unsigned len) {
-#ifndef __CYGWIN__
-    //return new raw_mmap_pages(len);
-    return new raw_posix_aligned(len);
-#else
-    return new raw_hack_aligned(len);
-#endif
-  }
+  static raw* copy(const char *c, unsigned len);
+  static raw* create(unsigned len);
+  static raw* claim_char(unsigned len, char *buf);
+  static raw* create_malloc(unsigned len);
+  static raw* claim_malloc(unsigned len, char *buf);
+  static raw* create_static(unsigned len, char *buf);
+  static raw* create_page_aligned(unsigned len);
   
   
   /*