Increasing frame size used by thrift (#99)

* Thrift frame size adjustment

Author: davidhjp01

src/proxyfmu/client/proxy_slave.cpp

@@ -45,6 +45,7 @@ namespace proxyfmu::client
 
 const int max_retries = 600;
 const int retry_interval = 500;
+const int MAX_FRAME_SIZE = 50 * 1024 * 1024;
 
 proxy_slave::proxy_slave(const filesystem::path& fmuPath, const std::string& instanceName, fmi::model_description modelDescription, const std::optional<remote_info>& remote)
     : modelDescription_(std::move(modelDescription))
@@ -62,7 +63,9 @@ proxy_slave::proxy_slave(const filesystem::path& fmuPath, const std::string& ins
     } else {
         host = remote->host();
         std::shared_ptr<TTransport> socket(new TSocket(host, remote->port()));
-        auto transport = std::make_shared<TFramedTransport>(socket);
+        auto t_config = std::make_shared<TConfiguration>();
+        t_config->setMaxFrameSize(MAX_FRAME_SIZE);
+        auto transport = std::make_shared<TFramedTransport>(socket, t_config);
         std::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
         auto client = std::make_shared<BootServiceClient>(protocol);
 
@@ -94,7 +97,9 @@ proxy_slave::proxy_slave(const filesystem::path& fmuPath, const std::string& ins
     }
 
     std::shared_ptr<TTransport> socket(new TSocket(host, port));
-    transport_ = std::make_shared<TFramedTransport>(socket);
+    auto t_config = std::make_shared<TConfiguration>();
+    t_config->setMaxFrameSize(MAX_FRAME_SIZE);
+    transport_ = std::make_shared<TFramedTransport>(socket, t_config);
     std::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport_));
     client_ = std::make_shared<FmuServiceClient>(protocol);
     transport_->open();

tool/proxyfmu.cpp

@@ -42,8 +42,28 @@ class ServerReadyEventHandler : public TServerEventHandler
     }
 };
 
+class ProxyFMUFramedTransportFactory : public TTransportFactory
+{
+public:
+    explicit ProxyFMUFramedTransportFactory(uint32_t maxFrameSize)
+        : maxFrameSize_(maxFrameSize)
+    { }
+
+    std::shared_ptr<TTransport> getTransport(std::shared_ptr<TTransport> trans) override
+    {
+        auto t_config = std::make_shared<TConfiguration>();
+        t_config->setMaxFrameSize(maxFrameSize_);
+        return std::shared_ptr<TTransport>(new TFramedTransport(trans, t_config));
+    }
+
+private:
+    uint32_t maxFrameSize_;
+};
+
 const int port_range_min = 49152;
 const int port_range_max = 65535;
+const int MAX_FRAME_SIZE = 50 * 1024 * 1024;
+
 
 const int max_port_retries = 10;
 
@@ -68,7 +88,7 @@ int run_booter_application(const int port)
     std::shared_ptr<boot_service_handler> handler(new boot_service_handler());
     std::shared_ptr<TProcessor> processor(new BootServiceProcessor(handler));
 
-    std::shared_ptr<TTransportFactory> transportFactory(new TFramedTransportFactory());
+    std::shared_ptr<TTransportFactory> transportFactory(new ProxyFMUFramedTransportFactory(MAX_FRAME_SIZE));
     std::shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
 
     std::shared_ptr<TServerTransport> serverTransport(new TServerSocket(port));
@@ -93,7 +113,7 @@ int run_application(const std::string& fmu, const std::string& instanceName)
     std::shared_ptr<fmu_service_handler> handler(new fmu_service_handler(fmu, instanceName, stop));
     std::shared_ptr<TProcessor> processor(new FmuServiceProcessor(handler));
 
-    std::shared_ptr<TTransportFactory> transportFactory(new TFramedTransportFactory());
+    std::shared_ptr<TTransportFactory> transportFactory(new ProxyFMUFramedTransportFactory(MAX_FRAME_SIZE));
     std::shared_ptr<TProtocolFactory> protocolFactory(new TBinaryProtocolFactory());
 
     proxyfmu::fixed_range_random_generator rng(port_range_min, port_range_max);

version.txt

@@ -1 +1 @@
-0.4.0
+0.4.1