fix serialport loss message when send too fast

TarsCloud · Feb 25, 2025 · 9560953 · 9560953
1 parent c9d4363
commit 9560953
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 11 deletions.
diff --git a/unit-test/util/test_tc_serialport.cpp b/unit-test/util/test_tc_serialport.cpp
@@ -60,7 +60,7 @@ class SerialPortCallback : public TC_SerialPort::RequestCallback
 	}
     void onHeartbeat()
     {
-        LOG_CONSOLE_DEBUG << "onHeartbeat" << endl;
+        // LOG_CONSOLE_DEBUG << "onHeartbeat" << endl;
     }
     std::shared_ptr<TC_SerialPort> _serialPort;
 };
@@ -95,7 +95,7 @@ class AsyncSerialPortCallback : public TC_SerialPort::RequestCallback
 
     void onHeartbeat()
     {
-        cout << "onHeartbeat" << endl;
+        // cout << "onHeartbeat" << endl;
     }
 };
 
@@ -251,29 +251,35 @@ TEST_F(UtilSerialPortTest, test2)
 
         shared_ptr<TC_SerialPort> serialPort = serialPortGroup.create(options, onParser2, make_shared<AsyncSerialPortCallback>());
         // string msg_send = {0x2f,0x44,0x1f,0x1f,0x1f,0x23};		
-        const vector<uint8_t> query_version = {0x2f,0x0b, 0x00, 0x00, 0x00, 0x01, 0x63, 0x1f,0x1f,0x01,0x23};		
+        vector<uint8_t> set_speed = {0x2f,0x0b, 0x00, 0x00, 0x00, 0x01, 0x45, 0x59,0x18,0x01,0x23};		
 
-        // string msg_send = {0x2f,0x47,0x57,0x00,0x01,0x23};
-
-    // 7e000801000201abcd
-        while(true)
+        uint8_t id = 0;
+        int count = 20;
+        while(--count > 0)
         {
             try
             {
                 int64_t start = TC_Common::now2ms();
                 std::unique_lock<std::mutex> lock(mtx);
-                serialPort->sendRequest((const char *)query_version.data(), query_version.size());
-                cnd.wait_for(lock, std::chrono::seconds(3));
+                set_speed[5] = ++id;
+                serialPort->sendRequest((const char *)set_speed.data(), set_speed.size());
+                // cnd.wait_for(lock, std::chrono::seconds(3));
 
-                LOG_CONSOLE_DEBUG << "cost: " << TC_Common::now2ms() - start << endl;
+                // LOG_CONSOLE_DEBUG << "cost: " << TC_Common::now2ms() - start << endl;
             }
             catch(const std::exception& ex)
             {
                 cout << "ex: " << ex.what() << endl;
             }
 
-            TC_Common::sleep(1);
+            // TC_Common::sleep(1);
         }
+
+        TC_Common::sleep(5);
+
+        serialPortGroup.erase(serialPort);
+        serialPortGroup.terminate();
+
 	}
 	catch(const std::exception& e)
 	{

diff --git a/util/src/tc_serialport.cpp b/util/src/tc_serialport.cpp
@@ -944,6 +944,18 @@ int TC_SerialPort::send(const void *buf, uint32_t len)
 		return 0;
 	}
 
+	DWORD  dwErrorFlags;
+	COMSTAT comStat;
+	DWORD dwBytesRead;
+
+	ClearCommError( _serialFd, &dwErrorFlags, &comStat );
+
+	if(comStat.cbOutQue >= 5)
+	{
+		//发送太快，等待1ms
+		TC_Common::msleep(1);
+	}
+
 	unsigned long dwBytesWritten = 0;
 	bool bWriteStat = WriteFile(_serialFd, buf, len, &dwBytesWritten, &_osWrite);
 	bool isPending = TC_Socket::isPending() ;