Proxyfmu encapsulation

include/proxyfmu/fmi/slave.hpp

@@ -4,7 +4,6 @@
 
 #include <proxyfmu/fmi/model_description.hpp>
 #include <proxyfmu/state.hpp>
-#include <proxyfmu/thrift/defs_types.h>
 
 #include <memory>
 #include <vector>
@@ -47,8 +46,8 @@ class slave
     virtual void save_state(state_index stateIndex) = 0;
     virtual void restore_state(state_index stateIndex) = 0;
     virtual void release_state(state_index stateIndex) = 0;
-    virtual void export_state(state_index stateIndex, proxyfmu::thrift::ExportedState& exportedState) const = 0;
-    virtual state_index import_state(const proxyfmu::thrift::ExportedState& exportedState) = 0;
+    virtual void export_state(state_index stateIndex, state::exported_state& exportedState) const = 0;
+    virtual state_index import_state(const state::exported_state& exportedState) = 0;
 
     virtual ~slave() = default;
 };

include/proxyfmu/state.hpp

@@ -19,6 +19,15 @@ struct saved_state
     bool simStarted = false;
 };
 
+struct exported_state
+{
+    std::int32_t schemeVersion;
+    std::string uuid;
+    std::string fmuState;
+    bool setupComplete;
+    bool simStarted;
+};
+
 }
 
 

src/CMakeLists.txt

@@ -70,11 +70,10 @@ set_target_properties(fmilibwrapper PROPERTIES POSITION_INDEPENDENT_CODE ON)
 target_include_directories(fmilibwrapper
         PUBLIC
         "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>"
-        "$<BUILD_INTERFACE:${generatedSourcesDir}>"
         PRIVATE
         "${CMAKE_CURRENT_SOURCE_DIR}"
         )
-target_link_libraries(fmilibwrapper PRIVATE FMILIB::FMILIB PUBLIC thrift::thrift)
+target_link_libraries(fmilibwrapper PRIVATE FMILIB::FMILIB)
 if (UNIX)
     target_link_libraries(fmilibwrapper INTERFACE stdc++fs PRIVATE dl)
 endif ()
@@ -117,11 +116,13 @@ target_include_directories(proxyfmu-client
         "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>"
         PRIVATE
         "${CMAKE_CURRENT_SOURCE_DIR}"
+        "${generatedSourcesDir}"
         )
 target_link_libraries(proxyfmu-client
         PUBLIC
         fmilibwrapper
         #PRIVATE # Temporarily disabled due to https://github.com/conan-io/conan/issues/13302
+        thrift::thrift
         Boost::filesystem
         )
 if (UNIX)
@@ -142,8 +143,6 @@ install(
         ${PROXYFMU_INSTALL_DESTINATIONS}
 )
 install(
-        DIRECTORY
-            "${publicHeaderDir}/proxyfmu"
-            "${generatedSourcesDir}/proxyfmu"
+        DIRECTORY "${publicHeaderDir}/proxyfmu"
         DESTINATION "${PROXYFMU_HEADER_INSTALL_DIR}"
 )

src/proxyfmu/client/proxy_slave.cpp

@@ -250,14 +250,28 @@ void proxy_slave::release_state(state_index stateIndex)
     client_->release_state(stateIndex);
 }
 
-void proxy_slave::export_state(state_index stateIndex, proxyfmu::thrift::ExportedState& es) const
+void proxy_slave::export_state(state_index stateIndex, state::exported_state& es) const
 {
-    client_->export_state(es, stateIndex);
+    ExportedState es_;
+    es_.simStarted = es.simStarted;
+    es_.setupComplete = es.setupComplete;
+    es_.fmuState = es.fmuState;
+    es_.schemeVersion = es.schemeVersion;
+    es_.uuid = es.uuid;
+
+    client_->export_state(es_, stateIndex);
 }
 
-state_index proxy_slave::import_state(const proxyfmu::thrift::ExportedState& exportedState)
+state_index proxy_slave::import_state(const state::exported_state& exportedState)
 {
-    return client_->import_state(exportedState);
+    ExportedState es_;
+    es_.simStarted = exportedState.simStarted;
+    es_.setupComplete = exportedState.setupComplete;
+    es_.fmuState = exportedState.fmuState;
+    es_.schemeVersion = exportedState.schemeVersion;
+    es_.uuid = exportedState.uuid;
+
+    return client_->import_state(es_);
 }
 
 } // namespace proxyfmu::client

src/proxyfmu/client/proxy_slave.hpp

@@ -61,8 +61,8 @@ class proxy_slave : public fmi::slave
     void save_state(state_index stateIndex) override;
     void restore_state(state_index stateIndex) override;
     void release_state(state_index stateIndex) override;
