]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
buffer: Move functions touching buffer::raw internals into buffer.cc
authorTommi Virtanen <tommi.virtanen@dreamhost.com>
Wed, 6 Apr 2011 20:48:02 +0000 (13:48 -0700)
committerTommi Virtanen <tommi.virtanen@dreamhost.com>
Thu, 7 Apr 2011 17:53:19 +0000 (10:53 -0700)
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
src/common/buffer.cc
src/include/buffer.h

index a792777fec360d63beea0f6827bffda2561647d4..a1eee29e693c4ba37a2e649eb45e288d11f1a46b 100644 (file)
@@ -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);
index 5089364b2ca75b8613deb224e6330203f41a654e..7f12f3d368bfc0d1617ec4be5591a82fefd87a2d 100644 (file)
@@ -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);
   
   
   /*