some reorganization

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@136 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/Makefile b/ceph/Makefile
index 7264b29aab1c621f7ae9fbf44b962ac2d6a4d848..0f0c1d5099d3eda13947fe3ff4f378f82f7337a1 100644 (file)
--- a/ceph/Makefile
+++ b/ceph/Makefile
@@ -16,8 +16,7 @@ LEAKTRACER=
 
 SRCS=*.cc */*.cc
 OBJS=osd/OSD.o\
- Messenger.o\
- Logger.o\
+ msg/Messenger.o\
  mds/MDBalancer.o\
  mds/MDS.o\
  mds/CDentry.o\
@@ -25,12 +24,13 @@ OBJS=osd/OSD.o\
  mds/CInode.o\
  mds/MDCache.o\
  mds/MDStore.o\
- clock.o\
  mds/LogStream.o\
  mds/IdAllocator.o\
  mds/MDLog.o\
- client/Client.o\
  mds/MDCluster.o\
+ client/Client.o\
+ Logger.o\
+ clock.o\
  config.o
 
 TARGETS=test import pmds
@@ -38,15 +38,15 @@ TARGETS=test import pmds
 all: depend ${TARGETS}
 
 
-test: test.cc FakeMessenger.o pmds.o
+test: test.cc msg/FakeMessenger.o pmds.o
        test ! -e leak.out || rm leak.out
-       ${CC} ${CFLAGS} ${LIBS} pmds.o FakeMessenger.o ${LEAKTRACER} test.cc -o test
+       ${CC} ${CFLAGS} ${LIBS} pmds.o msg/FakeMessenger.o ${LEAKTRACER} test.cc -o test
 
-import: pmds.o FakeMessenger.o import.cc
-       ${CC} ${CFLAGS} ${LIBS} pmds.o FakeMessenger.o import.cc ${LEAKTRACER} -o import
+import: pmds.o msg/FakeMessenger.o import.cc
+       ${CC} ${CFLAGS} ${LIBS} pmds.o msg/FakeMessenger.o import.cc ${LEAKTRACER} -o import
 
-pmds: mpitest.cc MPIMessenger.cc pmds.o
-       ${MPICC} ${MPICFLAGS} ${MPILIBS} mpitest.cc MPIMessenger.cc pmds.o  -o pmds
+pmds: mpitest.cc msg/MPIMessenger.cc pmds.o
+       ${MPICC} ${MPICFLAGS} ${MPILIBS} mpitest.cc msg/MPIMessenger.cc pmds.o  -o pmds
 
 
 clean:

diff --git a/ceph/TODO b/ceph/TODO
index 73ab7350c1691b670fd5d1630df215237ff57a75..8bf38eb65eb8452038ee6f0ea35e43687301b59a 100644 (file)
--- a/ceph/TODO
+++ b/ceph/TODO
@@ -1,5 +1,11 @@
 
 
+CLIENT
+- structure.. multithreaded until messenger
+
+
+
+MDS
 - qsync
 - high level locker functions
 - expand Lock

diff --git a/ceph/client/Client.cc b/ceph/client/Client.cc
index 36fcc6cc066364cb3604a76e26515694fa38dc4d..5b5d3bec9f63e43b4db2d1039a58fdfb54de9e0d 100644 (file)
--- a/ceph/client/Client.cc
+++ b/ceph/client/Client.cc
@@ -1,7 +1,8 @@
 
 #include "include/types.h"
-#include "include/Messenger.h"
-#include "include/Message.h"
+
+#include "msg/Messenger.h"
+#include "msg/Message.h"
 
 #include "mds/MDS.h"
 #include "mds/MDCluster.h"

diff --git a/ceph/client/Client.h b/ceph/client/Client.h
index afe1ea1c08d27be0ed6a3abdfdfc7ff1a20267f5..574a8f3319f455bf698050c6505d147576b16e70 100644 (file)
--- a/ceph/client/Client.h
+++ b/ceph/client/Client.h
@@ -1,8 +1,8 @@
 #ifndef __CLIENT_H
 #define __CLIENT_H
 
-#include "../include/Dispatcher.h"
-#include "../include/lru.h"
+#include "msg/Dispatcher.h"
+#include "include/lru.h"
 #include "ClNode.h"
 
 #include <map>

diff --git a/ceph/mds/CInode.cc b/ceph/mds/CInode.cc
index 0763478f57657d81888e89a00116c1bd6c6d1c85..84b31159b47023a5bc8cd621b0625c0c2dcd5a28 100644 (file)
--- a/ceph/mds/CInode.cc
+++ b/ceph/mds/CInode.cc
@@ -4,8 +4,8 @@
 #include "CDentry.h"
 
 #include "MDS.h"
-#include "include/Message.h"
 
+#include "msg/Message.h"
 #include "messages/MInodeSyncStart.h"
 
 #include <string>

diff --git a/ceph/mds/MDBalancer.cc b/ceph/mds/MDBalancer.cc
index 4567120a3b739bc3194ebcc72fa2f0f3d3737e07..ea4075543a26f70359aea8f5df26c0bace5a979d 100644 (file)
--- a/ceph/mds/MDBalancer.cc
+++ b/ceph/mds/MDBalancer.cc
@@ -8,8 +8,7 @@
 #include "MDCache.h"
 
 #include "messages/MHeartbeat.h"
-
-#include "include/Messenger.h"
+#include "msg/Messenger.h"
 #include "include/Context.h"
 
 #include <vector>

diff --git a/ceph/mds/MDCache.cc b/ceph/mds/MDCache.cc
index f141577789edf8bf128a995c1e6128f9716f6b76..4b1a783984a3d1d0dfd861aee9ffb50cf09cb5f1 100644 (file)
--- a/ceph/mds/MDCache.cc
+++ b/ceph/mds/MDCache.cc
@@ -10,8 +10,8 @@
 
 #include "include/filepath.h"
 
-#include "include/Message.h"
-#include "include/Messenger.h"
+#include "msg/Message.h"
+#include "msg/Messenger.h"
 
 #include "events/EInodeUpdate.h"
 #include "events/EInodeUnlink.h"

diff --git a/ceph/mds/MDLog.cc b/ceph/mds/MDLog.cc
index b359bf2aa037a48b82d88bb98435312d7fc5114d..5a9cbdd0dd08acc784e757be0d23b13a6ace7102 100644 (file)
--- a/ceph/mds/MDLog.cc
+++ b/ceph/mds/MDLog.cc
@@ -8,7 +8,7 @@
 
 #include "include/LogType.h"
 #include "include/Logger.h"
-#include "include/Message.h"
+#include "msg/Message.h"
 
 LogType mdlog_logtype;
 

diff --git a/ceph/mds/MDS.cc b/ceph/mds/MDS.cc
index c6d08d23cb7cfdbd33e243cc733623ec7da3c68d..764ff7778aa6cbe7083611567a21736df31bd113 100644 (file)
--- a/ceph/mds/MDS.cc
+++ b/ceph/mds/MDS.cc
@@ -1,8 +1,9 @@
 
 #include "include/types.h"
-#include "include/Messenger.h"
 #include "include/Clock.h"
 
+#include "msg/Messenger.h"
+
 #include "MDS.h"
 #include "MDCache.h"
 #include "MDStore.h"

diff --git a/ceph/mds/MDS.h b/ceph/mds/MDS.h
index 0dadc5f15b68e2443209dfe8127c9f602a902c7c..3f0c429e48f4f1175e3cf68a097cb1e12ab0d197 100644 (file)
--- a/ceph/mds/MDS.h
+++ b/ceph/mds/MDS.h
@@ -9,9 +9,9 @@
 #include <ostream>
 #include <ext/rope>
 
+#include "msg/Dispatcher.h"
 #include "include/types.h"
 #include "include/Context.h"
-#include "include/Dispatcher.h"
 #include "include/DecayCounter.h"
 #include "include/Logger.h"
 

diff --git a/ceph/mds/MDStore.cc b/ceph/mds/MDStore.cc
index 5f957a9c730048113aa43b67e605db237bd2b5e9..453d332c35f9ff22a5125f90c7af24f9dacdecdb 100644 (file)
--- a/ceph/mds/MDStore.cc
+++ b/ceph/mds/MDStore.cc
@@ -7,7 +7,7 @@
 #include "CDentry.h"
 #include "MDCluster.h"
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 #include <cassert>
 #include <iostream>

diff --git a/ceph/messages/MClientReply.h b/ceph/messages/MClientReply.h
index fe224c0aab32f7885089096972d9244698de77a8..191f7ebbad2efeb3fb0045811fc5bff07928ce8d 100644 (file)
--- a/ceph/messages/MClientReply.h
+++ b/ceph/messages/MClientReply.h
@@ -1,7 +1,7 @@
 #ifndef __MCLIENTREPLY_H
 #define __MCLIENTREPLY_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 #include "mds/CInode.h"
 
 #include <vector>

diff --git a/ceph/messages/MClientRequest.h b/ceph/messages/MClientRequest.h
index 8a3a8396918d37b81dff0405a16ef4a0a702b957..d587713129c297fc4149bc579702f937a9bfcdf2 100644 (file)
--- a/ceph/messages/MClientRequest.h
+++ b/ceph/messages/MClientRequest.h
@@ -1,7 +1,7 @@
 #ifndef __MCLIENTREQUEST_H
 #define __MCLIENTREQUEST_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 #include "include/filepath.h"
 #include "mds/MDS.h"
 

diff --git a/ceph/messages/MDirSyncAck.h b/ceph/messages/MDirSyncAck.h
index 989e2b37fd5ae2e2c08986b9eb3f7c802f6d0118..a21d1d5818ec116a5d3290457fac2fd5b9af8ff3 100644 (file)
--- a/ceph/messages/MDirSyncAck.h
+++ b/ceph/messages/MDirSyncAck.h
@@ -1,7 +1,7 @@
 #ifndef __MDIRSYNCACK_H
 #define __MDIRSYNCACK_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 class MDirSyncAck : public Message {
   inodeno_t ino;

diff --git a/ceph/messages/MDirSyncRelease.h b/ceph/messages/MDirSyncRelease.h
index 8a79da5233472a43be5d13c6d5e77aa282efb11e..dec4f8cbc1fe641811e4405c08cb8672133e62dc 100644 (file)
--- a/ceph/messages/MDirSyncRelease.h
+++ b/ceph/messages/MDirSyncRelease.h
@@ -1,7 +1,7 @@
 #ifndef __MDIRSYNCRELEASE_H
 #define __MDIRSYNCRELEASE_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 class MDirSyncRelease : public Message {
   inodeno_t ino;

diff --git a/ceph/messages/MDirSyncStart.h b/ceph/messages/MDirSyncStart.h
index f413f225130fd3af8aa110e358ab0065262fd325..1c499130a7e3e69705e4658ac979a8d2dd655239 100644 (file)
--- a/ceph/messages/MDirSyncStart.h
+++ b/ceph/messages/MDirSyncStart.h
@@ -1,7 +1,7 @@
 #ifndef __MDIRSYNCSTART_H
 #define __MDIRSYNCSTART_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 class MDirSyncStart : public Message {
   inodeno_t ino;

diff --git a/ceph/messages/MDirUpdate.h b/ceph/messages/MDirUpdate.h
index bb715bf98e0db4ee0ed0fe78434c501dadbb0cff..5bb04981ff47be3ff8bdf851e13504fa4ed415e0 100644 (file)
--- a/ceph/messages/MDirUpdate.h
+++ b/ceph/messages/MDirUpdate.h
@@ -1,7 +1,7 @@
 #ifndef __MDIRUPDATE_H
 #define __MDIRUPDATE_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 typedef struct {
   inodeno_t ino;

diff --git a/ceph/messages/MDiscover.h b/ceph/messages/MDiscover.h
index 6f65d664f2f149d82347dc0e2c3bf492ec110163..37b38f2a0ae2ff93cb31ae298c7432d03de821ed 100644 (file)
--- a/ceph/messages/MDiscover.h
+++ b/ceph/messages/MDiscover.h
@@ -1,7 +1,7 @@
 #ifndef __MDISCOVER_H
 #define __MDISCOVER_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 #include "mds/CDir.h"
 #include "include/filepath.h"
 

diff --git a/ceph/messages/MDiscoverReply.h b/ceph/messages/MDiscoverReply.h
index 4e376c4c1662bbe84d4228547838bfb995e608de..40a6f3ce65185ab9fade1075aff0499c1b1f73fc 100644 (file)
--- a/ceph/messages/MDiscoverReply.h
+++ b/ceph/messages/MDiscoverReply.h
@@ -1,7 +1,7 @@
 #ifndef __MDISCOVERREPLY_H
 #define __MDISCOVERREPLY_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 #include "mds/CDir.h"
 #include "mds/CInode.h"
 #include "include/filepath.h"

diff --git a/ceph/messages/MExportDir.h b/ceph/messages/MExportDir.h
index 8f260753d8ddbdbf49532994cdbd37b9b97f7aa7..3d73899421f0887eb2194bceb27335f7ec0561b4 100644 (file)
--- a/ceph/messages/MExportDir.h
+++ b/ceph/messages/MExportDir.h
@@ -1,7 +1,7 @@
 #ifndef __MEXPORTDIR_H
 #define __MEXPORTDIR_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 #include <ext/rope>
 using namespace std;

diff --git a/ceph/messages/MExportDirDiscover.h b/ceph/messages/MExportDirDiscover.h
index 95726482bfdfa591b3a363e35c3c51caf42bde15..c51fed08abe613dd6590241567e16f474e8fc9a6 100644 (file)
--- a/ceph/messages/MExportDirDiscover.h
+++ b/ceph/messages/MExportDirDiscover.h
@@ -1,7 +1,7 @@
 #ifndef __MEXPORTDIRDISCOVER_H
 #define __MEXPORTDIRDISCOVER_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 #include "mds/CInode.h"
 #include "include/types.h"
 

diff --git a/ceph/messages/MExportDirDiscoverAck.h b/ceph/messages/MExportDirDiscoverAck.h
index 4e2b9fc44e5d293330a84e9b89e55411286bc0ee..0e1fc598790e141811ceb687165f1a1c282aaa89 100644 (file)
--- a/ceph/messages/MExportDirDiscoverAck.h
+++ b/ceph/messages/MExportDirDiscoverAck.h
@@ -1,7 +1,7 @@
 #ifndef __MEXPORTDIRDISCOVERACK_H
 #define __MEXPORTDIRDISCOVERACK_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 #include "mds/CInode.h"
 #include "include/types.h"
 

diff --git a/ceph/messages/MExportDirNotify.h b/ceph/messages/MExportDirNotify.h
index 76aa89736a54a9f7a4ae474b5b453591eb7b9002..aae439e753565c5e175c91ed9dde40610bf83fe0 100644 (file)
--- a/ceph/messages/MExportDirNotify.h
+++ b/ceph/messages/MExportDirNotify.h
@@ -1,7 +1,7 @@
 #ifndef __MEXPORTDIRNOTIFY_H
 #define __MEXPORTDIRNOTIFY_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 #include <string>
 using namespace std;
 

diff --git a/ceph/messages/MExportDirNotifyAck.h b/ceph/messages/MExportDirNotifyAck.h
index 2031dc695374e64464cdbbdfedb2a9e5a9d7fe91..2b804410b810fde0025aa3b7551e914598c75c2a 100644 (file)
--- a/ceph/messages/MExportDirNotifyAck.h
+++ b/ceph/messages/MExportDirNotifyAck.h
@@ -1,7 +1,7 @@
 #ifndef __MEXPORTDIRNOTIFYACK_H
 #define __MEXPORTDIRNOTIFYACK_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 #include <string>
 using namespace std;
 

diff --git a/ceph/messages/MExportDirPrep.h b/ceph/messages/MExportDirPrep.h
index bf0be7c7d0995094e6c65a0b96cada7cb8e452a1..0c7ec033f43ba17feafc7082b6121ebc33b153a9 100644 (file)
--- a/ceph/messages/MExportDirPrep.h
+++ b/ceph/messages/MExportDirPrep.h
@@ -1,7 +1,7 @@
 #ifndef __MEXPORTDIRPREP_H
 #define __MEXPORTDIRPREP_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 #include "mds/CInode.h"
 #include "include/types.h"
 

diff --git a/ceph/messages/MExportDirPrepAck.h b/ceph/messages/MExportDirPrepAck.h
index 1b9c11544e36443caf353d5f2d748831e8a1a2d4..d93575aa7be4ac3d54d0931dfc7d12f324f64cfa 100644 (file)
--- a/ceph/messages/MExportDirPrepAck.h
+++ b/ceph/messages/MExportDirPrepAck.h
@@ -1,7 +1,7 @@
 #ifndef __MEXPORTDIRPREPACK_H
 #define __MEXPORTDIRPREPACK_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 #include "include/types.h"
 
 class MExportDirPrepAck : public Message {

diff --git a/ceph/messages/MExportDirWarning.h b/ceph/messages/MExportDirWarning.h
index e031bded431f86ab533568cc9394cc85ec4aedb9..84076af29e962a9da662aa7910cc3ae9111ba390 100644 (file)
--- a/ceph/messages/MExportDirWarning.h
+++ b/ceph/messages/MExportDirWarning.h
@@ -1,7 +1,7 @@
 #ifndef __MEXPORTDIRWARNING_H
 #define __MEXPORTDIRWARNING_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 #include "mds/CInode.h"
 #include "include/types.h"
 

diff --git a/ceph/messages/MHashDir.h b/ceph/messages/MHashDir.h
index 2c53bd45cc2d22dbe74ed745bcbcdbdb62bc3c4c..eb2038aaf0e0a3d975d0db8cd42bd33a366da76e 100644 (file)
--- a/ceph/messages/MHashDir.h
+++ b/ceph/messages/MHashDir.h
@@ -1,7 +1,7 @@
 #ifndef __MHASHDIR_H
 #define __MHASHDIR_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 #include <ext/rope>
 using namespace std;

diff --git a/ceph/messages/MHeartbeat.h b/ceph/messages/MHeartbeat.h
index 557c05e07282f511031dc0db2efdab8ff9acd3ea..f1e84fc6da46a2cfff7fa9dcdf460a4516eca226 100644 (file)
--- a/ceph/messages/MHeartbeat.h
+++ b/ceph/messages/MHeartbeat.h
@@ -1,8 +1,8 @@
 #ifndef __MHEARTBEAT_H
 #define __MHEARTBEAT_H
 
-#include "include/Message.h"
 #include "include/types.h"
+#include "msg/Message.h"
 
 class MHeartbeat : public Message {
   mds_load_t load;

diff --git a/ceph/messages/MInodeLockAck.h b/ceph/messages/MInodeLockAck.h
index 517e0a0472b4c7b35a90631be9110297e5478575..eaa0dba9bfda137b41d681ef204b040ba7835285 100644 (file)
--- a/ceph/messages/MInodeLockAck.h
+++ b/ceph/messages/MInodeLockAck.h
@@ -1,7 +1,7 @@
 #ifndef __MINODELOCKACK_H
 #define __MINODELOCKACK_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 class MInodeLockAck : public Message {
   inodeno_t ino;

diff --git a/ceph/messages/MInodeLockRelease.h b/ceph/messages/MInodeLockRelease.h
index eb6b358390bca98ce3ca0346cee9bd7e1cd04632..c1bfbd7981fded84cfb89e7963753f0c39ee18b6 100644 (file)
--- a/ceph/messages/MInodeLockRelease.h
+++ b/ceph/messages/MInodeLockRelease.h
@@ -1,7 +1,7 @@
 #ifndef __MINODELOCKRELEASE_H
 #define __MINODELOCKRELEASE_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 class MInodeLockRelease : public Message {
   inode_t inode;

diff --git a/ceph/messages/MInodeLockStart.h b/ceph/messages/MInodeLockStart.h
index eca2764265c8dc0bec745640b78a1362b9c17ed0..3ec2fc6b4e4d4b5f893929a45792447162f612c8 100644 (file)
--- a/ceph/messages/MInodeLockStart.h
+++ b/ceph/messages/MInodeLockStart.h
@@ -1,7 +1,7 @@
 #ifndef __MINODELOCKSTART_H
 #define __MINODELOCKSTART_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 class MInodeLockStart : public Message {
   inodeno_t ino;

diff --git a/ceph/messages/MInodeSyncAck.h b/ceph/messages/MInodeSyncAck.h
index 36c2c03a2b9e25dba0418478ba8751b49f67fdcd..385f640f295206cb41d699877d1498b25b8f68cb 100644 (file)
--- a/ceph/messages/MInodeSyncAck.h
+++ b/ceph/messages/MInodeSyncAck.h
@@ -1,7 +1,7 @@
 #ifndef __MINODESYNCACK_H
 #define __MINODESYNCACK_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 class MInodeSyncAck : public Message {
   inodeno_t ino;

diff --git a/ceph/messages/MInodeSyncRecall.h b/ceph/messages/MInodeSyncRecall.h
index 0bb05025dc6b7402c720abfbd00bdb310100ae78..6ad32703e99384342c4b4421b6c8852137352a39 100644 (file)
--- a/ceph/messages/MInodeSyncRecall.h
+++ b/ceph/messages/MInodeSyncRecall.h
@@ -1,7 +1,7 @@
 #ifndef __MINODESYNCRECALL_H
 #define __MINODESYNCRECALL_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 class MInodeSyncRecall : public Message {
   inodeno_t ino;

diff --git a/ceph/messages/MInodeSyncRelease.h b/ceph/messages/MInodeSyncRelease.h
index f6df40cc575dd835d66fce45bf0851db508ef4ed..73ddf3402cb4f7973441966b5943f9559d40108e 100644 (file)
--- a/ceph/messages/MInodeSyncRelease.h
+++ b/ceph/messages/MInodeSyncRelease.h
@@ -1,7 +1,7 @@
 #ifndef __MINODESYNCRELEASE_H
 #define __MINODESYNCRELEASE_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 class MInodeSyncRelease : public Message {
   inode_t inode;

diff --git a/ceph/messages/MInodeSyncStart.h b/ceph/messages/MInodeSyncStart.h
index 98d955474a38ab8f5c99306e5f75a3291ef64fc2..065898cf4c6e4d1dce6785560038f9964399ee50 100644 (file)
--- a/ceph/messages/MInodeSyncStart.h
+++ b/ceph/messages/MInodeSyncStart.h
@@ -1,7 +1,7 @@
 #ifndef __MINODESYNCSTART_H
 #define __MINODESYNCSTART_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 class MInodeSyncStart : public Message {
   inodeno_t ino;

diff --git a/ceph/messages/MInodeUpdate.h b/ceph/messages/MInodeUpdate.h
index aa80848a91999aa7761a4df57ad4278f4191e720..42de600ba1ddca11322120d660e4875bfcfc1806 100644 (file)
--- a/ceph/messages/MInodeUpdate.h
+++ b/ceph/messages/MInodeUpdate.h
@@ -1,7 +1,7 @@
 #ifndef __MINODEUPDATE_H
 #define __MINODEUPDATE_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 #include <set>
 using namespace std;

diff --git a/ceph/messages/MLock.h b/ceph/messages/MLock.h
index 693365836e8ec193810abc08490b784ae96bd839..92c5cf054b87ec42eed9c9673b82cb38f8a52143 100644 (file)
--- a/ceph/messages/MLock.h
+++ b/ceph/messages/MLock.h
@@ -1,7 +1,7 @@
 #ifndef __MLOCK_H
 #define __MLOCK_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 #define LOCK_OTYPE_INO    1
 #define LOCK_OTYPE_DIRINO 2

diff --git a/ceph/messages/MOSDRead.h b/ceph/messages/MOSDRead.h
index a8c0e2f17b376be510669ac26da9607d8c403bcd..847edcea1dd9f2a41890ca53ee0252465aa817b7 100644 (file)
--- a/ceph/messages/MOSDRead.h
+++ b/ceph/messages/MOSDRead.h
@@ -1,7 +1,7 @@
 #ifndef __MOSDREAD_H
 #define __MOSDREAD_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 typedef struct {
   long tid;

diff --git a/ceph/messages/MOSDWrite.h b/ceph/messages/MOSDWrite.h
index 09dd7d99d8ca09ac6555418f660cd61d6dcb554b..699e5f7bb46e8188e590c01fc966457e15609598 100644 (file)
--- a/ceph/messages/MOSDWrite.h
+++ b/ceph/messages/MOSDWrite.h
@@ -1,7 +1,7 @@
 #ifndef __MOSDWRITE_H
 #define __MOSDWRITE_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 typedef struct {
   long tid;

diff --git a/ceph/messages/MPing.h b/ceph/messages/MPing.h
index 4636e0bb7a67ba450dc9d05d159e53d7a5186bd2..8d2f1984ca2f474b4425b6313f8e0c3cabc04a3c 100644 (file)
--- a/ceph/messages/MPing.h
+++ b/ceph/messages/MPing.h
@@ -2,7 +2,7 @@
 #ifndef __MPING_H
 #define __MPING_H
 
-#include "../include/Message.h"
+#include "msg/Message.h"
 
 class MPing : public Message {
  public:

diff --git a/ceph/messages/MUnhashDir.h b/ceph/messages/MUnhashDir.h
index b65c12b2fd91dc5c296a1882f1a44d336331648a..83c464c08443ca44a8f8ef28c030bdd559a260c7 100644 (file)
--- a/ceph/messages/MUnhashDir.h
+++ b/ceph/messages/MUnhashDir.h
@@ -1,7 +1,7 @@
 #ifndef __MUNHASHDIR_H
 #define __MUNHASHDIR_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 #include <ext/rope>
 using namespace std;

diff --git a/ceph/messages/MUnhashDirAck.h b/ceph/messages/MUnhashDirAck.h
index 012f5d69a8896ec489b8ff0c45dc0f68e9c4fba8..96d4a2852ae52a13400ea0c1663ea0dd7e942480 100644 (file)
--- a/ceph/messages/MUnhashDirAck.h
+++ b/ceph/messages/MUnhashDirAck.h
@@ -1,7 +1,7 @@
 #ifndef __MUNHASHDIRACK_H
 #define __MUNHASHDIRACK_H
 
-#include "include/Message.h"
+#include "msg/Message.h"
 
 #include <ext/rope>
 using namespace std;

diff --git a/ceph/msg/FakeMessenger.cc b/ceph/msg/FakeMessenger.cc
index c21828fed595f002749933a17abd26b191a13e68..38beaf46b7ae3895dba2ff5b02f701f12cca2c49 100644 (file)
--- a/ceph/msg/FakeMessenger.cc
+++ b/ceph/msg/FakeMessenger.cc
@@ -3,11 +3,11 @@
 using namespace std;
 
 
-#include "include/FakeMessenger.h"
+#include "Message.h"
+#include "FakeMessenger.h"
 #include "mds/MDS.h"
 #include "include/LogType.h"
 #include "include/Logger.h"
-#include "include/Message.h"
 
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/ceph/msg/MPIMessenger.cc b/ceph/msg/MPIMessenger.cc
index a23e376cc5a81a1b3a5fb02f1cdd4ecb29afd026..c32bb8d26d5066c4acce6ca430ce4d9c53f53dbb 100644 (file)
--- a/ceph/msg/MPIMessenger.cc
+++ b/ceph/msg/MPIMessenger.cc
@@ -1,8 +1,8 @@
 
 #include "include/config.h"
 
-#include "include/MPIMessenger.h"
-#include "include/Message.h"
+#include "MPIMessenger.h"
+#include "Message.h"
 
 #include <iostream>
 #include <cassert>

diff --git a/ceph/msg/Message.h b/ceph/msg/Message.h
index f52bbd56357b173f117cc573578298f6e085fd73..73ad269739365f7612a9f72a1f4f0c3604404394 100644 (file)
--- a/ceph/msg/Message.h
+++ b/ceph/msg/Message.h
@@ -71,7 +71,7 @@
 #define MSG_MDS_SHUTDOWNSTART  900
 #define MSG_MDS_SHUTDOWNFINISH 901
 
-#include "config.h"
+//#include "config.h"
 
 
 // address types

diff --git a/ceph/msg/Messenger.cc b/ceph/msg/Messenger.cc
index 38cff72acb3480528d92146d26983fb61e078997..cb40ee4c2d2f6ddc60a7822f14f268ef46fe90f8 100644 (file)
--- a/ceph/msg/Messenger.cc
+++ b/ceph/msg/Messenger.cc
@@ -2,8 +2,10 @@
 #include <ext/rope>
 #include "include/types.h"
 #include "include/config.h"
-#include "include/Message.h"
-#include "include/Messenger.h"
+
+#include "Message.h"
+#include "Messenger.h"
+
 #include <cassert>
 #include <iostream>
 using namespace std;

diff --git a/ceph/osd/OSD.cc b/ceph/osd/OSD.cc
index 57ef296f561897075a0f6d81a24de160115d5e6a..9ce5abf4129ae3d21fe1dd1b4dcdac78f20a88aa 100644 (file)
--- a/ceph/osd/OSD.cc
+++ b/ceph/osd/OSD.cc
@@ -1,11 +1,12 @@
 
 
 #include "include/types.h"
-#include "include/Messenger.h"
-#include "include/Message.h"
 
 #include "OSD.h"
 
+#include "msg/Messenger.h"
+#include "msg/Message.h"
+
 #include "messages/MOSDRead.h"
 #include "messages/MOSDReadReply.h"
 #include "messages/MOSDWrite.h"

diff --git a/ceph/osd/OSD.h b/ceph/osd/OSD.h
index 80c2a20e34e5d6820292d62dfac9ad906bb93d0a..a2e8436ff84578d5d37db7791826dca12b83aa10 100644 (file)
--- a/ceph/osd/OSD.h
+++ b/ceph/osd/OSD.h
@@ -2,7 +2,7 @@
 #ifndef __OSD_H
 #define __OSD_H
 
-#include "include/Dispatcher.h"
+#include "msg/Dispatcher.h"
 
 class Messenger;
 class MOSDRead;

diff --git a/ceph/test/fakemds.cc b/ceph/test/fakemds.cc
index 503a6178eb1249858b559a456b7b70016b5f74c2..f3c0d7bdecbcfc9900bb9876107a8fdc1d3d03a1 100644 (file)
--- a/ceph/test/fakemds.cc
+++ b/ceph/test/fakemds.cc
@@ -4,15 +4,15 @@
 #include <iostream>
 #include <string>
 
-#include "mds/MDCluster.h"
 #include "mds/MDS.h"
 #include "osd/OSD.h"
 #include "client/Client.h"
 
+#include "mds/MDCluster.h"
 #include "mds/MDCache.h"
 #include "mds/MDStore.h"
 
-#include "include/FakeMessenger.h"
+#include "msg/FakeMessenger.h"
 
 #include "messages/MPing.h"
 

diff --git a/ceph/test/mpitest.cc b/ceph/test/mpitest.cc
index 1867e7f7cb34b9e3b3f910f3002266dca6ae8f60..098f5486abb96f16f39466427d1496df9b27e695 100644 (file)
--- a/ceph/test/mpitest.cc
+++ b/ceph/test/mpitest.cc
@@ -12,7 +12,7 @@
 #include "mds/MDCache.h"
 #include "mds/MDStore.h"
 
-#include "include/MPIMessenger.h"
+#include "msg/MPIMessenger.h"
 
 #include "messages/MPing.h"