kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add a way to run in blocking more, which is useful for server mode to have N*thread instead of 2N*thread for N connections

Browse Source
This commit is contained in:
Benjamin Sergeant
2019-01-01 21:25:15 -08:00
parent 946d7015a2
commit 1bc5bc7f1c
5 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ixwebsocket/IXWebSocketServer.cpp
View File

@ -130,11 +130,16 @@ namespace ix
_conditionVariable.wait(lock);
}
// FIXME: we should cancel all the async per connections tasks
void WebSocketServer::stop()
{
if (!_thread.joinable()) return; // nothing to do
auto clients = getClients();
for (auto client : clients)
{
client->close();
}
_stop = true;
_thread.join();
_stop = false;
@ -187,20 +192,19 @@ namespace ix
}
}
//
// FIXME: make sure we never run into reconnectPerpetuallyIfDisconnected
//
void WebSocketServer::handleConnection(int fd)
{
std::shared_ptr<WebSocket> webSocket(new WebSocket);
_onConnectionCallback(webSocket);
webSocket->disableAutomaticReconnection();
// Add this client to our client set
{
std::lock_guard<std::mutex> lock(_clientsMutex);
_clients.insert(webSocket);
}
webSocket->start();
auto status = webSocket->connectToSocket(fd);
if (!status.success)
{
@ -211,16 +215,17 @@ namespace ix
return;
}
// We can do better than this busy loop, with a condition variable.
while (webSocket->isConnected())
{
std::chrono::duration<double, std::milli> wait(10);
std::this_thread::sleep_for(wait);
}
// Process incoming messages and execute callbacks
// until the connection is closed
webSocket->run();
// Remove this client from our client set
{
std::lock_guard<std::mutex> lock(_clientsMutex);
_clients.erase(webSocket);
if (_clients.erase(webSocket) != 1)
{
logError("Cannot delete client");
}
}
logInfo("WebSocketServer::handleConnection() done");