AsyncMessenger: Fix header file path

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

diff --git a/src/msg/Makefile.am b/src/msg/Makefile.am
index ebf698388b4bb1c8aafc8499f136e5905e1c126b..d6b276c2a427cd598e2c8c5b45394e785a06e00e 100644 (file)
--- a/src/msg/Makefile.am
+++ b/src/msg/Makefile.am
@@ -7,17 +7,7 @@ noinst_HEADERS += \
        msg/Connection.h \
        msg/Dispatcher.h \
        msg/Message.h \
-       msg/Messenger.h \
-       msg/Pipe.h \
-       msg/PipeConnection.h \
-       msg/AsyncConnection.h \
-       msg/SimpleMessenger.h \
-       msg/AsyncMessenger.h \
-       msg/SimplePolicyMessenger.h \
-       msg/msg_types.h \
-       msg/Event.h \
-       msg/EventEpoll.h \
-       msg/net_handler.h
+       msg/Messenger.h
 
 # simple
 libmsg_la_SOURCES += \
@@ -25,14 +15,24 @@ libmsg_la_SOURCES += \
        msg/simple/DispatchQueue.cc \
        msg/simple/Pipe.cc \
        msg/simple/PipeConnection.cc \
-       msg/simple/SimpleMessenger.cc
+       msg/simple/SimpleMessenger.cc \
+       msg/async/AsyncConnection.cc \
+       msg/async/AsyncMessenger.cc \
+       msg/async/Event.cc \
+       msg/async/net_handler.cc \
+       msg/async/EventEpoll.cc
 
 noinst_HEADERS += \
        msg/simple/Accepter.h \
        msg/simple/DispatchQueue.h \
        msg/simple/Pipe.h \
        msg/simple/PipeConnection.h \
-       msg/simple/SimpleMessenger.h
+       msg/simple/SimpleMessenger.h \
+       msg/async/AsyncConnection.h \
+       msg/async/AsyncMessenger.h \
+       msg/async/Event.h \
+       msg/async/EventEpoll.h \
+       msg/async/net_handler.h
 
 
 noinst_LTLIBRARIES += libmsg.la

diff --git a/src/msg/Messenger.cc b/src/msg/Messenger.cc
index 21ccea1d2fa18d89e940b885f0bc4ff27d1ed3c8..160980c5403f0cc666fd50cc4f0eebe0cedf7735 100644 (file)
--- a/src/msg/Messenger.cc
+++ b/src/msg/Messenger.cc
@@ -3,7 +3,7 @@
 #include "Messenger.h"
 
 #include "msg/simple/SimpleMessenger.h"
-#include "AsyncMessenger.h"
+#include "msg/async/AsyncMessenger.h"
 
 Messenger *Messenger::create(CephContext *cct,
                             entity_name_t name,

diff --git a/src/msg/async/AsyncConnection.h b/src/msg/async/AsyncConnection.h
index 3c025ff92bae089b3463d89b2abf48191a23794d..febb24e58b9fcd6334b9244b541a4b3bc6482fb1 100644 (file)
--- a/src/msg/async/AsyncConnection.h
+++ b/src/msg/async/AsyncConnection.h
@@ -12,10 +12,10 @@ using namespace std;
 
 #include "auth/AuthSessionHandler.h"
 #include "include/buffer.h"
-#include "Connection.h"
+#include "msg/Connection.h"
 #include "net_handler.h"
 #include "Event.h"
-#include "Messenger.h"
+#include "msg/Messenger.h"
 
 class AsyncMessenger;
 

diff --git a/src/msg/async/AsyncMessenger.h b/src/msg/async/AsyncMessenger.h
index 087f557de4977ec247c062cd315b19aeee18b056..0c2df25017e725c5a67a188b077f6e0d0c0a8561 100644 (file)
--- a/src/msg/async/AsyncMessenger.h
+++ b/src/msg/async/AsyncMessenger.h
@@ -18,9 +18,8 @@ using namespace std;
 #include "common/Thread.h"
 #include "common/Throttle.h"
 
-#include "SimplePolicyMessenger.h"
+#include "msg/SimplePolicyMessenger.h"
 #include "include/assert.h"
-#include "DispatchQueue.h"
 #include "AsyncConnection.h"
 #include "Event.h"