← Back to branch summary

~stolowski/unity-scopes-api/revert-delayed-removal

« back to all changes in this revision

Viewing changes to src/scopes/internal/zmq_middleware/ZmqScope.cpp

  • Committer: Tarmac
  • Author(s): Marcus Tomlinson
  • Date: 2015-07-01 16:31:58 UTC
  • mfrom: (606.1.1 devel)
  • Revision ID: tarmac-20150701163158-0aelhcoe1zp3c4lg
Reverted Debug.Process.Timeout and Debug.Locate.Timeout configuration parameters.

Approved by Pawel Stolowski, PS Jenkins bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/scopes/internal/zmq_middleware/ZmqScope.cpp
325
325
        capnp::MallocMessageBuilder request_builder;
326
326
        make_request_(request_builder, "debug_mode");
327
327
 
328
 
        int64_t timeout = mw_base()->debug_locate_timeout();
329
 
        auto future = mw_base()->twoway_pool()->submit([&] { return this->invoke_twoway_(request_builder, -1, timeout); });
 
328
        auto future = mw_base()->twoway_pool()->submit([&] { return this->invoke_twoway_(request_builder, -1, 30000); });
330
329
        auto out_params = future.get();
331
330
        auto response = out_params.reader->getRoot<capnproto::Response>();
332
331
        throw_if_runtime_exception(response);
346
345
ZmqObjectProxy::TwowayOutParams ZmqScope::invoke_scope_(capnp::MessageBuilder& in_params, int64_t timeout)
347
346
{
348
347
    // Check if this scope has requested debug mode, if so, disable two-way timeout and set
349
 
    // locate timeout to debug_locate_timeout.
 
348
    // locate timeout to 30s.
350
349
    if (debug_mode())
351
350
    {
352
 
        int64_t timeout = mw_base()->debug_locate_timeout();
353
 
        return this->invoke_twoway_(in_params, -1, timeout);
 
351
        return this->invoke_twoway_(in_params, -1, 30000);
354
352
    }
355
353
    return this->invoke_twoway_(in_params, timeout);
356
354
}