فهرست منبع

fix(test): lock std:cerr to prevent data race in TCP server tests (reported by clang thread sanitizer) #4313

Matej Kenda 2 سال پیش
والد
کامیت
287befc4a3

+ 6 - 1
Net/testsuite/src/TCPServerTest.cpp

@@ -18,6 +18,7 @@
 #include "Poco/Net/StreamSocket.h"
 #include "Poco/Net/ServerSocket.h"
 #include "Poco/Thread.h"
+#include "Poco/Mutex.h"
 #include <iostream>
 
 
@@ -35,6 +36,8 @@ using Poco::Thread;
 
 namespace
 {
+	static Poco::FastMutex cerrMutex;
+
 	class EchoConnection: public TCPServerConnection
 	{
 	public:
@@ -55,8 +58,10 @@ namespace
 					n = ss.receiveBytes(buffer, sizeof(buffer));
 				}
 			}
-			catch (Poco::Exception& exc)
+			catch (const Poco::Exception& exc)
 			{
+				Poco::FastMutex::ScopedLock l(cerrMutex);
+
 				std::cerr << "EchoConnection: " << exc.displayText() << std::endl;
 			}
 		}

+ 6 - 1
NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp

@@ -25,6 +25,7 @@
 #include "Poco/Util/Application.h"
 #include "Poco/Util/AbstractConfiguration.h"
 #include "Poco/Thread.h"
+#include "Poco/Mutex.h"
 #include <iostream>
 
 
@@ -46,6 +47,8 @@ using Poco::Util::Application;
 
 namespace
 {
+	static Poco::FastMutex cerrMutex;
+
 	class EchoConnection: public TCPServerConnection
 	{
 	public:
@@ -66,8 +69,10 @@ namespace
 					n = ss.receiveBytes(buffer, sizeof(buffer));
 				}
 			}
-			catch (Poco::Exception& exc)
+			catch (const Poco::Exception& exc)
 			{
+				Poco::FastMutex::ScopedLock l(cerrMutex);
+
 				std::cerr << "EchoConnection: " << exc.displayText() << std::endl;
 			}
 		}

+ 5 - 0
NetSSL_Win/testsuite/src/TCPServerTest.cpp

@@ -23,6 +23,7 @@
 #include "Poco/Util/Application.h"
 #include "Poco/Util/AbstractConfiguration.h"
 #include "Poco/Thread.h"
+#include "Poco/Mutex.h"
 #include <iostream>
 
 
@@ -44,6 +45,8 @@ using Poco::Util::Application;
 
 namespace
 {
+	static Poco::FastMutex cerrMutex;
+
 	class EchoConnection: public TCPServerConnection
 	{
 	public:
@@ -66,6 +69,8 @@ namespace
 			}
 			catch (Poco::Exception& exc)
 			{
+				Poco::FastMutex::ScopedLock l(cerrMutex);
+
 				std::cerr << "EchoConnection: " << exc.displayText() << std::endl;
 			}
 		}