Merge branch 'main' into ymq-pymod-tests-3

Author: magniloquency

.github/actions/compile-libraries/action.yml

@@ -13,7 +13,7 @@ runs:
       if: inputs.os == 'Linux'
       shell: bash
       run: |
-        CXX=$(which g++-14) ./scripts/build.sh
+        ./scripts/build.sh
 
     - name: Build and test C++ Components (Windows)
       if: inputs.os == 'Windows'

examples/cpp/ymq/automated_echo_client.cpp

@@ -1,9 +1,6 @@
 
-
-// C++
-#include <stdio.h>
-
 #include <future>
+#include <iostream>
 #include <memory>
 #include <string>
 
@@ -25,7 +22,7 @@ int main()
         longStr += "1234567890";
 
     auto clientSocket = syncCreateSocket(context, IOSocketType::Connector, "ClientSocket");
-    printf("Successfully created socket.\n");
+    std::cout << "Successfully created socket.\n";
 
     constexpr size_t msgCnt = 100'000;
 
@@ -34,9 +31,8 @@ int main()
     std::vector<std::promise<std::pair<Message, Error>>> recvPromises;
     recvPromises.reserve(msgCnt + 10);
 
-    // syncConnectSocket(clientSocket, "tcp://51.15.214.200:32912");
     syncConnectSocket(clientSocket, "tcp://127.0.0.1:8080");
-    printf("Connected to server.\n");
+    std::cout << "Connected to server.\n";
 
     const std::string_view line = longStr;
 
@@ -64,19 +60,19 @@ int main()
         auto future = x.get_future();
         future.wait();
     }
-    printf("send completes\n");
+    std::cout << "Send completes.\n";
 
     for (auto&& x: recvPromises) {
         auto future = x.get_future();
         Message msg = future.get().first;
         if (msg.payload.as_string() != longStr) {
-            printf("Checksum failed, %s\n", msg.payload.as_string()->c_str());
+            std::cerr << "Checksum failed, " << *msg.payload.as_string() << std::endl;
             exit(1);
         }
     }
-    printf("recv completes\n");
+    std::cout << "Recv completes.\n";
 
-    printf("Send and recv %lu messages, checksum fits, exiting.\n", msgCnt);
+    std::cout << "Send and recv " << msgCnt << " messages, checksum fits, exiting.\n";
 
     context.removeIOSocket(clientSocket);
 

examples/cpp/ymq/echo_client.cpp

@@ -1,7 +1,4 @@
 
-// C++
-#include <stdio.h>
-
 #include <future>
 #include <iostream>
 #include <memory>
@@ -21,10 +18,10 @@ int main()
     IOContext context;
 
     auto clientSocket = syncCreateSocket(context, IOSocketType::Connector, "ClientSocket");
-    printf("Successfully created socket.\n");
+    std::cout << "Successfully created socket.\n";
 
     syncConnectSocket(clientSocket, "tcp://127.0.0.1:8080");
-    printf("Connected to server.\n");
+    std::cout << "Connected to server.\n";
 
     for (int cnt = 0; cnt < 10; ++cnt) {
         std::string line;
@@ -48,7 +45,7 @@ int main()
             std::move(message), [&send_promise](std::expected<void, Error>) { send_promise.set_value({}); });
 
         send_future.wait();
-        printf("Message sent, waiting for response...\n");
+        std::cout << "Message sent, waiting for response...\n";
 
         auto recv_promise = std::promise<std::pair<Message, Error>>();
         auto recv_future  = recv_promise.get_future();
@@ -58,7 +55,7 @@ int main()
 
         Message reply = recv_future.get().first;
         std::string reply_str(reply.payload.data(), reply.payload.data() + reply.payload.len());
-        printf("Received echo: '%s'\n", reply_str.c_str());
+        std::cout << "Received echo: '" << reply_str << "'.\n";
     }
 
     // TODO: remove IOSocket also needs a future

examples/cpp/ymq/echo_server.cpp

@@ -1,7 +1,6 @@
 
