Merge lp:~marcustomlinson/unity-scopes-api/fix_two-way_invoke_hang into lp:unity-scopes-api/devel

[Marcus Tomlinson]

Upped two-way invoke threads to 3 as both rebinding and debug_mode requests could be invoked within a single two-way invocation.

[Pete Woods (pete-woods)]

This fix works for me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:470
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1094/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/652/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/647
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/647/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/646/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1094/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:470
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/1097/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/655
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/650
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/650/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/649

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/1097/rebuild

review: Approve (continuous-integration)

=== modified file 'src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp'
--- src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2014-08-14 00:42:11 +0000
+++ src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2014-08-18 14:05:30 +0000
@@ -198,9 +198,9 @@
             {
                 lock_guard<mutex> lock(data_mutex_);
                 oneway_invoker_.reset(new ThreadPool(1));  // Oneway pool must have a single thread
-                // N.B. We absolutely MUST have AT LEAST 2 two-way invoke threads
-                // as rebinding is invoked within two-way invocations.
-                twoway_invokers_.reset(new ThreadPool(2));  // TODO: get pool size from config
+                // N.B. We absolutely MUST have AT LEAST 3 two-way invoke threads as both rebinding
+                // and debug_mode requests could be invoked within a single two-way invocation.
+                twoway_invokers_.reset(new ThreadPool(3));  // TODO: get pool size from config
             }
             shutdown_flag = false;
             state_ = Started;