diff options
author | Håvard Pettersen <havardpe@oath.com> | 2018-09-04 12:16:55 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@oath.com> | 2018-09-05 13:25:25 +0000 |
commit | f163bfa304b627aa0fda87b13bf4d22f5bf21fbf (patch) | |
tree | 9b1d694b790ac407417ea5dfa0f0ddbb0ae500b7 /slobrok | |
parent | 3bcb5407524034b3206aef269fef52a196023504 (diff) |
remove non-instant invocation
Diffstat (limited to 'slobrok')
-rw-r--r-- | slobrok/src/tests/mirrorapi/mirrorapi.cpp | 2 | ||||
-rw-r--r-- | slobrok/src/tests/oldapi/old.cpp | 2 | ||||
-rw-r--r-- | slobrok/src/tests/standalone/standalone.cpp | 2 | ||||
-rw-r--r-- | slobrok/src/tests/startsome/tstdst.cpp | 4 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/sbregister.cpp | 4 | ||||
-rw-r--r-- | slobrok/src/vespa/slobrok/server/rpchooks.cpp | 38 |
6 files changed, 26 insertions, 26 deletions
diff --git a/slobrok/src/tests/mirrorapi/mirrorapi.cpp b/slobrok/src/tests/mirrorapi/mirrorapi.cpp index 0550bf51b0c..f77dfd80986 100644 --- a/slobrok/src/tests/mirrorapi/mirrorapi.cpp +++ b/slobrok/src/tests/mirrorapi/mirrorapi.cpp @@ -41,7 +41,7 @@ Server::Server(std::string name, int port, std::string slobrokSpec) { FRT_ReflectionBuilder rb(&_orb); //--------------------------------------------------------------------- - rb.DefineMethod("slobrok.callback.listNamesServed", "", "S", true, + rb.DefineMethod("slobrok.callback.listNamesServed", "", "S", FRT_METHOD(Server::rpc_listNamesServed), this); rb.MethodDesc("Look up a rpcserver"); rb.ReturnDesc("names", "The rpcserver names on this server"); diff --git a/slobrok/src/tests/oldapi/old.cpp b/slobrok/src/tests/oldapi/old.cpp index 77bca6dfe90..42cec186a08 100644 --- a/slobrok/src/tests/oldapi/old.cpp +++ b/slobrok/src/tests/oldapi/old.cpp @@ -39,7 +39,7 @@ Server::Server(std::string name, int port, std::string slobrokSpec) { FRT_ReflectionBuilder rb(&_orb); //--------------------------------------------------------------------- - rb.DefineMethod("slobrok.callback.listNamesServed", "", "S", true, + rb.DefineMethod("slobrok.callback.listNamesServed", "", "S", FRT_METHOD(Server::rpc_listNamesServed), this); rb.MethodDesc("Look up a rpcserver"); rb.ReturnDesc("names", "The rpcserver names on this server"); diff --git a/slobrok/src/tests/standalone/standalone.cpp b/slobrok/src/tests/standalone/standalone.cpp index 63f8b1d2c59..136f8125c8b 100644 --- a/slobrok/src/tests/standalone/standalone.cpp +++ b/slobrok/src/tests/standalone/standalone.cpp @@ -26,7 +26,7 @@ Server::Server(std::string name, int port) { FRT_ReflectionBuilder rb(&_orb); //--------------------------------------------------------------------- - rb.DefineMethod("slobrok.callback.listNamesServed", "", "S", true, + rb.DefineMethod("slobrok.callback.listNamesServed", "", "S", FRT_METHOD(Server::rpc_listNamesServed), this); rb.MethodDesc("Look up a rpcserver"); rb.ReturnDesc("names", "The rpcserver names on this server"); diff --git a/slobrok/src/tests/startsome/tstdst.cpp b/slobrok/src/tests/startsome/tstdst.cpp index 44b42e1ff83..4723b3819d7 100644 --- a/slobrok/src/tests/startsome/tstdst.cpp +++ b/slobrok/src/tests/startsome/tstdst.cpp @@ -87,12 +87,12 @@ RPCHooks::initRPC(FRT_Supervisor *supervisor) FRT_ReflectionBuilder rb(supervisor); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.callback.listNamesServed", "", "S", true, + rb.DefineMethod("slobrok.callback.listNamesServed", "", "S", FRT_METHOD(RPCHooks::rpc_listNamesServed), this); rb.MethodDesc("Look up a rpcserver"); rb.ReturnDesc("names", "The rpcserver names on this server"); //------------------------------------------------------------------------- - rb.DefineMethod("system.stop", "", "", true, + rb.DefineMethod("system.stop", "", "", FRT_METHOD(RPCHooks::rpc_stop), this); rb.MethodDesc("Shut down the application"); //------------------------------------------------------------------------- diff --git a/slobrok/src/vespa/slobrok/sbregister.cpp b/slobrok/src/vespa/slobrok/sbregister.cpp index 8f8e42a39aa..a1346feeece 100644 --- a/slobrok/src/vespa/slobrok/sbregister.cpp +++ b/slobrok/src/vespa/slobrok/sbregister.cpp @@ -277,12 +277,12 @@ RegisterAPI::RPCHooks::RPCHooks(RegisterAPI &owner) { FRT_ReflectionBuilder rb(&_owner._orb); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.callback.listNamesServed", "", "S", true, + rb.DefineMethod("slobrok.callback.listNamesServed", "", "S", FRT_METHOD(RPCHooks::rpc_listNamesServed), this); rb.MethodDesc("List rpcserver names"); rb.ReturnDesc("names", "The rpcserver names this server wants to serve"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.callback.notifyUnregistered", "s", "", true, + rb.DefineMethod("slobrok.callback.notifyUnregistered", "s", "", FRT_METHOD(RPCHooks::rpc_notifyUnregistered), this); rb.MethodDesc("Notify a server about removed registration"); rb.ParamDesc("name", "RpcServer name"); diff --git a/slobrok/src/vespa/slobrok/server/rpchooks.cpp b/slobrok/src/vespa/slobrok/server/rpchooks.cpp index 33cc10937df..82e30a309a1 100644 --- a/slobrok/src/vespa/slobrok/server/rpchooks.cpp +++ b/slobrok/src/vespa/slobrok/server/rpchooks.cpp @@ -81,39 +81,39 @@ RPCHooks::initRPC(FRT_Supervisor *supervisor) FRT_ReflectionBuilder rb(supervisor); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.system.resume", "", "", true, + rb.DefineMethod("slobrok.system.resume", "", "", FRT_METHOD(RPCHooks::rpc_resume), this); rb.MethodDesc("Enable something - currently NOP"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.system.suspend", "", "", true, + rb.DefineMethod("slobrok.system.suspend", "", "", FRT_METHOD(RPCHooks::rpc_suspend), this); rb.MethodDesc("Disable something - currently NOP"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.system.version", "", "s", true, + rb.DefineMethod("slobrok.system.version", "", "s", FRT_METHOD(RPCHooks::rpc_version), this); rb.MethodDesc("Get location broker version"); rb.ReturnDesc("version", "version string"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.system.stop", "", "", true, + rb.DefineMethod("slobrok.system.stop", "", "", FRT_METHOD(RPCHooks::rpc_stop), this); rb.MethodDesc("Shut down the location broker application"); //------------------------------------------------------------------------- //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.internal.listManagedRpcServers", "", "SS", true, + rb.DefineMethod("slobrok.internal.listManagedRpcServers", "", "SS", FRT_METHOD(RPCHooks::rpc_listManagedRpcServers), this); rb.MethodDesc("List all rpcservers managed by this location broker"); rb.ReturnDesc("names", "Managed rpcserver names"); rb.ReturnDesc("specs", "The connection specifications (in same order)"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.internal.lookupManaged", "s", "ss", true, + rb.DefineMethod("slobrok.internal.lookupManaged", "s", "ss", FRT_METHOD(RPCHooks::rpc_lookupManaged), this); rb.MethodDesc("Lookup a specific rpcserver managed by this location broker"); rb.ParamDesc("name", "Name of rpc server"); rb.ReturnDesc("name", "Name of rpc server"); rb.ReturnDesc("spec", "The connection specification"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.internal.wantAdd", "sss", "is", true, + rb.DefineMethod("slobrok.internal.wantAdd", "sss", "is", FRT_METHOD(RPCHooks::rpc_wantAdd), this); rb.MethodDesc("remote location broker wants to add a rpcserver"); rb.ParamDesc("slobrok", "Name of remote location broker"); @@ -122,7 +122,7 @@ RPCHooks::initRPC(FRT_Supervisor *supervisor) rb.ReturnDesc("denied", "non-zero if request was denied"); rb.ReturnDesc("reason", "reason for denial"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.internal.doAdd", "sss", "is", true, + rb.DefineMethod("slobrok.internal.doAdd", "sss", "is", FRT_METHOD(RPCHooks::rpc_doAdd), this); rb.MethodDesc("add rpcserver managed by remote location broker"); rb.ParamDesc("slobrok", "Name of remote location broker"); @@ -131,7 +131,7 @@ RPCHooks::initRPC(FRT_Supervisor *supervisor) rb.ReturnDesc("denied", "non-zero if request was denied"); rb.ReturnDesc("reason", "reason for denial"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.internal.doRemove", "sss", "is", true, + rb.DefineMethod("slobrok.internal.doRemove", "sss", "is", FRT_METHOD(RPCHooks::rpc_doRemove), this); rb.MethodDesc("remove rpcserver managed by remote location broker"); rb.ParamDesc("slobrok", "Name of remote location broker"); @@ -142,31 +142,31 @@ RPCHooks::initRPC(FRT_Supervisor *supervisor) //------------------------------------------------------------------------- //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.callback.listNamesServed", "", "S", true, + rb.DefineMethod("slobrok.callback.listNamesServed", "", "S", FRT_METHOD(RPCHooks::rpc_listNamesServed), this); rb.MethodDesc("List rpcservers served"); rb.ReturnDesc("names", "The rpcserver names this server wants to serve"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.callback.notifyUnregistered", "s", "", true, + rb.DefineMethod("slobrok.callback.notifyUnregistered", "s", "", FRT_METHOD(RPCHooks::rpc_notifyUnregistered), this); rb.MethodDesc("Notify a server about removed registration"); rb.ParamDesc("name", "NamedService name"); //------------------------------------------------------------------------- //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.admin.removePeer", "ss", "", true, + rb.DefineMethod("slobrok.admin.removePeer", "ss", "", FRT_METHOD(RPCHooks::rpc_removePeer), this); rb.MethodDesc("stop syncing with other location broker"); rb.ParamDesc("slobrok", "NamedService name of remote location broker"); rb.ParamDesc("spec", "Connection specification of remote location broker"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.admin.addPeer", "ss", "", true, + rb.DefineMethod("slobrok.admin.addPeer", "ss", "", FRT_METHOD(RPCHooks::rpc_addPeer), this); rb.MethodDesc("sync our information with other location broker"); rb.ParamDesc("slobrok", "NamedService name of remote location broker"); rb.ParamDesc("spec", "Connection specification of remote location broker"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.admin.listAllRpcServers", "", "SSS", true, + rb.DefineMethod("slobrok.admin.listAllRpcServers", "", "SSS", FRT_METHOD(RPCHooks::rpc_listAllRpcServers), this); rb.MethodDesc("List all known rpcservers"); rb.ReturnDesc("names", "NamedService names"); @@ -175,13 +175,13 @@ RPCHooks::initRPC(FRT_Supervisor *supervisor) //------------------------------------------------------------------------- //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.unregisterRpcServer", "ss", "", true, + rb.DefineMethod("slobrok.unregisterRpcServer", "ss", "", FRT_METHOD(RPCHooks::rpc_unregisterRpcServer), this); rb.MethodDesc("Unregister a rpcserver"); rb.ParamDesc("name", "NamedService name"); rb.ParamDesc("spec", "The connection specification"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.registerRpcServer", "ss", "", true, + rb.DefineMethod("slobrok.registerRpcServer", "ss", "", FRT_METHOD(RPCHooks::rpc_registerRpcServer), this); rb.MethodDesc("Register a rpcserver"); rb.ParamDesc("name", "NamedService name"); @@ -189,7 +189,7 @@ RPCHooks::initRPC(FRT_Supervisor *supervisor) //------------------------------------------------------------------------- //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.mirror.fetch", "ii", "SSi", true, + rb.DefineMethod("slobrok.mirror.fetch", "ii", "SSi", FRT_METHOD(RPCHooks::rpc_mirrorFetch), this); rb.MethodDesc("Fetch or update mirror of name to spec map"); rb.ParamDesc("gencnt", "generation already known by client"); @@ -199,7 +199,7 @@ RPCHooks::initRPC(FRT_Supervisor *supervisor) rb.ReturnDesc("specs", "Array of connection specifications (same order)"); rb.ReturnDesc("newgen", "Generation count for new version of the map"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.incremental.fetch", "ii", "iSSSi", true, + rb.DefineMethod("slobrok.incremental.fetch", "ii", "iSSSi", FRT_METHOD(RPCHooks::rpc_incrementalFetch), this); rb.MethodDesc("Fetch or update mirror of name to spec map"); rb.ParamDesc("gencnt", "generation already known by client"); @@ -212,7 +212,7 @@ RPCHooks::initRPC(FRT_Supervisor *supervisor) rb.ReturnDesc("specs", "Array of connection specifications (same order)"); rb.ReturnDesc("newgen", "Generation count for new version of the map"); //------------------------------------------------------------------------- - rb.DefineMethod("slobrok.lookupRpcServer", "s", "SS", true, + rb.DefineMethod("slobrok.lookupRpcServer", "s", "SS", FRT_METHOD(RPCHooks::rpc_lookupRpcServer), this); rb.MethodDesc("Look up rpcservers"); rb.ParamDesc("pattern", "The pattern of the rpcservers to lookup.\n" |