comparison vamp-client/CapnpRRClient.h @ 126:2004ec2b653e

Ensure we read right up to end of buffered data after server exits; adjust waiting schedule on Windows (where waitForReadyRead is far too wasteful of sleep time)

 
     ListResponse
     listPluginData() override {
 
         if (!m_transport->isOK()) {
-            throw std::runtime_error("Piper server failed to start");
+            throw std::runtime_error("Piper server crashed or failed to start");
         }
 
         capnp::MallocMessageBuilder message;
         piper::RpcRequest::Builder builder = message.initRoot<piper::RpcRequest>();
         VampnProto::buildRpcRequest_List(builder);
         ReqId id = getId();
         builder.getId().setNumber(id);
 
-        auto karr = call(message);
+        auto karr = call(message, true);
 
         capnp::FlatArrayMessageReader responseMessage(karr);
         piper::RpcResponse::Reader reader = responseMessage.getRoot<piper::RpcResponse>();
 
         checkResponseType(reader, piper::RpcResponse::Response::Which::LIST, id);

     
     LoadResponse
     loadPlugin(const LoadRequest &req) override {
 
         if (!m_transport->isOK()) {
-            throw std::runtime_error("Piper server failed to start");
+            throw std::runtime_error("Piper server crashed or failed to start");
         }
 
         LoadResponse resp;
         PluginHandleMapper::Handle handle = serverLoad(req.pluginKey,
                                                        req.inputSampleRate,

     Vamp::Plugin::OutputList
     configure(PluginStub *plugin,
               PluginConfiguration config) override {
 
         if (!m_transport->isOK()) {
-            throw std::runtime_error("Piper server failed to start");
+            throw std::runtime_error("Piper server crashed or failed to start");
         }
 
         ConfigurationRequest request;
         request.plugin = plugin;
         request.configuration = config;

 
         VampnProto::buildRpcRequest_Configure(builder, request, m_mapper);
         ReqId id = getId();
         builder.getId().setNumber(id);
 
-        auto karr = call(message);
+        auto karr = call(message, true);
 
         capnp::FlatArrayMessageReader responseMessage(karr);
         piper::RpcResponse::Reader reader = responseMessage.getRoot<piper::RpcResponse>();
 
         //!!! handle (explicit) error case

     process(PluginStub *plugin,
             std::vector<std::vector<float> > inputBuffers,
             Vamp::RealTime timestamp) override {
 
         if (!m_transport->isOK()) {
-            throw std::runtime_error("Piper server failed to start");
+            throw std::runtime_error("Piper server crashed or failed to start");
         }
 
         ProcessRequest request;
         request.plugin = plugin;
         request.inputBuffers = inputBuffers;

         piper::RpcRequest::Builder builder = message.initRoot<piper::RpcRequest>();
         VampnProto::buildRpcRequest_Process(builder, request, m_mapper);
         ReqId id = getId();
         builder.getId().setNumber(id);
 
-        auto karr = call(message);
+        auto karr = call(message, false);
 
         capnp::FlatArrayMessageReader responseMessage(karr);
         piper::RpcResponse::Reader reader = responseMessage.getRoot<piper::RpcResponse>();
 
         //!!! handle (explicit) error case

 
     virtual Vamp::Plugin::FeatureSet
     finish(PluginStub *plugin) override {
 
         if (!m_transport->isOK()) {
-            throw std::runtime_error("Piper server failed to start");
+            throw std::runtime_error("Piper server crashed or failed to start");
         }
 
         FinishRequest request;
         request.plugin = plugin;
         

 
         VampnProto::buildRpcRequest_Finish(builder, request, m_mapper);
         ReqId id = getId();
         builder.getId().setNumber(id);
         
-        auto karr = call(message);
+        auto karr = call(message, true);
 
         capnp::FlatArrayMessageReader responseMessage(karr);
         piper::RpcResponse::Reader reader = responseMessage.getRoot<piper::RpcResponse>();
 
         //!!! handle (explicit) error case

           PluginConfiguration config) override {
 
         // Reload the plugin on the server side, and configure it as requested
         
         if (!m_transport->isOK()) {
-            throw std::runtime_error("Piper server failed to start");
+            throw std::runtime_error("Piper server crashed or failed to start");
         }
 
         if (m_mapper.havePlugin(plugin)) {
             (void)finish(plugin); // server-side unload
         }

             throw std::runtime_error("Wrong response id");
         }
     }
 
     kj::Array<capnp::word>
-    call(capnp::MallocMessageBuilder &message) {
+    call(capnp::MallocMessageBuilder &message, bool slow) {
         auto arr = capnp::messageToFlatArray(message);
         auto responseBuffer = m_transport->call(arr.asChars().begin(),
-                                                arr.asChars().size());
+                                                arr.asChars().size(),
+                                                slow);
         return toKJArray(responseBuffer);
     }
     
     PluginHandleMapper::Handle
     serverLoad(std::string key, float inputSampleRate, int adapterFlags,

 
         VampnProto::buildRpcRequest_Load(builder, request);
         ReqId id = getId();
         builder.getId().setNumber(id);
 
-        auto karr = call(message);
+        auto karr = call(message, false);
 
         //!!! ... --> will also need some way to kill this process
         //!!! (from another thread)
 
         capnp::FlatArrayMessageReader responseMessage(karr);