summaryrefslogtreecommitdiffstats
path: root/src/tools/common.cc
diff options
context:
space:
mode:
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>2011-06-10 01:08:14 +0200
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>2011-06-10 01:08:14 +0200
commite6349ec2e0ff65d78e2606843660cf4e5841d5d5 (patch)
tree019a39ee0d061f3464ad68ca9058b4aeb264662b /src/tools/common.cc
parentmds: fix tcmalloc check. (diff)
downloadceph-e6349ec2e0ff65d78e2606843660cf4e5841d5d5.tar.xz
ceph-e6349ec2e0ff65d78e2606843660cf4e5841d5d5.zip
Dispatcher should take a CephContext argument
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Diffstat (limited to 'src/tools/common.cc')
-rw-r--r--src/tools/common.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/common.cc b/src/tools/common.cc
index 5e42bfd7f49..2de08841f0d 100644
--- a/src/tools/common.cc
+++ b/src/tools/common.cc
@@ -280,7 +280,8 @@ static void send_command(CephToolCtx *ctx)
class Admin : public Dispatcher {
public:
Admin(CephToolCtx *ctx_)
- : ctx(ctx_)
+ : Dispatcher(&g_ceph_context),
+ ctx(ctx_)
{
}
@@ -538,7 +539,7 @@ CephToolCtx* ceph_tool_common_init(ceph_tool_mode_t mode, bool concise)
tok = tok_init(NULL);
// start up network
- messenger = new SimpleMessenger();
+ messenger = new SimpleMessenger(&g_ceph_context);
messenger->register_entity(entity_name_t::CLIENT());
messenger->start_with_nonce(getpid());
ctx->dispatcher = new Admin(ctx.get());