Merge seastar upstream

* seastar 10e09b0...2e041c2 (7):
  > Merge "Change app_template::run() to terminate when callback is done" from Tomasz
  > resource: Fix compilation for hwloc version 1.8.0
  > memory: Fix infinite recursion when throwing std::bad_alloc
  > core/reactor: Throw the right error code when connect() fails
  > future: improve exception safety
  > xen: add missing virtual destructors
  > circular_buffer: do not destroy uninitialized object

app_template::run() users updated to call app_template::run_depracated().

main.cc

@@ -92,7 +92,7 @@ int main(int ac, char** av) {
     auto& mm = service::get_migration_manager();
     api::http_context ctx(db, proxy);
 
-    return app.run(ac, av, [&] {
+    return app.run_deprecated(ac, av, [&] {
         if (help_loggers) {
             do_help_loggers();
             engine().exit(1);

tests/gossip.cc

@@ -16,7 +16,7 @@ int main(int ac, char ** av) {
     app.add_options()
         ("seed", bpo::value<std::vector<std::string>>(), "IP address of seed node")
         ("listen-address", bpo::value<std::string>()->default_value("0.0.0.0"), "IP address to listen");
-    return app.run(ac, av, [&db, &app] {
+    return app.run_deprecated(ac, av, [&db, &app] {
         auto config = app.configuration();
         logging::logger_registry().set_logger_level("gossip", logging::log_level::trace);
         const gms::inet_address listen = gms::inet_address(config["listen-address"].as<std::string>());

tests/message.cc

@@ -139,7 +139,7 @@ int main(int ac, char ** av) {
 
     distributed<database> db;
 
-    return app.run(ac, av, [&app] {
+    return app.run_deprecated(ac, av, [&app] {
         auto config = app.configuration();
         uint16_t api_port = config["api-port"].as<uint16_t>();
         bool stay_alive = config["stay-alive"].as<bool>();

tests/perf/perf_mutation.cc

@@ -7,7 +7,7 @@ static atomic_cell make_atomic_cell(bytes value) {
 };
 
 int main(int argc, char* argv[]) {
-    return app_template().run(argc, argv, [] {
+    return app_template().run_deprecated(argc, argv, [] {
         auto s = make_lw_shared(schema({}, "ks", "cf",
             {{"p1", utf8_type}}, {{"c1", int32_type}}, {{"r1", int32_type}}, {}, utf8_type));
 

tests/perf/perf_simple_query.cc

@@ -111,7 +111,7 @@ int main(int argc, char** argv) {
         ("query-single-key", "test write path instead of read path")
         ("concurrency", bpo::value<unsigned>()->default_value(100), "workers per core");
 
-    return app.run(argc, argv, [&app] {
+    return app.run_deprecated(argc, argv, [&app] {
         make_env_for_test().then([&app] (auto env) {
             auto cfg = make_lw_shared<test_config>();
             cfg->partitions = app.configuration()["partitions"].as<unsigned>();

tests/perf/perf_sstable.cc

@@ -58,7 +58,7 @@ int main(int argc, char** argv) {
         ("mode", bpo::value<sstring>()->default_value("index_write"), "one of: random_read, sequential_read, index_read, write, index_write (default)")
         ("testdir", bpo::value<sstring>()->default_value("/var/lib/cassandra/perf-tests"), "directory in which to store the sstables");
 
-    return app.run(argc, argv, [&app] {
+    return app.run_deprecated(argc, argv, [&app] {
         auto test = make_lw_shared<distributed<test_env>>();
 
         auto cfg = test_env::conf();