From 9d8df70588f927ff187cc92ddf48b884de166a8d Mon Sep 17 00:00:00 2001
From: Christoph Kampmeyer <christoph.kampmeyer@desy.de>
Date: Thu, 9 Apr 2020 14:30:42 +0200
Subject: [PATCH] Adaptions to DeviceAccess #117:

Replaces calls to doXxxTransferYyy of the TransferElement by the
corresponding xxxTransferYyy call
---
 include/FeedingFanOut.h                 | 14 +++++++-------
 include/TestableModeAccessorDecorator.h | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/include/FeedingFanOut.h b/include/FeedingFanOut.h
index 1cc240f0..bd2ce6e5 100644
--- a/include/FeedingFanOut.h
+++ b/include/FeedingFanOut.h
@@ -70,17 +70,17 @@ namespace ChimeraTK {
 
     void doReadTransfer() override {
       if(!_withReturn) throw ChimeraTK::logic_error("Read operation called on write-only variable.");
-      _returnSlave->doReadTransfer();
+      _returnSlave->readTransfer();
     }
 
     bool doReadTransferNonBlocking() override {
       if(!_withReturn) throw ChimeraTK::logic_error("Read operation called on write-only variable.");
-      return _returnSlave->doReadTransferNonBlocking();
+      return _returnSlave->readTransferNonBlocking();
     }
 
     bool doReadTransferLatest() override {
       if(!_withReturn) throw ChimeraTK::logic_error("Read operation called on write-only variable.");
-      return _returnSlave->doReadTransferLatest();
+      return _returnSlave->readTransferLatest();
     }
 
     void doPreRead() override {
@@ -106,7 +106,7 @@ namespace ChimeraTK {
 
     ChimeraTK::TransferFuture doReadTransferAsync() override {
       if(!_withReturn) throw ChimeraTK::logic_error("Read operation called on write-only variable.");
-      return {_returnSlave->doReadTransferAsync(), this};
+      return {_returnSlave->readTransferAsync(), this};
     }
 
     void doPreWrite() override {
@@ -135,10 +135,10 @@ namespace ChimeraTK {
         bool ret;
         if(isFirst) {
           isFirst = false;
-          ret = slave->doWriteTransfer(versionNumber);
+          ret = slave->writeTransfer(versionNumber);
         }
         else {
-          ret = slave->doWriteTransferDestructively(versionNumber);
+          ret = slave->writeTransferDestructively(versionNumber);
         }
         if(ret) dataLost = true;
       }
@@ -148,7 +148,7 @@ namespace ChimeraTK {
     bool doWriteTransferDestructively(ChimeraTK::VersionNumber versionNumber = {}) override {
       bool dataLost = false;
       for(auto& slave : FanOut<UserType>::slaves) {
-        bool ret = slave->doWriteTransferDestructively(versionNumber);
+        bool ret = slave->writeTransferDestructively(versionNumber);
         if(ret) dataLost = true;
       }
       return dataLost;
diff --git a/include/TestableModeAccessorDecorator.h b/include/TestableModeAccessorDecorator.h
index 1b43b845..b41f83f2 100644
--- a/include/TestableModeAccessorDecorator.h
+++ b/include/TestableModeAccessorDecorator.h
@@ -44,14 +44,14 @@ namespace ChimeraTK {
     }
 
     bool doWriteTransfer(ChimeraTK::VersionNumber versionNumber = {}) override {
-      if(!_handleWrite) return _target->doWriteTransfer(versionNumber);
+      if(!_handleWrite) return _target->writeTransfer(versionNumber);
 
       bool dataLost = false;
       if(!Application::testableModeTestLock()) {
         // may happen if first write in thread is done before first blocking read
         Application::testableModeLock("write " + this->getName());
       }
-      dataLost = _target->doWriteTransfer(versionNumber);
+      dataLost = _target->writeTransfer(versionNumber);
       if(!dataLost) {
         ++Application::getInstance().testableMode_counter;
         ++Application::getInstance().testableMode_perVarCounter[_variableIdWrite];
@@ -74,14 +74,14 @@ namespace ChimeraTK {
     }
 
     bool doWriteTransferDestructively(ChimeraTK::VersionNumber versionNumber = {}) override {
-      if(!_handleWrite) return _target->doWriteTransferDestructively(versionNumber);
+      if(!_handleWrite) return _target->writeTransferDestructively(versionNumber);
 
       bool dataLost = false;
       if(!Application::testableModeTestLock()) {
         // may happen if first write in thread is done before first blocking read
         Application::testableModeLock("write " + this->getName());
       }
-      dataLost = _target->doWriteTransferDestructively(versionNumber);
+      dataLost = _target->writeTransferDestructively(versionNumber);
       if(!dataLost) {
         ++Application::getInstance().testableMode_counter;
         ++Application::getInstance().testableMode_perVarCounter[_variableIdWrite];
@@ -105,7 +105,7 @@ namespace ChimeraTK {
 
     void doReadTransfer() override {
       if(_handleRead) releaseLock();
-      _target->doReadTransfer();
+      _target->readTransfer();
     }
 
     /** Release the testableModeLock */
@@ -152,13 +152,13 @@ namespace ChimeraTK {
     }
 
     bool doReadTransferNonBlocking() override {
-      bool newData = _target->doReadTransferNonBlocking();
+      bool newData = _target->readTransferNonBlocking();
       if(!newData) return false;
       return true;
     }
 
     bool doReadTransferLatest() override {
-      bool newData = _target->doReadTransferLatest();
+      bool newData = _target->readTransferLatest();
       if(!newData) return false;
 
       // the queue has been emptied, so make sure that the testableMode_counter
-- 
GitLab