Som devel

.github/workflows/c-cpp.yml

@@ -21,4 +21,4 @@ jobs:
         -   name: prepare build
             run: chmod 755 make/build.sh
         -   name: build
-            run: make/build.sh -c
+            run: make/build.sh -cr prod test

code/TCP_Srv_Base.cpp

@@ -30,8 +30,9 @@ void TCP_Srv_Base::run(const INT32 argc, const CONST_C_STRING* const argv)
     if (argc > 1)
     {
         UINT16 port = defPort;
-        regex rxPort {"^\\d{2,5}$"};
-        regex rxHelp {"^-[hH]$"};
+        const regex rxPort {"^\\d{2,5}$"};
+        const regex rxHelp {"^-[hH]$"};
+        const regex rxTest {"^test$", std::regex_constants::icase};  
         bool cont = true;
         for (INT32 n = 1; cont and n < argc; ++n)
         {
@@ -45,6 +46,7 @@ void TCP_Srv_Base::run(const INT32 argc, const CONST_C_STRING* const argv)
         for (INT32 n = 1; cont and n < argc; ++n)
         {
             if (regex_match(argv[n], rxPort)) port = static_cast<UINT16>(atoi(argv[n]));
+            else if (regex_match(argv[n], rxTest)) mTest = true;
             else cont = handleArg(argv[n]);
         }
         if (cont) run(port);
@@ -113,49 +115,52 @@ void TCP_Srv_Base::run(const UINT16 port)
         displayThreads();
     }
 
-    //  select and other tasks loop
-    while (ok)
+    if (not mTest)
     {
-
-    //  select and accept loop
-        bool clients = false;
-        do 
+        //  select and other tasks loop
+        while (ok)
         {
-            clients = false;
-            //  select
-            fd_set lset;
-            FD_ZERO(&lset);
-            FD_SET(listenSocket, &lset);
-            timeval tv { tmSec, tmMic};
-
-            if (select(listenSocket + 1, &lset, nullptr, nullptr, &tv) < 0)
-            {
-                cerr << "ERR listen select" << endl;
-                ok = false;
-            }
 
-
-            //  accept to new client socket if listen socket is set 
-            else if (FD_ISSET(listenSocket, &lset))
+        //  select and accept loop
+            bool clients = false;
+            do 
             {
-                SOCKET clientSocket = accept(listenSocket, nullptr, nullptr);
-
-                if (clientSocket < 0) 
+                clients = false;
+                //  select
+                fd_set lset;
+                FD_ZERO(&lset);
+                FD_SET(listenSocket, &lset);
+                timeval tv { tmSec, tmMic};
+
+                if (select(listenSocket + 1, &lset, nullptr, nullptr, &tv) < 0)
                 {
-                    cerr << "ERR accept" << endl;
+                    cerr << "ERR listen select" << endl;
                     ok = false;
                 }
-                //  start thread with client socket
-                else
+
+
+                //  accept to new client socket if listen socket is set 
+                else if (FD_ISSET(listenSocket, &lset))
                 {
-                    startThread(clientSocket);
-                    clients = true;
+                    SOCKET clientSocket = accept(listenSocket, nullptr, nullptr);
+
+                    if (clientSocket < 0) 
+                    {
+                        cerr << "ERR accept" << endl;
+                        ok = false;
+                    }
+                    //  start thread with client socket
+                    else
+                    {
+                        startThread(clientSocket);
+                        clients = true;
+                    }
                 }
-            }
-        } while (clients);
+            } while (clients);
 
-        //  other tasks
-        otherTasks();
+            //  other tasks
+            otherTasks();
+        }
     }
     //  only reached in case of error: clean up
     if (listenSocket >= 0)

code/TCP_Srv_Base.h

@@ -77,16 +77,18 @@ class TCP_Srv_Base
 private:
     //  default port
     constexpr static UINT16 defPort = 8080;
-    //  client thread method
-    void handleClient(SOCKET clientSocket, UINT32 nr);
     //  thread count
     UINT32 mCnt = 0;
     //  thread number
     UINT32 mNum = 0;
     //  mutex for thread count and number
     std::mutex mMtxStat;
+    //  just bind test
+    bool mTest = false;
     //  start thread with increased thread number and count
     void startThread(SOCKET clientSocket);
+    //  client thread method
+    void handleClient(SOCKET clientSocket, UINT32 nr);
     //  decrease thread count, reset thread number when count is 0    
     void endOfThread();
     //  display current number of threads

code/TCP_Srv_Echo_main.cpp

@@ -8,6 +8,6 @@ int main(const INT32 argc, const CONST_C_STRING* const argv)
 {
     TCP_Srv_Echo srv;
     srv.run(argc, argv);
-    //  only reached in case of failure
-    return 1;
+    //  reached in case of test mode
+    return 0;
 }

make/build.sh

@@ -22,7 +22,7 @@ getcfgs()
 
 help()
 {
-    echo "Usage: $(basename $0) options [port] [locale]"
+    echo "Usage: $(basename $0) [options] [port] [locale]"
     echo "options:"
     echo "-c  clean ignored artifacts before"
     echo "-r  <config> run binary with [port] [locale]"
@@ -106,4 +106,4 @@ fi
 echo ""
 echo "starting $bin $*"
 echo ""
-$bin $*
+exec $bin $*

make/howto_build.md

@@ -36,7 +36,7 @@ TCP_Srv\make> premake5 vs2019
 ````
 ### 2) build executables in VS
 - open solution (TCP_Srv/make/EchoSrv.sln)
-- select a configuration (see also header of premake5.lua)
+- select a configuration (see also header of [premake5.lua](premake5.lua))
 - build (and run)
 
 ### 3) VS keyboard shortcuts