Minor cleanup and small fixes.

AlloSphere-Research-Group · Dec 21, 2020 · 3ec521c · 3ec521c
1 parent eb9a77d
commit 3ec521c
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 31 deletions.
diff --git a/include/tinc/ComputationChain.hpp b/include/tinc/ComputationChain.hpp
@@ -58,27 +58,13 @@ class ComputationChain : public Processor {
    * This function will block if computation is currently executing and will
    * return after computation is done.
    */
-  std::map<std::string, bool> getResults() {
-    std::unique_lock<std::mutex> lk2(mChainLock);
-    return mResults;
-  }
+  std::map<std::string, bool> getResults();
 
-  ComputationChain &operator<<(Processor &processor) {
-    addProcessor(processor);
-    return *this;
-  }
+  ComputationChain &operator<<(Processor &processor);
 
   template <class ParameterType>
   ComputationChain &
-  registerParameter(al::ParameterWrapper<ParameterType> &param) {
-    mParameters.push_back(&param);
-    configuration[param.getName()] = param.get();
-    param.registerChangeCallback([&](ParameterType value) {
-      configuration[param.getName()] = value;
-      process();
-    });
-    return *this;
-  }
+  registerParameter(al::ParameterWrapper<ParameterType> &param);
 
   template <class ParameterType>
   ComputationChain &operator<<(al::ParameterWrapper<ParameterType> &newParam) {
@@ -99,6 +85,20 @@ class ComputationChain : public Processor {
   ChainType mType;
 };
 
+// Implementation
+
+template <class ParameterType>
+ComputationChain &ComputationChain::registerParameter(
+    al::ParameterWrapper<ParameterType> &param) {
+  mParameters.push_back(&param);
+  configuration[param.getName()] = param.get();
+  param.registerChangeCallback([&](ParameterType value) {
+    configuration[param.getName()] = value;
+    process();
+  });
+  return *this;
+}
+
 } // namespace tinc
 
 #endif // COMPUTATIONCHAIN_HPP
diff --git a/src/ComputationChain.cpp b/src/ComputationChain.cpp
@@ -72,3 +72,13 @@ bool ComputationChain::process(bool forceRecompute) {
   callDoneCallbacks(ret);
   return ret;
 }
+
+std::map<std::string, bool> ComputationChain::getResults() {
+  std::unique_lock<std::mutex> lk2(mChainLock);
+  return mResults;
+}
+
+ComputationChain &tinc::ComputationChain::operator<<(Processor &processor) {
+  addProcessor(processor);
+  return *this;
+}
diff --git a/src/TincClient.cpp b/src/TincClient.cpp
@@ -59,16 +59,18 @@ bool TincClient::processIncomingMessage(al::Message &message, al::Socket *src) {
         }
         break;
       case MessageType::REGISTER:
-        // FIXME remove after debugging
-        std::cout << "client register" << std::endl;
+        if (verbose()) {
+          std::cout << "client register received" << std::endl;
+        }
         if (!readRegisterMessage(objectType, (void *)&details, src)) {
           std::cerr << __FUNCTION__ << ": Error processing Register message"
                     << std::endl;
         }
         break;
       case MessageType::CONFIGURE:
-        // FIXME remove after debugging
-        std::cout << "client configure" << std::endl;
+        if (verbose()) {
+          std::cout << "client configure received" << std::endl;
+        }
         if (!readConfigureMessage(objectType, (void *)&details, src)) {
           std::cerr << __FUNCTION__ << ": Error processing Configure message"
                     << std::endl;

diff --git a/tests/tincprotocol_parameters.cpp b/tests/tincprotocol_parameters.cpp
@@ -526,10 +526,11 @@ TEST(TincProtocol, ParameterTrigger) {
   EXPECT_EQ(paramTrigger->get(), true);
 
   // change value on the clientside
-  paramTrigger->set(false);
+  paramTrigger->set(true);
   al::al_sleep(0.1); // wait for new value
 
-  EXPECT_EQ(p.get(), false);
+  // It makes no sense to get() values for Trigger.
+  // EXPECT_EQ(p.get(), false);
 
   tclient.stop();
   tserver.stop();

diff --git a/tests/tincprotocol_remote_parameter.cpp b/tests/tincprotocol_remote_parameter.cpp
@@ -413,17 +413,21 @@ TEST(TincProtocol, RemoteParameterTrigger) {
   EXPECT_EQ(paramTrigger->getDefault(), false);
   EXPECT_EQ(paramTrigger->get(), false);
 
-  // change value on the serverside
-  p.trigger();
-  al::al_sleep(0.1); // wait for new value
+  bool triggeredInServer = false;
+  bool triggeredInClient = false;
 
-  EXPECT_EQ(paramTrigger->get(), true);
+  static_cast<al::Trigger *>(param)
+      ->registerChangeCallback([&](bool val) { triggeredInServer = true; });
 
-  // change value on the clientside
-  paramTrigger->set(false);
-  al::al_sleep(0.1); // wait for new value
+  // change value on the client side
+  p.trigger();
+  al::al_sleep(0.2); // wait for new value
+  EXPECT_EQ(triggeredInServer, true);
 
-  EXPECT_EQ(p.get(), false);
+  p.registerChangeCallback([&](bool val) { triggeredInClient = true; });
+  static_cast<al::Trigger *>(param)->trigger();
+  al::al_sleep(0.2); // wait for new value
+  EXPECT_EQ(triggeredInClient, true);
 
   tclient.stop();
   tserver.stop();