Bugfixes

Author: PascalBoeschoten

src/CommandLineUtilities/AliceLowlevelFrontend/AliceLowlevelFrontend.h

@@ -59,14 +59,24 @@ inline void setDataBuffer(std::vector<char>& buffer, DimObject& dimObject)
   dimObject.setData(buffer.data(), buffer.size());
 }
 
+inline std::string argumentSeparator()
+{
+  return "\n";
+}
+
+inline std::string scaPairSeparator()
+{
+  return ",";
+}
+
 inline std::string successPrefix()
 {
-  return "success:";
+  return "success" + argumentSeparator();
 }
 
 inline std::string failPrefix()
 {
-  return "failure:";
+  return "failure" + argumentSeparator();
 }
 
 inline std::string makeSuccessString(const std::string& string)
@@ -92,6 +102,7 @@ inline bool isFail(const std::string& string)
 inline std::string stripPrefix(const std::string& string)
 {
   if (string.length() < PREFIX_LENGTH) {
+    printf("len=%ul  str=%s\n", string.length(), string.c_str());
     BOOST_THROW_EXCEPTION(AlfException() << ErrorInfo::Message("string too short to contain prefix"));
   }
   return string.substr(PREFIX_LENGTH);
@@ -115,7 +126,7 @@ class DimRpcInfoWrapper
       auto string = std::string(mRpcInfo->getString());
       if (isFail(string)) {
         BOOST_THROW_EXCEPTION(
-          AlfException() << ErrorInfo::Message("ALF server failure" + string));
+          AlfException() << ErrorInfo::Message("ALF server failure: " + string));
       }
       return string;
     }
@@ -137,60 +148,69 @@ class DimRpcInfoWrapper
     std::unique_ptr<DimRpcInfo> mRpcInfo;
 };
 
-class PublishRpc : DimRpcInfoWrapper
+class PublishRegistersStartRpc : DimRpcInfoWrapper
 {
   public:
-    PublishRpc(const std::string& serviceName)
+    PublishRegistersStartRpc(const std::string& serviceName)
         : DimRpcInfoWrapper(serviceName)
     {
     }
 
-    void publish(std::string dnsName, double frequency, std::vector<size_t> addresses)
+    void publish(std::string dnsName, double interval, std::vector<size_t> addresses)
     {
       std::ostringstream stream;
-      stream << dnsName << ';';
+      auto sep = argumentSeparator();
+      stream << dnsName << sep << interval;
       for (size_t i = 0; i < addresses.size(); ++i) {
-        stream << addresses[i];
-        if ((i + 1) < addresses.size()) {
-          stream << ',';
-        }
+        stream << sep << addresses[i];
       }
-      stream << ';' << frequency;
       printf("Publish: %s\n", stream.str().c_str());
       setString(stream.str());
       getString();
     }
 };
 
-class PublishScaRpc : DimRpcInfoWrapper
+class PublishScaSequenceStartRpc : DimRpcInfoWrapper
 {
   public:
-    PublishScaRpc(const std::string& serviceName)
+    PublishScaSequenceStartRpc(const std::string& serviceName)
       : DimRpcInfoWrapper(serviceName)
     {
     }
 
-    void publish(std::string dnsName, double frequency, const std::vector<Sca::CommandData>& commandDataPairs)
+    void publish(std::string dnsName, double interval, const std::vector<Sca::CommandData>& commandDataPairs)
     {
       std::ostringstream stream;
-      stream << dnsName << ';';
+      auto sep = argumentSeparator();
+      stream << dnsName << sep << interval;
       for (size_t i = 0; i < commandDataPairs.size(); ++i) {
-        stream << commandDataPairs[i].command << ',' << commandDataPairs[i].data;
-        if ((i + 1) < commandDataPairs.size()) {
-          stream << '\n';
-        }
+        stream << sep << commandDataPairs[i].command << scaPairSeparator() << commandDataPairs[i].data;
       }
-      stream << ';' << frequency;
       printf("Publish SCA: %s\n", stream.str().c_str());
       setString(stream.str());
       getString();
     }
 };
 
-class PublishStopRpc: DimRpcInfoWrapper
+class PublishRegistersStopRpc: DimRpcInfoWrapper
+{
+  public:
+    PublishRegistersStopRpc(const std::string &serviceName)
+      : DimRpcInfoWrapper(serviceName)
+    {
+    }
+
+    void stop(std::string dnsName)
+    {
+      setString(dnsName);
+      getString();
+    }
+};
+
+class PublishScaSequenceStopRpc: DimRpcInfoWrapper
 {
   public:
-    PublishStopRpc(const std::string &serviceName)
+    PublishScaSequenceStopRpc(const std::string &serviceName)
       : DimRpcInfoWrapper(serviceName)
     {
     }
@@ -319,32 +339,6 @@ class ScaWriteSequence: DimRpcInfoWrapper
     }
 };
 
-class StringRpcServer: public DimRpc
-{
-  public:
-    using Callback = std::function<std::string(const std::string&)>;
-
-    StringRpcServer(const std::string& serviceName, Callback callback)
-        : DimRpc(serviceName.c_str(), "C", "C"), callback(callback)
-    {
-    }
-
-    StringRpcServer(const StringRpcServer& b) = delete;
-    StringRpcServer(StringRpcServer&& b) = delete;
-
-  private:
-    void rpcHandler() override
-    {
-      try {
-        auto returnValue = callback(std::string(getString()));
-        Alf::setDataString(Alf::makeSuccessString(returnValue), *this);
-      } catch (const std::exception& e) {
-        Alf::setDataString(Alf::makeFailString(e.what()), *this);
-      }
-    }
-
-    Callback callback;
-};
 
 } // namespace Alf
 } // namespace CommandLineUtilities

