diff options
| author | Sage Weil <sage@newdream.net> | 2012-03-14 16:33:39 -0700 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2012-03-14 16:33:39 -0700 |
| commit | 80e2a5e8370edf09480f5d6711021decc75d999f (patch) | |
| tree | 0b607204aec082f8bf870fbe053566fe945948fc /src/mds | |
| parent | 1e1453c17f56c775ad97f9a85385925d58726467 (diff) | |
| download | ceph-80e2a5e8370edf09480f5d6711021decc75d999f.tar.gz | |
msgr: switch all users over to abstract interface
This will let us transparently swap implementations out.
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'src/mds')
| -rw-r--r-- | src/mds/Dumper.h | 8 | ||||
| -rw-r--r-- | src/mds/Resetter.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mds/Dumper.h b/src/mds/Dumper.h index c722f1106dc..ec3ad6d1cd5 100644 --- a/src/mds/Dumper.h +++ b/src/mds/Dumper.h @@ -19,7 +19,7 @@ #include "osdc/Journaler.h" #include "msg/Dispatcher.h" #include "msg/Messenger.h" -#include "msg/SimpleMessenger.h" +#include "msg/Messenger.h" #include "auth/Auth.h" /** @@ -35,7 +35,7 @@ public: Objecter *objecter; Journaler *journaler; OSDMap *osdmap; - SimpleMessenger *messenger; + Messenger *messenger; MonClient *monc; Mutex lock; SafeTimer timer; @@ -43,12 +43,12 @@ public: int rank; /* - * The messenger should be a valid SimpleMessenger. You should call bind() + * The messenger should be a valid Messenger. You should call bind() * before passing it in, but not do anything else. * The MonClient needs to be valid, and you should have called * build_initial_monmap(). */ - Dumper(SimpleMessenger *messenger_, MonClient *monc_) : + Dumper(Messenger *messenger_, MonClient *monc_) : Dispatcher(messenger_->cct), messenger(messenger_), monc(monc_), diff --git a/src/mds/Resetter.h b/src/mds/Resetter.h index 76e55fe22cf..663dde12f17 100644 --- a/src/mds/Resetter.h +++ b/src/mds/Resetter.h @@ -19,7 +19,7 @@ #include "osdc/Journaler.h" #include "msg/Dispatcher.h" #include "msg/Messenger.h" -#include "msg/SimpleMessenger.h" +#include "msg/Messenger.h" #include "auth/Auth.h" /** @@ -35,18 +35,18 @@ public: Objecter *objecter; Journaler *journaler; OSDMap *osdmap; - SimpleMessenger *messenger; + Messenger *messenger; MonClient *monc; Mutex lock; SafeTimer timer; /* - * The messenger should be a valid SimpleMessenger. You should call bind() + * The messenger should be a valid Messenger. You should call bind() * before passing it in, but not do anything else. * The MonClient needs to be valid, and you should have called * build_initial_monmap(). */ - Resetter(SimpleMessenger *messenger_, MonClient *monc_) : + Resetter(Messenger *messenger_, MonClient *monc_) : Dispatcher(messenger_->cct), messenger(messenger_), monc(monc_), |