-    void export_state(state_index stateIndex, proxyfmu::thrift::ExportedState& exportedState) const override;
-    state_index import_state(const proxyfmu::thrift::ExportedState& exportedState) override;
+    void export_state(state_index stateIndex, state::exported_state& exportedState) const override;
+    state_index import_state(const state::exported_state& exportedState) override;
 
     ~proxy_slave() override;
 };

src/proxyfmu/fmi/fmi1/fmi1_slave.cpp

@@ -192,12 +192,12 @@ void fmi1_slave::release_state(state_index)
     throw std::runtime_error("State saving API is not supported for FMI 1.0");
 }
 
-void fmi1_slave::export_state(state_index, proxyfmu::thrift::ExportedState&) const
+void fmi1_slave::export_state(state_index, state::exported_state&) const
 {
     throw std::runtime_error("State saving API is not supported for FMI 1.0");
 }
 
-state_index fmi1_slave::import_state(const proxyfmu::thrift::ExportedState&)
+state_index fmi1_slave::import_state(const state::exported_state&)
 {
     throw std::runtime_error("State saving API is not supported for FMI 1.0");
 }

src/proxyfmu/fmi/fmi1/fmi1_slave.hpp

@@ -56,8 +56,8 @@ class fmi1_slave : public slave
     void save_state(state_index stateIndex) override;
     void restore_state(state_index stateIndex) override;
     void release_state(state_index stateIndex) override;
-    void export_state(state_index stateIndex, proxyfmu::thrift::ExportedState& es) const override;
-    state_index import_state(const proxyfmu::thrift::ExportedState& exportedState) override;
+    void export_state(state_index stateIndex, state::exported_state& es) const override;
+    state_index import_state(const state::exported_state& exportedState) override;
 
     ~fmi1_slave() override;
 };

src/proxyfmu/fmi/fmi2/fmi2_slave.cpp

@@ -3,6 +3,7 @@
 
 #include <fmilib.h>
 
+#include <cassert>
 #include <exception>
 #include <memory>
 
@@ -251,7 +252,7 @@ void fmi2_slave::release_state(state_index state)
 
 }
 
-void fmi2_slave::export_state(state_index stateIndex, proxyfmu::thrift::ExportedState& es) const
+void fmi2_slave::export_state(state_index stateIndex, state::exported_state& es) const
 {
     const auto& savedState = savedStates_.at(stateIndex);
 
@@ -283,7 +284,7 @@ void fmi2_slave::export_state(state_index stateIndex, proxyfmu::thrift::Exported
     es.simStarted = savedState.simStarted;
 }
 
-state_index fmi2_slave::import_state(const proxyfmu::thrift::ExportedState& exportedState)
+state_index fmi2_slave::import_state(const state::exported_state& exportedState)
 {
     saved_state savedState;
     // First some sanity checks

src/proxyfmu/fmi/fmi2/fmi2_slave.hpp

@@ -65,8 +65,8 @@ class fmi2_slave : public slave
     void save_state(state_index stateIndex) override;
     void restore_state(state_index stateIndex) override;
     void release_state(state_index stateIndex) override;
-    void export_state(state_index stateIndex, proxyfmu::thrift::ExportedState& es) const override;
-    state_index import_state(const proxyfmu::thrift::ExportedState& exportedState) override;
+    void export_state(state_index stateIndex, state::exported_state& es) const override;
+    state_index import_state(const state::exported_state& exportedState) override;
 
     ~fmi2_slave() override;
 };

tool/handlers/fmu_service_handler.cpp

@@ -145,10 +145,26 @@ void fmu_service_handler::release_state(const StateIndex idx)
 
 void fmu_service_handler::export_state(ExportedState& _return, const StateIndex idx)
 {
-    slave_->export_state(idx, _return);
+    proxyfmu::state::exported_state es;
+
+    slave_->export_state(idx, es);
+
+    _return.schemeVersion = es.schemeVersion;
+    _return.fmuState = es.fmuState;
+    _return.setupComplete = es.setupComplete;
+    _return.simStarted = es.simStarted;
+    _return.uuid = es.uuid;
 }
 
 StateIndex fmu_service_handler::import_state(const ExportedState& esin)
 {
-    return slave_->import_state(esin);
+    proxyfmu::state::exported_state es;
+
+    es.schemeVersion = esin.schemeVersion;
+    es.fmuState = esin.fmuState;
+    es.setupComplete = esin.setupComplete;
+    es.simStarted = esin.simStarted;
+    es.uuid = esin.uuid;
+
+    return slave_->import_state(es);
 }