Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix server empty thread name #478

Merged
merged 1 commit into from
Aug 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion ixwebsocket/IXWebSocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ namespace ix
, _enablePong(kDefaultEnablePong)
, _pingIntervalSecs(kDefaultPingIntervalSecs)
, _pingType(SendMessageKind::Ping)
, _autoThreadName(true)
{
_ws.setOnCloseCallback(
[this](uint16_t code, const std::string& reason, size_t wireSize, bool remote)
Expand Down Expand Up @@ -370,7 +371,10 @@ namespace ix

void WebSocket::run()
{
setThreadName(getUrl());
if (_autoThreadName)
{
setThreadName(getUrl());
}

bool firstConnectionAttempt = true;

Expand Down Expand Up @@ -627,4 +631,9 @@ namespace ix
std::lock_guard<std::mutex> lock(_configMutex);
return _subProtocols;
}

void WebSocket::setAutoThreadName(bool enabled)
{
_autoThreadName = enabled;
}
} // namespace ix
5 changes: 5 additions & 0 deletions ixwebsocket/IXWebSocket.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ namespace ix
uint32_t getMinWaitBetweenReconnectionRetries() const;
const std::vector<std::string>& getSubProtocols();

void setAutoThreadName(bool enabled);

private:
WebSocketSendInfo sendMessage(const IXWebSocketSendData& message,
SendMessageKind sendMessageKind,
Expand Down Expand Up @@ -182,6 +184,9 @@ namespace ix
// Subprotocols
std::vector<std::string> _subProtocols;

// enable or disable auto set thread name
bool _autoThreadName;

friend class WebSocketServer;
};
} // namespace ix
3 changes: 3 additions & 0 deletions ixwebsocket/IXWebSocketServer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ namespace ix
setThreadName("Srv:ws:" + connectionState->getId());

auto webSocket = std::make_shared<WebSocket>();

webSocket->setAutoThreadName(false);

if (_onConnectionCallback)
{
_onConnectionCallback(webSocket, connectionState);
Expand Down
Loading