review comments rework

sorgom · Apr 2, 2024 · b76ebdf · b76ebdf
1 parent 8ce9127
commit b76ebdf
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 8 deletions.
diff --git a/code/TCP_Srv_Base.cpp b/code/TCP_Srv_Base.cpp
@@ -187,6 +187,7 @@ void TCP_Srv_Base::startThread(SOCKET clientSocket)
     ++mCnt;
     ++mNum;
     std::thread(&TCP_Srv_Base::tm, this, clientSocket, mNum).detach();
+    displayThreads();
 }
 
 void TCP_Srv_Base::endOfThread()
@@ -200,5 +201,13 @@ void TCP_Srv_Base::endOfThread()
             mNum = 0;
             TRACE("--- no clients ---")
         }
+        displayThreads();
     }
+}
+
+void TCP_Srv_Base::displayThreads() const
+{
+#ifndef VERBOSE
+    cout << "threads:" << setw(6) << mCnt << '\r';
+#endif
 }
diff --git a/code/TCP_Srv_Base.h b/code/TCP_Srv_Base.h
@@ -42,9 +42,12 @@ class TCP_Srv_Base
     void run(INT32 argc, const CONST_C_STRING* argv);
 
 protected:
+    //  timeval seconds
     constexpr static UINT32 tmSec = SELECT_MILLI_SECONDS / 1000;
+    //  timeval microseconds
     constexpr static UINT32 tmMic = (SELECT_MILLI_SECONDS % 1000) * 1000;
-    constexpr static UINT32 buffSize = READ_BUFFER_SIZE;
+    //  (minimum) buffer size
+    constexpr static UINT32 buffSize = READ_BUFFER_SIZE < 4 ? 4 : READ_BUFFER_SIZE;
     using Buffer = CHAR[buffSize];
 
     //  process received data
@@ -68,6 +71,8 @@ class TCP_Srv_Base
     void startThread(SOCKET clientSocket);
     //  decrease thread count, reset thread number when count is 0    
     void endOfThread();
+    //  display current number of threads
+    void displayThreads() const;
 };
 
 #endif // _H
diff --git a/code/TCP_Srv_Echo.h b/code/TCP_Srv_Echo.h
@@ -14,8 +14,9 @@ class TCP_Srv_Echo : public TCP_Srv_Base
 public:
     inline TCP_Srv_Echo() = default;
 protected:
-    //  simple implementation of process: echo received data
-    //  trace received data if TRACE_ON is defined
+    //  simple implementation of process: 
+    //  - echo received data
+    //  - trace received data if VERBOSE is defined
     void process(const SOCKET clientSocket, Buffer buff, size_t size, UINT32 nr) final;
 };
 

diff --git a/make/TCP_Srv_Echo.make b/make/TCP_Srv_Echo.make
@@ -51,7 +51,7 @@ ALL_LDFLAGS += $(LDFLAGS) -pthread
 
 else ifeq ($(config),vsmall)
 OBJDIR = obj/gcc/vsmall
-DEFINES += -DDEBUG -DVERBOSE -DSELECT_MILLI_SECONDS=1000 -DREAD_BUFFER_SIZE=16
+DEFINES += -DDEBUG -DVERBOSE -DSELECT_MILLI_SECONDS=1000 -DREAD_BUFFER_SIZE=8
 ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O0 -g -std=c++17 -pedantic-errors -Werror -Wall
 ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O0 -g -std=c++17 -pedantic-errors -Werror -Wall
 ALL_LDFLAGS += $(LDFLAGS) -pthread

diff --git a/make/howto_build.md b/make/howto_build.md
@@ -13,7 +13,7 @@ $> make help
 Usage: make [config=name] [target]
 
 CONFIGURATIONS:
-  silent
+  prod
   verbose
   vsmall
 

diff --git a/make/premake5.lua b/make/premake5.lua
@@ -12,15 +12,14 @@
 --      - no optimization
 --  - vsmall:
 --      - same as verbose
---      - but with small buffer sizes (16 bytes)
+--      - but with small buffer sizes (8 bytes)
 --      - and long select timeout (1 second)
 --  ============================================================
 --  created by Manfred Sorgo
 
 workspace 'TCP_Srv_Echo'
     configurations { 'prod', 'verbose', 'vsmall' }
     language 'C++'
-    optimize 'On'
 
     project 'TCP_Srv_Echo'
         kind 'ConsoleApp'
@@ -40,7 +39,7 @@ workspace 'TCP_Srv_Echo'
             defines { 
                 'DEBUG', 'VERBOSE',
                 'SELECT_MILLI_SECONDS=1000',
-                'READ_BUFFER_SIZE=16'
+                'READ_BUFFER_SIZE=8'
              }
             symbols 'On'
             optimize 'Off'