From a0ea30e124f72ecae5771da7ae1a08127f90c986 Mon Sep 17 00:00:00 2001 From: Yingxin Cheng Date: Wed, 13 Feb 2019 11:35:54 +0800 Subject: [PATCH] crimson/net: fix var capture in test_alien_echo Signed-off-by: Yingxin Cheng --- src/test/crimson/test_alien_echo.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/test/crimson/test_alien_echo.cc b/src/test/crimson/test_alien_echo.cc index 2000b590ad34d..26b756d2bedac 100644 --- a/src/test/crimson/test_alien_echo.cc +++ b/src/test/crimson/test_alien_echo.cc @@ -271,16 +271,15 @@ private: }; static seastar::future<> -seastar_echo(SeastarContext& sc, - const entity_addr_t& addr, echo_role role, unsigned count) +seastar_echo(const entity_addr_t addr, echo_role role, unsigned count) { std::cout << "seastar/"; if (role == echo_role::as_server) { return ceph::net::Messenger::create(entity_name_t::OSD(0), "server", 0, seastar::engine().cpu_id()) - .then([&addr, count] (auto msgr) { + .then([addr, count] (auto msgr) { return seastar::do_with(seastar_pingpong::Server{*msgr}, - [&addr, count](auto& server) mutable { + [addr, count](auto& server) mutable { std::cout << "server listening at " << addr << std::endl; // bind the server server.msgr.set_policy_throttler(entity_name_t::TYPE_OSD, @@ -301,14 +300,14 @@ seastar_echo(SeastarContext& sc, } else { return ceph::net::Messenger::create(entity_name_t::OSD(1), "client", 1, seastar::engine().cpu_id()) - .then([&addr, count] (auto msgr) { + .then([addr, count] (auto msgr) { return seastar::do_with(seastar_pingpong::Client{*msgr}, - [&addr, count](auto& client) { + [addr, count](auto& client) { std::cout << "client sending to " << addr << std::endl; client.msgr.set_policy_throttler(entity_name_t::TYPE_OSD, &client.byte_throttler); return client.msgr.start(&client.dispatcher) - .then([&] { + .then([addr, &client] { return client.msgr.connect(addr, entity_name_t::TYPE_OSD); }).then([&disp=client.dispatcher, count](ceph::net::ConnectionXRef conn) { return seastar::do_until( @@ -408,8 +407,8 @@ int main(int argc, char** argv) seastar::app_template app; SeastarContext sc; auto job = sc.with_seastar([&] { - auto fut = seastar::alien::submit_to(0, [&sc, &addr, role, count] { - return seastar_echo(sc, addr, role, count); + auto fut = seastar::alien::submit_to(0, [addr, role, count] { + return seastar_echo(addr, role, count); }); fut.wait(); }); -- 2.39.5