Merge lp:~marcustomlinson/unity-scopes-api/locate_fix into lp:unity-scopes-api

[Marcus Tomlinson]

Fixed invoke_twoway_() to not call locate() when targeting the registry or the SS registry

[lp:~marcustomlinson/unity-scopes-api/locate_fix]

232. By Marcus Tomlinson on 2014-07-28

Added TODO

[Michi Henning (michihenning)]

As an interim fix, this will help. I really need to get around to reworking the message pump :-(

Marcus, and you please top-approve yourself once Jenkins is happy with it? It's getting late here...

review: Approve

[Marcus Tomlinson (marcustomlinson)]

> As an interim fix, this will help. I really need to get around to reworking
> the message pump :-(
>
> Marcus, and you please top-approve yourself once Jenkins is happy with it?
> It's getting late here...

"getting late"? Its been late there for a while now! :P
Thanks Michi!

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/408/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-amd64-ci/35
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-i386-ci/35

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:232
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/409/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-i386-ci/36

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

review: Approve (continuous-integration)

=== modified file 'src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp'
--- src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2014-07-21 15:45:02 +0000
+++ src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp	2014-07-28 13:07:03 +0000
@@ -841,7 +841,7 @@
         // TODO: get pool size from config
         // NB: On rebind, locate() is called on this adapter. A scope may then call registry methods during
         // its start() method, hence we must ensure this adapter has enough threads available to handle this.
-        pool_size = 6;
+        pool_size = 11;
         mode = RequestMode::Twoway;
     }
     else

=== modified file 'src/scopes/internal/zmq_middleware/ZmqObject.cpp'
--- src/scopes/internal/zmq_middleware/ZmqObject.cpp	2014-07-21 07:29:51 +0000
+++ src/scopes/internal/zmq_middleware/ZmqObject.cpp	2014-07-28 13:07:03 +0000
@@ -209,10 +209,15 @@
 ZmqReceiver ZmqObjectProxy::invoke_twoway_(capnp::MessageBuilder& out_params, int64_t timeout)
 {
     auto registry_proxy = mw_base()->registry_proxy();
-
-    // If a registry is configured and this object is not the registry itself,
+    auto ss_registry_proxy = mw_base()->ss_registry_proxy();
+
+    // TODO: HACK: this builds knowledge about the smartscopes proxy running permanently into the run time.
+    bool this_is_registry = registry_proxy && identity() == registry_proxy->identity();
+    bool this_is_ss_registry = ss_registry_proxy && identity() == ss_registry_proxy->identity();
+
+    // If a registry is configured and this object is not a registry itself,
     // attempt to locate the scope before invoking it.
-    if (registry_proxy && identity() != registry_proxy->identity())
+    if (!this_is_registry && !this_is_ss_registry)
     {
         try
         {