generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-25 10:09:36 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matej Kenda
2024-01-03 19:47:57 +01:00
parent 9a36adb979
commit 287befc4a3
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Net/testsuite/src/TCPServerTest.cpp
View File

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

7
NetSSL_OpenSSL/testsuite/src/TCPServerTest.cpp
View File

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

5
NetSSL_Win/testsuite/src/TCPServerTest.cpp
View File

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