From de3ed7e76f381460a7cee56b124d37a3615fb865 Mon Sep 17 00:00:00 2001
From: Jorge Camarero Vera <jorge.camarero@cern.ch>
Date: Fri, 12 Nov 2021 14:40:45 +0100
Subject: [PATCH] Remove helgrind_annotator
---
objectstore/AgentHeartbeatThread.cpp | 5 -----
objectstore/AgentReference.cpp | 11 -----------
scheduler/OStoreDB/MemQueues.hpp | 9 ---------
scheduler/OStoreDB/OStoreDB.cpp | 4 ----
4 files changed, 29 deletions(-)
diff --git a/objectstore/AgentHeartbeatThread.cpp b/objectstore/AgentHeartbeatThread.cpp
index 9a429e82d2..55dab36fef 100644
--- a/objectstore/AgentHeartbeatThread.cpp
+++ b/objectstore/AgentHeartbeatThread.cpp
@@ -24,15 +24,12 @@
#include "common/Timer.hpp"
#include "common/utils/utils.hpp"
-#include "common/helgrind_annotator.hpp"
-
namespace cta { namespace objectstore {
//------------------------------------------------------------------------------
// AgentHeartbeatThread::stopAndWaitThread
//------------------------------------------------------------------------------
void AgentHeartbeatThread::stopAndWaitThread() {
- ANNOTATE_HAPPENS_BEFORE(&m_exit);
m_exit.set_value();
wait();
}
@@ -57,8 +54,6 @@ void AgentHeartbeatThread::run() {
::exit(EXIT_FAILURE);
}
}
- ANNOTATE_HAPPENS_AFTER(&m_exit);
- ANNOTATE_HAPPENS_BEFORE_FORGET_ALL(&m_exit);
} catch (cta::exception::Exception & ex) {
log::ScopedParamContainer params(lc);
params.add("Message", ex.getMessageValue());
diff --git a/objectstore/AgentReference.cpp b/objectstore/AgentReference.cpp
index 45964115e5..0fd60ad86c 100644
--- a/objectstore/AgentReference.cpp
+++ b/objectstore/AgentReference.cpp
@@ -26,8 +26,6 @@
#include "common/exception/Errnum.hpp"
#include "common/utils/utils.hpp"
-#include "common/helgrind_annotator.hpp"
-
namespace cta { namespace objectstore {
std::atomic <uint64_t> AgentReference::g_nextAgentId(0);
@@ -61,7 +59,6 @@ m_logger(logger) {
threading::MutexLocker ml(m_currentQueueMutex);
m_nextQueueExecutionPromise.reset(new std::promise<void>);
m_nextQueueExecutionFuture = m_nextQueueExecutionPromise->get_future();
- ANNOTATE_HAPPENS_BEFORE(m_nextQueueExecutionPromise.get());
m_nextQueueExecutionPromise->set_value();
}
@@ -115,8 +112,6 @@ void AgentReference::queueAndExecuteAction(std::shared_ptr<Action> action, objec
ulQueue.unlock();
ulGlobal.unlock();
actionFuture.get();
- ANNOTATE_HAPPENS_AFTER(&action->promise);
- ANNOTATE_HAPPENS_BEFORE_FORGET_ALL(&action->promise);
} else {
// There is no queue, so we need to create and serve it ourselves.
// To make sure there is no lifetime issues, we make it a shared_ptr
@@ -139,8 +134,6 @@ void AgentReference::queueAndExecuteAction(std::shared_ptr<Action> action, objec
// Wait for previous queue to complete so we will not contend with other threads while
// updating the object store.
futureForThisQueue.get();
- ANNOTATE_HAPPENS_AFTER(promiseForThisQueue.get());
- ANNOTATE_HAPPENS_BEFORE_FORGET_ALL(promiseForThisQueue.get());
// Make sure we are not listed anymore as the queue taking jobs.
// We should still be the listed queue
ulGlobal.lock();
@@ -215,24 +208,20 @@ void AgentReference::queueAndExecuteAction(std::shared_ptr<Action> action, objec
// We avoid global log (with a count) as we would get one for each heartbeat.
} catch (...) {
// Something wend wrong: , we release the next batch of changes
- ANNOTATE_HAPPENS_BEFORE(promiseForNextQueue.get());
promiseForNextQueue->set_value();
// We now pass the exception to all threads
for (auto a: q->queue) {
threading::MutexLocker ml(a->mutex);
- ANNOTATE_HAPPENS_BEFORE(&a->promise);
a->promise.set_exception(std::current_exception());
}
// And to our own caller
throw;
}
// Things went well. We pass the token to the next queue
- ANNOTATE_HAPPENS_BEFORE(promiseForNextQueue.get());
promiseForNextQueue->set_value();
// and release the other threads
for (auto a: q->queue) {
threading::MutexLocker ml(a->mutex);
- ANNOTATE_HAPPENS_BEFORE(&a->promise);
a->promise.set_value();
}
}
diff --git a/scheduler/OStoreDB/MemQueues.hpp b/scheduler/OStoreDB/MemQueues.hpp
index c24b664ea8..22319d8f0c 100644
--- a/scheduler/OStoreDB/MemQueues.hpp
+++ b/scheduler/OStoreDB/MemQueues.hpp
@@ -32,8 +32,6 @@
#include "objectstore/RetrieveQueue.hpp"
#include "objectstore/RetrieveRequest.hpp"
-#include "common/helgrind_annotator.hpp"
-
namespace cta {
// Forward declaration
class OStoreDB;
@@ -73,7 +71,6 @@ SharedQueueLock<Queue, Request>::~SharedQueueLock() {
double queueUnlockTime = m_timer.secs(utils::Timer::resetCounter);
// The next update of the queue can now proceed
if (m_promiseForSuccessor.get()) {
- ANNOTATE_HAPPENS_BEFORE(m_promiseForSuccessor.get());
m_promiseForSuccessor->set_value();
} else {
m_logContext.log(log::ERR, "In SharedQueueLock::~SharedQueueLock(): the promise was not present. Skipping value setting.");
@@ -232,8 +229,6 @@ std::shared_ptr<SharedQueueLock<Queue, Request>> MemQueue<Request, Queue>::share
globalLock.unlock();
// Wait for our request completion (this could throw, if there was a problem)
resultFuture.get();
- ANNOTATE_HAPPENS_AFTER(&maqr->m_promise);
- ANNOTATE_HAPPENS_BEFORE_FORGET_ALL(&maqr->m_promise);
auto ret=maqr->m_returnValue;
__attribute__((unused)) auto debugMaqr=maqr.get();
maqr.reset();
@@ -271,8 +266,6 @@ std::shared_ptr<SharedQueueLock<Queue, Request>> MemQueue<Request, Queue>::share
// Wait on out future, if necessary
if (promiseFromPredecessor.get()) {
futureFromPredecessor.get();
- ANNOTATE_HAPPENS_AFTER(promiseFromPredecessor.get());
- ANNOTATE_HAPPENS_BEFORE_FORGET_ALL(promiseFromPredecessor.get());
}
// We are now clear to update the queue in object store.
// Re-take the global and make sure the queue is not referenced anymore.
@@ -356,7 +349,6 @@ std::shared_ptr<SharedQueueLock<Queue, Request>> MemQueue<Request, Queue>::share
for (auto &maqr: maq->m_requests) {
{
threading::MutexLocker (maqr->m_mutex);
- ANNOTATE_HAPPENS_BEFORE(&maqr->m_promise);
maqr->m_returnValue=ret;
maqr->m_promise.set_value();
}
@@ -382,7 +374,6 @@ std::shared_ptr<SharedQueueLock<Queue, Request>> MemQueue<Request, Queue>::share
for (auto & maqr: maq->m_requests) {
try {
threading::MutexLocker (maqr->m_mutex);
- ANNOTATE_HAPPENS_BEFORE(&maqr->m_promise);
maqr->m_promise.set_exception(std::current_exception());
} catch (...) {
exceptionsNotPassed++;
diff --git a/scheduler/OStoreDB/OStoreDB.cpp b/scheduler/OStoreDB/OStoreDB.cpp
index e5d1fdb93f..ca30397a01 100644
--- a/scheduler/OStoreDB/OStoreDB.cpp
+++ b/scheduler/OStoreDB/OStoreDB.cpp
@@ -137,9 +137,7 @@ void OStoreDB::EnqueueingWorkerThread::run() {
while (true) {
std::unique_ptr<EnqueueingTask> et(m_enqueueingTasksQueue.pop());
if (!et.get()) break;
- ANNOTATE_HAPPENS_AFTER(et.get());
(*et)();
- ANNOTATE_HAPPENS_BEFORE_FORGET_ALL(et.get());
}
}
@@ -900,7 +898,6 @@ std::string OStoreDB::queueArchive(const std::string &instanceName, const cta::c
+ agOwnershipResetTime);
logContext.log(log::INFO, "In OStoreDB::queueArchive_bottomHalf(): Finished enqueueing request.");
});
- ANNOTATE_HAPPENS_BEFORE(et);
mlForHelgrind.unlock();
m_enqueueingTasksQueue.push(et);
double taskPostingTime = timer.secs(cta::utils::Timer::reset_t::resetCounter);
@@ -1392,7 +1389,6 @@ SchedulerDatabase::RetrieveRequestInfo OStoreDB::queueRetrieve(cta::common::data
+ rUnlockTime + agOwnershipResetTime);
logContext.log(log::INFO, "In OStoreDB::queueRetrieve_bottomHalf(): added job to queue (enqueueing finished).");
});
- ANNOTATE_HAPPENS_BEFORE(et);
mlForHelgrind.unlock();
m_enqueueingTasksQueue.push(et);
double taskPostingTime = timer.secs(cta::utils::Timer::reset_t::resetCounter);
--
GitLab