diff options
Diffstat (limited to 'utils/src')
| -rw-r--r-- | utils/src/hiperf.cc | 39 | ||||
| -rw-r--r-- | utils/src/ping_client.cc | 4 | ||||
| -rw-r--r-- | utils/src/ping_server.cc | 16 |
3 files changed, 40 insertions, 19 deletions
diff --git a/utils/src/hiperf.cc b/utils/src/hiperf.cc index 8db4d9f0d..bbef2d27e 100644 --- a/utils/src/hiperf.cc +++ b/utils/src/hiperf.cc @@ -108,7 +108,8 @@ class HIperfClient { HIperfClient(const ClientConfiguration &conf) : configuration_(conf), total_duration_milliseconds_(0), - old_bytes_value_(0) {} + old_bytes_value_(0), + signals_(io_service_, SIGINT) {} void processPayload(ConsumerSocket &c, std::size_t bytes_transferred, const std::error_code &ec) { @@ -122,6 +123,8 @@ class HIperfClient { std::cerr << "Elapsed Time: " << usec / 1000000.0 << " seconds -- " << (bytes_transferred * 8) * 1.0 / usec * 1.0 << " [Mbps]" << std::endl; + + io_service_.stop(); } bool verifyData(ConsumerSocket &c, const ContentObject &contentObject) { @@ -302,11 +305,15 @@ class HIperfClient { int run() { std::cout << "Starting download of " << configuration_.name << std::endl; - do { - t1_ = std::chrono::steady_clock::now(); - consumer_socket_->consume(configuration_.name, - *configuration_.receive_buffer); - } while (configuration_.virtual_download); + signals_.async_wait([this](const std::error_code &, const int &) { + consumer_socket_->stop(); + io_service_.stop(); + }); + + t1_ = std::chrono::steady_clock::now(); + consumer_socket_->asyncConsume(configuration_.name, + configuration_.receive_buffer); + io_service_.run(); return ERROR_SUCCESS; } @@ -317,7 +324,8 @@ class HIperfClient { Time t1_; uint32_t total_duration_milliseconds_; uint64_t old_bytes_value_; - // std::unique_ptr<asio::signal_set> signals_; + asio::io_service io_service_; + asio::signal_set signals_; }; class HIperfServer { @@ -326,13 +334,10 @@ class HIperfServer { public: HIperfServer(ServerConfiguration &conf) : configuration_(conf), - // signals_(io_service_, SIGINT, SIGQUIT), + signals_(io_service_, SIGINT), content_objects_((std::uint16_t)(1 << log2_content_object_buffer_size)), content_objects_index_(0), mask_((std::uint16_t)(1 << log2_content_object_buffer_size) - 1) { - // signals_.async_wait([this] (const std::error_code&, const int&) - // {std::cout << "STOPPING!!" << std::endl; io_service_.stop();}); - std::string buffer(1440, 'X'); std::cout << "Producing contents under name " << conf.name.getName() @@ -480,7 +485,14 @@ class HIperfServer { int run() { std::cerr << "Starting to serve consumers" << std::endl; - producer_socket_->serveForever(); + + signals_.async_wait([this](const std::error_code &, const int &) { + std::cout << "STOPPING!!" << std::endl; + producer_socket_->stop(); + io_service_.stop(); + }); + + io_service_.run(); return ERROR_SUCCESS; } @@ -488,7 +500,8 @@ class HIperfServer { private: ServerConfiguration configuration_; std::unique_ptr<ProducerSocket> producer_socket_; - // asio::signal_set signals_; + asio::io_service io_service_; + asio::signal_set signals_; std::vector<std::shared_ptr<ContentObject>> content_objects_; std::uint16_t content_objects_index_; std::uint16_t mask_; diff --git a/utils/src/ping_client.cc b/utils/src/ping_client.cc index 598012143..d31147c70 100644 --- a/utils/src/ping_client.cc +++ b/utils/src/ping_client.cc @@ -117,9 +117,9 @@ class Client : interface::BasePortal::ConsumerCallback { auto dt = std::chrono::duration_cast<std::chrono::microseconds>(t1 - t0); std::cout << "Verification time: " << dt.count() << std::endl; - std::cout << "<<<<<< Signature OK!!!" << std::endl; + std::cout << "<<< Signature Ok." << std::endl; } else { - std::cout << "<<<<<< Signature verification failed!" << std::endl; + std::cout << "<<< Signature verification failed!" << std::endl; } } diff --git a/utils/src/ping_server.cc b/utils/src/ping_server.cc index e3500a4ba..3a20dffd1 100644 --- a/utils/src/ping_server.cc +++ b/utils/src/ping_server.cc @@ -288,9 +288,7 @@ int main(int argc, char **argv) { reset, ttl, identity, sign); } - asio::io_service io_service; - - ProducerSocket p(io_service); // , setProducerIdentity()); + ProducerSocket p; p.registerPrefix(producer_namespace); p.setSocketOption(GeneralTransportOptions::OUTPUT_BUFFER_SIZE, 0U); @@ -301,7 +299,17 @@ int main(int argc, char **argv) { p.connect(); - p.serveForever(); + asio::io_service io_service; + asio::signal_set signal_set(io_service, SIGINT); + signal_set.async_wait( + [&p, &io_service](const std::error_code &, const int &) { + std::cout << "STOPPING!!" << std::endl; + p.stop(); + io_service.stop(); + }); + + io_service.run(); + #ifdef _WIN32 WSACleanup(); #endif |