From 7742a1b79c3211abf76c26901e1ae49b2bfdeb8a Mon Sep 17 00:00:00 2001 From: sage Date: Tue, 16 May 2006 00:05:44 +0000 Subject: [PATCH] some rearranging git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@768 29311d96-e01e-0410-9327-a35deaab8ce9 --- ceph/Makefile | 6 +++--- ceph/client/Client.cc | 6 +++--- ceph/include/types.h | 36 +++++++++++++++++++++++------------- ceph/mds/AnchorTable.cc | 2 +- ceph/mds/IdAllocator.cc | 3 +-- ceph/mds/LogStream.cc | 2 +- ceph/mds/MDCache.cc | 2 +- ceph/mds/MDS.cc | 4 ++-- ceph/mds/MDStore.cc | 2 +- ceph/osd/OSD.h | 1 - ceph/osdc/Filer.cc | 2 +- ceph/osdc/Filer.h | 2 +- ceph/osdc/Objecter.cc | 2 +- ceph/osdc/Objecter.h | 23 ----------------------- 14 files changed, 39 insertions(+), 54 deletions(-) diff --git a/ceph/Makefile b/ceph/Makefile index aedba67e073ee..7310544e15605 100644 --- a/ceph/Makefile +++ b/ceph/Makefile @@ -52,9 +52,9 @@ COMMON_OBJS= \ msg/Messenger.o\ msg/Dispatcher.o\ msg/HostMonitor.o\ - osd/Filer.o\ - osd/ObjectCacher.o\ - osd/Objecter.o\ + client/Filer.o\ + client/ObjectCacher.o\ + client/Objecter.o\ osd/OSDMap.o\ mds/MDCluster.o\ common/Logger.o\ diff --git a/ceph/client/Client.cc b/ceph/client/Client.cc index 7399c419d995b..7ce3aeceff7c3 100644 --- a/ceph/client/Client.cc +++ b/ceph/client/Client.cc @@ -30,9 +30,9 @@ #include "messages/MGenericMessage.h" -#include "osd/Filer.h" -#include "osd/Objecter.h" -#include "osd/ObjectCacher.h" +#include "Filer.h" +#include "Objecter.h" +#include "ObjectCacher.h" #include "common/Cond.h" #include "common/Mutex.h" diff --git a/ceph/include/types.h b/ceph/include/types.h index 7bb3a06a9756e..6d26d4f907d04 100644 --- a/ceph/include/types.h +++ b/ceph/include/types.h @@ -241,17 +241,38 @@ typedef __uint64_t object_t; // object id #endif - #define PG_NONE 0xffffffffffffffffLL +// new types +typedef __uint64_t tid_t; // transaction id + +class ObjectExtent { + public: + object_t oid; // object id + pg_t pgid; + off_t start; // in object + size_t length; // in object + map buffer_extents; // off -> len. extents in buffer being mapped (may be fragmented bc of striping!) + + ObjectExtent(object_t o=0, off_t s=0, size_t l=0) : oid(o), start(s), length(l) { } +}; + +inline ostream& operator<<(ostream& out, ObjectExtent &ex) +{ + return out << "extent(" + << hex << ex.oid << " in " << ex.pgid << dec + << " " << ex.start << "~" << ex.length + << ")"; +} +/* struct ostat { object_t object_id; size_t size; time_t ctime; time_t mtime; }; - +*/ struct onode_t { object_t oid; @@ -261,17 +282,6 @@ struct onode_t { //time_t ctime, mtime; }; -class pginfo_t { - public: - version_t created; - version_t last_clean; - version_t last_complete; - version_t primary_since; - - pginfo_t() : created(0), last_clean(0), last_complete(0), primary_since(0) { } -} ; - - // client types typedef int fh_t; // file handle diff --git a/ceph/mds/AnchorTable.cc b/ceph/mds/AnchorTable.cc index bdbed304d5e4e..6f42f899253e8 100644 --- a/ceph/mds/AnchorTable.cc +++ b/ceph/mds/AnchorTable.cc @@ -16,7 +16,7 @@ #include "AnchorTable.h" #include "MDS.h" -#include "osd/Filer.h" +#include "client/Filer.h" #include "msg/Messenger.h" #include "messages/MAnchorRequest.h" diff --git a/ceph/mds/IdAllocator.cc b/ceph/mds/IdAllocator.cc index 1acae8a34246f..3cb4861df033e 100644 --- a/ceph/mds/IdAllocator.cc +++ b/ceph/mds/IdAllocator.cc @@ -20,8 +20,7 @@ #include "MDLog.h" #include "events/EAlloc.h" -#include "osd/Filer.h" -#include "osd/OSDMap.h" +#include "client/Filer.h" #include "include/types.h" diff --git a/ceph/mds/LogStream.cc b/ceph/mds/LogStream.cc index 3e4eec7d2e65c..cc8ed50673183 100644 --- a/ceph/mds/LogStream.cc +++ b/ceph/mds/LogStream.cc @@ -17,7 +17,7 @@ #include "MDS.h" #include "LogEvent.h" -#include "osd/Filer.h" +#include "client/Filer.h" #include "common/Logger.h" diff --git a/ceph/mds/MDCache.cc b/ceph/mds/MDCache.cc index ee076f5b9b125..7766dad4cb74d 100644 --- a/ceph/mds/MDCache.cc +++ b/ceph/mds/MDCache.cc @@ -28,7 +28,7 @@ #include "msg/Message.h" #include "msg/Messenger.h" -#include "osd/Filer.h" +#include "client/Filer.h" #include "events/EInodeUpdate.h" #include "events/EDirUpdate.h" diff --git a/ceph/mds/MDS.cc b/ceph/mds/MDS.cc index 0aee386e74696..a8c96a62d5832 100644 --- a/ceph/mds/MDS.cc +++ b/ceph/mds/MDS.cc @@ -19,8 +19,8 @@ #include "msg/Messenger.h" #include "osd/OSDMap.h" -#include "osd/Objecter.h" -#include "osd/Filer.h" +#include "client/Objecter.h" +#include "client/Filer.h" #include "MDS.h" #include "MDCache.h" diff --git a/ceph/mds/MDStore.cc b/ceph/mds/MDStore.cc index 726b78689e632..fefe863e643fc 100644 --- a/ceph/mds/MDStore.cc +++ b/ceph/mds/MDStore.cc @@ -21,7 +21,7 @@ #include "CDentry.h" #include "MDCluster.h" -#include "osd/Filer.h" +#include "client/Filer.h" #include "osd/OSDMap.h" #include "msg/Message.h" diff --git a/ceph/osd/OSD.h b/ceph/osd/OSD.h index b95eb43b38eee..3b9bb53ce493c 100644 --- a/ceph/osd/OSD.h +++ b/ceph/osd/OSD.h @@ -19,7 +19,6 @@ #include "common/Mutex.h" #include "common/ThreadPool.h" -#include "Objecter.h" #include "ObjectStore.h" #include "PG.h" diff --git a/ceph/osdc/Filer.cc b/ceph/osdc/Filer.cc index 2094eca7ae257..9cca80fbecfa2 100644 --- a/ceph/osdc/Filer.cc +++ b/ceph/osdc/Filer.cc @@ -15,7 +15,7 @@ #include #include "Filer.h" -#include "OSDMap.h" +#include "osd/OSDMap.h" //#include "messages/MOSDRead.h" //#include "messages/MOSDReadReply.h" diff --git a/ceph/osdc/Filer.h b/ceph/osdc/Filer.h index d4f8702115f37..68951717613b7 100644 --- a/ceph/osdc/Filer.h +++ b/ceph/osdc/Filer.h @@ -38,7 +38,7 @@ using namespace __gnu_cxx; #include "include/types.h" -#include "OSDMap.h" +#include "osd/OSDMap.h" #include "Objecter.h" class Context; diff --git a/ceph/osdc/Objecter.cc b/ceph/osdc/Objecter.cc index c9e3d868c3fe8..e61fed5d67f32 100644 --- a/ceph/osdc/Objecter.cc +++ b/ceph/osdc/Objecter.cc @@ -1,6 +1,6 @@ #include "Objecter.h" -#include "OSDMap.h" +#include "osd/OSDMap.h" #include "msg/Messenger.h" #include "msg/Message.h" diff --git a/ceph/osdc/Objecter.h b/ceph/osdc/Objecter.h index d42962810929b..a47a6e144b8aa 100644 --- a/ceph/osdc/Objecter.h +++ b/ceph/osdc/Objecter.h @@ -15,29 +15,6 @@ class Messenger; class OSDMap; class Message; - -// new types -typedef __uint64_t tid_t; // transaction id - -class ObjectExtent { - public: - object_t oid; // object id - pg_t pgid; - off_t start; // in object - size_t length; // in object - map buffer_extents; // off -> len. extents in buffer being mapped (may be fragmented bc of striping!) - - ObjectExtent(object_t o=0, off_t s=0, size_t l=0) : oid(o), start(s), length(l) { } -}; - -inline ostream& operator<<(ostream& out, ObjectExtent &ex) -{ - return out << "extent(" - << hex << ex.oid << " in " << ex.pgid << dec - << " " << ex.start << "~" << ex.length - << ")"; -} - class Objecter { public: Messenger *messenger; -- 2.39.5