From f66c3f9cf58105242339690ae280c85226cb35ba Mon Sep 17 00:00:00 2001
From: Cedric CAFFY <cedric.caffy@cern.ch>
Date: Mon, 2 Mar 2020 10:24:28 +0100
Subject: [PATCH] Used one mutex instead of 4 in RecallReportPacker
---
.../tape/tapeserver/daemon/RecallReportPacker.cpp | 10 +++++-----
.../tape/tapeserver/daemon/RecallReportPacker.hpp | 8 +-------
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.cpp b/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.cpp
index 2207dcd0cd..16fa55552f 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.cpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.cpp
@@ -396,22 +396,22 @@ void RecallReportPacker::fullCheckAndFinishAsyncExecute() {
//reportTapeDone()
//------------------------------------------------------------------------------
void RecallReportPacker::setTapeDone() {
- cta::threading::MutexLocker mutexLocker(m_mutexTapeDone);
+ cta::threading::MutexLocker mutexLocker(m_mutex);
m_tapeThreadComplete = true;
}
void RecallReportPacker::setTapeComplete(){
- cta::threading::MutexLocker mutexLocker(m_mutexSetTapeComplete);
+ cta::threading::MutexLocker mutexLocker(m_mutex);
m_retrieveMount->tapeComplete();
}
void RecallReportPacker::setDiskComplete(){
- cta::threading::MutexLocker mutexLocker(m_mutexSetDiskComplete);
+ cta::threading::MutexLocker mutexLocker(m_mutex);
m_retrieveMount->diskComplete();
}
bool RecallReportPacker::isDiskDone(){
- cta::threading::MutexLocker mutexLocker(m_mutexDiskDone);
+ cta::threading::MutexLocker mutexLocker(m_mutex);
return m_diskThreadComplete;
}
@@ -419,7 +419,7 @@ bool RecallReportPacker::isDiskDone(){
//reportDiskDone()
//------------------------------------------------------------------------------
void RecallReportPacker::setDiskDone() {
- cta::threading::MutexLocker mutexLocker(m_mutexDiskDone);
+ cta::threading::MutexLocker mutexLocker(m_mutex);
m_diskThreadComplete = true;
}
diff --git a/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.hpp b/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.hpp
index 25b4e76869..0ec6868ac9 100644
--- a/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.hpp
+++ b/tapeserver/castor/tape/tapeserver/daemon/RecallReportPacker.hpp
@@ -233,13 +233,7 @@ private:
*/
bool m_diskThreadComplete;
- cta::threading::Mutex m_mutexSetTapeComplete;
-
- cta::threading::Mutex m_mutexSetDiskComplete;
-
- cta::threading::Mutex m_mutexDiskDone;
-
- cta::threading::Mutex m_mutexTapeDone;
+ cta::threading::Mutex m_mutex;
/*
* Proceed finish procedure for async execute for all reports.
--
GitLab