Use the hostname as ALF_ID (#8)

Author: kostorr

apps/ProgramAlf.cxx

@@ -14,6 +14,8 @@
 /// \author Pascal Boeschoten ([email protected])
 /// \author Kostas Alexopoulos ([email protected])
 
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/asio.hpp>
 #include <cstdlib>
 
 #include "AlfServer.h"
@@ -24,6 +26,7 @@
 #include "ReadoutCard/CardFinder.h"
 #include "ReadoutCard/ChannelFactory.h"
 
+namespace ip = boost::asio::ip;
 namespace po = boost::program_options;
 
 namespace AliceO2
@@ -49,9 +52,7 @@ class ProgramAlf : public AliceO2::Common::Program
   {
     options.add_options()("dim-dns-node",
                           po::value<std::string>(&mOptions.dimDnsNode)->default_value(""),
-                          "The DIM DNS node to set the env var if not already set")("alf-id",
-                                                                                    po::value<int>(&mOptions.alfId)->default_value(-1),
-                                                                                    "The ALF ID");
+                          "The DIM DNS node to set the env var if not already set");
   }
 
   virtual void run(const po::variables_map&) override
@@ -71,22 +72,12 @@ class ProgramAlf : public AliceO2::Common::Program
       BOOST_THROW_EXCEPTION(AlfException() << ErrorInfo::Message("DIM_DNS_NODE env variable not set, and no relevant argument provided.")); // InfoLogger and errors?
     }
 
-    int alfId;
-
-    if (const char* alfIdString = std::getenv("ALF_ID")) {
-      getLogger() << "Setting ALF_ID from argument." << endm;
-      alfId = mOptions.alfId;
-      getLogger() << "ALF_ID=" << alfId << endm;
-    } else {
-      getLogger() << "Picked up ALF_ID from the environment." << endm;
-      getLogger() << "ALF_ID=" << alfIdString << endm;
-      alfId = atoi(alfIdString);
-    }
-
+    std::string alfId = ip::host_name();
+    boost::to_upper(alfId);
 
     getLogger() << "Starting the DIM Server" << endm;
     DimServer::setDnsNode(mOptions.dimDnsNode.c_str(), 2505);
-    DimServer::start(alfId == -1 ? "ALF" : ("ALF" + std::to_string(alfId)).c_str());
+    DimServer::start(("ALF_" + alfId).c_str());
 
     AlfServer alfServer = AlfServer();
 
@@ -133,7 +124,6 @@ class ProgramAlf : public AliceO2::Common::Program
  private:
   struct OptionsStruct {
     std::string dimDnsNode = "";
-    int alfId = -1;
   } mOptions;
 };
 

apps/ProgramAlfClient.cxx

@@ -14,6 +14,8 @@
 /// \author Pascal Boeschoten ([email protected])
 /// \author Kostas Alexopoulos ([email protected])
 
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/asio.hpp>
 #include <chrono>
 #include <cstdlib>
 #include <thread>
@@ -24,6 +26,7 @@
 #include "DimServices/ServiceNames.h"
 #include "Logger.h"
 
+namespace ip = boost::asio::ip;
 namespace po = boost::program_options;
 
 namespace AliceO2
