import quincy beta 17.1.0

[ceph.git] / ceph / src / seastar / demos / tcp_sctp_client_demo.cc

diff --git a/ceph/src/seastar/demos/tcp_sctp_client_demo.cc b/ceph/src/seastar/demos/tcp_sctp_client_demo.cc
index 4e46a565824951ca71ff8571f256a30a2619c385..1ef51fd221e792b08137e3772a7cf98a7db9641c 100644 (file)
--- a/ceph/src/seastar/demos/tcp_sctp_client_demo.cc
+++ b/ceph/src/seastar/demos/tcp_sctp_client_demo.cc
@@ -93,12 +93,12 @@ public:
             }).then([this, times] {
                 return _read_buf.read_exactly(4).then([this, times] (temporary_buffer<char> buf) {
                     if (buf.size() != 4) {
-                        fprint(std::cerr, "illegal packet received: %d\n", buf.size());
+                        fmt::print(std::cerr, "illegal packet received: {}\n", buf.size());
                         return make_ready_future();
                     }
                     auto str = std::string(buf.get(), buf.size());
                     if (str != "pong") {
-                        fprint(std::cerr, "illegal packet received: %d\n", buf.size());
+                        fmt::print(std::cerr, "illegal packet received: {}\n", buf.size());
                         return make_ready_future();
                     }
                     if (times > 0) {
@@ -166,12 +166,12 @@ public:
             auto elapsed = _latest_finished - _earliest_started;
             auto usecs = std::chrono::duration_cast<std::chrono::microseconds>(elapsed).count();
             auto secs = static_cast<double>(usecs) / static_cast<double>(1000 * 1000);
-            fprint(std::cout, "========== ping ============\n");
-            fprint(std::cout, "Server: %s\n", _server_addr);
-            fprint(std::cout,"Connections: %u\n", _concurrent_connections);
-            fprint(std::cout, "Total PingPong: %u\n", _total_pings);
-            fprint(std::cout, "Total Time(Secs): %f\n", secs);
-            fprint(std::cout, "Requests/Sec: %f\n",
+            fmt::print(std::cout, "========== ping ============\n");
+            fmt::print(std::cout, "Server: {}\n", _server_addr);
+            fmt::print(std::cout,"Connections: {}\n", _concurrent_connections);
+            fmt::print(std::cout, "Total PingPong: {}\n", _total_pings);
+            fmt::print(std::cout, "Total Time(Secs): {}\n", secs);
+            fmt::print(std::cout, "Requests/Sec: {}\n",
                 static_cast<double>(_total_pings) / secs);
             (void)clients.stop().then([] {
                 engine().exit(0);
@@ -189,12 +189,12 @@ public:
             auto elapsed = _latest_finished - _earliest_started;
             auto usecs = std::chrono::duration_cast<std::chrono::microseconds>(elapsed).count();
             auto secs = static_cast<double>(usecs) / static_cast<double>(1000 * 1000);
-            fprint(std::cout, "========== %s ============\n", _test);
-            fprint(std::cout, "Server: %s\n", _server_addr);
-            fprint(std::cout, "Connections: %u\n", _concurrent_connections);
-            fprint(std::cout, "Bytes Received(MiB): %u\n", _processed_bytes/1024/1024);
-            fprint(std::cout, "Total Time(Secs): %f\n", secs);
-            fprint(std::cout, "Bandwidth(Gbits/Sec): %f\n",
+            fmt::print(std::cout, "========== {} ============\n", _test);
+            fmt::print(std::cout, "Server: {}\n", _server_addr);
+            fmt::print(std::cout, "Connections: {}\n", _concurrent_connections);
+            fmt::print(std::cout, "Bytes Received(MiB): {}\n", _processed_bytes/1024/1024);
+            fmt::print(std::cout, "Total Time(Secs): {}\n", secs);
+            fmt::print(std::cout, "Bandwidth(Gbits/Sec): {}\n",
                 static_cast<double>((_processed_bytes * 8)) / (1000 * 1000 * 1000) / secs);
             (void)clients.stop().then([] {
                 engine().exit(0);
@@ -217,7 +217,7 @@ public:
                     try {
                         f.get();
                     } catch (std::exception& ex) {
-                        fprint(std::cerr, "request error: %s\n", ex.what());
+                        fmt::print(std::cerr, "request error: {}\n", ex.what());
                     }
                 });
             });
@@ -255,12 +255,12 @@ int main(int ac, char ** av) {
         } else if (proto == "sctp") {
             protocol = transport::SCTP;
         } else {
-            fprint(std::cerr, "Error: --proto=tcp|sctp\n");
+            fmt::print(std::cerr, "Error: --proto=tcp|sctp\n");
             return engine().exit(1);
         }
 
         if (!client::tests.count(test)) {
-            fprint(std::cerr, "Error: -test=ping | rxrx | txtx\n");
+            fmt::print(std::cerr, "Error: -test=ping | rxrx | txtx\n");
             return engine().exit(1);
         }