Skip to content

DPL: fix multithreading issues in WS driver #5537

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.

Sign up for GitHub

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

Merged
ktf merged 1 commit into from
Feb 24, 2021
Merged

DPL: fix multithreading issues in WS driver #5537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions Framework/Core/src/DPLWebSocket.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "Framework/DeviceSpec.h"
#include "HTTPParser.h"
#include <algorithm>
#include <atomic>
#include <uv.h>
#include <sys/types.h>
#include <unistd.h>
Expand Down
5 changes: 3 additions & 2 deletions Framework/Core/src/DPLWebSocket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <string>
#include <map>
#include <functional>
#include <atomic>

class uv_stream_s;

Expand Down Expand Up @@ -70,11 +71,11 @@ struct WSDPLClient : public HTTPParser {
/// Dump headers
void dumpHeaders();
void sendHandshake();
bool isConnected() { return mHandshaken; }
bool isHandshaken() { return mHandshaken; }

std::string mNonce;
DeviceSpec const& mSpec;
bool mHandshaken = false;
std::atomic<bool> mHandshaken = false;
std::function<void()> mHandshake;
uv_stream_t* mStream = nullptr;
std::map<std::string, std::string> mHeaders;
Expand Down
12 changes: 7 additions & 5 deletions Framework/Core/src/WSDriverClient.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ void on_connect(uv_connect_t* connection, int status)
auto onHandshake = [client]() {
client->flushPending();
};
std::lock_guard<std::mutex> lock(client->mutex());
client->setDPLClient(std::make_unique<WSDPLClient>(connection->handle, client->spec(), onHandshake));
client->sendHandshake();
}
Expand Down Expand Up @@ -62,6 +63,7 @@ void sendMessageToDriver(std::unique_ptr<o2::framework::WSDPLClient>& client, ch
void WSDriverClient::setDPLClient(std::unique_ptr<WSDPLClient> client)
{
mClient = std::move(client);
mConnected = true;
}

void WSDriverClient::sendHandshake()
Expand All @@ -76,23 +78,23 @@ void WSDriverClient::observe(const char*, std::function<void(char const*)>)

void WSDriverClient::tell(const char* msg, size_t s, bool flush)
{
static std::mutex tellMutex;
std::lock_guard<std::mutex> guard(tellMutex);

static bool printed1 = false;
static bool printed2 = false;
if (mClient && mClient->isConnected() && flush) {
if (mConnected && mClient->isHandshaken() && flush) {
flushPending();
std::lock_guard<std::mutex> lock(mClientMutex);
std::vector<uv_buf_t> outputs;
encode_websocket_frames(outputs, msg, s, WebSocketOpCode::Binary, 0);
mClient->write(outputs);
} else {
std::lock_guard<std::mutex> lock(mClientMutex);
encode_websocket_frames(mBacklog, msg, s, WebSocketOpCode::Binary, 0);
}
}

void WSDriverClient::flushPending()
{
std::lock_guard<std::mutex> lock(mClientMutex);
static bool printed1 = false;
static bool printed2 = false;
if (!mClient) {
Expand All @@ -104,7 +106,7 @@ void WSDriverClient::flushPending()
}
return;
}
if (!(mClient->isConnected())) {
if (!(mClient->isHandshaken())) {
if (mBacklog.size() > 1000) {
if (!printed2) {
LOG(WARNING) << "Unable to communicate with driver because client is not connected";
Expand Down
7 changes: 6 additions & 1 deletion Framework/Core/src/WSDriverClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
#include <memory>
#include <string>
#include <vector>
#include <mutex>
#include <atomic>

typedef struct uv_connect_s uv_connect_t;

Expand All @@ -42,10 +44,13 @@ class WSDriverClient : public DriverClient
DeviceSpec const& spec() { return mSpec; }
// Initiate a websocket session
void sendHandshake();
std::mutex& mutex() { return mClientMutex; }

private:
// Whether or not we managed to connect.
std::atomic<bool> mConnected = false;
std::mutex mClientMutex;
DeviceSpec const& mSpec;
bool mConnected = false;
std::vector<uv_buf_t> mBacklog;
uv_connect_t* mConnection = nullptr;
std::unique_ptr<WSDPLClient> mClient;
Expand Down