From: Greg Farnum Date: Wed, 16 Jan 2013 01:48:46 +0000 (-0800) Subject: client: rename client/SnapRealm files to avoid automake build conflict X-Git-Tag: v0.58~100^2~74 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e72893152a9ef7c72b510460a6c80cda043ad48;p=ceph.git client: rename client/SnapRealm files to avoid automake build conflict We are about to move the MDS' SnapRealm into its own files, which conflicts. The MDS is more important, so it wins the "SnapRealm" filename and we move the client stuff to ClientSnapRealm.[h|cc]. Signed-off-by: Sage Weil Signed-off-by: Greg Farnum --- diff --git a/src/Makefile.am b/src/Makefile.am index d4f52d073fc76..b0b7179dda448 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1412,7 +1412,7 @@ libclient_la_SOURCES = \ client/Inode.cc \ client/Dentry.cc \ client/MetaRequest.cc \ - client/SnapRealm.cc \ + client/ClientSnapRealm.cc \ client/MetaSession.cc \ client/Trace.cc libclient_la_LIBADD = libosdc.la $(LIBEDIT_LIBS) @@ -1464,7 +1464,7 @@ noinst_HEADERS = \ client/Inode.h\ client/MetaRequest.h\ client/MetaSession.h\ - client/SnapRealm.h\ + client/ClientSnapRealm.h\ client/SyntheticClient.h\ client/Trace.h\ client/fuse_ll.h\ diff --git a/src/client/Client.cc b/src/client/Client.cc index 6cff22be9f0e6..e5e5272ee0b61 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -73,7 +73,7 @@ using namespace std; #include "Inode.h" #include "Dentry.h" #include "Dir.h" -#include "SnapRealm.h" +#include "ClientSnapRealm.h" #include "Fh.h" #include "MetaSession.h" #include "MetaRequest.h" diff --git a/src/client/ClientSnapRealm.cc b/src/client/ClientSnapRealm.cc new file mode 100644 index 0000000000000..3656fbdf5052d --- /dev/null +++ b/src/client/ClientSnapRealm.cc @@ -0,0 +1,29 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab + +#include "ClientSnapRealm.h" +#include "common/Formatter.h" + +void SnapRealm::dump(Formatter *f) const +{ + f->dump_stream("ino") << ino; + f->dump_int("nref", nref); + f->dump_stream("created") << created; + f->dump_stream("seq") << seq; + f->dump_stream("parent_ino") << parent; + f->dump_stream("parent_since") << parent_since; + + f->open_array_section("prior_parent_snaps"); + for (vector::const_iterator p = prior_parent_snaps.begin(); p != prior_parent_snaps.end(); ++p) + f->dump_stream("snapid") << *p; + f->close_section(); + f->open_array_section("my_snaps"); + for (vector::const_iterator p = my_snaps.begin(); p != my_snaps.end(); ++p) + f->dump_stream("snapid") << *p; + f->close_section(); + + f->open_array_section("children"); + for (set::const_iterator p = pchildren.begin(); p != pchildren.end(); ++p) + f->dump_stream("child") << (*p)->ino; + f->close_section(); +} diff --git a/src/client/ClientSnapRealm.h b/src/client/ClientSnapRealm.h new file mode 100644 index 0000000000000..34d8956830076 --- /dev/null +++ b/src/client/ClientSnapRealm.h @@ -0,0 +1,60 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- +// vim: ts=8 sw=2 smarttab + +#ifndef CEPH_CLIENT_SNAPREALM_H +#define CEPH_CLIENT_SNAPREALM_H + +#include "include/types.h" +#include "common/snap_types.h" +#include "include/xlist.h" + +class Inode; + +struct SnapRealm { + inodeno_t ino; + int nref; + snapid_t created; + snapid_t seq; + + inodeno_t parent; + snapid_t parent_since; + vector prior_parent_snaps; // snaps prior to parent_since + vector my_snaps; + + SnapRealm *pparent; + set pchildren; + +private: + SnapContext cached_snap_context; // my_snaps + parent snaps + past_parent_snaps + friend ostream& operator<<(ostream& out, const SnapRealm& r); + +public: + xlist inodes_with_caps; + + SnapRealm(inodeno_t i) : + ino(i), nref(0), created(0), seq(0), + pparent(NULL) { } + + void build_snap_context(); + void invalidate_cache() { + cached_snap_context.clear(); + } + + const SnapContext& get_snap_context() { + if (cached_snap_context.seq == 0) + build_snap_context(); + return cached_snap_context; + } + + void dump(Formatter *f) const; +}; + +inline ostream& operator<<(ostream& out, const SnapRealm& r) { + return out << "snaprealm(" << r.ino << " nref=" << r.nref << " c=" << r.created << " seq=" << r.seq + << " parent=" << r.parent + << " my_snaps=" << r.my_snaps + << " cached_snapc=" << r.cached_snap_context + << ")"; +} + +#endif diff --git a/src/client/Inode.cc b/src/client/Inode.cc index 4b0c99d5764da..60bc489b3c783 100644 --- a/src/client/Inode.cc +++ b/src/client/Inode.cc @@ -5,7 +5,7 @@ #include "Inode.h" #include "Dentry.h" #include "Dir.h" -#include "SnapRealm.h" +#include "ClientSnapRealm.h" ostream& operator<<(ostream &out, Inode &in) { diff --git a/src/client/SnapRealm.cc b/src/client/SnapRealm.cc deleted file mode 100644 index 6a5918a058913..0000000000000 --- a/src/client/SnapRealm.cc +++ /dev/null @@ -1,29 +0,0 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -// vim: ts=8 sw=2 smarttab - -#include "SnapRealm.h" -#include "common/Formatter.h" - -void SnapRealm::dump(Formatter *f) const -{ - f->dump_stream("ino") << ino; - f->dump_int("nref", nref); - f->dump_stream("created") << created; - f->dump_stream("seq") << seq; - f->dump_stream("parent_ino") << parent; - f->dump_stream("parent_since") << parent_since; - - f->open_array_section("prior_parent_snaps"); - for (vector::const_iterator p = prior_parent_snaps.begin(); p != prior_parent_snaps.end(); ++p) - f->dump_stream("snapid") << *p; - f->close_section(); - f->open_array_section("my_snaps"); - for (vector::const_iterator p = my_snaps.begin(); p != my_snaps.end(); ++p) - f->dump_stream("snapid") << *p; - f->close_section(); - - f->open_array_section("children"); - for (set::const_iterator p = pchildren.begin(); p != pchildren.end(); ++p) - f->dump_stream("child") << (*p)->ino; - f->close_section(); -} diff --git a/src/client/SnapRealm.h b/src/client/SnapRealm.h deleted file mode 100644 index 34d8956830076..0000000000000 --- a/src/client/SnapRealm.h +++ /dev/null @@ -1,60 +0,0 @@ -// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- -// vim: ts=8 sw=2 smarttab - -#ifndef CEPH_CLIENT_SNAPREALM_H -#define CEPH_CLIENT_SNAPREALM_H - -#include "include/types.h" -#include "common/snap_types.h" -#include "include/xlist.h" - -class Inode; - -struct SnapRealm { - inodeno_t ino; - int nref; - snapid_t created; - snapid_t seq; - - inodeno_t parent; - snapid_t parent_since; - vector prior_parent_snaps; // snaps prior to parent_since - vector my_snaps; - - SnapRealm *pparent; - set pchildren; - -private: - SnapContext cached_snap_context; // my_snaps + parent snaps + past_parent_snaps - friend ostream& operator<<(ostream& out, const SnapRealm& r); - -public: - xlist inodes_with_caps; - - SnapRealm(inodeno_t i) : - ino(i), nref(0), created(0), seq(0), - pparent(NULL) { } - - void build_snap_context(); - void invalidate_cache() { - cached_snap_context.clear(); - } - - const SnapContext& get_snap_context() { - if (cached_snap_context.seq == 0) - build_snap_context(); - return cached_snap_context; - } - - void dump(Formatter *f) const; -}; - -inline ostream& operator<<(ostream& out, const SnapRealm& r) { - return out << "snaprealm(" << r.ino << " nref=" << r.nref << " c=" << r.created << " seq=" << r.seq - << " parent=" << r.parent - << " my_snaps=" << r.my_snaps - << " cached_snapc=" << r.cached_snap_context - << ")"; -} - -#endif