zeroc-ice 3.6.5 → 3.7.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ICE_LICENSE +17 -17
- data/LICENSE +12 -12
- data/bin/slice2rb +1 -6
- data/ext/Communicator.cpp +223 -61
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +23 -7
- data/ext/Connection.cpp +108 -76
- data/ext/Connection.h +4 -6
- data/ext/Endpoint.cpp +16 -54
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -10
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +4 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +38 -54
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +3 -8
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +111 -70
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +5 -20
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +313 -224
- data/ext/Types.h +118 -71
- data/ext/Util.cpp +69 -36
- data/ext/Util.h +117 -42
- data/ext/ValueFactoryManager.cpp +440 -0
- data/ext/ValueFactoryManager.h +95 -0
- data/ext/extconf.rb +52 -48
- data/ext/ice/cpp/include/Ice/Application.h +275 -105
- data/ext/ice/cpp/include/Ice/AsyncResult.h +124 -337
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -7
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +39 -16
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +10 -15
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +56 -17
- data/ext/ice/cpp/include/Ice/Comparable.h +205 -0
- data/ext/ice/cpp/include/Ice/Config.h +16 -39
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +203 -16
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +7 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +23 -0
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +57 -0
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +20 -12
- data/ext/ice/cpp/include/Ice/Dispatcher.h +35 -19
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -10
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +110 -63
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +74 -0
- data/ext/ice/cpp/include/Ice/FactoryTable.h +22 -18
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +28 -31
- data/ext/ice/cpp/include/Ice/Format.h +17 -18
- data/ext/ice/cpp/include/Ice/Functional.h +38 -38
- data/ext/ice/cpp/include/Ice/GCObject.h +9 -10
- data/ext/ice/cpp/include/Ice/Handle.h +6 -16
- data/ext/ice/cpp/include/Ice/Ice.h +9 -10
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +377 -0
- data/ext/ice/cpp/include/Ice/Incoming.h +132 -38
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +109 -31
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +872 -60
- data/ext/ice/cpp/include/Ice/InputStream.h +1514 -0
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -7
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +57 -0
- data/ext/ice/cpp/include/Ice/LocalObject.h +13 -14
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +56 -24
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +124 -71
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +25 -10
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +116 -32
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +61 -30
- data/ext/ice/cpp/include/Ice/Object.h +413 -78
- data/ext/ice/cpp/include/Ice/ObjectF.h +12 -8
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -13
- data/ext/ice/cpp/include/Ice/Optional.h +1114 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +684 -89
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -11
- data/ext/ice/cpp/include/Ice/OutputStream.h +1092 -0
- data/ext/ice/cpp/include/Ice/Protocol.h +49 -17
- data/ext/ice/cpp/include/Ice/Proxy.h +3438 -745
- data/ext/ice/cpp/include/Ice/ProxyF.h +13 -38
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +43 -55
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +84 -12
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -9
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +42 -0
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +273 -154
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +121 -53
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +17 -11
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +453 -140
- data/ext/ice/cpp/include/Ice/StringConverter.h +78 -0
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +19 -0
- data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +22 -28
- data/ext/ice/cpp/include/Ice/UniqueRef.h +97 -0
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +45 -13
- data/ext/ice/cpp/include/Ice/Value.h +139 -0
- data/ext/ice/cpp/include/Ice/ValueF.h +21 -0
- data/ext/ice/cpp/include/IceSSL/Config.h +8 -28
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -11
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +147 -0
- data/ext/ice/cpp/include/IceSSL/Plugin.h +461 -448
- data/ext/ice/cpp/include/IceSSL/SChannel.h +72 -0
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +72 -0
- data/ext/ice/cpp/include/IceSSL/UWP.h +62 -0
- data/ext/ice/cpp/include/IceUtil/Atomic.h +7 -14
- data/ext/ice/cpp/include/IceUtil/Cond.h +17 -23
- data/ext/ice/cpp/include/IceUtil/Config.h +166 -46
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +92 -0
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -10
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +63 -41
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -13
- data/ext/ice/cpp/include/IceUtil/Exception.h +284 -75
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +143 -0
- data/ext/ice/cpp/include/IceUtil/Functional.h +4 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +11 -16
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -15
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -7
- data/ext/ice/cpp/include/IceUtil/Lock.h +8 -15
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -7
- data/ext/ice/cpp/include/IceUtil/Mutex.h +19 -23
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -7
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/Optional.h +134 -23
- data/ext/ice/cpp/include/IceUtil/Options.h +17 -23
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +61 -37
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -11
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +18 -15
- data/ext/ice/cpp/include/IceUtil/Random.h +39 -8
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -13
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +53 -0
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +10 -15
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -7
- data/ext/ice/cpp/include/IceUtil/Shared.h +5 -12
- data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -7
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +146 -126
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -26
- data/ext/ice/cpp/include/IceUtil/Thread.h +10 -17
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -47
- data/ext/ice/cpp/include/IceUtil/Time.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Timer.h +18 -18
- data/ext/ice/cpp/include/IceUtil/UUID.h +6 -7
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +170 -0
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +1156 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Connection.h +1660 -0
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +119 -0
- data/ext/ice/cpp/include/generated/Ice/Current.h +322 -0
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +943 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +166 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +118 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +31 -15
- data/ext/ice/cpp/include/generated/Ice/Identity.h +264 -0
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +278 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +1143 -0
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +128 -0
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +7041 -0
- data/ext/ice/cpp/include/generated/Ice/Locator.h +3850 -0
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +147 -0
- data/ext/ice/cpp/include/generated/Ice/Logger.h +231 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +4717 -0
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1175 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +197 -0
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +306 -0
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +110 -0
- data/ext/ice/cpp/include/generated/Ice/Process.h +971 -0
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/Properties.h +446 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +1360 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +134 -0
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2689 -0
- data/ext/ice/cpp/include/generated/Ice/Router.h +1838 -0
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +299 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +51 -16
- data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +34 -14
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +318 -0
- data/ext/ice/cpp/include/generated/Ice/Version.h +357 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +223 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +101 -0
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +181 -0
- data/ext/ice/cpp/src/Ice/ACM.cpp +38 -27
- data/ext/ice/cpp/src/Ice/ACM.h +9 -7
- data/ext/ice/cpp/src/Ice/ACMF.h +30 -0
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +4 -8
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +59 -0
- data/ext/ice/cpp/src/Ice/ArgVector.h +36 -0
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -544
- data/ext/ice/cpp/src/Ice/Base64.cpp +22 -28
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +41 -18
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -15
- data/ext/ice/cpp/src/Ice/Buffer.cpp +75 -18
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +21 -12
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +86 -197
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -23
- data/ext/ice/cpp/src/Ice/Communicator.cpp +43 -15
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +318 -117
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +95 -40
- data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +55 -122
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +15 -31
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -7
- data/ext/ice/cpp/src/Ice/Connection.cpp +111 -20
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +300 -107
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +44 -28
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +30 -0
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +785 -713
- data/ext/ice/cpp/src/Ice/ConnectionI.h +105 -80
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -20
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +5 -9
- data/ext/ice/cpp/src/Ice/Connector.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Connector.h +4 -8
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -9
- data/ext/ice/cpp/src/Ice/Current.cpp +30 -12
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +10 -16
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +13 -25
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +34 -28
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +107 -19
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -11
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +41 -36
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -9
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +18 -7
- data/ext/ice/cpp/src/Ice/EndpointI.h +39 -18
- data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -10
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +19 -12
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -9
- data/ext/ice/cpp/src/Ice/EventHandler.h +13 -13
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -7
- data/ext/ice/cpp/src/Ice/Exception.cpp +102 -98
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +21 -12
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -33
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -9
- data/ext/ice/cpp/src/Ice/GCObject.cpp +29 -31
- data/ext/ice/cpp/src/Ice/HashUtil.h +3 -9
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -7
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +128 -111
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +23 -19
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -7
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +51 -0
- data/ext/ice/cpp/src/Ice/Identity.cpp +25 -16
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +11 -28
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -10
- data/ext/ice/cpp/src/Ice/Incoming.cpp +284 -255
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -214
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -9
- data/ext/ice/cpp/src/Ice/Initialize.cpp +309 -193
- data/ext/ice/cpp/src/Ice/InputStream.cpp +2726 -0
- data/ext/ice/cpp/src/Ice/Instance.cpp +243 -262
- data/ext/ice/cpp/src/Ice/Instance.h +30 -23
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +137 -23
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +118 -105
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -36
- data/ext/ice/cpp/src/Ice/LocalException.cpp +1191 -422
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Locator.cpp +1282 -1222
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +150 -186
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +31 -36
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +39 -12
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +182 -88
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -9
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +26 -55
- data/ext/ice/cpp/src/Ice/LoggerI.h +7 -18
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -17
- data/ext/ice/cpp/src/Ice/Metrics.cpp +1280 -1107
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +58 -33
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Network.cpp +753 -408
- data/ext/ice/cpp/src/Ice/Network.h +99 -36
- data/ext/ice/cpp/src/Ice/NetworkF.h +2 -7
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +20 -19
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -7
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
- data/ext/ice/cpp/src/Ice/Object.cpp +227 -232
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +45 -13
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +83 -33
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -12
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +25 -0
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +298 -191
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +44 -39
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -37
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +67 -67
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +15 -11
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +801 -366
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1367 -0
- data/ext/ice/cpp/src/Ice/Plugin.cpp +52 -14
- data/ext/ice/cpp/src/Ice/PluginF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +27 -51
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +7 -13
- data/ext/ice/cpp/src/Ice/Process.cpp +294 -128
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/Properties.cpp +42 -15
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +382 -340
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +83 -24
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -10
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +46 -57
- data/ext/ice/cpp/src/Ice/PropertiesI.h +18 -26
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +112 -19
- data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +6 -19
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -7
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -25
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +729 -957
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +33 -38
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -16
- data/ext/ice/cpp/src/Ice/Reference.cpp +190 -106
- data/ext/ice/cpp/src/Ice/Reference.h +39 -28
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +69 -118
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -17
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +19 -9
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +766 -565
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -8
- data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -18
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -11
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -7
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -11
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -12
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +12 -20
- data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -11
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
- data/ext/ice/cpp/src/Ice/Router.cpp +614 -492
- data/ext/ice/cpp/src/Ice/RouterF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +93 -99
- data/ext/ice/cpp/src/Ice/RouterInfo.h +42 -38
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +23 -28
- data/ext/ice/cpp/src/Ice/Selector.cpp +948 -855
- data/ext/ice/cpp/src/Ice/Selector.h +100 -152
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +24 -45
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +2 -7
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +21 -12
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -7
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -25
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +208 -76
- data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -9
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +57 -22
- data/ext/ice/cpp/src/Ice/StringUtil.h +30 -0
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +6 -7
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -8
- data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
- data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +169 -49
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -10
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -12
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +51 -46
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +12 -14
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +17 -32
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -15
- data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +41 -54
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +242 -274
- data/ext/ice/cpp/src/Ice/ThreadPool.h +46 -48
- data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +38 -26
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -7
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -7
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -36
- data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -11
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Transceiver.h +8 -12
- data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +5 -13
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +118 -60
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +13 -10
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +177 -236
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -22
- data/ext/ice/cpp/src/Ice/Value.cpp +76 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +83 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +61 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +37 -0
- data/ext/ice/cpp/src/Ice/Version.cpp +25 -20
- data/ext/ice/cpp/src/Ice/VirtualShared.h +38 -0
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -14
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -12
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -16
- data/ext/ice/cpp/src/Ice/WSConnector.h +3 -11
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +188 -89
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +22 -37
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +65 -66
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -27
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +596 -281
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1383 -543
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +89 -32
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -28
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -66
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -41
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -64
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -8
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +450 -172
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +863 -406
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +47 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +636 -144
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +20 -173
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -22
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +279 -0
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +64 -0
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +42 -17
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +61 -0
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +15 -64
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -18
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +207 -204
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +43 -40
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +42 -16
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -11
- data/ext/ice/cpp/src/IceSSL/Instance.h +7 -12
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -12
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +583 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +134 -115
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +27 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +127 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +477 -182
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +32 -26
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +286 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +58 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -46
- data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -23
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -60
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -12
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +580 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +523 -74
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +123 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +31 -0
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +73 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +187 -221
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +24 -26
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +97 -94
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +26 -192
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -24
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +868 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +69 -201
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +29 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +75 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +174 -161
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +29 -33
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +864 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +45 -0
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +12 -22
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -9
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -8
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +266 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +338 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +41 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +26 -0
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +89 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +383 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +71 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +71 -1260
- data/ext/ice/cpp/src/IceSSL/Util.h +48 -142
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +157 -0
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -27
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -31
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +22 -36
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +30 -126
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Options.cpp +20 -33
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +47 -21
- data/ext/ice/cpp/src/IceUtil/Random.cpp +15 -20
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +4 -19
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -8
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -269
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +582 -244
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -79
- data/ext/ice/cpp/src/IceUtil/Time.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +17 -22
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +97 -101
- data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -40
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +839 -0
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +894 -234
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +72 -0
- data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -7
- data/ext/ice/cpp/src/Slice/Checksum.h +21 -0
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -83
- data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -14
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1981 -1944
- data/ext/ice/cpp/src/Slice/Grammar.h +39 -19
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -20
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2752 -1948
- data/ext/ice/cpp/src/Slice/JavaUtil.h +398 -0
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
- data/ext/ice/cpp/src/Slice/MD5.h +1 -6
- data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -1
- data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +17 -20
- data/ext/ice/cpp/src/Slice/PHPUtil.h +36 -0
- data/ext/ice/cpp/src/Slice/Parser.cpp +1190 -426
- data/ext/ice/cpp/{include → src}/Slice/Parser.h +143 -91
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +67 -36
- data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +8 -18
- data/ext/ice/cpp/src/Slice/Python.cpp +218 -111
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +787 -699
- data/ext/ice/cpp/src/Slice/PythonUtil.h +70 -0
- data/ext/ice/cpp/src/Slice/Ruby.cpp +42 -43
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +175 -445
- data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -11
- data/ext/ice/cpp/src/Slice/Scanner.cpp +390 -399
- data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +36 -69
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +456 -0
- data/ext/ice/cpp/src/Slice/Util.h +50 -0
- data/ice.gemspec +2 -9
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +6 -50
- data/lib/Glacier2/PermissionsVerifier.rb +23 -99
- data/lib/Glacier2/PermissionsVerifierF.rb +2 -7
- data/lib/Glacier2/Router.rb +31 -78
- data/lib/Glacier2/RouterF.rb +2 -7
- data/lib/Glacier2/SSLInfo.rb +3 -11
- data/lib/Glacier2/Session.rb +87 -311
- data/lib/Ice.rb +84 -58
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +54 -61
- data/lib/Ice/CommunicatorF.rb +2 -7
- data/lib/Ice/Connection.rb +152 -166
- data/lib/Ice/ConnectionF.rb +2 -7
- data/lib/Ice/Current.rb +3 -15
- data/lib/Ice/Endpoint.rb +56 -137
- data/lib/Ice/EndpointF.rb +2 -7
- data/lib/Ice/EndpointTypes.rb +2 -11
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +4 -12
- data/lib/Ice/ImplicitContext.rb +4 -38
- data/lib/Ice/ImplicitContextF.rb +2 -7
- data/lib/Ice/Instrumentation.rb +22 -279
- data/lib/Ice/InstrumentationF.rb +2 -7
- data/lib/Ice/LocalException.rb +94 -145
- data/lib/Ice/Locator.rb +50 -169
- data/lib/Ice/LocatorF.rb +2 -7
- data/lib/Ice/Logger.rb +4 -38
- data/lib/Ice/LoggerF.rb +2 -7
- data/lib/Ice/Metrics.rb +60 -420
- data/lib/Ice/ObjectAdapter.rb +29 -0
- data/lib/Ice/ObjectAdapterF.rb +2 -7
- data/lib/Ice/ObjectFactory.rb +4 -34
- data/lib/Ice/Plugin.rb +6 -64
- data/lib/Ice/PluginF.rb +2 -7
- data/lib/Ice/Process.rb +15 -56
- data/lib/Ice/ProcessF.rb +2 -7
- data/lib/Ice/Properties.rb +4 -45
- data/lib/Ice/PropertiesAdmin.rb +18 -60
- data/lib/Ice/PropertiesF.rb +2 -7
- data/lib/Ice/RemoteLogger.rb +33 -119
- data/lib/Ice/Router.rb +28 -105
- data/lib/Ice/RouterF.rb +2 -7
- data/lib/Ice/ServantLocator.rb +26 -0
- data/lib/Ice/ServantLocatorF.rb +24 -0
- data/lib/Ice/SliceChecksumDict.rb +2 -7
- data/lib/Ice/ValueFactory.rb +28 -0
- data/lib/Ice/Version.rb +4 -15
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +43 -152
- data/lib/IceGrid.rb +1 -9
- data/lib/IceGrid/Admin.rb +550 -431
- data/lib/IceGrid/Descriptor.rb +61 -533
- data/lib/IceGrid/Exception.rb +23 -49
- data/lib/IceGrid/FileParser.rb +13 -54
- data/lib/IceGrid/PluginFacade.rb +35 -0
- data/lib/IceGrid/Registry.rb +150 -62
- data/lib/IceGrid/Session.rb +24 -68
- data/lib/IceGrid/UserAccountMapper.rb +13 -54
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +4 -15
- data/lib/IcePatch2/FileServer.rb +32 -80
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +78 -210
- data/lib/IceStorm/Metrics.rb +10 -93
- data/slice/Glacier2/Metrics.ice +20 -10
- data/slice/Glacier2/PermissionsVerifier.ice +19 -12
- data/slice/Glacier2/PermissionsVerifierF.ice +16 -9
- data/slice/Glacier2/Router.ice +19 -13
- data/slice/Glacier2/RouterF.ice +16 -9
- data/slice/Glacier2/SSLInfo.ice +17 -10
- data/slice/Glacier2/Session.ice +24 -18
- data/slice/Ice/BuiltinSequences.ice +18 -9
- data/slice/Ice/Communicator.ice +180 -64
- data/slice/Ice/CommunicatorF.ice +18 -9
- data/slice/Ice/Connection.ice +208 -75
- data/slice/Ice/ConnectionF.ice +18 -9
- data/slice/Ice/Current.ice +37 -28
- data/slice/Ice/Endpoint.ice +73 -21
- data/slice/Ice/EndpointF.ice +19 -10
- data/slice/Ice/EndpointTypes.ice +21 -13
- data/slice/Ice/FacetMap.ice +19 -10
- data/slice/Ice/Identity.ice +24 -10
- data/slice/Ice/ImplicitContext.ice +41 -33
- data/slice/Ice/ImplicitContextF.ice +17 -9
- data/slice/Ice/Instrumentation.ice +37 -30
- data/slice/Ice/InstrumentationF.ice +19 -10
- data/slice/Ice/LocalException.ice +118 -112
- data/slice/Ice/Locator.ice +28 -21
- data/slice/Ice/LocatorF.ice +18 -9
- data/slice/Ice/Logger.ice +26 -18
- data/slice/Ice/LoggerF.ice +18 -9
- data/slice/Ice/Metrics.ice +42 -30
- data/slice/Ice/ObjectAdapter.ice +88 -53
- data/slice/Ice/ObjectAdapterF.ice +18 -9
- data/slice/Ice/ObjectFactory.ice +28 -17
- data/slice/Ice/Plugin.ice +25 -13
- data/slice/Ice/PluginF.ice +22 -9
- data/slice/Ice/Process.ice +20 -11
- data/slice/Ice/ProcessF.ice +18 -9
- data/slice/Ice/Properties.ice +42 -28
- data/slice/Ice/PropertiesAdmin.ice +20 -10
- data/slice/Ice/PropertiesF.ice +18 -9
- data/slice/Ice/RemoteLogger.ice +23 -19
- data/slice/Ice/Router.ice +28 -13
- data/slice/Ice/RouterF.ice +18 -9
- data/slice/Ice/ServantLocator.ice +40 -29
- data/slice/Ice/ServantLocatorF.ice +18 -9
- data/slice/Ice/SliceChecksumDict.ice +18 -9
- data/slice/Ice/ValueFactory.ice +132 -0
- data/slice/Ice/Version.ice +20 -10
- data/slice/IceBT/ConnectionInfo.ice +58 -0
- data/slice/IceBT/EndpointInfo.ice +56 -0
- data/slice/IceBT/Types.ice +44 -0
- data/slice/IceBox/IceBox.ice +45 -27
- data/slice/IceDiscovery/IceDiscovery.ice +75 -10
- data/slice/IceGrid/Admin.ice +410 -44
- data/slice/IceGrid/Descriptor.ice +47 -34
- data/slice/IceGrid/Exception.ice +43 -32
- data/slice/IceGrid/FileParser.ice +21 -12
- data/slice/IceGrid/PluginFacade.ice +26 -18
- data/slice/IceGrid/Registry.ice +150 -21
- data/slice/IceGrid/Session.ice +25 -17
- data/slice/IceGrid/UserAccountMapper.ice +23 -14
- data/slice/IceIAP/ConnectionInfo.ice +73 -0
- data/slice/IceIAP/EndpointInfo.ice +67 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +19 -12
- data/slice/IcePatch2/FileInfo.ice +19 -13
- data/slice/IcePatch2/FileServer.ice +27 -18
- data/slice/IceSSL/ConnectionInfo.ice +27 -23
- data/slice/IceSSL/ConnectionInfoF.ice +30 -0
- data/slice/IceSSL/EndpointInfo.ice +21 -36
- data/slice/IceStorm/IceStorm.ice +33 -24
- data/slice/IceStorm/Metrics.ice +19 -11
- metadata +148 -120
- data/ext/ObjectFactory.cpp +0 -140
- data/ext/ObjectFactory.h +0 -50
- data/ext/ice/cpp/include/Ice/ACMF.h +0 -30
- data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
- data/ext/ice/cpp/include/Ice/BuiltinSequences.h +0 -82
- data/ext/ice/cpp/include/Ice/Communicator.h +0 -200
- data/ext/ice/cpp/include/Ice/Connection.h +0 -497
- data/ext/ice/cpp/include/Ice/ConnectionF.h +0 -74
- data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +0 -30
- data/ext/ice/cpp/include/Ice/Current.h +0 -102
- data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +0 -48
- data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +0 -62
- data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
- data/ext/ice/cpp/include/Ice/EndpointF.h +0 -93
- data/ext/ice/cpp/include/Ice/EndpointTypes.h +0 -82
- data/ext/ice/cpp/include/Ice/Identity.h +0 -168
- data/ext/ice/cpp/include/Ice/ImplicitContext.h +0 -102
- data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
- data/ext/ice/cpp/include/Ice/InstrumentationF.h +0 -75
- data/ext/ice/cpp/include/Ice/LocalException.h +0 -1030
- data/ext/ice/cpp/include/Ice/Locator.h +0 -2193
- data/ext/ice/cpp/include/Ice/LocatorF.h +0 -93
- data/ext/ice/cpp/include/Ice/Logger.h +0 -100
- data/ext/ice/cpp/include/Ice/Metrics.h +0 -2974
- data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
- data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.h +0 -26
- data/ext/ice/cpp/include/Ice/ObjectFactory.h +0 -92
- data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +0 -66
- data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.h +0 -26
- data/ext/ice/cpp/include/Ice/Outgoing.h +0 -225
- data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
- data/ext/ice/cpp/include/Ice/PluginF.h +0 -70
- data/ext/ice/cpp/include/Ice/Process.h +0 -574
- data/ext/ice/cpp/include/Ice/ProcessF.h +0 -83
- data/ext/ice/cpp/include/Ice/Properties.h +0 -136
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
- data/ext/ice/cpp/include/Ice/PropertiesF.h +0 -87
- data/ext/ice/cpp/include/Ice/RemoteLogger.h +0 -1500
- data/ext/ice/cpp/include/Ice/Router.h +0 -1159
- data/ext/ice/cpp/include/Ice/RouterF.h +0 -83
- data/ext/ice/cpp/include/Ice/ServantLocator.h +0 -96
- data/ext/ice/cpp/include/Ice/Stream.h +0 -447
- data/ext/ice/cpp/include/Ice/StreamF.h +0 -30
- data/ext/ice/cpp/include/Ice/Version.h +0 -262
- data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +0 -158
- data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +0 -142
- data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +0 -119
- data/ext/ice/cpp/include/IceUtil/Cache.h +0 -362
- data/ext/ice/cpp/include/IceUtil/IconvStringConverter.h +0 -302
- data/ext/ice/cpp/include/IceUtil/SHA1.h +0 -47
- data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +0 -65
- data/ext/ice/cpp/include/Slice/Checksum.h +0 -26
- data/ext/ice/cpp/include/Slice/CsUtil.h +0 -92
- data/ext/ice/cpp/include/Slice/DotNetNames.h +0 -34
- data/ext/ice/cpp/include/Slice/JavaUtil.h +0 -279
- data/ext/ice/cpp/include/Slice/ObjCUtil.h +0 -127
- data/ext/ice/cpp/include/Slice/PHPUtil.h +0 -50
- data/ext/ice/cpp/include/Slice/PythonUtil.h +0 -64
- data/ext/ice/cpp/include/Slice/Util.h +0 -56
- data/ext/ice/cpp/src/Ice/BasicStream.cpp +0 -3428
- data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +0 -62
- data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +0 -44
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +0 -139
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +0 -43
- data/ext/ice/cpp/src/Ice/Outgoing.cpp +0 -694
- data/ext/ice/cpp/src/Ice/Stream.cpp +0 -53
- data/ext/ice/cpp/src/Ice/StreamI.cpp +0 -832
- data/ext/ice/cpp/src/Ice/StreamI.h +0 -198
- data/ext/ice/cpp/src/IceSSL/Certificate.cpp +0 -1336
- data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +0 -64
- data/ext/ice/cpp/src/IceUtil/ArgVector.h +0 -41
- data/ext/ice/cpp/src/IceUtil/Exception.cpp +0 -792
- data/ext/ice/cpp/src/IceUtil/FileUtil.h +0 -185
- data/ext/ice/cpp/src/Slice/CsUtil.cpp +0 -2660
- data/ext/ice/cpp/src/Slice/DotNetNames.cpp +0 -146
- data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +0 -1310
- data/lib/Ice/ObjectFactoryF.rb +0 -29
- data/lib/IceGrid/Locator.rb +0 -106
- data/lib/IceGrid/Observer.rb +0 -572
- data/lib/IceGrid/Query.rb +0 -169
- data/slice/Freeze/BackgroundSaveEvictor.ice +0 -111
- data/slice/Freeze/CatalogData.ice +0 -49
- data/slice/Freeze/Connection.ice +0 -121
- data/slice/Freeze/ConnectionF.ice +0 -20
- data/slice/Freeze/DB.ice +0 -37
- data/slice/Freeze/Evictor.ice +0 -346
- data/slice/Freeze/EvictorF.ice +0 -22
- data/slice/Freeze/EvictorStorage.ice +0 -72
- data/slice/Freeze/Exception.ice +0 -100
- data/slice/Freeze/Transaction.ice +0 -58
- data/slice/Freeze/TransactionalEvictor.ice +0 -50
- data/slice/Ice/ObjectFactoryF.ice +0 -21
- data/slice/IceGrid/Locator.ice +0 -57
- data/slice/IceGrid/Observer.ice +0 -395
- data/slice/IceGrid/Query.ice +0 -131
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <IceDiscovery/LocatorI.h>
|
11
6
|
#include <IceDiscovery/LookupI.h>
|
@@ -14,6 +9,10 @@
|
|
14
9
|
#include <Ice/Communicator.h>
|
15
10
|
#include <Ice/ObjectAdapter.h>
|
16
11
|
|
12
|
+
#include <IceUtil/Random.h>
|
13
|
+
|
14
|
+
#include <iterator>
|
15
|
+
|
17
16
|
using namespace std;
|
18
17
|
using namespace Ice;
|
19
18
|
using namespace IceDiscovery;
|
@@ -23,11 +22,20 @@ LocatorRegistryI::LocatorRegistryI(const Ice::CommunicatorPtr& com) :
|
|
23
22
|
{
|
24
23
|
}
|
25
24
|
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
25
|
+
#ifdef ICE_CPP11_MAPPING
|
26
|
+
void
|
27
|
+
LocatorRegistryI::setAdapterDirectProxyAsync(string adapterId,
|
28
|
+
shared_ptr<ObjectPrx> proxy,
|
29
|
+
function<void()> response,
|
30
|
+
function<void(exception_ptr)>,
|
31
|
+
const Ice::Current&)
|
32
|
+
#else
|
33
|
+
void
|
34
|
+
LocatorRegistryI::setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb,
|
35
|
+
const std::string& adapterId,
|
36
|
+
const ObjectPrxPtr& proxy,
|
30
37
|
const Current&)
|
38
|
+
#endif
|
31
39
|
{
|
32
40
|
Lock sync(*this);
|
33
41
|
if(proxy)
|
@@ -38,16 +46,30 @@ LocatorRegistryI::setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapt
|
|
38
46
|
{
|
39
47
|
_adapters.erase(adapterId);
|
40
48
|
}
|
49
|
+
#ifdef ICE_CPP11_MAPPING
|
50
|
+
response();
|
51
|
+
#else
|
41
52
|
cb->ice_response();
|
53
|
+
#endif
|
42
54
|
}
|
43
55
|
|
56
|
+
#ifdef ICE_CPP11_MAPPING
|
57
|
+
void
|
58
|
+
LocatorRegistryI::setReplicatedAdapterDirectProxyAsync(string adapterId,
|
59
|
+
string replicaGroupId,
|
60
|
+
shared_ptr<ObjectPrx> proxy,
|
61
|
+
function<void()> response,
|
62
|
+
function<void(exception_ptr)>,
|
63
|
+
const Ice::Current&)
|
64
|
+
#else
|
44
65
|
void
|
45
66
|
LocatorRegistryI::setReplicatedAdapterDirectProxy_async(
|
46
67
|
const AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& cb,
|
47
68
|
const std::string& adapterId,
|
48
69
|
const std::string& replicaGroupId,
|
49
|
-
const
|
70
|
+
const ObjectPrxPtr& proxy,
|
50
71
|
const Current&)
|
72
|
+
#endif
|
51
73
|
{
|
52
74
|
Lock sync(*this);
|
53
75
|
if(proxy)
|
@@ -73,19 +95,35 @@ LocatorRegistryI::setReplicatedAdapterDirectProxy_async(
|
|
73
95
|
}
|
74
96
|
}
|
75
97
|
}
|
98
|
+
#ifdef ICE_CPP11_MAPPING
|
99
|
+
response();
|
100
|
+
#else
|
76
101
|
cb->ice_response();
|
102
|
+
#endif
|
77
103
|
}
|
78
104
|
|
105
|
+
#ifdef ICE_CPP11_MAPPING
|
79
106
|
void
|
80
|
-
LocatorRegistryI::
|
81
|
-
|
82
|
-
|
107
|
+
LocatorRegistryI::setServerProcessProxyAsync(string,
|
108
|
+
shared_ptr<ProcessPrx>,
|
109
|
+
function<void()> response,
|
110
|
+
function<void(exception_ptr)>,
|
111
|
+
const Ice::Current&)
|
112
|
+
{
|
113
|
+
response();
|
114
|
+
}
|
115
|
+
#else
|
116
|
+
void
|
117
|
+
LocatorRegistryI::setServerProcessProxy_async(const AMD_LocatorRegistry_setServerProcessProxyPtr& cb,
|
118
|
+
const std::string&,
|
119
|
+
const ProcessPrxPtr&,
|
83
120
|
const Current&)
|
84
121
|
{
|
85
122
|
cb->ice_response();
|
86
123
|
}
|
124
|
+
#endif
|
87
125
|
|
88
|
-
Ice::
|
126
|
+
Ice::ObjectPrxPtr
|
89
127
|
LocatorRegistryI::findObject(const Ice::Identity& id) const
|
90
128
|
{
|
91
129
|
Lock sync(*this);
|
@@ -94,7 +132,7 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const
|
|
94
132
|
return 0;
|
95
133
|
}
|
96
134
|
|
97
|
-
Ice::
|
135
|
+
Ice::ObjectPrxPtr prx = _wellKnownProxy->ice_identity(id);
|
98
136
|
|
99
137
|
vector<string> adapterIds;
|
100
138
|
for(map<string, set<string> >::const_iterator p = _replicaGroups.begin(); p != _replicaGroups.end(); ++p)
|
@@ -112,7 +150,7 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const
|
|
112
150
|
|
113
151
|
if(adapterIds.empty())
|
114
152
|
{
|
115
|
-
for(map<string, Ice::
|
153
|
+
for(map<string, Ice::ObjectPrxPtr>::const_iterator p = _adapters.begin(); p != _adapters.end(); ++p)
|
116
154
|
{
|
117
155
|
try
|
118
156
|
{
|
@@ -131,16 +169,16 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const
|
|
131
169
|
return 0;
|
132
170
|
}
|
133
171
|
|
134
|
-
|
172
|
+
IceUtilInternal::shuffle(adapterIds.begin(), adapterIds.end());
|
135
173
|
return prx->ice_adapterId(adapterIds[0]);
|
136
174
|
}
|
137
175
|
|
138
|
-
Ice::
|
176
|
+
Ice::ObjectPrxPtr
|
139
177
|
LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) const
|
140
178
|
{
|
141
179
|
Lock sync(*this);
|
142
180
|
|
143
|
-
map<string, Ice::
|
181
|
+
map<string, Ice::ObjectPrxPtr>::const_iterator p = _adapters.find(adapterId);
|
144
182
|
if(p != _adapters.end())
|
145
183
|
{
|
146
184
|
isReplicaGroup = false;
|
@@ -151,10 +189,10 @@ LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) con
|
|
151
189
|
if(q != _replicaGroups.end())
|
152
190
|
{
|
153
191
|
Ice::EndpointSeq endpoints;
|
154
|
-
Ice::
|
192
|
+
Ice::ObjectPrxPtr prx;
|
155
193
|
for(set<string>::const_iterator r = q->second.begin(); r != q->second.end(); ++r)
|
156
194
|
{
|
157
|
-
map<string, Ice::
|
195
|
+
map<string, Ice::ObjectPrxPtr>::const_iterator s = _adapters.find(*r);
|
158
196
|
if(s == _adapters.end())
|
159
197
|
{
|
160
198
|
continue; // TODO: Inconsistency
|
@@ -175,34 +213,53 @@ LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) con
|
|
175
213
|
return prx->ice_endpoints(endpoints);
|
176
214
|
}
|
177
215
|
}
|
178
|
-
|
216
|
+
|
179
217
|
isReplicaGroup = false;
|
180
218
|
return 0;
|
181
219
|
}
|
182
220
|
|
183
|
-
LocatorI::LocatorI(const LookupIPtr& lookup, const
|
221
|
+
LocatorI::LocatorI(const LookupIPtr& lookup, const LocatorRegistryPrxPtr& registry) : _lookup(lookup), _registry(registry)
|
184
222
|
{
|
185
223
|
}
|
186
224
|
|
187
|
-
|
188
|
-
|
189
|
-
|
225
|
+
#ifdef ICE_CPP11_MAPPING
|
226
|
+
void
|
227
|
+
LocatorI::findObjectByIdAsync(Ice::Identity id,
|
228
|
+
function<void(const shared_ptr<ObjectPrx>&)> response,
|
229
|
+
function<void(exception_ptr)> ex,
|
230
|
+
const Ice::Current&) const
|
231
|
+
{
|
232
|
+
_lookup->findObject(make_pair(response, ex), id);
|
233
|
+
}
|
234
|
+
|
235
|
+
void
|
236
|
+
LocatorI::findAdapterByIdAsync(string adapterId,
|
237
|
+
function<void(const shared_ptr<ObjectPrx>&)> response,
|
238
|
+
function<void(exception_ptr)> ex,
|
239
|
+
const Ice::Current&) const
|
240
|
+
{
|
241
|
+
_lookup->findAdapter(make_pair(response, ex), adapterId);
|
242
|
+
}
|
243
|
+
#else
|
244
|
+
void
|
245
|
+
LocatorI::findObjectById_async(const AMD_Locator_findObjectByIdPtr& cb,
|
246
|
+
const Identity& id,
|
190
247
|
const Current&) const
|
191
248
|
{
|
192
249
|
_lookup->findObject(cb, id);
|
193
250
|
}
|
194
251
|
|
195
|
-
void
|
196
|
-
LocatorI::findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb,
|
197
|
-
const std::string& adapterId,
|
252
|
+
void
|
253
|
+
LocatorI::findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb,
|
254
|
+
const std::string& adapterId,
|
198
255
|
const Current&) const
|
199
256
|
{
|
200
257
|
_lookup->findAdapter(cb, adapterId);
|
201
258
|
}
|
259
|
+
#endif
|
202
260
|
|
203
|
-
|
261
|
+
LocatorRegistryPrxPtr
|
204
262
|
LocatorI::getRegistry(const Current&) const
|
205
263
|
{
|
206
264
|
return _registry;
|
207
265
|
}
|
208
|
-
|
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#ifndef LOCATORI_H
|
11
6
|
#define LOCATORI_H
|
@@ -23,54 +18,90 @@ class LocatorRegistryI : public Ice::LocatorRegistry, private IceUtil::Mutex
|
|
23
18
|
public:
|
24
19
|
|
25
20
|
LocatorRegistryI(const Ice::CommunicatorPtr&);
|
26
|
-
|
27
|
-
|
28
|
-
|
21
|
+
|
22
|
+
#ifdef ICE_CPP11_MAPPING
|
23
|
+
virtual void
|
24
|
+
setAdapterDirectProxyAsync(std::string,
|
25
|
+
std::shared_ptr<Ice::ObjectPrx>,
|
26
|
+
std::function<void()>,
|
27
|
+
std::function<void(std::exception_ptr)>,
|
28
|
+
const Ice::Current&);
|
29
|
+
|
30
|
+
virtual void
|
31
|
+
setReplicatedAdapterDirectProxyAsync(std::string,
|
32
|
+
std::string,
|
33
|
+
std::shared_ptr<Ice::ObjectPrx>,
|
34
|
+
std::function<void()>,
|
35
|
+
std::function<void(std::exception_ptr)>,
|
36
|
+
const Ice::Current&);
|
37
|
+
|
38
|
+
virtual void
|
39
|
+
setServerProcessProxyAsync(std::string,
|
40
|
+
std::shared_ptr<Ice::ProcessPrx>,
|
41
|
+
std::function<void()>,
|
42
|
+
std::function<void(std::exception_ptr)>,
|
43
|
+
const Ice::Current&);
|
44
|
+
#else
|
45
|
+
virtual void
|
46
|
+
setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&, const std::string&,
|
29
47
|
const Ice::ObjectPrx&, const Ice::Current&);
|
30
48
|
|
31
49
|
virtual void
|
32
50
|
setReplicatedAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr&,
|
33
|
-
const std::string&, const std::string&, const Ice::ObjectPrx&,
|
51
|
+
const std::string&, const std::string&, const Ice::ObjectPrx&,
|
34
52
|
const Ice::Current&);
|
35
53
|
|
36
|
-
virtual void
|
37
|
-
setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr&, const std::string&,
|
54
|
+
virtual void
|
55
|
+
setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr&, const std::string&,
|
38
56
|
const Ice::ProcessPrx&, const Ice::Current&);
|
39
|
-
|
40
|
-
Ice::
|
41
|
-
Ice::
|
57
|
+
#endif
|
58
|
+
Ice::ObjectPrxPtr findObject(const Ice::Identity&) const;
|
59
|
+
Ice::ObjectPrxPtr findAdapter(const std::string&, bool&) const;
|
42
60
|
|
43
61
|
private:
|
44
62
|
|
45
|
-
const Ice::
|
46
|
-
std::map<std::string, Ice::
|
63
|
+
const Ice::ObjectPrxPtr _wellKnownProxy;
|
64
|
+
std::map<std::string, Ice::ObjectPrxPtr> _adapters;
|
47
65
|
std::map<std::string, std::set<std::string> > _replicaGroups;
|
48
66
|
};
|
49
|
-
|
67
|
+
ICE_DEFINE_PTR(LocatorRegistryIPtr, LocatorRegistryI);
|
50
68
|
|
51
69
|
class LookupI;
|
52
|
-
|
70
|
+
ICE_DEFINE_PTR(LookupIPtr, LookupI);
|
53
71
|
|
54
72
|
class LocatorI : public Ice::Locator
|
55
73
|
{
|
56
74
|
public:
|
57
75
|
|
58
|
-
LocatorI(const LookupIPtr&, const Ice::
|
76
|
+
LocatorI(const LookupIPtr&, const Ice::LocatorRegistryPrxPtr&);
|
77
|
+
|
78
|
+
#ifdef ICE_CPP11_MAPPING
|
79
|
+
virtual void
|
80
|
+
findObjectByIdAsync(Ice::Identity,
|
81
|
+
std::function<void(const std::shared_ptr<Ice::ObjectPrx>&)>,
|
82
|
+
std::function<void(std::exception_ptr)>,
|
83
|
+
const Ice::Current&) const;
|
59
84
|
|
60
|
-
virtual void
|
61
|
-
|
85
|
+
virtual void
|
86
|
+
findAdapterByIdAsync(std::string,
|
87
|
+
std::function<void(const std::shared_ptr<Ice::ObjectPrx>&)>,
|
88
|
+
std::function<void(std::exception_ptr)>,
|
89
|
+
const Ice::Current&) const;
|
90
|
+
#else
|
91
|
+
virtual void
|
92
|
+
findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&,
|
62
93
|
const Ice::Current&) const;
|
63
94
|
|
64
|
-
virtual void
|
65
|
-
findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&,
|
95
|
+
virtual void
|
96
|
+
findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&,
|
66
97
|
const Ice::Current&) const;
|
67
|
-
|
68
|
-
virtual Ice::
|
98
|
+
#endif
|
99
|
+
virtual Ice::LocatorRegistryPrxPtr getRegistry(const Ice::Current&) const;
|
69
100
|
|
70
101
|
private:
|
71
|
-
|
102
|
+
|
72
103
|
LookupIPtr _lookup;
|
73
|
-
Ice::
|
104
|
+
Ice::LocatorRegistryPrxPtr _registry;
|
74
105
|
};
|
75
106
|
|
76
107
|
};
|
@@ -1,59 +1,151 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Ice/Connection.h>
|
11
6
|
#include <Ice/ObjectAdapter.h>
|
12
7
|
#include <Ice/Communicator.h>
|
13
8
|
#include <Ice/LocalException.h>
|
14
9
|
#include <Ice/Initialize.h>
|
15
|
-
#include <
|
10
|
+
#include <Ice/LoggerUtil.h>
|
11
|
+
#include <Ice/UUID.h>
|
12
|
+
|
16
13
|
#include <IceDiscovery/LookupI.h>
|
14
|
+
#include <iterator>
|
17
15
|
|
18
16
|
using namespace std;
|
19
17
|
using namespace Ice;
|
20
18
|
using namespace IceDiscovery;
|
21
19
|
|
20
|
+
#ifndef ICE_CPP11_MAPPING
|
21
|
+
namespace
|
22
|
+
{
|
23
|
+
|
24
|
+
class AdapterCallbackI : public IceUtil::Shared
|
25
|
+
{
|
26
|
+
public:
|
27
|
+
|
28
|
+
AdapterCallbackI(const LookupIPtr& lookup, const AdapterRequestPtr& request) : _lookup(lookup), _request(request)
|
29
|
+
{
|
30
|
+
}
|
31
|
+
|
32
|
+
void
|
33
|
+
completed(const Ice::AsyncResultPtr& result)
|
34
|
+
{
|
35
|
+
try
|
36
|
+
{
|
37
|
+
result->throwLocalException();
|
38
|
+
}
|
39
|
+
catch(const Ice::LocalException& ex)
|
40
|
+
{
|
41
|
+
_lookup->adapterRequestException(_request, ex);
|
42
|
+
}
|
43
|
+
}
|
44
|
+
|
45
|
+
private:
|
46
|
+
|
47
|
+
LookupIPtr _lookup;
|
48
|
+
AdapterRequestPtr _request;
|
49
|
+
};
|
50
|
+
|
51
|
+
class ObjectCallbackI : public IceUtil::Shared
|
52
|
+
{
|
53
|
+
public:
|
54
|
+
|
55
|
+
ObjectCallbackI(const LookupIPtr& lookup, const ObjectRequestPtr& request) : _lookup(lookup), _request(request)
|
56
|
+
{
|
57
|
+
}
|
58
|
+
|
59
|
+
void
|
60
|
+
completed(const Ice::AsyncResultPtr& result)
|
61
|
+
{
|
62
|
+
try
|
63
|
+
{
|
64
|
+
result->throwLocalException();
|
65
|
+
}
|
66
|
+
catch(const Ice::LocalException& ex)
|
67
|
+
{
|
68
|
+
_lookup->objectRequestException(_request, ex);
|
69
|
+
}
|
70
|
+
}
|
71
|
+
|
72
|
+
private:
|
73
|
+
|
74
|
+
LookupIPtr _lookup;
|
75
|
+
ObjectRequestPtr _request;
|
76
|
+
};
|
77
|
+
|
78
|
+
}
|
79
|
+
#endif
|
80
|
+
|
22
81
|
IceDiscovery::Request::Request(const LookupIPtr& lookup, int retryCount) :
|
23
|
-
_lookup(lookup),
|
82
|
+
_lookup(lookup), _requestId(Ice::generateUUID()), _retryCount(retryCount), _lookupCount(0), _failureCount(0)
|
24
83
|
{
|
25
84
|
}
|
26
85
|
|
27
86
|
bool
|
28
87
|
IceDiscovery::Request::retry()
|
29
88
|
{
|
30
|
-
return --
|
89
|
+
return --_retryCount >= 0;
|
90
|
+
}
|
91
|
+
|
92
|
+
void
|
93
|
+
IceDiscovery::Request::invoke(const string& domainId, const vector<pair<LookupPrxPtr, LookupReplyPrxPtr> >& lookups)
|
94
|
+
{
|
95
|
+
_lookupCount = lookups.size();
|
96
|
+
_failureCount = 0;
|
97
|
+
Ice::Identity id;
|
98
|
+
id.name = _requestId;
|
99
|
+
for(vector<pair<LookupPrxPtr, LookupReplyPrxPtr> >::const_iterator p = lookups.begin(); p != lookups.end(); ++p)
|
100
|
+
{
|
101
|
+
invokeWithLookup(domainId, p->first, ICE_UNCHECKED_CAST(LookupReplyPrx, p->second->ice_identity(id)));
|
102
|
+
}
|
103
|
+
}
|
104
|
+
|
105
|
+
bool
|
106
|
+
IceDiscovery::Request::exception()
|
107
|
+
{
|
108
|
+
//
|
109
|
+
// If all the invocations on all the lookup proxies failed, report it to the locator.
|
110
|
+
//
|
111
|
+
if(++_failureCount == _lookupCount)
|
112
|
+
{
|
113
|
+
finished(0);
|
114
|
+
return true;
|
115
|
+
}
|
116
|
+
return false;
|
31
117
|
}
|
32
118
|
|
33
|
-
|
119
|
+
string
|
34
120
|
IceDiscovery::Request::getRequestId() const
|
35
121
|
{
|
36
122
|
return _requestId;
|
37
123
|
}
|
38
124
|
|
125
|
+
AdapterRequest::AdapterRequest(const LookupIPtr& lookup, const std::string& adapterId, int retryCount) :
|
126
|
+
RequestT<std::string, AdapterCB>(lookup, adapterId, retryCount),
|
127
|
+
_start(IceUtil::Time::now())
|
128
|
+
{
|
129
|
+
}
|
130
|
+
|
39
131
|
bool
|
40
132
|
AdapterRequest::retry()
|
41
133
|
{
|
42
|
-
return _proxies.empty() && --
|
134
|
+
return _proxies.empty() && --_retryCount >= 0;
|
43
135
|
}
|
44
136
|
|
45
137
|
bool
|
46
|
-
AdapterRequest::response(const Ice::
|
138
|
+
AdapterRequest::response(const Ice::ObjectPrxPtr& proxy, bool isReplicaGroup)
|
47
139
|
{
|
48
140
|
if(isReplicaGroup)
|
49
141
|
{
|
50
142
|
if(_latency == IceUtil::Time())
|
51
143
|
{
|
52
144
|
_latency = (IceUtil::Time::now() - _start) * _lookup->latencyMultiplier();
|
53
|
-
_lookup->timer()->cancel(
|
54
|
-
_lookup->timer()->schedule(
|
145
|
+
_lookup->timer()->cancel(ICE_SHARED_FROM_THIS);
|
146
|
+
_lookup->timer()->schedule(ICE_SHARED_FROM_THIS, _latency);
|
55
147
|
}
|
56
|
-
_proxies.
|
148
|
+
_proxies.insert(proxy);
|
57
149
|
return false;
|
58
150
|
}
|
59
151
|
finished(proxy);
|
@@ -61,60 +153,123 @@ AdapterRequest::response(const Ice::ObjectPrx& proxy, bool isReplicaGroup)
|
|
61
153
|
}
|
62
154
|
|
63
155
|
void
|
64
|
-
AdapterRequest::finished(const
|
156
|
+
AdapterRequest::finished(const ObjectPrxPtr& proxy)
|
65
157
|
{
|
66
158
|
if(proxy || _proxies.empty())
|
67
159
|
{
|
68
|
-
RequestT<
|
69
|
-
return;
|
160
|
+
RequestT<string, AdapterCB>::finished(proxy);
|
70
161
|
}
|
71
162
|
else if(_proxies.size() == 1)
|
72
163
|
{
|
73
|
-
RequestT<
|
74
|
-
return;
|
164
|
+
RequestT<string, AdapterCB>::finished(*_proxies.begin());
|
75
165
|
}
|
76
|
-
|
77
|
-
Ice::EndpointSeq endpoints;
|
78
|
-
Ice::ObjectPrx prx;
|
79
|
-
for(vector<Ice::ObjectPrx>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
|
166
|
+
else
|
80
167
|
{
|
81
|
-
|
168
|
+
EndpointSeq endpoints;
|
169
|
+
ObjectPrxPtr prx;
|
170
|
+
for(set<ObjectPrxPtr>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
|
82
171
|
{
|
83
|
-
prx
|
172
|
+
if(!prx)
|
173
|
+
{
|
174
|
+
prx = *p;
|
175
|
+
}
|
176
|
+
Ice::EndpointSeq endpts = (*p)->ice_getEndpoints();
|
177
|
+
copy(endpts.begin(), endpts.end(), back_inserter(endpoints));
|
84
178
|
}
|
85
|
-
|
86
|
-
copy(endpts.begin(), endpts.end(), back_inserter(endpoints));
|
179
|
+
RequestT<string, AdapterCB>::finished(prx->ice_endpoints(endpoints));
|
87
180
|
}
|
88
|
-
|
181
|
+
}
|
182
|
+
|
183
|
+
void
|
184
|
+
AdapterRequest::invokeWithLookup(const string& domainId, const LookupPrxPtr& lookup, const LookupReplyPrxPtr& lookupReply)
|
185
|
+
{
|
186
|
+
#ifdef ICE_CPP11_MAPPING
|
187
|
+
auto self = ICE_SHARED_FROM_THIS;
|
188
|
+
lookup->findAdapterByIdAsync(domainId, _id, lookupReply, nullptr, [self](exception_ptr ex)
|
189
|
+
{
|
190
|
+
try
|
191
|
+
{
|
192
|
+
rethrow_exception(ex);
|
193
|
+
}
|
194
|
+
catch(const Ice::LocalException& e)
|
195
|
+
{
|
196
|
+
self->_lookup->adapterRequestException(self, e);
|
197
|
+
}
|
198
|
+
});
|
199
|
+
#else
|
200
|
+
lookup->begin_findAdapterById(domainId, _id, lookupReply, newCallback(new AdapterCallbackI(_lookup, this),
|
201
|
+
&AdapterCallbackI::completed));
|
202
|
+
#endif
|
89
203
|
}
|
90
204
|
|
91
205
|
void
|
92
206
|
AdapterRequest::runTimerTask()
|
93
207
|
{
|
94
|
-
_lookup->adapterRequestTimedOut(
|
208
|
+
_lookup->adapterRequestTimedOut(ICE_SHARED_FROM_THIS);
|
209
|
+
}
|
210
|
+
|
211
|
+
ObjectRequest::ObjectRequest(const LookupIPtr& lookup, const Ice::Identity& id, int retryCount) :
|
212
|
+
RequestT<Ice::Identity, ObjectCB>(lookup, id, retryCount)
|
213
|
+
{
|
95
214
|
}
|
96
215
|
|
97
216
|
void
|
98
|
-
ObjectRequest::response(const Ice::
|
217
|
+
ObjectRequest::response(const Ice::ObjectPrxPtr& proxy)
|
99
218
|
{
|
100
219
|
finished(proxy);
|
101
220
|
}
|
102
221
|
|
222
|
+
void
|
223
|
+
ObjectRequest::invokeWithLookup(const string& domainId, const LookupPrxPtr& lookup, const LookupReplyPrxPtr& lookupReply)
|
224
|
+
{
|
225
|
+
#ifdef ICE_CPP11_MAPPING
|
226
|
+
auto self = ICE_SHARED_FROM_THIS;
|
227
|
+
lookup->findObjectByIdAsync(domainId, _id, lookupReply, nullptr, [self](exception_ptr ex)
|
228
|
+
{
|
229
|
+
try
|
230
|
+
{
|
231
|
+
rethrow_exception(ex);
|
232
|
+
}
|
233
|
+
catch(const Ice::LocalException& e)
|
234
|
+
{
|
235
|
+
self->_lookup->objectRequestException(self, e);
|
236
|
+
}
|
237
|
+
});
|
238
|
+
#else
|
239
|
+
lookup->begin_findObjectById(domainId, _id, lookupReply, newCallback(new ObjectCallbackI(_lookup, this),
|
240
|
+
&ObjectCallbackI::completed));
|
241
|
+
|
242
|
+
#endif
|
243
|
+
}
|
244
|
+
|
103
245
|
void
|
104
246
|
ObjectRequest::runTimerTask()
|
105
247
|
{
|
106
|
-
_lookup->objectRequestTimedOut(
|
248
|
+
_lookup->objectRequestTimedOut(ICE_SHARED_FROM_THIS);
|
107
249
|
}
|
108
250
|
|
109
|
-
LookupI::LookupI(const LocatorRegistryIPtr& registry, const
|
251
|
+
LookupI::LookupI(const LocatorRegistryIPtr& registry, const LookupPrxPtr& lookup, const Ice::PropertiesPtr& properties) :
|
110
252
|
_registry(registry),
|
111
253
|
_lookup(lookup),
|
112
254
|
_timeout(IceUtil::Time::milliSeconds(properties->getPropertyAsIntWithDefault("IceDiscovery.Timeout", 300))),
|
113
255
|
_retryCount(properties->getPropertyAsIntWithDefault("IceDiscovery.RetryCount", 3)),
|
114
256
|
_latencyMultiplier(properties->getPropertyAsIntWithDefault("IceDiscovery.LatencyMultiplier", 1)),
|
115
257
|
_domainId(properties->getProperty("IceDiscovery.DomainId")),
|
116
|
-
_timer(IceInternal::getInstanceTimer(lookup->ice_getCommunicator()))
|
258
|
+
_timer(IceInternal::getInstanceTimer(lookup->ice_getCommunicator())),
|
259
|
+
_warnOnce(true)
|
117
260
|
{
|
261
|
+
//
|
262
|
+
// Create one lookup proxy per endpoint from the given proxy. We want to send a multicast
|
263
|
+
// datagram on each endpoint.
|
264
|
+
//
|
265
|
+
EndpointSeq endpoints = lookup->ice_getEndpoints();
|
266
|
+
for(vector<EndpointPtr>::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p)
|
267
|
+
{
|
268
|
+
EndpointSeq single;
|
269
|
+
single.push_back(*p);
|
270
|
+
_lookups.push_back(make_pair(lookup->ice_endpoints(single), LookupReplyPrxPtr()));
|
271
|
+
}
|
272
|
+
assert(!_lookups.empty());
|
118
273
|
}
|
119
274
|
|
120
275
|
LookupI::~LookupI()
|
@@ -130,6 +285,7 @@ LookupI::destroy()
|
|
130
285
|
p->second->finished(0);
|
131
286
|
_timer->cancel(p->second);
|
132
287
|
}
|
288
|
+
_objectRequests.clear();
|
133
289
|
|
134
290
|
for(map<string, AdapterRequestPtr>::const_iterator p = _adapterRequests.begin(); p != _adapterRequests.end(); ++p)
|
135
291
|
{
|
@@ -140,13 +296,38 @@ LookupI::destroy()
|
|
140
296
|
}
|
141
297
|
|
142
298
|
void
|
143
|
-
LookupI::setLookupReply(const
|
299
|
+
LookupI::setLookupReply(const LookupReplyPrxPtr& lookupReply)
|
144
300
|
{
|
145
|
-
|
301
|
+
//
|
302
|
+
// Use a lookup reply proxy whose adress matches the interface used to send multicast datagrams.
|
303
|
+
//
|
304
|
+
for(vector<pair<LookupPrxPtr, LookupReplyPrxPtr> >::iterator p = _lookups.begin(); p != _lookups.end(); ++p)
|
305
|
+
{
|
306
|
+
UDPEndpointInfoPtr info = ICE_DYNAMIC_CAST(UDPEndpointInfo, p->first->ice_getEndpoints()[0]->getInfo());
|
307
|
+
if(info && !info->mcastInterface.empty())
|
308
|
+
{
|
309
|
+
EndpointSeq endpts = lookupReply->ice_getEndpoints();
|
310
|
+
for(EndpointSeq::const_iterator q = endpts.begin(); q != endpts.end(); ++q)
|
311
|
+
{
|
312
|
+
IPEndpointInfoPtr r = ICE_DYNAMIC_CAST(IPEndpointInfo, (*q)->getInfo());
|
313
|
+
if(r && r->host == info->mcastInterface)
|
314
|
+
{
|
315
|
+
EndpointSeq single;
|
316
|
+
single.push_back(*q);
|
317
|
+
p->second = lookupReply->ice_endpoints(single);
|
318
|
+
}
|
319
|
+
}
|
320
|
+
}
|
321
|
+
|
322
|
+
if(!p->second)
|
323
|
+
{
|
324
|
+
p->second = lookupReply; // Fallback: just use the given lookup reply proxy if no matching endpoint found.
|
325
|
+
}
|
326
|
+
}
|
146
327
|
}
|
147
328
|
|
148
329
|
void
|
149
|
-
LookupI::findObjectById(
|
330
|
+
LookupI::findObjectById(ICE_IN(string) domainId, ICE_IN(Ice::Identity) id, ICE_IN(LookupReplyPrxPtr) reply,
|
150
331
|
const Ice::Current&)
|
151
332
|
{
|
152
333
|
if(domainId != _domainId)
|
@@ -154,7 +335,7 @@ LookupI::findObjectById(const string& domainId, const Ice::Identity& id, const I
|
|
154
335
|
return; // Ignore.
|
155
336
|
}
|
156
337
|
|
157
|
-
Ice::
|
338
|
+
Ice::ObjectPrxPtr proxy = _registry->findObject(id);
|
158
339
|
if(proxy)
|
159
340
|
{
|
160
341
|
//
|
@@ -162,7 +343,11 @@ LookupI::findObjectById(const string& domainId, const Ice::Identity& id, const I
|
|
162
343
|
//
|
163
344
|
try
|
164
345
|
{
|
346
|
+
#ifdef ICE_CPP11_MAPPING
|
347
|
+
reply->foundObjectByIdAsync(id, proxy);
|
348
|
+
#else
|
165
349
|
reply->begin_foundObjectById(id, proxy);
|
350
|
+
#endif
|
166
351
|
}
|
167
352
|
catch(const Ice::LocalException&)
|
168
353
|
{
|
@@ -172,8 +357,8 @@ LookupI::findObjectById(const string& domainId, const Ice::Identity& id, const I
|
|
172
357
|
}
|
173
358
|
|
174
359
|
void
|
175
|
-
LookupI::findAdapterById(
|
176
|
-
const
|
360
|
+
LookupI::findAdapterById(ICE_IN(string) domainId, ICE_IN(string) adapterId, ICE_IN(LookupReplyPrxPtr) reply,
|
361
|
+
const Ice::Current&)
|
177
362
|
{
|
178
363
|
if(domainId != _domainId)
|
179
364
|
{
|
@@ -181,7 +366,7 @@ LookupI::findAdapterById(const string& domainId, const std::string& adapterId,
|
|
181
366
|
}
|
182
367
|
|
183
368
|
bool isReplicaGroup;
|
184
|
-
Ice::
|
369
|
+
Ice::ObjectPrxPtr proxy = _registry->findAdapter(adapterId, isReplicaGroup);
|
185
370
|
if(proxy)
|
186
371
|
{
|
187
372
|
//
|
@@ -189,7 +374,11 @@ LookupI::findAdapterById(const string& domainId, const std::string& adapterId,
|
|
189
374
|
//
|
190
375
|
try
|
191
376
|
{
|
377
|
+
#ifdef ICE_CPP11_MAPPING
|
378
|
+
reply->foundAdapterByIdAsync(adapterId, proxy, isReplicaGroup);
|
379
|
+
#else
|
192
380
|
reply->begin_foundAdapterById(adapterId, proxy, isReplicaGroup);
|
381
|
+
#endif
|
193
382
|
}
|
194
383
|
catch(const Ice::LocalException&)
|
195
384
|
{
|
@@ -199,65 +388,63 @@ LookupI::findAdapterById(const string& domainId, const std::string& adapterId,
|
|
199
388
|
}
|
200
389
|
|
201
390
|
void
|
202
|
-
LookupI::findObject(const
|
391
|
+
LookupI::findObject(const ObjectCB& cb, const Ice::Identity& id)
|
203
392
|
{
|
204
393
|
Lock sync(*this);
|
205
394
|
map<Ice::Identity, ObjectRequestPtr>::iterator p = _objectRequests.find(id);
|
206
395
|
if(p == _objectRequests.end())
|
207
396
|
{
|
208
|
-
p = _objectRequests.insert(make_pair(id,
|
397
|
+
p = _objectRequests.insert(make_pair(id, ICE_MAKE_SHARED(ObjectRequest,
|
398
|
+
ICE_SHARED_FROM_THIS,
|
399
|
+
id,
|
400
|
+
_retryCount))).first;
|
209
401
|
}
|
210
402
|
|
211
403
|
if(p->second->addCallback(cb))
|
212
404
|
{
|
213
405
|
try
|
214
406
|
{
|
215
|
-
|
216
|
-
ident.name = p->second->getRequestId();
|
217
|
-
_lookup->begin_findObjectById(_domainId,
|
218
|
-
id,
|
219
|
-
LookupReplyPrx::uncheckedCast(_lookupReply->ice_identity(ident)));
|
407
|
+
p->second->invoke(_domainId, _lookups);
|
220
408
|
_timer->schedule(p->second, _timeout);
|
221
409
|
}
|
222
410
|
catch(const Ice::LocalException&)
|
223
411
|
{
|
224
|
-
p->second->finished(
|
412
|
+
p->second->finished(ICE_NULLPTR);
|
225
413
|
_objectRequests.erase(p);
|
226
414
|
}
|
227
415
|
}
|
228
416
|
}
|
229
417
|
|
230
418
|
void
|
231
|
-
LookupI::findAdapter(const
|
419
|
+
LookupI::findAdapter(const AdapterCB& cb, const std::string& adapterId)
|
232
420
|
{
|
233
421
|
Lock sync(*this);
|
234
422
|
map<string, AdapterRequestPtr>::iterator p = _adapterRequests.find(adapterId);
|
235
423
|
if(p == _adapterRequests.end())
|
236
424
|
{
|
237
|
-
p = _adapterRequests.insert(make_pair(adapterId,
|
425
|
+
p = _adapterRequests.insert(make_pair(adapterId, ICE_MAKE_SHARED(AdapterRequest,
|
426
|
+
ICE_SHARED_FROM_THIS,
|
427
|
+
adapterId,
|
428
|
+
_retryCount))).first;
|
238
429
|
}
|
239
430
|
|
240
431
|
if(p->second->addCallback(cb))
|
241
432
|
{
|
242
433
|
try
|
243
434
|
{
|
244
|
-
|
245
|
-
ident.name = p->second->getRequestId();
|
246
|
-
_lookup->begin_findAdapterById(_domainId,
|
247
|
-
adapterId,
|
248
|
-
LookupReplyPrx::uncheckedCast(_lookupReply->ice_identity(ident)));
|
435
|
+
p->second->invoke(_domainId, _lookups);
|
249
436
|
_timer->schedule(p->second, _timeout);
|
250
437
|
}
|
251
438
|
catch(const Ice::LocalException&)
|
252
439
|
{
|
253
|
-
p->second->finished(
|
440
|
+
p->second->finished(ICE_NULLPTR);
|
254
441
|
_adapterRequests.erase(p);
|
255
442
|
}
|
256
443
|
}
|
257
444
|
}
|
258
445
|
|
259
446
|
void
|
260
|
-
LookupI::foundObject(const Ice::Identity& id, const string& requestId, const Ice::
|
447
|
+
LookupI::foundObject(const Ice::Identity& id, const string& requestId, const Ice::ObjectPrxPtr& proxy)
|
261
448
|
{
|
262
449
|
Lock sync(*this);
|
263
450
|
map<Ice::Identity, ObjectRequestPtr>::iterator p = _objectRequests.find(id);
|
@@ -270,7 +457,7 @@ LookupI::foundObject(const Ice::Identity& id, const string& requestId, const Ice
|
|
270
457
|
}
|
271
458
|
|
272
459
|
void
|
273
|
-
LookupI::foundAdapter(const
|
460
|
+
LookupI::foundAdapter(const string& adapterId, const string& requestId, const Ice::ObjectPrxPtr& proxy,
|
274
461
|
bool isReplicaGroup)
|
275
462
|
{
|
276
463
|
Lock sync(*this);
|
@@ -299,8 +486,8 @@ LookupI::objectRequestTimedOut(const ObjectRequestPtr& request)
|
|
299
486
|
{
|
300
487
|
try
|
301
488
|
{
|
302
|
-
|
303
|
-
_timer->schedule(
|
489
|
+
request->invoke(_domainId, _lookups);
|
490
|
+
_timer->schedule(request, _timeout);
|
304
491
|
return;
|
305
492
|
}
|
306
493
|
catch(const Ice::LocalException&)
|
@@ -313,6 +500,29 @@ LookupI::objectRequestTimedOut(const ObjectRequestPtr& request)
|
|
313
500
|
_timer->cancel(request);
|
314
501
|
}
|
315
502
|
|
503
|
+
void
|
504
|
+
LookupI::adapterRequestException(const AdapterRequestPtr& request, const LocalException& ex)
|
505
|
+
{
|
506
|
+
Lock sync(*this);
|
507
|
+
map<string, AdapterRequestPtr>::iterator p = _adapterRequests.find(request->getId());
|
508
|
+
if(p == _adapterRequests.end() || p->second.get() != request.get())
|
509
|
+
{
|
510
|
+
return;
|
511
|
+
}
|
512
|
+
|
513
|
+
if(request->exception())
|
514
|
+
{
|
515
|
+
if(_warnOnce)
|
516
|
+
{
|
517
|
+
Warning warn(_lookup->ice_getCommunicator()->getLogger());
|
518
|
+
warn << "failed to lookup adapter `" << p->first << "' with lookup proxy `" << _lookup << "':\n" << ex;
|
519
|
+
_warnOnce = false;
|
520
|
+
}
|
521
|
+
_timer->cancel(request);
|
522
|
+
_adapterRequests.erase(p);
|
523
|
+
}
|
524
|
+
}
|
525
|
+
|
316
526
|
void
|
317
527
|
LookupI::adapterRequestTimedOut(const AdapterRequestPtr& request)
|
318
528
|
{
|
@@ -327,8 +537,8 @@ LookupI::adapterRequestTimedOut(const AdapterRequestPtr& request)
|
|
327
537
|
{
|
328
538
|
try
|
329
539
|
{
|
330
|
-
|
331
|
-
_timer->schedule(
|
540
|
+
request->invoke(_domainId, _lookups);
|
541
|
+
_timer->schedule(request, _timeout);
|
332
542
|
return;
|
333
543
|
}
|
334
544
|
catch(const Ice::LocalException&)
|
@@ -341,19 +551,58 @@ LookupI::adapterRequestTimedOut(const AdapterRequestPtr& request)
|
|
341
551
|
_timer->cancel(request);
|
342
552
|
}
|
343
553
|
|
554
|
+
void
|
555
|
+
LookupI::objectRequestException(const ObjectRequestPtr& request, const LocalException& ex)
|
556
|
+
{
|
557
|
+
Lock sync(*this);
|
558
|
+
map<Ice::Identity, ObjectRequestPtr>::iterator p = _objectRequests.find(request->getId());
|
559
|
+
if(p == _objectRequests.end() || p->second.get() != request.get())
|
560
|
+
{
|
561
|
+
return;
|
562
|
+
}
|
563
|
+
|
564
|
+
if(request->exception())
|
565
|
+
{
|
566
|
+
if(_warnOnce)
|
567
|
+
{
|
568
|
+
Warning warn(_lookup->ice_getCommunicator()->getLogger());
|
569
|
+
string id = _lookup->ice_getCommunicator()->identityToString(p->first);
|
570
|
+
warn << "failed to lookup object `" << id << "' with lookup proxy `" << _lookup << "':\n" << ex;
|
571
|
+
_warnOnce = false;
|
572
|
+
}
|
573
|
+
_timer->cancel(request);
|
574
|
+
_objectRequests.erase(p);
|
575
|
+
}
|
576
|
+
}
|
577
|
+
|
344
578
|
LookupReplyI::LookupReplyI(const LookupIPtr& lookup) : _lookup(lookup)
|
345
579
|
{
|
346
580
|
}
|
347
581
|
|
582
|
+
#ifdef ICE_CPP11_MAPPING
|
583
|
+
void
|
584
|
+
LookupReplyI::foundObjectById(Identity id, shared_ptr<ObjectPrx> proxy, const Current& current)
|
585
|
+
{
|
586
|
+
_lookup->foundObject(id, current.id.name, proxy);
|
587
|
+
}
|
588
|
+
|
589
|
+
void
|
590
|
+
LookupReplyI::foundAdapterById(string adapterId, shared_ptr<ObjectPrx> proxy, bool isReplicaGroup,
|
591
|
+
const Current& current)
|
592
|
+
{
|
593
|
+
_lookup->foundAdapter(adapterId, current.id.name, proxy, isReplicaGroup);
|
594
|
+
}
|
595
|
+
#else
|
348
596
|
void
|
349
|
-
LookupReplyI::foundObjectById(const
|
597
|
+
LookupReplyI::foundObjectById(const Identity& id, const ObjectPrxPtr& proxy, const Current& current)
|
350
598
|
{
|
351
599
|
_lookup->foundObject(id, current.id.name, proxy);
|
352
600
|
}
|
353
601
|
|
354
602
|
void
|
355
|
-
LookupReplyI::foundAdapterById(const
|
356
|
-
const
|
603
|
+
LookupReplyI::foundAdapterById(const string& adapterId, const ObjectPrxPtr& proxy, bool isReplicaGroup,
|
604
|
+
const Current& current)
|
357
605
|
{
|
358
606
|
_lookup->foundAdapter(adapterId, current.id.name, proxy, isReplicaGroup);
|
359
607
|
}
|
608
|
+
#endif
|