Merge pull request #67 from freidt/master

Bug fix for adding timeout to the implicit locking for SWT and SCA
AliceO2Group · Dec 14, 2023 · b5a46a7 · b5a46a7
2 parents dfc9829 + 43f4bf0
commit b5a46a7
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/AlfServer.cxx b/src/AlfServer.cxx
@@ -74,12 +74,14 @@ std::string AlfServer::scaBlobWrite(const std::string& parameter, AlfLink link)
   Sca sca = Sca(link, mSessions[link.serialId]);
 
   bool lock = false;
+  int lockTimeout = 0;
   // Check if the operation should be locked
   if (scaPairs[0].first == Sca::Operation::Lock) {
+    lockTimeout = boost::get<int>(scaPairs[0].second);
     scaPairs.erase(scaPairs.begin());
     lock = true;
   }
-  return sca.writeSequence(scaPairs, lock);
+  return sca.writeSequence(scaPairs, lock, lockTimeout);
 }
 
 std::string AlfServer::scaMftPsuBlobWrite(const std::string& parameter, AlfLink link)
@@ -105,12 +107,14 @@ std::string AlfServer::swtBlobWrite(const std::string& parameter, AlfLink link)
   Swt swt = Swt(link, mSessions[link.serialId], mSwtWordSize);
 
   bool lock = false;
+  int lockTimeout = 0;
   // Check if the operation should be locked
   if (swtPairs[0].first == Swt::Operation::Lock) {
-    swtPairs.erase(swtPairs.begin());
+    lockTimeout = boost::get<int>(swtPairs[0].second);
     lock = true;
+    swtPairs.erase(swtPairs.begin());
   }
-  return swt.writeSequence(swtPairs, lock);
+  return swt.writeSequence(swtPairs, lock, lockTimeout);
 }
 
 std::string AlfServer::icBlobWrite(const std::string& parameter, AlfLink link)