cleaning up socket

tests/src/testserver.cpp

@@ -3,44 +3,54 @@
 
 #include "tests/testenum.h"
 
+#include "ServerInterface2.h"
 #include "container_utils.h"
 #include <iostream>
 #include <unordered_map>
-#include "ServerInterface2.h"
 
-struct EnumClassHash
-{
-    template <typename T>
-    std::size_t operator()(T t) const
-    {
+// For hashing of enum with C++11, not needed in 14
+struct EnumClassHash {
+    template <typename T> std::size_t operator()(T t) const {
         return static_cast<std::size_t>(t);
     }
 };
 
 using Interface = sls::ServerInterface2;
-using func_ptr = int (*)(Interface &);
+using func_ptr = void (*)(Interface &);
 
-int read_data(Interface &socket) {
+/********************************************
+ *           Mapped functions               *
+ ********************************************/
+
+void read_data(Interface &socket) {
     auto data = sls::make_unique<char[]>(DATA_SIZE);
     std::cout << "Read: " << socket.receiveData(data.get(), DATA_SIZE)
               << " bytes into buffer\n";
-    return 0;
 }
 
-int read_int(Interface &socket) {
+void read_half_data(Interface &socket) {
+    auto data = sls::make_unique<char[]>(DATA_SIZE);
+    std::cout << "Read: " << socket.receiveData(data.get(), DATA_SIZE / 2)
+              << " bytes into buffer\n";
+}
+
+void read_int(Interface &socket) {
     auto i = socket.receive<int>();
     std::cout << "Read <int>: " << i << "\n";
-    return 0;
 }
 
-static std::unordered_map<func_id, func_ptr, EnumClassHash> fmap{
-    {func_id::read_data, &read_data}, {func_id::read_int, &read_int}};
+// Map from int to function pointer, in this case probably a map would be faster
+std::unordered_map<func_id, func_ptr, EnumClassHash> fmap{
+    {func_id::read_data, &read_data},
+    {func_id::read_int, &read_int},
+    {func_id::read_half_data, &read_half_data}};
 
 int main(int argc, char **argv) {
-    std::cout << "Test server\n";
+    std::cout << "Starting test server...\n";
     int port = 2345;
-    auto cli = clara::Opt(port, "port")["-p"]["--port"]("Port to send to");
 
+    // Parse command line arguments using clara
+    auto cli = clara::Opt(port, "port")["-p"]["--port"]("Port to send to");
     auto result = cli.parse(clara::Args(argc, argv));
     if (!result) {
         std::cerr << "Error in command line: " << result.errorMessage()
@@ -48,17 +58,17 @@ int main(int argc, char **argv) {
         exit(1);
     }
     std::cout << "Listening to port: " << port << "\n";
-    auto server = sls::ServerSocket(port);
 
+    auto server = sls::ServerSocket(port);
     while (true) {
         try {
             auto socket = server.accept();
             auto fnum = socket.receive<func_id>();
             std::cout << "Calling func: " << (int)fnum << "\n";
-            auto ret = (*fmap[fnum])(socket);
-            // std::cout << "function returned: " << ret << "\n";
+            (*fmap[fnum])(socket); // call mapped function
 
         } catch (const sls::RuntimeError &e) {
+            // Do nothing, error is printed when the exeption is created
         }
     }
 }