From e0d7b5f1f6ed4b0a578bec649b68a86087dc28b9 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 10 Sep 2014 15:45:23 +0300 Subject: [PATCH] s/networking/network/ Just because. --- core/reactor.cc | 34 +++++++++++++++++----------------- core/reactor.hh | 26 +++++++++++++------------- net/stack.cc | 18 +++++++++--------- net/stack.hh | 4 ++-- 4 files changed, 41 insertions(+), 41 deletions(-) diff --git a/core/reactor.cc b/core/reactor.cc index 232a615957..7a6a5bf57d 100644 --- a/core/reactor.cc +++ b/core/reactor.cc @@ -36,7 +36,7 @@ wrap_syscall(T result) { } reactor::reactor() - : _networking_stack(networking_stack_registry::create()) + : _network_stack(network_stack_registry::create()) , _epollfd(file_desc::epoll_create(EPOLL_CLOEXEC)) , _io_eventfd() , _io_context(0) @@ -50,9 +50,9 @@ reactor::reactor() } void reactor::configure(boost::program_options::variables_map vm) { - _networking_stack = vm.count("network-stack") - ? networking_stack_registry::create(sstring(vm["network-stack"].as())) - : networking_stack_registry::create(); + _network_stack = vm.count("network-stack") + ? network_stack_registry::create(sstring(vm["network-stack"].as())) + : network_stack_registry::create(); } future<> reactor::get_epoll_future(pollable_fd_state& pfd, @@ -104,7 +104,7 @@ reactor::posix_listen(socket_address sa, listen_options opts) { server_socket reactor::listen(socket_address sa, listen_options opt) { - return _networking_stack->listen(sa, opt); + return _network_stack->listen(sa, opt); } class posix_connected_socket_impl final : public connected_socket_impl { @@ -449,23 +449,23 @@ posix_data_sink_impl::do_write(size_t idx) { } server_socket -posix_networking_stack::listen(socket_address sa, listen_options opt) { +posix_network_stack::listen(socket_address sa, listen_options opt) { return server_socket(std::make_unique(the_reactor.posix_listen(sa, opt))); } -void networking_stack_registry::register_stack(sstring name, - std::function ()> create, bool make_default) { +void network_stack_registry::register_stack(sstring name, + std::function ()> create, bool make_default) { _map()[name] = std::move(create); if (make_default) { _default() = name; } } -sstring networking_stack_registry::default_stack() { +sstring network_stack_registry::default_stack() { return _default(); } -std::vector networking_stack_registry::list() { +std::vector network_stack_registry::list() { std::vector ret; for (auto&& ns : _map()) { ret.push_back(ns.first); @@ -473,13 +473,13 @@ std::vector networking_stack_registry::list() { return ret; } -std::unique_ptr -networking_stack_registry::create() { +std::unique_ptr +network_stack_registry::create() { return create(_default()); } -std::unique_ptr -networking_stack_registry::create(sstring name) { +std::unique_ptr +network_stack_registry::create(sstring name) { return _map()[name](); } @@ -487,15 +487,15 @@ boost::program_options::options_description reactor::get_options_description() { namespace bpo = boost::program_options; bpo::options_description opts("Core options"); - auto net_stack_names = networking_stack_registry::list(); + auto net_stack_names = network_stack_registry::list(); opts.add_options() ("network-stack", bpo::value(), - sprint("select networking stack (valid values: %s)", + sprint("select network stack (valid values: %s)", format_separated(net_stack_names.begin(), net_stack_names.end(), ", ")).c_str()) ; return opts; } -networking_stack_registrator nsr_posix{"posix", true}; +network_stack_registrator nsr_posix{"posix", true}; reactor the_reactor; diff --git a/core/reactor.hh b/core/reactor.hh index efb9580c9a..8c638ac18f 100644 --- a/core/reactor.hh +++ b/core/reactor.hh @@ -223,17 +223,17 @@ public: } }; -class networking_stack { +class network_stack { public: - virtual ~networking_stack() {} + virtual ~network_stack() {} virtual server_socket listen(socket_address sa, listen_options opts) = 0; }; -class networking_stack_registry { +class network_stack_registry { static std::unordered_map ()>>& _map() { + std::function ()>>& _map() { static std::unordered_map ()>> map; + std::function ()>> map; return map; } static sstring& _default() { @@ -242,22 +242,22 @@ class networking_stack_registry { } public: static void register_stack(sstring name, - std::function ()> create, bool make_default = false); + std::function ()> create, bool make_default = false); static sstring default_stack(); static std::vector list(); - static std::unique_ptr create(); - static std::unique_ptr create(sstring name); + static std::unique_ptr create(); + static std::unique_ptr create(sstring name); }; template -class networking_stack_registrator { +class network_stack_registrator { public: - explicit networking_stack_registrator(sstring name, bool make_default = false) { - networking_stack_registry::register_stack(name, std::make_unique, make_default); + explicit network_stack_registrator(sstring name, bool make_default = false) { + network_stack_registry::register_stack(name, std::make_unique, make_default); } }; -class posix_networking_stack : public networking_stack { +class posix_network_stack : public network_stack { public: virtual server_socket listen(socket_address sa, listen_options opts) override; }; @@ -338,7 +338,7 @@ class reactor { }; std::unordered_map _signal_handlers; bool _stopped = false; - std::unique_ptr _networking_stack; + std::unique_ptr _network_stack; public: file_desc _epollfd; readable_eventfd _io_eventfd; diff --git a/net/stack.cc b/net/stack.cc index d4a4320015..05b6a3b502 100644 --- a/net/stack.cc +++ b/net/stack.cc @@ -12,7 +12,7 @@ namespace net { -class native_networking_stack; +class native_network_stack; template class native_server_socket_impl; @@ -41,19 +41,19 @@ public: virtual future accept() override; }; -class native_networking_stack : public networking_stack { - static std::unique_ptr _s; +class native_network_stack : public network_stack { + static std::unique_ptr _s; interface _netif; ipv4 _inet; using tcp4 = tcp; public: - explicit native_networking_stack(std::unique_ptr dev); - explicit native_networking_stack() : native_networking_stack(create_virtio_net_device("tap0")) {} + explicit native_network_stack(std::unique_ptr dev); + explicit native_network_stack() : native_network_stack(create_virtio_net_device("tap0")) {} virtual server_socket listen(socket_address sa, listen_options opt) override; friend class native_server_socket_impl; }; -native_networking_stack::native_networking_stack(std::unique_ptr dev) +native_network_stack::native_network_stack(std::unique_ptr dev) : _netif(std::move(dev)) , _inet(&_netif) { _netif.run(); @@ -76,7 +76,7 @@ native_server_socket_impl::accept() { } server_socket -native_networking_stack::listen(socket_address sa, listen_options opts) { +native_network_stack::listen(socket_address sa, listen_options opts) { assert(sa.as_posix_sockaddr().sa_family == AF_INET); return server_socket(std::make_unique>( _inet.get_tcp(), ntohs(sa.as_posix_sockaddr_in().sin_port), opts)); @@ -138,8 +138,8 @@ native_connected_socket_impl::output() { } -std::unique_ptr native_networking_stack::_s; +std::unique_ptr native_network_stack::_s; -networking_stack_registrator nns_registrator{"native"}; +network_stack_registrator nns_registrator{"native"}; } diff --git a/net/stack.hh b/net/stack.hh index 5976f4bd57..65435d9c00 100644 --- a/net/stack.hh +++ b/net/stack.hh @@ -9,8 +9,8 @@ namespace net { -std::unique_ptr -create_native_networking_stack(); +std::unique_ptr +create_native_network_stack(); }