[swt] Handle SWT timeout properly

Author: kostorr

src/Swt/Swt.cxx

@@ -89,6 +89,11 @@ void Swt::read(std::vector<SwtWord>& words, TimeOut msTimeOut, SwtWord::Size wor
 
     // If we get the same counter as before it means the FIFO wasn't updated; drop the word
     if (tempWord.getSequence() != mWordSequence) {
+
+      if (std::chrono::steady_clock::now() < timeOut) {
+        BOOST_THROW_EXCEPTION(SwtException() << ErrorInfo::Message("Timed out: not enough words in SWT READ FIFO"));
+      }
+
       getWarningLogger() << "SWT word sequence duplicate" << endm;
 
       mWordSequence = tempWord.getSequence(); //roll mWordSequence back by one
@@ -139,13 +144,10 @@ std::string Swt::writeSequence(std::vector<std::pair<SwtData, Operation>> sequen
         try {
           timeOut = std::get<TimeOut>(data);
         } catch (...) { // no timeout was provided
-          timeOut = -1;
-        }
-        if (timeOut >= 0) {
-          read(results, timeOut);
-        } else {
-          read(results);
+          data = DEFAULT_SWT_TIMEOUT_MS;
+          timeOut = std::get<TimeOut>(data);
         }
+        read(results, timeOut);
 
         for (const auto& result : results) {
           resultBuffer << result << "\n";

src/Swt/Swt.h

@@ -51,7 +51,7 @@ class Swt
 
   void reset();
   uint32_t write(const SwtWord& swtWord);
-  void read(std::vector<SwtWord>& word, TimeOut msTimeOut = 10, SwtWord::Size wordSize = SwtWord::Size::High);
+  void read(std::vector<SwtWord>& word, TimeOut msTimeOut, SwtWord::Size wordSize = SwtWord::Size::High);
 
   enum Operation { Read,
                    Write,
@@ -68,6 +68,7 @@ class Swt
 
   AlfLink mLink;
   int mWordSequence = 0; //start from 0, as after the reset the counter starts at 1
+  static constexpr int DEFAULT_SWT_TIMEOUT_MS = 10;
 };
 
 } // namespace Alf