-#include <stdio.h>
-
 #include <future>
+#include <iostream>
 #include <memory>
 
 #include "scaler/io/ymq/error.h"
@@ -16,10 +15,10 @@ int main()
     IOContext context;
 
     auto socket = syncCreateSocket(context, IOSocketType::Binder, "ServerSocket");
-    printf("Successfully created socket.\n");
+    std::cout << "Successfully created socket." << std::endl;
 
     syncBindSocket(socket, "tcp://127.0.0.1:8080");
-    printf("Successfully bound socket\n");
+    std::cout << "Successfully bound socket." << std::endl;
 
     while (true) {
         auto recv_promise = std::promise<std::pair<Message, Error>>();

examples/cpp/ymq/pingpong.cpp

@@ -1,12 +1,7 @@
-
-
-// C++
-#include <stdio.h>
-
 #include <chrono>
 #include <future>
+#include <iostream>
 #include <memory>
-#include <print>
 #include <string>
 #include <thread>
 
@@ -23,7 +18,7 @@ using namespace std::chrono_literals;
 int main(int argc, char* argv[])
 {
     if (argc != 5) {
-        printf("Usage: %s <Identity> <MessageSize> <MessageCount> <AddressString>\n", argv[0]);
+        std::cout << "Usage: " << argv[0] << " <Identity> <MessageSize> <MessageCount> <AddressString>\n";
         exit(1);
     }
     const std::string identity(argv[1]);
@@ -34,10 +29,10 @@ int main(int argc, char* argv[])
     IOContext context;
 
     auto clientSocket = syncCreateSocket(context, IOSocketType::Connector, identity);
-    printf("Successfully created socket.\n");
+    std::cout << "Successfully created socket.\n";
 
     syncConnectSocket(clientSocket, address);
-    printf("Connected to server.\n");
+    std::cout << "Connected to server.\n";
 
     const std::string_view line = longStr;
 
@@ -62,10 +57,10 @@ int main(int argc, char* argv[])
 
     time_point<system_clock> end = system_clock::now();
 
-    printf("Send and recv %lu messages with %lu bytes.\n", msgCnt, longStr.size());
+    std::cout << "Send and recv " << msgCnt << " messages with " << longStr.size() << " bytes.\n";
     auto milli = duration_cast<milliseconds>(end - start);
-    std::print("Spend {}\n", milli);
-    std::print("Throughput {} Bpms\n", msgCnt * (longStr.size()) * 1.0 / milli.count());
+    std::cout << "Spend " << milli.count() << "ms.\n";
+    std::cout << "Throughput " << msgCnt * (longStr.size()) * 1.0 / milli.count() << " Bpms.\n";
 
     context.removeIOSocket(clientSocket);
 

examples/cpp/ymq/pub_server.cpp

@@ -1,8 +1,6 @@
-
-#include <stdio.h>
-
 #include <chrono>
 #include <future>
+#include <iostream>
 #include <memory>
 #include <thread>
 
@@ -18,10 +16,10 @@ int main()
     IOContext context;
 
     auto socket = syncCreateSocket(context, IOSocketType::Multicast, "ServerSocket");
-    printf("Successfully created socket.\n");
+    std::cout << "Successfully created socket.\n";
 
     syncBindSocket(socket, "tcp://127.0.0.1:8080");
-    printf("Successfully bound socket\n");
+    std::cout << "Successfully bound socket.\n";
 
     while (true) {
         std::string address("");
@@ -37,7 +35,7 @@ int main()
             std::move(publishContent), [&send_promise](std::expected<void, Error>) { send_promise.set_value({}); });
         send_future.wait();
 
-        printf("One message published, sleep for 10 sec\n");
+        std::cout << "One message published, sleep for 10 sec.\n";
         using namespace std::chrono_literals;
         std::this_thread::sleep_for(10s);
     }

examples/cpp/ymq/remove_iosocket.cpp

@@ -1,5 +1,4 @@
-#include <stdio.h>
-
+#include <iostream>
 #include <memory>
 #include <string>
 
@@ -13,10 +12,10 @@ int main()
 {
     IOContext context;
     auto clientSocket = syncCreateSocket(context, IOSocketType::Connector, "ServerSocket");
-    printf("Successfully created socket.\n");
+    std::cout << "Successfully created socket.\n";
 
     syncConnectSocket(clientSocket, "tcp://127.0.0.1:8080");
-    printf("Connected to server.\n");
+    std::cout << "Connected to server.\n";
 
     context.removeIOSocket(clientSocket);
 

examples/cpp/ymq/sub_client.cpp

@@ -1,5 +1,3 @@
-#include <stdio.h>
-
 #include <future>
 #include <iostream>
 #include <memory>
@@ -19,7 +17,7 @@ int main()
     IOContext context;
     auto clientSocket1 = syncCreateSocket(context, IOSocketType::Unicast, "ClientSocket1");
     auto clientSocket2 = syncCreateSocket(context, IOSocketType::Unicast, "ClientSocket2");
-    printf("Successfully created sockets.\n");
+    std::cout << "Successfully created sockets.\n";
 
     syncConnectSocket(clientSocket1, "tcp://127.0.0.1:8080");
     syncConnectSocket(clientSocket2, "tcp://127.0.0.1:8080");
@@ -33,7 +31,7 @@ int main()
 
         Message reply = recv_future.get().first;
         std::string reply_str(reply.payload.data(), reply.payload.data() + reply.payload.len());
-        printf("clientSocket1 Received from publisher: '%s'\n", reply_str.c_str());
+        std::cout << "clientSocket1 Received from publisher: '" << reply_str << "'.\n";
 
         auto recv_promise2 = std::promise<std::pair<Message, Error>>();
         auto recv_future2  = recv_promise2.get_future();
@@ -43,7 +41,7 @@ int main()
 
         Message reply2 = recv_future2.get().first;
         std::string reply_str2(reply2.payload.data(), reply2.payload.data() + reply2.payload.len());
-        printf("clientSocket2 Received from publisher: '%s'\n", reply_str2.c_str());
+        std::cout << "clientSocket2 Received from publisher: '" << reply_str2 << "'.\n";
     }
 
     // TODO: remove IOSocket also needs a future

examples/cpp/ymq/timestamp.cpp

@@ -11,9 +11,9 @@ int main()
     std::cout << ts.timestamp << std::endl;
     Timestamp three_seconds_later_than_ts = ts.createTimestampByOffsetDuration(3s);
     std::cout << three_seconds_later_than_ts.timestamp << std::endl;
-    printf("%s\n", stringifyTimestamp(ts).c_str());
+    std::cout << stringifyTimestamp(ts) << std::endl;
     // a timestamp is smaller iff it is closer to the beginning of the world
     if (ts < three_seconds_later_than_ts) {
-        printf("ts happen before than three_seconds_later_than_ts\n");
+        std::cout << "ts happen before than three_seconds_later_than_ts.\n";
     }
 }

scaler/io/ymq/error.h

@@ -4,7 +4,7 @@
 #include <exception>  // std::terminate
 #include <format>
 #include <functional>
-#include <print>
+#include <iostream>
 #include <string>
 
 #include "scaler/io/ymq/timestamp.h"
@@ -87,7 +87,7 @@ struct Error: public std::exception {
             case ErrorCode::BinderSendMessageWithNoAddress:
                 return "You call sendMessage with a Binder IOSocket but failed to provide an address";
         }
-        fprintf(stderr, "Unrecognized ErrorCode value, program exits\n");
+        std::cerr << "Unrecognized ErrorCode value, program exits\n";
         std::exit(1);
     }
 
@@ -119,7 +119,7 @@ using UnrecoverableErrorFunctionHookPtr = std::function<void(scaler::ymq::Error)
 
 [[noreturn]] inline void defaultUnrecoverableError(scaler::ymq::Error e) noexcept
 {
-    std::print(stderr, "{}\n", e);
+    std::cerr << e.what() << '\n';
     std::exit(1);
 }