src/CommandLineUtilities/AliceLowlevelFrontend/ProgramAliceLowlevelFrontendClient.cxx

@@ -60,6 +60,8 @@ class ProgramAliceLowlevelFrontendClient: public Program
         BOOST_THROW_EXCEPTION(Alf::AlfException() << Alf::ErrorInfo::Message("Environment variable 'DIM_DNS_NODE' not set"));
       }
 
+      cout << "Using serial=" << mSerialNumber << " link=" << mLink << '\n';
+
       // Initialize DIM objects
       Alf::ServiceNames names(mSerialNumber, mLink);
       TemperatureInfo alfTestInt(names.temperature());
@@ -70,13 +72,12 @@ class ProgramAliceLowlevelFrontendClient: public Program
       Alf::ScaGpioReadRpc scaGpioReadRpc(names.scaGpioRead());
       Alf::ScaGpioWriteRpc scaGpioWriteRpc(names.scaGpioWrite());
       Alf::ScaWriteSequence scaWriteSequence(names.scaWriteSequence());
-      Alf::PublishRpc publishRpc(names.publishStartCommandRpc());
-      Alf::PublishScaRpc publishScaRpc(names.publishScaStartCommandRpc());
-
-      publishRpc.publish("ALF/TEST/1", 1.0, {0x1fc});
-      publishRpc.publish("ALF/TEST/2", 3.0, {0x100, 0x104, 0x108});
+      Alf::PublishRegistersStartRpc publishRpc(names.publishRegistersStart());
+      Alf::PublishScaSequenceStartRpc publishScaRpc(names.publishScaSequenceStart());
 
-      publishScaRpc.publish("ALF/TEST/SCA_1", 1.0, {{0x0, 0x1}, {0x10, 0x11}});
+      publishRpc.publish("TEST_1", 1.0, {0x1fc});
+      publishRpc.publish("TEST_2", 3.0, {0x100, 0x104, 0x108});
+      publishScaRpc.publish("TEST_3", 1.0, {{0x0, 0x1}, {0x10, 0x11}});
 
       for (int i = 0; i < 10; ++i) {
         cout << "SCA GPIO write '" << i << "'" << endl;
@@ -115,32 +116,33 @@ class ProgramAliceLowlevelFrontendClient: public Program
         cout << "  " << result << '\n';
       }
 
-      while (false)//!isSigInt())
+      while (!isSigInt())
       {
-        cout << "-------------------------------------\n";
-        cout << "Temperature   = " << gTemperature << endl;
-
-        int writes = 10; //std::rand() % 50;
-        cout << "Write   0x1f8 = 0x1 times " << writes << endl;
-        for (int i = 0; i < writes; ++i) {
-          writeRpc.writeRegister(0x1f8, 0x1);
-        }
-
-        cout << "Read    0x1fc = " << readRpc.readRegister(0x1fc) << endl;
-        cout << "Read    0x1ec = " << readRpc.readRegister(0x1ec) << endl;
-        cout << "Cmd     0x1f4 = 0x1" << endl;
-        writeRpc.writeRegister(0x1f4, 0x1);
-        cout << "Cmd     0x1f4 = 0x2" << endl;
-        writeRpc.writeRegister(0x1f4, 0x1);
-        cout << "Cmd     0x1f4 = 0x3" << endl;
-        writeRpc.writeRegister(0x1f4, 0x1);
+//        cout << "-------------------------------------\n";
+//        cout << "Temperature   = " << gTemperature << endl;
+//
+//        int writes = 10; //std::rand() % 50;
+//        cout << "Write   0x1f8 = 0x1 times " << writes << endl;
+//        for (int i = 0; i < writes; ++i) {
+//          writeRpc.writeRegister(0x1f8, 0x1);
+//        }
+//
+//        cout << "Read    0x1fc = " << readRpc.readRegister(0x1fc) << endl;
+//        cout << "Read    0x1ec = " << readRpc.readRegister(0x1ec) << endl;
+//        cout << "Cmd     0x1f4 = 0x1" << endl;
+//        writeRpc.writeRegister(0x1f4, 0x1);
+//        cout << "Cmd     0x1f4 = 0x2" << endl;
+//        writeRpc.writeRegister(0x1f4, 0x1);
+//        cout << "Cmd     0x1f4 = 0x3" << endl;
+//        writeRpc.writeRegister(0x1f4, 0x1);
         std::this_thread::sleep_for(std::chrono::milliseconds(1000));
       }
 
-      Alf::PublishStopRpc publishStopRpc(names.publishStopCommandRpc());
-      publishStopRpc.stop("ALF/TEST/1");
-      publishStopRpc.stop("ALF/TEST/2");
-      publishStopRpc.stop("ALF/TEST/SCA_1");
+      Alf::PublishRegistersStopRpc publishRegistersStopRpc(names.publishRegistersStop());
+      Alf::PublishScaSequenceStopRpc publishScaSequenceStopRpc(names.publishScaSequenceStop());
+      publishRegistersStopRpc.stop("TEST_1");
+      publishScaSequenceStopRpc.stop("TEST_2");
+      publishScaSequenceStopRpc.stop("TEST_3");
     }
 
     int mSerialNumber;