@@ -47,9 +50,6 @@ class ProgramAlfClient : public AliceO2::Common::Program
 
   virtual void addOptions(po::options_description& options) override
   {
-    options.add_options()("alf-id",
-                          po::value<int>(&mOptions.alfId)->default_value(-1),
-                          "The ID of the ALF server.");
     options.add_options()("dim-dns-node",
                           po::value<std::string>(&mOptions.dimDnsNode)->default_value(""),
                           "The DIM DNS node to connect to if the env var is not set");
@@ -66,32 +66,23 @@ class ProgramAlfClient : public AliceO2::Common::Program
 
     getLogger() << "ALF client initializations..." << endm;
 
-    if (const char* alfIdString = std::getenv("ALF_ID")) {
-      getLogger() << "Picked up ALF_ID from the environment." << endm;
-      getLogger() << "ALF_ID=" << alfIdString << endm;
-      mOptions.alfId = atoi(alfIdString);
-    } else {
-      getLogger() << "ALF_ID env variable not set. Setting it from argument." << endm;
-      //setenv("ALF_ID", std::to_string(mOptions.alfId).c_str(), 1);
-      getLogger() << "ALF_ID=" << mOptions.alfId << endm;
-      /* Do I need to set the env var for ALF_ID? */
-    }
-
-    if (const char* dimDnsNode = std::getenv("DIM_DNS_NODE")) {
+    if (mOptions.dimDnsNode != "") {
+      getLogger() << "DIM_DNS_NODE env variable not set. Setting it from argument." << endm;
+      getLogger() << "DIM_DNS_NODE=" << mOptions.dimDnsNode << endm;
+    } else if (const char* dimDnsNode = std::getenv("DIM_DNS_NODE")) {
       getLogger() << "Picked up DIM_DMS_NODE from the environment." << endm;
       getLogger() << "DIM_DNS_NODE=" << dimDnsNode << endm;
       mOptions.dimDnsNode = dimDnsNode;
-    } else if (mOptions.dimDnsNode != "") {
-      getLogger() << "DIM_DNS_NODE env variable not set. Setting it from argument." << endm;
-      setenv("DIM_DNS_NODE", mOptions.dimDnsNode.c_str(), 1); // Don't be afraid to overwrite since we ended up here
-      getLogger() << "DIM_DNS_NODE=" << mOptions.dimDnsNode << endm;
     } else {
       BOOST_THROW_EXCEPTION(AlfException() << ErrorInfo::Message("DIM_DNS_NODE env variable not set, and no relevant argument provided.")); // InfoLogger and errors?
     }
 
-    getLogger() << "Starting the DIM Client using ALF ID=" << mOptions.alfId << ", serial=" << mOptions.serial << " and link=" << mOptions.link << endm;
+    std::string alfId = ip::host_name();
+    boost::to_upper(alfId);
+
+    getLogger() << "Starting the DIM Client using ALF ID=" << alfId << ", serial=" << mOptions.serial << " and link=" << mOptions.link << endm;
 
-    AlfLink link = AlfLink{ mOptions.alfId, mOptions.serial, mOptions.link, nullptr };
+    AlfLink link = AlfLink{ alfId, mOptions.serial, mOptions.link, nullptr };
 
     ServiceNames names(link);
     Alf::RegisterReadRpc registerReadRpc(names.registerRead());
@@ -143,7 +134,6 @@ class ProgramAlfClient : public AliceO2::Common::Program
     std::string dimDnsNode = "";
     int serial = -1;
     int link = -1;
-    int alfId = -1;
   } mOptions;
 };
 

src/Common.h

@@ -32,7 +32,7 @@ static constexpr auto BUSY_TIMEOUT = std::chrono::milliseconds(10);
 static constexpr auto CHANNEL_BUSY_TIMEOUT = std::chrono::milliseconds(10);
 
 struct AlfLink {
-  int alfId;
+  std::string alfId;
   int serial;
   int linkId;
   std::shared_ptr<roc::BarInterface> bar2;

src/DimServices/ServiceNames.cxx

@@ -33,14 +33,11 @@ DEFSERVICENAME(registerWrite, "REGISTER_WRITE")
 DEFSERVICENAME(scaSequence, "SCA_SEQUENCE")
 DEFSERVICENAME(swtSequence, "SWT_SEQUENCE")
 DEFSERVICENAME(icSequence, "IC_SEQUENCE")
-DEFSERVICENAME(icGbtI2cWrite, "IC_GBT_I2C_write")
+DEFSERVICENAME(icGbtI2cWrite, "IC_GBT_I2C_WRITE")
 
 std::string ServiceNames::format(std::string name) const
 {
-  if (mAlfId != "-1")
-    return ((boost::format("ALF%1%/SERIAL_%2%/LINK_%3%/%4%") % mAlfId % mSerial % mLink % name)).str();
-  else
-    return ((boost::format("ALF/SERIAL_%1%/LINK_%2%/%3%") % mSerial % mLink % name)).str();
+  return ((boost::format("ALF_%1%/SERIAL_%2%/LINK_%3%/%4%") % mAlfId % mSerial % mLink % name)).str();
 }
 
 } // namespace Alf

src/DimServices/ServiceNames.h

@@ -29,7 +29,7 @@ class ServiceNames
 {
  public:
   ServiceNames(AlfLink link)
-    : mAlfId(std::to_string(link.alfId).c_str()), mSerial(link.serial), mLink(link.linkId)
+    : mAlfId(link.alfId), mSerial(link.serial), mLink(link.linkId)
   {
   }