Changeset 94:20a1183cbd09 in finroc_plugins_runtime_construction

Timestamp:

06.06.2017 21:13:51 (6 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Adds GetRegisterUpdates function to AdministrationService

Files:

• tAdministrationService.cpp (modified) (3 diffs)
• tAdministrationService.h (modified) (5 diffs)

tAdministrationService.cpp

@@ -82 +82 @@
     &tAdministrationService::SaveFinstructableGroup, &tAdministrationService::SetAnnotation, &tAdministrationService::SetPortValue,
     &tAdministrationService::StartExecution, &tAdministrationService::NetworkConnect, &tAdministrationService::ConnectPorts,  // NetworkConnect etc. are last in order to not break binary compatibility
-    &tAdministrationService::CreateUriConnector, &tAdministrationService::DeleteUriConnector);
+    &tAdministrationService::CreateUriConnector, &tAdministrationService::DeleteUriConnector, &tAdministrationService::GetRegisterUpdates);
 
 static tAdministrationService administration_service;
@@ -454 +454 @@
 }
 
+rrlib::serialization::tRegisterUpdate tAdministrationService::GetRegisterUpdates(int register_uid)
+{
+  if (register_uid < 0 || register_uid >= rrlib::serialization::cMAX_PUBLISHED_REGISTERS)
+  {
+    throw std::runtime_error("Invalid register uid");
+  }
+  return rrlib::serialization::tRegisterUpdate(register_uid);
+}
+
 tAdministrationService::tExecutionStatus tAdministrationService::IsExecuting(int element_handle)
 {
@@ -596 +605 @@
     {
       core::tAnnotation* annotation = element->GetAnnotation(type.GetRttiName());
-      if (annotation == NULL)
+      if (!annotation)
       {
         FINROC_LOG_PRINT(ERROR, "Creating new annotations not supported yet. Canceling setting of annotation.");

tAdministrationService.h

@@ -44 +44 @@
 // External includes (system with <>, local with "")
 //----------------------------------------------------------------------
+#include "rrlib/serialization/tRegisterUpdate.h"
 #include "plugins/rpc_ports/tServerPort.h"
 
@@ -99 +100 @@
 
   /*!
+   * (superseded by ConnectPorts)
    * Connect source port to destination port
    *
@@ -184 +186 @@
 
   /*!
+   * (superseded by GetRegisterUpdates)
+   *
    * \return All actions for creating framework element currently registered in this runtime environment - serialized
    */
@@ -200 +204 @@
 
   /*!
+   * Gets all updates on specified register and all registers to be updated on change.
+   * After calling this method, the client's data on these remote registers is up to date.
+   *
+   * \param register_uid Uid of register to obtain updates for
+   * \return Updates (object does not need to be processed - does its work during deserialization)
+   */
+  rrlib::serialization::tRegisterUpdate GetRegisterUpdates(int register_uid);
+
+  /*!
    * \param element_handle Handle of framework element
    * \return Is specified framework element currently executing?
@@ -209 +222 @@
    *
    * \param library_name File name of library to load
-   * \return Available module libraries (.so files) that have not been loaded yet - serialized (Updated version)
+   * \return Empty memory buffer (used to be buffer with all actions for creating framework element currently registered in this runtime environment - serialized)
    */
   rrlib::serialization::tMemoryBuffer LoadModuleLibrary(const std::string& library_name);
 
   /*!
+   * (superseded by CreateUriConnector)
+   *
    * Connect local port to port in remote runtime environment using one of the
    * available network transport plugins.