common/filepath: un-inline methods to reduce header dependencies

Signed-off-by: Max Kellermann <max.kellermann@ionos.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1e21cb21f3609d6f671ff2f32e92ad4acc4a946d..ada75e281c5fd6663845703ee2864a0c50cf57ff 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -500,6 +500,7 @@ set(libcommon_files
   ceph_ver.c
   global/global_context.cc
   xxHash/xxhash.c
+  include/filepath.cc
   include/invoke_date.cc
   include/object.cc
   include/types.cc

diff --git a/src/crimson/CMakeLists.txt b/src/crimson/CMakeLists.txt
index 8fb417fe35910c0add0c387ae0cd0461e2092aa5..4133494039c58ce731828d905606f0e533ec8c4c 100644 (file)
--- a/src/crimson/CMakeLists.txt
+++ b/src/crimson/CMakeLists.txt
@@ -98,6 +98,7 @@ add_library(crimson-common STATIC
   ${PROJECT_SOURCE_DIR}/src/crush/CrushTester.cc
   ${PROJECT_SOURCE_DIR}/src/global/global_context.cc
   ${PROJECT_SOURCE_DIR}/src/global/pidfile.cc
+  ${PROJECT_SOURCE_DIR}/src/include/filepath.cc
   ${PROJECT_SOURCE_DIR}/src/include/object.cc
   ${PROJECT_SOURCE_DIR}/src/include/types.cc
   ${PROJECT_SOURCE_DIR}/src/include/utime.cc

diff --git a/src/include/filepath.cc b/src/include/filepath.cc
new file mode 100644 (file)
index 0000000..25d52eb
--- /dev/null
+++ b/src/include/filepath.cc
@@ -0,0 +1,146 @@
+// -*- 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>
+ *
+ * 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 
+ * Foundation.  See file COPYING.
+ * 
+ */
+
+#include "filepath.h"
+#include "common/Formatter.h"
+
+#include <ostream>
+
+void filepath::rebuild_path() {
+  path.clear();
+  for (unsigned i=0; i<bits.size(); i++) {
+    if (i) path += "/";
+    path += bits[i];
+  }
+}
+
+void filepath::parse_bits() const {
+  bits.clear();
+  int off = 0;
+  while (off < (int)path.length()) {
+    int nextslash = path.find('/', off);
+    if (nextslash < 0) 
+      nextslash = path.length();  // no more slashes
+    if (((nextslash - off) > 0) || encoded) {
+      // skip empty components unless they were introduced deliberately
+      // see commit message for more detail
+      bits.push_back( path.substr(off,nextslash-off) );
+    }
+    off = nextslash+1;
+  }
+}
+
+void filepath::set_path(std::string_view s) {
+  if (!s.empty() && s[0] == '/') {
+    path = s.substr(1);
+    ino = 1;
+  } else {
+    ino = 0;
+    path = s;
+  }
+  bits.clear();
+}
+
+filepath filepath::prefixpath(int s) const {
+  filepath t(ino);
+  for (int i=0; i<s; i++)
+    t.push_dentry(bits[i]);
+  return t;
+}
+
+filepath filepath::postfixpath(int s) const {
+  filepath t;
+  for (unsigned i=s; i<bits.size(); i++)
+    t.push_dentry(bits[i]);
+  return t;
+}
+
+void filepath::pop_dentry() {
+  if (bits.empty() && path.length() > 0) 
+    parse_bits();
+  bits.pop_back();
+  rebuild_path();
+}
+
+void filepath::push_dentry(std::string_view s) {
+  if (bits.empty() && path.length() > 0) 
+    parse_bits();
+  if (!bits.empty())
+    path += "/";
+  path += s;
+  bits.emplace_back(s);
+}
+
+void filepath::push_front_dentry(const std::string& s) {
+  bits.insert(bits.begin(), s);
+  rebuild_path();
+}
+
+void filepath::append(const filepath& a) {
+  ceph_assert(a.pure_relative());
+  for (unsigned i=0; i<a.depth(); i++) 
+    push_dentry(a[i]);
+}
+
+void filepath::encode(ceph::buffer::list& bl) const {
+  using ceph::encode;
+  __u8 struct_v = 1;
+  encode(struct_v, bl);
+  encode(ino, bl);
+  encode(path, bl);
+}
+
+void filepath::decode(ceph::buffer::list::const_iterator& blp) {
+  using ceph::decode;
+  bits.clear();
+  __u8 struct_v;
+  decode(struct_v, blp);
+  decode(ino, blp);
+  decode(path, blp);
+  encoded = true;
+}
+
+void filepath::dump(ceph::Formatter *f) const {
+  f->dump_unsigned("base_ino", ino);
+  f->dump_string("relative_path", path);
+}
+
+void filepath::generate_test_instances(std::list<filepath*>& o) {
+  o.push_back(new filepath);
+  o.push_back(new filepath("/usr/bin", 0));
+  o.push_back(new filepath("/usr/sbin", 1));
+  o.push_back(new filepath("var/log", 1));
+  o.push_back(new filepath("foo/bar", 101));
+}
+
+bool filepath::is_last_dot_or_dotdot() const {
+  if (depth() > 0) {
+    std::string dname = last_dentry();
+    if (dname == "." || dname == "..") {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+std::ostream& operator<<(std::ostream& out, const filepath& path)
+{
+  if (path.get_ino()) {
+    out << '#' << path.get_ino();
+    if (path.length())
+      out << '/';
+  }
+  return out << path.get_path();
+}

diff --git a/src/include/filepath.h b/src/include/filepath.h
index 4b71ef2bedbd34acae07ec9139ec96c84858f3ef..b36f616dd8f755a8f80a78189e2122734c747245 100644 (file)
--- a/src/include/filepath.h
+++ b/src/include/filepath.h
@@ -33,8 +33,7 @@
 #include "encoding.h"
 #include "include/fs_types.h" // for inodeno_t
 
-#include "common/Formatter.h"
-
+namespace ceph { class Formatter; }
 
 class filepath {
   inodeno_t ino = 0;   // base inode.  ino=0 implies pure relative path.
@@ -48,28 +47,8 @@ class filepath {
   mutable std::vector<std::string> bits;
   bool encoded = false;
 
-  void rebuild_path() {
-    path.clear();
-    for (unsigned i=0; i<bits.size(); i++) {
-      if (i) path += "/";
-      path += bits[i];
-    }
-  }
-  void parse_bits() const {
-    bits.clear();
-    int off = 0;
-    while (off < (int)path.length()) {
-      int nextslash = path.find('/', off);
-      if (nextslash < 0) 
-        nextslash = path.length();  // no more slashes
-      if (((nextslash - off) > 0) || encoded) {
-        // skip empty components unless they were introduced deliberately
-        // see commit message for more detail
-        bits.push_back( path.substr(off,nextslash-off) );
-      }
-      off = nextslash+1;
-    }
-  }
+  void rebuild_path();
+  void parse_bits() const;
 
  public:
   filepath() = default;
@@ -97,17 +76,8 @@ class filepath {
     path = s;
     ino = b;
   }
-  void set_path(std::string_view s) {
-    if (!s.empty() && s[0] == '/') {
-      path = s.substr(1);
-      ino = 1;
-    } else {
-      ino = 0;
-      path = s;
-    }
-    bits.clear();
-  }
 
+  void set_path(std::string_view s);
 
   // accessors
   inodeno_t get_ino() const { return ino; }
@@ -154,19 +124,8 @@ class filepath {
     return bits[ bits.size()-1 ];
   }
 
-  filepath prefixpath(int s) const {
-    filepath t(ino);
-    for (int i=0; i<s; i++)
-      t.push_dentry(bits[i]);
-    return t;
-  }
-  filepath postfixpath(int s) const {
-    filepath t;
-    for (unsigned i=s; i<bits.size(); i++)
-      t.push_dentry(bits[i]);
-    return t;
-  }
-
+  filepath prefixpath(int s) const;
+  filepath postfixpath(int s) const;
 
   // modifiers
   //  string can be relative "a/b/c" (ino=0) or absolute "/a/b/c" (ino=1)
@@ -177,75 +136,24 @@ class filepath {
     bits.clear();
   }
 
-  void pop_dentry() {
-    if (bits.empty() && path.length() > 0) 
-      parse_bits();
-    bits.pop_back();
-    rebuild_path();
-  }
-  void push_dentry(std::string_view s) {
-    if (bits.empty() && path.length() > 0) 
-      parse_bits();
-    if (!bits.empty())
-      path += "/";
-    path += s;
-    bits.emplace_back(s);
-  }
+  void pop_dentry();
+  void push_dentry(std::string_view s);
   void push_dentry(const std::string& s) {
     push_dentry(std::string_view(s));
   }
   void push_dentry(const char *cs) {
     push_dentry(std::string_view(cs, strlen(cs)));
   }
-  void push_front_dentry(const std::string& s) {
-    bits.insert(bits.begin(), s);
-    rebuild_path();
-  }
-  void append(const filepath& a) {
-    ceph_assert(a.pure_relative());
-    for (unsigned i=0; i<a.depth(); i++) 
-      push_dentry(a[i]);
-  }
+  void push_front_dentry(const std::string& s);
+  void append(const filepath& a);
 
   // encoding
-  void encode(ceph::buffer::list& bl) const {
-    using ceph::encode;
-    __u8 struct_v = 1;
-    encode(struct_v, bl);
-    encode(ino, bl);
-    encode(path, bl);
-  }
-  void decode(ceph::buffer::list::const_iterator& blp) {
-    using ceph::decode;
-    bits.clear();
-    __u8 struct_v;
-    decode(struct_v, blp);
-    decode(ino, blp);
-    decode(path, blp);
-    encoded = true;
-  }
-  void dump(ceph::Formatter *f) const {
-    f->dump_unsigned("base_ino", ino);
-    f->dump_string("relative_path", path);
-  }
-  static void generate_test_instances(std::list<filepath*>& o) {
-    o.push_back(new filepath);
-    o.push_back(new filepath("/usr/bin", 0));
-    o.push_back(new filepath("/usr/sbin", 1));
-    o.push_back(new filepath("var/log", 1));
-    o.push_back(new filepath("foo/bar", 101));
-  }
+  void encode(ceph::buffer::list& bl) const;
+  void decode(ceph::buffer::list::const_iterator& blp);
+  void dump(ceph::Formatter *f) const;
+  static void generate_test_instances(std::list<filepath*>& o);
 
-  bool is_last_dot_or_dotdot() const {
-    if (depth() > 0) {
-      std::string dname = last_dentry();
-      if (dname == "." || dname == "..") {
-        return true;
-      }
-    }
-
-    return false;
-  }
+  bool is_last_dot_or_dotdot() const;
 
   bool is_last_snap() const {
     // walk into snapdir?
@@ -255,14 +163,6 @@ class filepath {
 
 WRITE_CLASS_ENCODER(filepath)
 
-inline std::ostream& operator<<(std::ostream& out, const filepath& path)
-{
-  if (path.get_ino()) {
-    out << '#' << path.get_ino();
-    if (path.length())
-      out << '/';
-  }
-  return out << path.get_path();
-}
+std::ostream& operator<<(std::ostream& out, const filepath& path);
 
 #endif