From b2e4bd512b175746a951444457b86075d1d9e665 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 6 Oct 2014 08:40:16 -0700 Subject: [PATCH] msg: move SimpleMessenger to msg/simple/ Signed-off-by: Sage Weil --- src/msg/Makefile.am | 28 ++++++++++++++++--------- src/msg/Messenger.cc | 2 +- src/msg/{ => simple}/Accepter.cc | 6 +++--- src/msg/{ => simple}/Accepter.h | 0 src/msg/{ => simple}/DispatchQueue.cc | 0 src/msg/{ => simple}/DispatchQueue.h | 0 src/msg/{ => simple}/Pipe.cc | 2 +- src/msg/{ => simple}/Pipe.h | 6 +++--- src/msg/{ => simple}/PipeConnection.cc | 2 +- src/msg/{ => simple}/PipeConnection.h | 3 ++- src/msg/{ => simple}/SimpleMessenger.cc | 0 src/msg/{ => simple}/SimpleMessenger.h | 8 +++---- 12 files changed, 33 insertions(+), 24 deletions(-) rename src/msg/{ => simple}/Accepter.cc (99%) rename src/msg/{ => simple}/Accepter.h (100%) rename src/msg/{ => simple}/DispatchQueue.cc (100%) rename src/msg/{ => simple}/DispatchQueue.h (100%) rename src/msg/{ => simple}/Pipe.cc (99%) rename src/msg/{ => simple}/Pipe.h (99%) rename src/msg/{ => simple}/PipeConnection.cc (98%) rename src/msg/{ => simple}/PipeConnection.h (97%) rename src/msg/{ => simple}/SimpleMessenger.cc (100%) rename src/msg/{ => simple}/SimpleMessenger.h (99%) diff --git a/src/msg/Makefile.am b/src/msg/Makefile.am index e4a94106127d..189ecfa96611 100644 --- a/src/msg/Makefile.am +++ b/src/msg/Makefile.am @@ -1,24 +1,32 @@ libmsg_la_SOURCES = \ - msg/Accepter.cc \ - msg/DispatchQueue.cc \ msg/Message.cc \ msg/Messenger.cc \ - msg/Pipe.cc \ - msg/PipeConnection.cc \ - msg/SimpleMessenger.cc \ msg/msg_types.cc noinst_HEADERS += \ - msg/Accepter.h \ msg/Connection.h \ - msg/DispatchQueue.h \ msg/Dispatcher.h \ msg/Message.h \ msg/Messenger.h \ - msg/Pipe.h \ - msg/PipeConnection.h \ - msg/SimpleMessenger.h \ msg/SimplePolicyMessenger.h \ msg/msg_types.h +# simple +libmsg_la_SOURCES += \ + msg/simple/Accepter.cc \ + msg/simple/DispatchQueue.cc \ + msg/simple/Pipe.cc \ + msg/simple/PipeConnection.cc \ + msg/simple/SimpleMessenger.cc + +noinst_HEADERS += \ + msg/simple/Accepter.h \ + msg/simple/DispatchQueue.h \ + msg/simple/Pipe.h \ + msg/simple/PipeConnection.h \ + msg/simple/SimpleMessenger.h + + noinst_LTLIBRARIES += libmsg.la + + diff --git a/src/msg/Messenger.cc b/src/msg/Messenger.cc index c02929c63c4d..8be11d44ac72 100644 --- a/src/msg/Messenger.cc +++ b/src/msg/Messenger.cc @@ -2,7 +2,7 @@ #include "include/types.h" #include "Messenger.h" -#include "SimpleMessenger.h" +#include "msg/simple/SimpleMessenger.h" Messenger *Messenger::create(CephContext *cct, entity_name_t name, diff --git a/src/msg/Accepter.cc b/src/msg/simple/Accepter.cc similarity index 99% rename from src/msg/Accepter.cc rename to src/msg/simple/Accepter.cc index 029a037bdbd7..7fb2baa56fbe 100644 --- a/src/msg/Accepter.cc +++ b/src/msg/simple/Accepter.cc @@ -18,11 +18,11 @@ #include #include -#include "Accepter.h" -#include "SimpleMessenger.h" +#include "msg/Message.h" -#include "Message.h" +#include "Accepter.h" #include "Pipe.h" +#include "SimpleMessenger.h" #include "common/debug.h" #include "common/errno.h" diff --git a/src/msg/Accepter.h b/src/msg/simple/Accepter.h similarity index 100% rename from src/msg/Accepter.h rename to src/msg/simple/Accepter.h diff --git a/src/msg/DispatchQueue.cc b/src/msg/simple/DispatchQueue.cc similarity index 100% rename from src/msg/DispatchQueue.cc rename to src/msg/simple/DispatchQueue.cc diff --git a/src/msg/DispatchQueue.h b/src/msg/simple/DispatchQueue.h similarity index 100% rename from src/msg/DispatchQueue.h rename to src/msg/simple/DispatchQueue.h diff --git a/src/msg/Pipe.cc b/src/msg/simple/Pipe.cc similarity index 99% rename from src/msg/Pipe.cc rename to src/msg/simple/Pipe.cc index aaa04cb3bcc4..4f386051811a 100644 --- a/src/msg/Pipe.cc +++ b/src/msg/simple/Pipe.cc @@ -18,7 +18,7 @@ #include #include -#include "Message.h" +#include "msg/Message.h" #include "Pipe.h" #include "SimpleMessenger.h" diff --git a/src/msg/Pipe.h b/src/msg/simple/Pipe.h similarity index 99% rename from src/msg/Pipe.h rename to src/msg/simple/Pipe.h index b6d743207b3f..3f33d31b7da2 100644 --- a/src/msg/Pipe.h +++ b/src/msg/simple/Pipe.h @@ -16,10 +16,10 @@ #define CEPH_MSGR_PIPE_H #include "include/memory.h" - -#include "msg_types.h" -#include "Messenger.h" #include "auth/AuthSessionHandler.h" + +#include "msg/msg_types.h" +#include "msg/Messenger.h" #include "PipeConnection.h" diff --git a/src/msg/PipeConnection.cc b/src/msg/simple/PipeConnection.cc similarity index 98% rename from src/msg/PipeConnection.cc rename to src/msg/simple/PipeConnection.cc index 695b2266e489..f4db37496fce 100644 --- a/src/msg/PipeConnection.cc +++ b/src/msg/simple/PipeConnection.cc @@ -12,7 +12,7 @@ * */ -#include "Message.h" +#include "msg/Message.h" #include "Pipe.h" #include "SimpleMessenger.h" #include "PipeConnection.h" diff --git a/src/msg/PipeConnection.h b/src/msg/simple/PipeConnection.h similarity index 97% rename from src/msg/PipeConnection.h rename to src/msg/simple/PipeConnection.h index c27a63c89051..cbe2677eedfa 100644 --- a/src/msg/PipeConnection.h +++ b/src/msg/simple/PipeConnection.h @@ -15,7 +15,8 @@ #ifndef CEPH_MSG_PIPECONNECTION_H #define CEPH_MSG_PIPECONNECTION_H -#include "Connection.h" +#include "msg/Connection.h" + class Pipe; struct PipeConnection : public Connection { diff --git a/src/msg/SimpleMessenger.cc b/src/msg/simple/SimpleMessenger.cc similarity index 100% rename from src/msg/SimpleMessenger.cc rename to src/msg/simple/SimpleMessenger.cc diff --git a/src/msg/SimpleMessenger.h b/src/msg/simple/SimpleMessenger.h similarity index 99% rename from src/msg/SimpleMessenger.h rename to src/msg/simple/SimpleMessenger.h index 006b60be6958..bb63dbe93cf3 100644 --- a/src/msg/SimpleMessenger.h +++ b/src/msg/simple/SimpleMessenger.h @@ -26,18 +26,18 @@ using namespace std; #include "common/Mutex.h" #include "include/atomic.h" +#include "include/Spinlock.h" #include "common/Cond.h" #include "common/Thread.h" #include "common/Throttle.h" -#include "SimplePolicyMessenger.h" -#include "Message.h" +#include "msg/SimplePolicyMessenger.h" +#include "msg/Message.h" #include "include/assert.h" -#include "DispatchQueue.h" +#include "DispatchQueue.h" #include "Pipe.h" #include "Accepter.h" -#include "include/Spinlock.h" /* * This class handles transmission and reception of messages. Generally -- 2.47.3