Revert "[alf] Temporarily revert parallel SC commits"

This reverts commit c2b2304.

Author: kostorr

CMakeLists.txt

@@ -67,6 +67,7 @@ find_package(Common REQUIRED)
 find_package(ReadoutCard REQUIRED)
 find_package(LLA REQUIRED)
 find_package(DIM REQUIRED)
+find_package(DimRpcParallel REQUIRED)
 
 if(NOT APPLE)
   find_package(Python3 3.6 COMPONENTS Interpreter Development)
@@ -127,6 +128,7 @@ target_link_libraries(ALF
     ${LINK_LIBS}
   PRIVATE
     dim::dim
+    DimRpcParallel 
 )
 
 set_target_properties(ALF
@@ -176,6 +178,7 @@ foreach(i RANGE ${count})
     PRIVATE
       ALF
       dim::dim
+      DimRpcParallel
   )
 endforeach()
 

apps/Alf.cxx

@@ -58,6 +58,9 @@ class Alf : public AliceO2::Common::Program
     options.add_options()("no-fw-check",
                           po::bool_switch(&mOptions.noFirmwareCheck)->default_value(false),
                           "Disable firmware compatibility check");
+    options.add_options()("sequential",
+                          po::bool_switch(&mOptions.sequentialRpcs)->default_value(false),
+                          "Switch to force DIM RPCs to be executed sequentially");
   }
 
   virtual void run(const po::variables_map&) override
@@ -126,7 +129,7 @@ class Alf : public AliceO2::Common::Program
           Logger::get() << link.alfId << " " << link.serialId << " " << link.linkId << LogDebugDevel << endm;
         }
       }
-      alfServer.makeRpcServers(links);
+      alfServer.makeRpcServers(links, mOptions.sequentialRpcs);
     }
 
     // main thread
@@ -139,6 +142,7 @@ class Alf : public AliceO2::Common::Program
   struct OptionsStruct {
     std::string dimDnsNode = "";
     bool noFirmwareCheck = false;
+    bool sequentialRpcs = false;
   } mOptions;
 };
 

src/AlfServer.cxx

@@ -543,13 +543,15 @@ std::vector<std::pair<Ic::Operation, Ic::Data>> AlfServer::parseStringToIcPairs(
   return pairs;
 }
 
-void AlfServer::makeRpcServers(std::vector<AlfLink> links)
+void AlfServer::makeRpcServers(std::vector<AlfLink> links, bool sequentialRpcs)
 {
   for (auto& link : links) {
+    // Set a unique parallel dim rpc bank for every link
+    int parallelDimRpcBank = sequentialRpcs ? 0 : (link.serialId.getSerial() * 100) + link.rawLinkId;
 
     // Function to create RPC server
     auto makeServer = [&](std::string name, auto callback) {
-      return std::make_unique<StringRpcServer>(name, callback);
+      return std::make_unique<StringRpcServer>(name, callback, parallelDimRpcBank);
     };
 
     // Object for generating DNS names for the AlfLink

src/AlfServer.h

@@ -48,7 +48,7 @@ class AlfServer
 {
  public:
   AlfServer();
-  void makeRpcServers(std::vector<AlfLink> links);
+  void makeRpcServers(std::vector<AlfLink> links, bool sequentialRpcs = false);
 
  private:
   std::string scaBlobWrite(const std::string& parameter, AlfLink link);

src/DimServices/DimServices.h

@@ -26,6 +26,8 @@
 #include <dim/dis.hxx>
 #include <string>
 
+#include <DimRpcParallel/dimrpcparallel.h>
+
 #include "Alf/Exception.h"
 #include "Alf/Common.h"
 #include "ReadoutCard/Register.h"
@@ -64,13 +66,13 @@ bool isSuccess(const std::string& str);
 bool isFailure(const std::string& str);
 std::string stripPrefix(const std::string& str);
 
-class StringRpcServer : public DimRpc
+class StringRpcServer : public DimRpcParallel
 {
  public:
   using Callback = std::function<std::string(const std::string&)>;
 
-  StringRpcServer(const std::string& serviceName, Callback callback)
-    : DimRpc(serviceName.c_str(), "C", "C"), mCallback(callback), mServiceName(serviceName)
+  StringRpcServer(const std::string& serviceName, Callback callback, int bank)
+    : DimRpcParallel(serviceName.c_str(), "C", "C", bank), mCallback(callback), mServiceName(serviceName)
   {
   }