jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

agent: Fix possible race conditions

Browse Source 
Change-Id: Ie6c21d1505f218a0de3bf79aec4565fc3713a922
This commit is contained in:
Olivier Dion
2021-08-13 09:41:49 -04:00
parent c6b84d3955
commit 66d5d95557
1 changed files with 71 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
test/agent/agent.cpp
View File

@ -57,8 +57,9 @@ Agent::ping(const std::string& conversation)
{
LOG_AGENT_STATE();
auto cv = std::make_shared<std::condition_variable>();
auto pongReceived = std::make_shared<std::atomic_bool>(false);
std::mutex mtx;
std::condition_variable cv;
std::atomic<bool> pongReceived(false);
std::string alphabet = "0123456789ABCDEF";
std::string messageSent;
@ -67,7 +68,7 @@ Agent::ping(const std::string& conversation)
messageSent.push_back(alphabet[rand() % alphabet.size()]);
}
onMessageReceived_.add([=](const std::string& /* accountID */,
onMessageReceived_.add([&](const std::string& /* accountID */,
const std::string& conversationID,
std::map<std::string, std::string> message) {
@ -77,14 +78,15 @@ Agent::ping(const std::string& conversation)
auto msg = message.at("body");
if (pongReceived->load()) {
if (pongReceived.load()) {
return false;
}
if (conversationID == conversation and message.at("author") != peerID_
and msg == "PONG:" + messageSent) {
*pongReceived = true;
cv->notify_one();
std::unique_lock lk(mtx);
pongReceived.store(true);
cv.notify_one();
return false;
}
@ -97,11 +99,10 @@ Agent::ping(const std::string& conversation)
/* Waiting for echo */
std::mutex mutex;
std::unique_lock<std::mutex> lck(mutex);
std::unique_lock<std::mutex> lk(mtx);
bool ret = std::cv_status::no_timeout == cv->wait_for(lck, std::chrono::seconds(30))
and pongReceived->load();
bool ret = (std::cv_status::no_timeout == cv.wait_for(lk, std::chrono::seconds(30)) and
pongReceived.load());
AGENT_INFO("Pong %s", ret ? "received" : "missing");
@ -142,20 +143,19 @@ Agent::placeCall(const std::string& contact)
{
LOG_AGENT_STATE();
auto cv = std::make_shared<std::condition_variable>();
std::mutex mtx;
std::condition_variable cv;
bool success(false);
bool over(false);
auto callID = DRing::placeCall(accountID_, contact);
auto success = std::make_shared<std::atomic<bool>>(false);
auto over = std::make_shared<std::atomic<bool>>(false);
std::string callID = "";
if (callID.empty()) {
return false;
}
onCallStateChanged_.add([=](const std::string& call_id, const std::string& state, signed code) {
onCallStateChanged_.add([&](const std::string& call_id, const std::string& state, signed code) {
AGENT_INFO("[call:%s] In state %s : %d", callID.c_str(), state.c_str(), code);
std::unique_lock lk(mtx);
if (call_id != callID) {
return true;
}
@ -163,39 +163,42 @@ Agent::placeCall(const std::string& contact)
bool ret = true;
if ("CURRENT" == state) {
success->store(true);
success = true;
} else if ("OVER" == state) {
over->store(true);
over = true;
ret = false;
}
cv->notify_one();
cv.notify_one();
return ret;
});
std::mutex mtx;
std::unique_lock<std::mutex> lck {mtx};
callID = DRing::placeCall(accountID_, contact);
AGENT_INFO("Waiting for call %s", callID.c_str());
/* TODO - Parametize me */
cv->wait_for(lck, std::chrono::seconds(30), [=]{
return success->load() or over->load();
});
{
std::unique_lock lk (mtx);
cv.wait_for(lk, std::chrono::seconds(30), [&]{
return success or over;
});
}
if (success->load()) {
if (success) {
AGENT_INFO("[call:%s] to %s: SUCCESS", callID.c_str(), contact.c_str());
DRing::hangUp(callID);
} else {
AGENT_INFO("[call:%s] to %s: FAIL", callID.c_str(), contact.c_str());
}
if (not over->load()) {
cv->wait_for(lck, std::chrono::seconds(30), [=] { return over->load(); });
if (not over) {
std::unique_lock lk (mtx);
cv.wait_for(lk, std::chrono::seconds(30), [&] { return over; });
}
return success->load();
return success;
}
void
@ -230,8 +233,37 @@ Agent::activate(bool state)
{
LOG_AGENT_STATE();
std::mutex mtx;
std::condition_variable cv;
bool done = false;
onVolatileDetailsChanged_.add([&](const std::string& accountID,
const std::map<std::string, std::string>& details) {
if (accountID_ != accountID) {
return true;
}
AGENT_INFO("Account is %s",
details.at(DRing::Account::VolatileProperties::ACTIVE).c_str());
std::unique_lock lk(mtx);
done = true;
cv.notify_one();
return false;
});
DRing::setAccountActive(accountID_, state);
std::unique_lock lk(mtx);
cv.wait_for(lk, std::chrono::seconds(10), [&]{
return done;
});
if (state) {
waitForAnnouncement();
}
@ -482,12 +514,11 @@ Agent::registerStaticCallbacks()
void
Agent::waitForAnnouncement(std::chrono::seconds timeout)
{
auto cv = std::make_shared<std::condition_variable>();
std::condition_variable cv;
std::mutex mtx;
std::unique_lock<std::mutex> lk {mtx};
onVolatileDetailsChanged_.add([=](const std::string& accountID,
onVolatileDetailsChanged_.add([&](const std::string& accountID,
const std::map<std::string, std::string>& details) {
if (accountID_ != accountID) {
@ -503,12 +534,16 @@ Agent::waitForAnnouncement(std::chrono::seconds timeout)
return true;
}
cv->notify_one();
std::unique_lock lk (mtx);
cv.notify_one();
return false;
});
AGENT_ASSERT(std::cv_status::no_timeout == cv->wait_for(lk, timeout),
std::unique_lock lk (mtx);
AGENT_ASSERT(std::cv_status::no_timeout == cv.wait_for(lk, timeout),
"Timeout while waiting for account announcement on DHT");
}