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
@@ -0,0 +1,47 @@
|
|
1
|
+
//
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
|
+
//
|
4
|
+
|
5
|
+
#ifndef LOCATOR_DISCOVERY_PLUGIN_I_H
|
6
|
+
#define LOCATOR_DISCOVERY_PLUGIN_I_H
|
7
|
+
|
8
|
+
#include <Ice/Config.h>
|
9
|
+
#include <Ice/Plugin.h>
|
10
|
+
#include <Ice/Locator.h>
|
11
|
+
#include <IceUtil/Time.h>
|
12
|
+
|
13
|
+
//
|
14
|
+
// Automatically link IceLocatorDiscovery[D|++11|++11D].lib with Visual C++
|
15
|
+
//
|
16
|
+
#if !defined(ICE_BUILDING_ICE_LOCATOR_DISCOVERY) && defined(ICE_LOCATOR_DISCOVERY_API_EXPORTS)
|
17
|
+
# define ICE_BUILDING_ICE_LOCATOR_DISCOVERY
|
18
|
+
#endif
|
19
|
+
|
20
|
+
#if defined(_MSC_VER) && !defined(ICE_BUILDING_ICE_LOCATOR_DISCOVERY)
|
21
|
+
# pragma comment(lib, ICE_LIBNAME("IceLocatorDiscovery"))
|
22
|
+
#endif
|
23
|
+
|
24
|
+
#ifndef ICE_LOCATOR_DISCOVERY_API
|
25
|
+
# if defined(ICE_STATIC_LIBS)
|
26
|
+
# define ICE_LOCATOR_DISCOVERY_API /**/
|
27
|
+
# elif defined(ICE_LOCATOR_DISCOVERY_API_EXPORTS)
|
28
|
+
# define ICE_LOCATOR_DISCOVERY_API ICE_DECLSPEC_EXPORT
|
29
|
+
# else
|
30
|
+
# define ICE_LOCATOR_DISCOVERY_API ICE_DECLSPEC_IMPORT
|
31
|
+
# endif
|
32
|
+
#endif
|
33
|
+
|
34
|
+
namespace IceLocatorDiscovery
|
35
|
+
{
|
36
|
+
|
37
|
+
class ICE_LOCATOR_DISCOVERY_API Plugin : public Ice::Plugin
|
38
|
+
{
|
39
|
+
public:
|
40
|
+
|
41
|
+
virtual std::vector<Ice::LocatorPrxPtr> getLocators(const std::string&, const IceUtil::Time&) const = 0;
|
42
|
+
};
|
43
|
+
ICE_DEFINE_PTR(PluginPtr, Plugin);
|
44
|
+
|
45
|
+
};
|
46
|
+
|
47
|
+
#endif
|
@@ -1,34 +1,36 @@
|
|
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 <IceUtil/IceUtil.h>
|
11
6
|
#include <Ice/Ice.h>
|
7
|
+
#include <Ice/Network.h> // For getInterfacesForMulticast
|
8
|
+
#include <Ice/LoggerUtil.h>
|
12
9
|
|
10
|
+
#include <IceLocatorDiscovery/Plugin.h>
|
13
11
|
#include <IceLocatorDiscovery/IceLocatorDiscovery.h>
|
14
12
|
|
15
13
|
using namespace std;
|
16
14
|
using namespace IceLocatorDiscovery;
|
17
15
|
|
18
|
-
#ifndef ICE_LOCATOR_DISCOVERY_API
|
19
|
-
# ifdef ICE_LOCATOR_DISCOVERY_API_EXPORTS
|
20
|
-
# define ICE_LOCATOR_DISCOVERY_API ICE_DECLSPEC_EXPORT
|
21
|
-
# else
|
22
|
-
# define ICE_LOCATOR_DISCOVERY_API /**/
|
23
|
-
# endif
|
24
|
-
#endif
|
25
|
-
|
26
16
|
namespace
|
27
17
|
{
|
28
18
|
|
29
19
|
class LocatorI; // Forward declaration
|
30
20
|
|
31
|
-
|
21
|
+
#ifdef ICE_CPP11_MAPPING
|
22
|
+
typedef std::pair<function<void(bool, const pair<const Ice::Byte*, const Ice::Byte*>&)>,
|
23
|
+
function<void(exception_ptr)>> AMDCallback;
|
24
|
+
#else
|
25
|
+
typedef Ice::AMD_Object_ice_invokePtr AMDCallback;
|
26
|
+
#endif
|
27
|
+
|
28
|
+
class Request :
|
29
|
+
#ifdef ICE_CPP11_MAPPING
|
30
|
+
public std::enable_shared_from_this<Request>
|
31
|
+
#else
|
32
|
+
public virtual IceUtil::Shared
|
33
|
+
#endif
|
32
34
|
{
|
33
35
|
public:
|
34
36
|
|
@@ -37,7 +39,7 @@ public:
|
|
37
39
|
Ice::OperationMode mode,
|
38
40
|
const pair<const Ice::Byte*, const Ice::Byte*>& inParams,
|
39
41
|
const Ice::Context& ctx,
|
40
|
-
const
|
42
|
+
const AMDCallback& amdCB) :
|
41
43
|
_locator(locator),
|
42
44
|
_operation(operation),
|
43
45
|
_mode(mode),
|
@@ -47,8 +49,8 @@ public:
|
|
47
49
|
{
|
48
50
|
}
|
49
51
|
|
50
|
-
void invoke(const Ice::
|
51
|
-
void response(
|
52
|
+
void invoke(const Ice::LocatorPrxPtr&);
|
53
|
+
void response(bool, const pair<const Ice::Byte*, const Ice::Byte*>&);
|
52
54
|
void exception(const Ice::Exception&);
|
53
55
|
|
54
56
|
protected:
|
@@ -58,47 +60,72 @@ protected:
|
|
58
60
|
const Ice::OperationMode _mode;
|
59
61
|
const Ice::Context _context;
|
60
62
|
const Ice::ByteSeq _inParams;
|
61
|
-
|
63
|
+
AMDCallback _amdCB;
|
64
|
+
#ifdef ICE_CPP11_MAPPING
|
65
|
+
exception_ptr _exception;
|
66
|
+
#else
|
67
|
+
IceInternal::UniquePtr<Ice::Exception> _exception;
|
68
|
+
#endif
|
62
69
|
|
63
|
-
Ice::
|
64
|
-
IceUtil::UniquePtr<Ice::Exception> _exception;
|
70
|
+
Ice::LocatorPrxPtr _locatorPrx;
|
65
71
|
};
|
66
|
-
|
72
|
+
ICE_DEFINE_PTR(RequestPtr, Request);
|
67
73
|
|
68
|
-
class LocatorI : public Ice::BlobjectArrayAsync,
|
74
|
+
class LocatorI : public Ice::BlobjectArrayAsync,
|
75
|
+
public IceUtil::TimerTask,
|
76
|
+
private IceUtil::Monitor<IceUtil::Mutex>
|
77
|
+
#ifdef ICE_CPP11_MAPPING
|
78
|
+
, public std::enable_shared_from_this<LocatorI>
|
79
|
+
#endif
|
69
80
|
{
|
70
81
|
public:
|
71
82
|
|
72
|
-
LocatorI(const
|
73
|
-
void setLookupReply(const
|
83
|
+
LocatorI(const string&, const LookupPrxPtr&, const Ice::PropertiesPtr&, const string&, const Ice::LocatorPrxPtr&);
|
84
|
+
void setLookupReply(const LookupReplyPrxPtr&);
|
74
85
|
|
86
|
+
#ifdef ICE_CPP11_MAPPING
|
87
|
+
virtual void ice_invokeAsync(pair<const Ice::Byte*, const Ice::Byte*>,
|
88
|
+
function<void(bool, const pair<const Ice::Byte*, const Ice::Byte*>&)>,
|
89
|
+
function<void(exception_ptr)>,
|
90
|
+
const Ice::Current&);
|
91
|
+
#else
|
75
92
|
virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&, const pair<const Ice::Byte*, const Ice::Byte*>&,
|
76
93
|
const Ice::Current&);
|
94
|
+
#endif
|
77
95
|
|
78
|
-
void foundLocator(const Ice::
|
79
|
-
void invoke(const Ice::
|
96
|
+
void foundLocator(const Ice::LocatorPrxPtr&);
|
97
|
+
void invoke(const Ice::LocatorPrxPtr&, const RequestPtr&);
|
98
|
+
|
99
|
+
vector<Ice::LocatorPrxPtr> getLocators(const string&, const IceUtil::Time&);
|
100
|
+
|
101
|
+
void exception(const Ice::LocalException&);
|
80
102
|
|
81
103
|
private:
|
82
104
|
|
83
105
|
virtual void runTimerTask();
|
84
106
|
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
107
|
+
LookupPrxPtr _lookup;
|
108
|
+
vector<pair<LookupPrxPtr, LookupReplyPrxPtr> > _lookups;
|
109
|
+
IceUtil::Time _timeout;
|
110
|
+
int _retryCount;
|
111
|
+
IceUtil::Time _retryDelay;
|
89
112
|
const IceUtil::TimerPtr _timer;
|
113
|
+
const int _traceLevel;
|
90
114
|
|
91
115
|
string _instanceName;
|
92
116
|
bool _warned;
|
93
|
-
|
94
|
-
Ice::
|
95
|
-
Ice::
|
117
|
+
Ice::LocatorPrxPtr _locator;
|
118
|
+
map<string, Ice::LocatorPrxPtr> _locators;
|
119
|
+
Ice::LocatorPrxPtr _voidLocator;
|
96
120
|
|
97
121
|
IceUtil::Time _nextRetry;
|
122
|
+
bool _pending;
|
98
123
|
int _pendingRetryCount;
|
124
|
+
size_t _failureCount;
|
125
|
+
bool _warnOnce;
|
99
126
|
vector<RequestPtr> _pendingRequests;
|
100
127
|
};
|
101
|
-
|
128
|
+
ICE_DEFINE_PTR(LocatorIPtr, LocatorI);
|
102
129
|
|
103
130
|
class LookupReplyI : public LookupReply
|
104
131
|
{
|
@@ -108,7 +135,7 @@ public:
|
|
108
135
|
{
|
109
136
|
}
|
110
137
|
|
111
|
-
virtual void foundLocator(
|
138
|
+
virtual void foundLocator(ICE_IN(Ice::LocatorPrxPtr), const Ice::Current&);
|
112
139
|
|
113
140
|
private:
|
114
141
|
|
@@ -122,6 +149,25 @@ class VoidLocatorI : public Ice::Locator
|
|
122
149
|
{
|
123
150
|
public:
|
124
151
|
|
152
|
+
#ifdef ICE_CPP11_MAPPING
|
153
|
+
virtual void
|
154
|
+
findObjectByIdAsync(::Ice::Identity,
|
155
|
+
function<void(const shared_ptr<::Ice::ObjectPrx>&)> response,
|
156
|
+
function<void(exception_ptr)>,
|
157
|
+
const Ice::Current&) const
|
158
|
+
{
|
159
|
+
response(nullptr);
|
160
|
+
}
|
161
|
+
|
162
|
+
virtual void
|
163
|
+
findAdapterByIdAsync(string,
|
164
|
+
function<void(const shared_ptr<::Ice::ObjectPrx>&)> response,
|
165
|
+
function<void(exception_ptr)>,
|
166
|
+
const Ice::Current&) const
|
167
|
+
{
|
168
|
+
response(nullptr);
|
169
|
+
}
|
170
|
+
#else
|
125
171
|
virtual void
|
126
172
|
findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr& amdCB,
|
127
173
|
const Ice::Identity&,
|
@@ -137,46 +183,75 @@ public:
|
|
137
183
|
{
|
138
184
|
amdCB->ice_response(0);
|
139
185
|
}
|
186
|
+
#endif
|
140
187
|
|
141
|
-
virtual Ice::
|
188
|
+
virtual Ice::LocatorRegistryPrxPtr
|
142
189
|
getRegistry(const Ice::Current&) const
|
143
190
|
{
|
144
|
-
return
|
191
|
+
return ICE_NULLPTR;
|
145
192
|
}
|
146
193
|
};
|
147
194
|
|
148
|
-
class PluginI : public
|
195
|
+
class PluginI : public Plugin
|
149
196
|
{
|
150
197
|
public:
|
151
198
|
|
152
|
-
PluginI(const Ice::CommunicatorPtr&);
|
199
|
+
PluginI(const std::string&, const Ice::CommunicatorPtr&);
|
153
200
|
|
154
201
|
virtual void initialize();
|
155
202
|
virtual void destroy();
|
203
|
+
virtual vector<Ice::LocatorPrxPtr> getLocators(const string&, const IceUtil::Time&) const;
|
156
204
|
|
157
205
|
private:
|
158
206
|
|
207
|
+
const string _name;
|
159
208
|
const Ice::CommunicatorPtr _communicator;
|
160
209
|
Ice::ObjectAdapterPtr _locatorAdapter;
|
161
210
|
Ice::ObjectAdapterPtr _replyAdapter;
|
162
|
-
|
163
|
-
Ice::
|
211
|
+
LocatorIPtr _locator;
|
212
|
+
Ice::LocatorPrxPtr _locatorPrx;
|
213
|
+
Ice::LocatorPrxPtr _defaultLocator;
|
214
|
+
};
|
215
|
+
|
216
|
+
#ifndef ICE_CPP11_MAPPING
|
217
|
+
|
218
|
+
class CallbackI : public IceUtil::Shared
|
219
|
+
{
|
220
|
+
public:
|
221
|
+
|
222
|
+
CallbackI(const LocatorIPtr& locator) : _locator(locator)
|
223
|
+
{
|
224
|
+
}
|
225
|
+
|
226
|
+
void
|
227
|
+
completed(const Ice::AsyncResultPtr& result)
|
228
|
+
{
|
229
|
+
try
|
230
|
+
{
|
231
|
+
result->throwLocalException();
|
232
|
+
}
|
233
|
+
catch(const Ice::LocalException& ex)
|
234
|
+
{
|
235
|
+
_locator->exception(ex);
|
236
|
+
}
|
237
|
+
}
|
238
|
+
|
239
|
+
private:
|
240
|
+
|
241
|
+
LocatorIPtr _locator;
|
164
242
|
};
|
165
243
|
|
244
|
+
#endif
|
245
|
+
|
166
246
|
}
|
167
247
|
|
168
248
|
//
|
169
249
|
// Plugin factory function.
|
170
250
|
//
|
171
|
-
extern "C"
|
251
|
+
extern "C" ICE_LOCATOR_DISCOVERY_API Ice::Plugin*
|
252
|
+
createIceLocatorDiscovery(const Ice::CommunicatorPtr& communicator, const string& name, const Ice::StringSeq&)
|
172
253
|
{
|
173
|
-
|
174
|
-
ICE_LOCATOR_DISCOVERY_API Ice::Plugin*
|
175
|
-
createIceLocatorDiscovery(const Ice::CommunicatorPtr& communicator, const string&, const Ice::StringSeq&)
|
176
|
-
{
|
177
|
-
return new PluginI(communicator);
|
178
|
-
}
|
179
|
-
|
254
|
+
return new PluginI(name, communicator);
|
180
255
|
}
|
181
256
|
|
182
257
|
namespace Ice
|
@@ -186,12 +261,28 @@ ICE_LOCATOR_DISCOVERY_API void
|
|
186
261
|
registerIceLocatorDiscovery(bool loadOnInitialize)
|
187
262
|
{
|
188
263
|
Ice::registerPluginFactory("IceLocatorDiscovery", createIceLocatorDiscovery, loadOnInitialize);
|
264
|
+
|
265
|
+
#ifdef ICE_STATIC_LIBS
|
266
|
+
//
|
267
|
+
// Also register the UDP plugin with static builds to ensure the UDP transport is loaded.
|
268
|
+
//
|
269
|
+
registerIceUDP(true);
|
270
|
+
#endif
|
189
271
|
}
|
190
272
|
|
191
273
|
}
|
192
274
|
|
275
|
+
//
|
276
|
+
// Objective-C function to allow Objective-C programs to register plugin.
|
277
|
+
//
|
278
|
+
extern "C" ICE_LOCATOR_DISCOVERY_API void
|
279
|
+
ICEregisterIceLocatorDiscovery(bool loadOnInitialize)
|
280
|
+
{
|
281
|
+
Ice::registerIceLocatorDiscovery(loadOnInitialize);
|
282
|
+
}
|
193
283
|
|
194
|
-
PluginI::PluginI(const Ice::CommunicatorPtr& communicator) :
|
284
|
+
PluginI::PluginI(const string& name, const Ice::CommunicatorPtr& communicator) :
|
285
|
+
_name(name), _communicator(communicator)
|
195
286
|
{
|
196
287
|
}
|
197
288
|
|
@@ -205,89 +296,83 @@ PluginI::initialize()
|
|
205
296
|
string address;
|
206
297
|
if(ipv4 && !preferIPv6)
|
207
298
|
{
|
208
|
-
address = properties->getPropertyWithDefault("
|
299
|
+
address = properties->getPropertyWithDefault(_name + ".Address", "239.255.0.1");
|
209
300
|
}
|
210
301
|
else
|
211
302
|
{
|
212
|
-
address = properties->getPropertyWithDefault("
|
303
|
+
address = properties->getPropertyWithDefault(_name + ".Address", "ff15::1");
|
213
304
|
}
|
214
|
-
int port = properties->getPropertyAsIntWithDefault("
|
215
|
-
string intf = properties->getProperty("
|
305
|
+
int port = properties->getPropertyAsIntWithDefault(_name + ".Port", 4061);
|
306
|
+
string intf = properties->getProperty(_name + ".Interface");
|
216
307
|
|
217
|
-
|
308
|
+
string lookupEndpoints = properties->getProperty(_name + ".Lookup");
|
309
|
+
if(lookupEndpoints.empty())
|
218
310
|
{
|
219
|
-
|
220
|
-
|
221
|
-
|
311
|
+
//
|
312
|
+
// If no lookup endpoints are specified, we get all the network interfaces and create
|
313
|
+
// an endpoint for each of them. We'll send UDP multicast packages on each interface.
|
314
|
+
//
|
315
|
+
IceInternal::ProtocolSupport protocol = ipv4 && !preferIPv6 ? IceInternal::EnableIPv4 : IceInternal::EnableIPv6;
|
316
|
+
vector<string> interfaces = IceInternal::getInterfacesForMulticast(intf, protocol);
|
317
|
+
ostringstream lookup;
|
318
|
+
for(vector<string>::const_iterator p = interfaces.begin(); p != interfaces.end(); ++p)
|
222
319
|
{
|
223
|
-
|
320
|
+
if(p != interfaces.begin())
|
321
|
+
{
|
322
|
+
lookup << ":";
|
323
|
+
}
|
324
|
+
lookup << "udp -h \"" << address << "\" -p " << port << " --interface \"" << *p << "\"";
|
224
325
|
}
|
225
|
-
|
326
|
+
lookupEndpoints = lookup.str();
|
226
327
|
}
|
227
|
-
|
328
|
+
|
329
|
+
if(properties->getProperty(_name + ".Reply.Endpoints").empty())
|
228
330
|
{
|
229
|
-
properties->setProperty("
|
331
|
+
properties->setProperty(_name + ".Reply.Endpoints", "udp -h " + (intf.empty() ? "*" : "\"" + intf + "\""));
|
230
332
|
}
|
231
333
|
|
232
|
-
|
233
|
-
|
334
|
+
if(properties->getProperty(_name + ".Locator.Endpoints").empty())
|
335
|
+
{
|
336
|
+
properties->setProperty(_name + ".Locator.AdapterId", Ice::generateUUID()); // Collocated adapter
|
337
|
+
}
|
338
|
+
|
339
|
+
_replyAdapter = _communicator->createObjectAdapter(_name + ".Reply");
|
340
|
+
_locatorAdapter = _communicator->createObjectAdapter(_name + ".Locator");
|
234
341
|
|
235
342
|
// We don't want those adapters to be registered with the locator so clear their locator.
|
236
343
|
_replyAdapter->setLocator(0);
|
237
344
|
_locatorAdapter->setLocator(0);
|
238
345
|
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
ostringstream os;
|
243
|
-
os << "udp -h \"" << address << "\" -p " << port;
|
244
|
-
if(!intf.empty())
|
245
|
-
{
|
246
|
-
os << " --interface \"" << intf << "\"";
|
247
|
-
}
|
248
|
-
lookupEndpoints = os.str();
|
249
|
-
}
|
250
|
-
|
251
|
-
Ice::ObjectPrx lookupPrx = _communicator->stringToProxy("IceLocatorDiscovery/Lookup -d:" + lookupEndpoints);
|
252
|
-
// No collocation optimization for the multicast proxy!
|
253
|
-
lookupPrx = lookupPrx->ice_collocationOptimized(false)->ice_router(0);
|
254
|
-
try
|
255
|
-
{
|
256
|
-
// Ensure we can establish a connection to the multicast proxy
|
257
|
-
// but don't block.
|
258
|
-
Ice::AsyncResultPtr result = lookupPrx->begin_ice_getConnection();
|
259
|
-
if(result->sentSynchronously())
|
260
|
-
{
|
261
|
-
lookupPrx->end_ice_getConnection(result);
|
262
|
-
}
|
263
|
-
}
|
264
|
-
catch(const Ice::LocalException& ex)
|
265
|
-
{
|
266
|
-
ostringstream os;
|
267
|
-
os << "IceLocatorDiscovery is unable to establish a multicast connection:\n";
|
268
|
-
os << "proxy = " << lookupPrx << '\n';
|
269
|
-
os << ex;
|
270
|
-
throw Ice::PluginInitializationException(__FILE__, __LINE__, os.str());
|
271
|
-
}
|
346
|
+
Ice::ObjectPrxPtr lookupPrx = _communicator->stringToProxy("IceLocatorDiscovery/Lookup -d:" + lookupEndpoints);
|
347
|
+
// No collocation optimization for the multicast proxy!
|
348
|
+
lookupPrx = lookupPrx->ice_collocationOptimized(false)->ice_router(ICE_NULLPTR);
|
272
349
|
|
273
|
-
Ice::
|
350
|
+
Ice::LocatorPrxPtr voidLocator = ICE_UNCHECKED_CAST(Ice::LocatorPrx,
|
351
|
+
_locatorAdapter->addWithUUID(ICE_MAKE_SHARED(VoidLocatorI)));
|
274
352
|
|
275
|
-
string instanceName = properties->getProperty("
|
353
|
+
string instanceName = properties->getProperty(_name + ".InstanceName");
|
276
354
|
Ice::Identity id;
|
277
355
|
id.name = "Locator";
|
278
|
-
id.category = !instanceName.empty() ? instanceName :
|
279
|
-
|
356
|
+
id.category = !instanceName.empty() ? instanceName : Ice::generateUUID();
|
357
|
+
_locator = ICE_MAKE_SHARED(LocatorI, _name, ICE_UNCHECKED_CAST(LookupPrx, lookupPrx), properties, instanceName,
|
358
|
+
voidLocator);
|
280
359
|
_defaultLocator = _communicator->getDefaultLocator();
|
281
|
-
_locatorPrx = Ice::LocatorPrx
|
360
|
+
_locatorPrx = ICE_UNCHECKED_CAST(Ice::LocatorPrx, _locatorAdapter->add(_locator, id));
|
282
361
|
_communicator->setDefaultLocator(_locatorPrx);
|
283
362
|
|
284
|
-
Ice::
|
285
|
-
|
363
|
+
Ice::ObjectPrxPtr lookupReply = _replyAdapter->addWithUUID(ICE_MAKE_SHARED(LookupReplyI, _locator))->ice_datagram();
|
364
|
+
_locator->setLookupReply(ICE_UNCHECKED_CAST(LookupReplyPrx, lookupReply));
|
286
365
|
|
287
366
|
_replyAdapter->activate();
|
288
367
|
_locatorAdapter->activate();
|
289
368
|
}
|
290
369
|
|
370
|
+
vector<Ice::LocatorPrxPtr>
|
371
|
+
PluginI::getLocators(const string& instanceName, const IceUtil::Time& waitTime) const
|
372
|
+
{
|
373
|
+
return _locator->getLocators(instanceName, waitTime);
|
374
|
+
}
|
375
|
+
|
291
376
|
void
|
292
377
|
PluginI::destroy()
|
293
378
|
{
|
@@ -307,8 +392,56 @@ PluginI::destroy()
|
|
307
392
|
}
|
308
393
|
|
309
394
|
void
|
310
|
-
Request::invoke(const Ice::
|
395
|
+
Request::invoke(const Ice::LocatorPrxPtr& l)
|
311
396
|
{
|
397
|
+
#ifdef ICE_CPP11_MAPPING
|
398
|
+
if(l != _locatorPrx)
|
399
|
+
{
|
400
|
+
_locatorPrx = l;
|
401
|
+
try
|
402
|
+
{
|
403
|
+
auto self = shared_from_this();
|
404
|
+
l->ice_invokeAsync(_operation, _mode, _inParams,
|
405
|
+
[self](bool ok, vector<Ice::Byte> outParams)
|
406
|
+
{
|
407
|
+
pair<const Ice::Byte*, const Ice::Byte*> outPair;
|
408
|
+
if(outParams.empty())
|
409
|
+
{
|
410
|
+
outPair.first = outPair.second = 0;
|
411
|
+
}
|
412
|
+
else
|
413
|
+
{
|
414
|
+
outPair.first = &outParams[0];
|
415
|
+
outPair.second = outPair.first + outParams.size();
|
416
|
+
}
|
417
|
+
self->response(ok, outPair);
|
418
|
+
},
|
419
|
+
[self](exception_ptr e)
|
420
|
+
{
|
421
|
+
try
|
422
|
+
{
|
423
|
+
rethrow_exception(e);
|
424
|
+
}
|
425
|
+
catch(const Ice::Exception& ex)
|
426
|
+
{
|
427
|
+
self->exception(ex);
|
428
|
+
}
|
429
|
+
},
|
430
|
+
nullptr,
|
431
|
+
_context);
|
432
|
+
}
|
433
|
+
catch(const Ice::LocalException& ex)
|
434
|
+
{
|
435
|
+
exception(ex);
|
436
|
+
}
|
437
|
+
}
|
438
|
+
else
|
439
|
+
{
|
440
|
+
assert(_exception); // Don't retry if the proxy didn't change
|
441
|
+
_amdCB.second(_exception);
|
442
|
+
}
|
443
|
+
|
444
|
+
#else
|
312
445
|
if(l != _locatorPrx)
|
313
446
|
{
|
314
447
|
_locatorPrx = l;
|
@@ -327,17 +460,74 @@ Request::invoke(const Ice::LocatorPrx& l)
|
|
327
460
|
assert(_exception.get()); // Don't retry if the proxy didn't change
|
328
461
|
_amdCB->ice_exception(*_exception.get());
|
329
462
|
}
|
463
|
+
#endif
|
330
464
|
}
|
331
465
|
|
332
466
|
void
|
333
467
|
Request::response(bool ok, const pair<const Ice::Byte*, const Ice::Byte*>& outParams)
|
334
468
|
{
|
469
|
+
#ifdef ICE_CPP11_MAPPING
|
470
|
+
_amdCB.first(ok, outParams);
|
471
|
+
#else
|
335
472
|
_amdCB->ice_response(ok, outParams);
|
473
|
+
#endif
|
336
474
|
}
|
337
475
|
|
338
476
|
void
|
339
477
|
Request::exception(const Ice::Exception& ex)
|
340
478
|
{
|
479
|
+
#ifdef ICE_CPP11_MAPPING
|
480
|
+
try
|
481
|
+
{
|
482
|
+
ex.ice_throw();
|
483
|
+
}
|
484
|
+
catch(const Ice::RequestFailedException&)
|
485
|
+
{
|
486
|
+
_amdCB.second(current_exception());
|
487
|
+
}
|
488
|
+
catch(const Ice::UnknownException&)
|
489
|
+
{
|
490
|
+
_amdCB.second(current_exception());
|
491
|
+
}
|
492
|
+
catch(const Ice::NoEndpointException&)
|
493
|
+
{
|
494
|
+
try
|
495
|
+
{
|
496
|
+
throw Ice::ObjectNotExistException(__FILE__, __LINE__);
|
497
|
+
}
|
498
|
+
catch(...)
|
499
|
+
{
|
500
|
+
_amdCB.second(current_exception());
|
501
|
+
}
|
502
|
+
}
|
503
|
+
catch(const Ice::CommunicatorDestroyedException&)
|
504
|
+
{
|
505
|
+
try
|
506
|
+
{
|
507
|
+
throw Ice::ObjectNotExistException(__FILE__, __LINE__);
|
508
|
+
}
|
509
|
+
catch(...)
|
510
|
+
{
|
511
|
+
_amdCB.second(current_exception());
|
512
|
+
}
|
513
|
+
}
|
514
|
+
catch(const Ice::ObjectAdapterDeactivatedException&)
|
515
|
+
{
|
516
|
+
try
|
517
|
+
{
|
518
|
+
throw Ice::ObjectNotExistException(__FILE__, __LINE__);
|
519
|
+
}
|
520
|
+
catch(...)
|
521
|
+
{
|
522
|
+
_amdCB.second(current_exception());
|
523
|
+
}
|
524
|
+
}
|
525
|
+
catch(const Ice::Exception&)
|
526
|
+
{
|
527
|
+
_exception = current_exception();
|
528
|
+
_locator->invoke(_locatorPrx, shared_from_this()); // Retry with new locator proxy
|
529
|
+
}
|
530
|
+
#else
|
341
531
|
try
|
342
532
|
{
|
343
533
|
ex.ice_throw();
|
@@ -367,31 +557,98 @@ Request::exception(const Ice::Exception& ex)
|
|
367
557
|
_exception.reset(ex.ice_clone());
|
368
558
|
_locator->invoke(_locatorPrx, this); // Retry with new locator proxy
|
369
559
|
}
|
560
|
+
#endif
|
370
561
|
}
|
371
562
|
|
372
|
-
LocatorI::LocatorI(const
|
563
|
+
LocatorI::LocatorI(const string& name,
|
564
|
+
const LookupPrxPtr& lookup,
|
373
565
|
const Ice::PropertiesPtr& p,
|
374
566
|
const string& instanceName,
|
375
|
-
const Ice::
|
567
|
+
const Ice::LocatorPrxPtr& voidLocator) :
|
376
568
|
_lookup(lookup),
|
377
|
-
_timeout(IceUtil::Time::milliSeconds(p->getPropertyAsIntWithDefault("
|
378
|
-
_retryCount(p->getPropertyAsIntWithDefault("
|
379
|
-
_retryDelay(IceUtil::Time::milliSeconds(p->getPropertyAsIntWithDefault("
|
569
|
+
_timeout(IceUtil::Time::milliSeconds(p->getPropertyAsIntWithDefault(name + ".Timeout", 300))),
|
570
|
+
_retryCount(p->getPropertyAsIntWithDefault(name + ".RetryCount", 3)),
|
571
|
+
_retryDelay(IceUtil::Time::milliSeconds(p->getPropertyAsIntWithDefault(name + ".RetryDelay", 2000))),
|
380
572
|
_timer(IceInternal::getInstanceTimer(lookup->ice_getCommunicator())),
|
573
|
+
_traceLevel(p->getPropertyAsInt(name + ".Trace.Lookup")),
|
381
574
|
_instanceName(instanceName),
|
382
575
|
_warned(false),
|
383
576
|
_locator(lookup->ice_getCommunicator()->getDefaultLocator()),
|
384
577
|
_voidLocator(voidLocator),
|
385
|
-
|
578
|
+
_pending(false),
|
579
|
+
_pendingRetryCount(0),
|
580
|
+
_failureCount(0),
|
581
|
+
_warnOnce(true)
|
386
582
|
{
|
583
|
+
if(_timeout < IceUtil::Time::milliSeconds(0))
|
584
|
+
{
|
585
|
+
_timeout = IceUtil::Time::milliSeconds(300);
|
586
|
+
}
|
587
|
+
if(_retryCount < 0)
|
588
|
+
{
|
589
|
+
_retryCount = 0;
|
590
|
+
}
|
591
|
+
if(_retryDelay < IceUtil::Time::milliSeconds(0))
|
592
|
+
{
|
593
|
+
_retryDelay = IceUtil::Time::milliSeconds(0);
|
594
|
+
}
|
595
|
+
|
596
|
+
//
|
597
|
+
// Create one lookup proxy per endpoint from the given proxy. We want to send a multicast
|
598
|
+
// datagram on each endpoint.
|
599
|
+
//
|
600
|
+
Ice::EndpointSeq endpoints = lookup->ice_getEndpoints();
|
601
|
+
for(vector<Ice::EndpointPtr>::const_iterator q = endpoints.begin(); q != endpoints.end(); ++q)
|
602
|
+
{
|
603
|
+
Ice::EndpointSeq single;
|
604
|
+
single.push_back(*q);
|
605
|
+
_lookups.push_back(make_pair(lookup->ice_endpoints(single), LookupReplyPrxPtr()));
|
606
|
+
}
|
607
|
+
assert(!_lookups.empty());
|
387
608
|
}
|
388
609
|
|
389
610
|
void
|
390
|
-
LocatorI::setLookupReply(const
|
611
|
+
LocatorI::setLookupReply(const LookupReplyPrxPtr& lookupReply)
|
391
612
|
{
|
392
|
-
|
613
|
+
//
|
614
|
+
// Use a lookup reply proxy whose adress matches the interface used to send multicast datagrams.
|
615
|
+
//
|
616
|
+
for(vector<pair<LookupPrxPtr, LookupReplyPrxPtr> >::iterator p = _lookups.begin(); p != _lookups.end(); ++p)
|
617
|
+
{
|
618
|
+
Ice::UDPEndpointInfoPtr info = ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, p->first->ice_getEndpoints()[0]->getInfo());
|
619
|
+
if(info && !info->mcastInterface.empty())
|
620
|
+
{
|
621
|
+
Ice::EndpointSeq endpts = lookupReply->ice_getEndpoints();
|
622
|
+
for(Ice::EndpointSeq::const_iterator q = endpts.begin(); q != endpts.end(); ++q)
|
623
|
+
{
|
624
|
+
Ice::IPEndpointInfoPtr r = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, (*q)->getInfo());
|
625
|
+
if(r && r->host == info->mcastInterface)
|
626
|
+
{
|
627
|
+
Ice::EndpointSeq single;
|
628
|
+
single.push_back(*q);
|
629
|
+
p->second = lookupReply->ice_endpoints(single);
|
630
|
+
}
|
631
|
+
}
|
632
|
+
}
|
633
|
+
|
634
|
+
if(!p->second)
|
635
|
+
{
|
636
|
+
p->second = lookupReply; // Fallback: just use the given lookup reply proxy if no matching endpoint found.
|
637
|
+
}
|
638
|
+
}
|
393
639
|
}
|
394
640
|
|
641
|
+
#ifdef ICE_CPP11_MAPPING
|
642
|
+
void
|
643
|
+
LocatorI::ice_invokeAsync(pair<const Ice::Byte*, const Ice::Byte*> inParams,
|
644
|
+
function<void(bool, const pair<const Ice::Byte*, const Ice::Byte*>&)> responseCB,
|
645
|
+
function<void(exception_ptr)> exceptionCB,
|
646
|
+
const Ice::Current& current)
|
647
|
+
{
|
648
|
+
invoke(nullptr, make_shared<Request>(this, current.operation, current.mode, inParams, current.ctx,
|
649
|
+
make_pair(move(responseCB), move(exceptionCB))));
|
650
|
+
}
|
651
|
+
#else
|
395
652
|
void
|
396
653
|
LocatorI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& amdCB,
|
397
654
|
const pair<const Ice::Byte*, const Ice::Byte*>& inParams,
|
@@ -399,13 +656,76 @@ LocatorI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& amdCB,
|
|
399
656
|
{
|
400
657
|
invoke(0, new Request(this, current.operation, current.mode, inParams, current.ctx, amdCB));
|
401
658
|
}
|
659
|
+
#endif
|
660
|
+
|
661
|
+
vector<Ice::LocatorPrxPtr>
|
662
|
+
LocatorI::getLocators(const string& instanceName, const IceUtil::Time& waitTime)
|
663
|
+
{
|
664
|
+
//
|
665
|
+
// Clear locators from previous search
|
666
|
+
//
|
667
|
+
{
|
668
|
+
Lock sync(*this);
|
669
|
+
_locators.clear();
|
670
|
+
}
|
671
|
+
|
672
|
+
//
|
673
|
+
// Find a locator
|
674
|
+
//
|
675
|
+
invoke(ICE_NULLPTR, ICE_NULLPTR);
|
676
|
+
|
677
|
+
//
|
678
|
+
// Wait for responses
|
679
|
+
//
|
680
|
+
if(instanceName.empty())
|
681
|
+
{
|
682
|
+
IceUtil::ThreadControl::sleep(waitTime);
|
683
|
+
}
|
684
|
+
else
|
685
|
+
{
|
686
|
+
Lock sync(*this);
|
687
|
+
while(_locators.find(instanceName) == _locators.end() && _pending)
|
688
|
+
{
|
689
|
+
timedWait(waitTime);
|
690
|
+
}
|
691
|
+
}
|
692
|
+
|
693
|
+
//
|
694
|
+
// Return found locators
|
695
|
+
//
|
696
|
+
Lock sync(*this);
|
697
|
+
vector<Ice::LocatorPrxPtr> locators;
|
698
|
+
for(map<string, Ice::LocatorPrxPtr>::const_iterator p = _locators.begin(); p != _locators.end(); ++p)
|
699
|
+
{
|
700
|
+
locators.push_back(p->second);
|
701
|
+
}
|
702
|
+
return locators;
|
703
|
+
}
|
402
704
|
|
403
705
|
void
|
404
|
-
LocatorI::foundLocator(const Ice::
|
706
|
+
LocatorI::foundLocator(const Ice::LocatorPrxPtr& locator)
|
405
707
|
{
|
406
708
|
Lock sync(*this);
|
407
|
-
|
709
|
+
|
710
|
+
if(!locator)
|
408
711
|
{
|
712
|
+
if(_traceLevel > 2)
|
713
|
+
{
|
714
|
+
Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
|
715
|
+
out << "ignoring locator reply: (null locator)";
|
716
|
+
}
|
717
|
+
return;
|
718
|
+
}
|
719
|
+
|
720
|
+
if(!_instanceName.empty() && locator->ice_getIdentity().category != _instanceName)
|
721
|
+
{
|
722
|
+
if(_traceLevel > 2)
|
723
|
+
{
|
724
|
+
Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
|
725
|
+
out << "ignoring locator reply: instance name doesn't match\n";
|
726
|
+
out << "expected = " << _instanceName;
|
727
|
+
out << "received = " << locator->ice_getIdentity().category;
|
728
|
+
}
|
409
729
|
return;
|
410
730
|
}
|
411
731
|
|
@@ -413,7 +733,8 @@ LocatorI::foundLocator(const Ice::LocatorPrx& locator)
|
|
413
733
|
// If we already have a locator assigned, ensure the given locator
|
414
734
|
// has the same identity, otherwise ignore it.
|
415
735
|
//
|
416
|
-
if(
|
736
|
+
if(!_pendingRequests.empty() &&
|
737
|
+
_locator && locator->ice_getIdentity().category != _locator->ice_getIdentity().category)
|
417
738
|
{
|
418
739
|
if(!_warned)
|
419
740
|
{
|
@@ -430,19 +751,31 @@ LocatorI::foundLocator(const Ice::LocatorPrx& locator)
|
|
430
751
|
return;
|
431
752
|
}
|
432
753
|
|
433
|
-
if(
|
754
|
+
if(_pending) // No need to continue, we found a locator.
|
434
755
|
{
|
435
|
-
_timer->cancel(
|
756
|
+
_timer->cancel(ICE_SHARED_FROM_THIS);
|
436
757
|
_pendingRetryCount = 0;
|
758
|
+
_pending = false;
|
759
|
+
}
|
760
|
+
|
761
|
+
if(_traceLevel > 0)
|
762
|
+
{
|
763
|
+
Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
|
764
|
+
out << "locator lookup succeeded:\nlocator = " << locator;
|
765
|
+
if(!_instanceName.empty())
|
766
|
+
{
|
767
|
+
out << "\ninstance name = " << _instanceName;
|
768
|
+
}
|
437
769
|
}
|
438
770
|
|
439
|
-
|
771
|
+
Ice::LocatorPrxPtr l = _pendingRequests.empty() ? _locators[locator->ice_getIdentity().category] : _locator;
|
772
|
+
if(l)
|
440
773
|
{
|
441
774
|
//
|
442
775
|
// We found another locator replica, append its endpoints to the
|
443
776
|
// current locator proxy endpoints.
|
444
777
|
//
|
445
|
-
Ice::EndpointSeq newEndpoints =
|
778
|
+
Ice::EndpointSeq newEndpoints = l->ice_getEndpoints();
|
446
779
|
Ice::EndpointSeq endpts = locator->ice_getEndpoints();
|
447
780
|
for(Ice::EndpointSeq::const_iterator p = endpts.begin(); p != endpts.end(); ++p)
|
448
781
|
{
|
@@ -463,29 +796,39 @@ LocatorI::foundLocator(const Ice::LocatorPrx& locator)
|
|
463
796
|
newEndpoints.push_back(*p);
|
464
797
|
}
|
465
798
|
}
|
466
|
-
|
799
|
+
l = l->ice_endpoints(newEndpoints);
|
800
|
+
}
|
801
|
+
else
|
802
|
+
{
|
803
|
+
l = locator;
|
804
|
+
}
|
805
|
+
|
806
|
+
if(_pendingRequests.empty())
|
807
|
+
{
|
808
|
+
_locators[locator->ice_getIdentity().category] = l;
|
809
|
+
notify();
|
467
810
|
}
|
468
811
|
else
|
469
812
|
{
|
470
|
-
_locator =
|
813
|
+
_locator = l;
|
471
814
|
if(_instanceName.empty())
|
472
815
|
{
|
473
816
|
_instanceName = _locator->ice_getIdentity().category; // Stick to the first discovered locator.
|
474
817
|
}
|
475
|
-
}
|
476
818
|
|
477
|
-
|
478
|
-
|
479
|
-
|
480
|
-
|
481
|
-
|
482
|
-
|
819
|
+
//
|
820
|
+
// Send pending requests if any.
|
821
|
+
//
|
822
|
+
for(vector<RequestPtr>::const_iterator p = _pendingRequests.begin(); p != _pendingRequests.end(); ++p)
|
823
|
+
{
|
824
|
+
(*p)->invoke(_locator);
|
825
|
+
}
|
826
|
+
_pendingRequests.clear();
|
483
827
|
}
|
484
|
-
_pendingRequests.clear();
|
485
828
|
}
|
486
829
|
|
487
830
|
void
|
488
|
-
LocatorI::invoke(const Ice::
|
831
|
+
LocatorI::invoke(const Ice::LocatorPrxPtr& locator, const RequestPtr& request)
|
489
832
|
{
|
490
833
|
Lock sync(*this);
|
491
834
|
if(request && _locator && _locator != locator)
|
@@ -500,39 +843,168 @@ LocatorI::invoke(const Ice::LocatorPrx& locator, const RequestPtr& request)
|
|
500
843
|
{
|
501
844
|
_locator = 0;
|
502
845
|
|
503
|
-
|
846
|
+
if(request)
|
847
|
+
{
|
848
|
+
_pendingRequests.push_back(request);
|
849
|
+
}
|
504
850
|
|
505
|
-
if(
|
851
|
+
if(!_pending) // No request in progress
|
506
852
|
{
|
853
|
+
_pending = true;
|
854
|
+
_failureCount = 0;
|
507
855
|
_pendingRetryCount = _retryCount;
|
508
856
|
try
|
509
857
|
{
|
510
|
-
|
511
|
-
|
858
|
+
if(_traceLevel > 1)
|
859
|
+
{
|
860
|
+
Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
|
861
|
+
out << "looking up locator:\nlookup = " << _lookup;
|
862
|
+
if(!_instanceName.empty())
|
863
|
+
{
|
864
|
+
out << "\ninstance name = " << _instanceName;
|
865
|
+
}
|
866
|
+
}
|
867
|
+
for(vector<pair<LookupPrxPtr, LookupReplyPrxPtr> >::const_iterator l = _lookups.begin();
|
868
|
+
l != _lookups.end(); ++l)
|
869
|
+
{
|
870
|
+
#ifdef ICE_CPP11_MAPPING
|
871
|
+
auto self = shared_from_this();
|
872
|
+
l->first->findLocatorAsync(_instanceName, l->second, nullptr, [self](exception_ptr ex)
|
873
|
+
{
|
874
|
+
try
|
875
|
+
{
|
876
|
+
rethrow_exception(ex);
|
877
|
+
}
|
878
|
+
catch(const Ice::LocalException& e)
|
879
|
+
{
|
880
|
+
self->exception(e);
|
881
|
+
}
|
882
|
+
});
|
883
|
+
#else
|
884
|
+
l->first->begin_findLocator(_instanceName, l->second, Ice::newCallback(new CallbackI(this),
|
885
|
+
&CallbackI::completed));
|
886
|
+
#endif
|
887
|
+
}
|
888
|
+
_timer->schedule(ICE_SHARED_FROM_THIS, _timeout);
|
512
889
|
}
|
513
|
-
catch(const Ice::LocalException&)
|
890
|
+
catch(const Ice::LocalException& ex)
|
514
891
|
{
|
892
|
+
if(_traceLevel > 0)
|
893
|
+
{
|
894
|
+
Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
|
895
|
+
out << "locator lookup failed:\nlookup = " << _lookup;
|
896
|
+
if(!_instanceName.empty())
|
897
|
+
{
|
898
|
+
out << "\ninstance name = " << _instanceName;
|
899
|
+
}
|
900
|
+
out << "\n" << ex;
|
901
|
+
}
|
902
|
+
|
515
903
|
for(vector<RequestPtr>::const_iterator p = _pendingRequests.begin(); p != _pendingRequests.end(); ++p)
|
516
904
|
{
|
517
905
|
(*p)->invoke(_voidLocator);
|
518
906
|
}
|
519
907
|
_pendingRequests.clear();
|
908
|
+
_pending = false;
|
520
909
|
_pendingRetryCount = 0;
|
521
910
|
}
|
522
911
|
}
|
523
912
|
}
|
524
913
|
}
|
525
914
|
|
915
|
+
void
|
916
|
+
LocatorI::exception(const Ice::LocalException& ex)
|
917
|
+
{
|
918
|
+
Lock sync(*this);
|
919
|
+
if(++_failureCount == _lookups.size() && _pending)
|
920
|
+
{
|
921
|
+
//
|
922
|
+
// All the lookup calls failed, cancel the timer and propagate the error to the requests.
|
923
|
+
//
|
924
|
+
_timer->cancel(ICE_SHARED_FROM_THIS);
|
925
|
+
_pendingRetryCount = 0;
|
926
|
+
_pending = false;
|
927
|
+
|
928
|
+
if(_warnOnce)
|
929
|
+
{
|
930
|
+
Ice::Warning warn(_lookup->ice_getCommunicator()->getLogger());
|
931
|
+
warn << "failed to lookup locator with lookup proxy `" << _lookup << "':\n" << ex;
|
932
|
+
_warnOnce = false;
|
933
|
+
}
|
934
|
+
|
935
|
+
if(_traceLevel > 0)
|
936
|
+
{
|
937
|
+
Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
|
938
|
+
out << "locator lookup failed:\nlookup = " << _lookup;
|
939
|
+
if(!_instanceName.empty())
|
940
|
+
{
|
941
|
+
out << "\ninstance name = " << _instanceName;
|
942
|
+
}
|
943
|
+
out << "\n" << ex;
|
944
|
+
}
|
945
|
+
|
946
|
+
if(_pendingRequests.empty())
|
947
|
+
{
|
948
|
+
notify();
|
949
|
+
}
|
950
|
+
else
|
951
|
+
{
|
952
|
+
for(vector<RequestPtr>::const_iterator p = _pendingRequests.begin(); p != _pendingRequests.end(); ++p)
|
953
|
+
{
|
954
|
+
(*p)->invoke(_voidLocator);
|
955
|
+
}
|
956
|
+
_pendingRequests.clear();
|
957
|
+
}
|
958
|
+
}
|
959
|
+
}
|
960
|
+
|
526
961
|
void
|
527
962
|
LocatorI::runTimerTask()
|
528
963
|
{
|
529
964
|
Lock sync(*this);
|
530
|
-
if(
|
965
|
+
if(!_pending)
|
531
966
|
{
|
967
|
+
assert(_pendingRequests.empty());
|
968
|
+
return; // The request failed
|
969
|
+
}
|
970
|
+
|
971
|
+
if(_pendingRetryCount > 0)
|
972
|
+
{
|
973
|
+
--_pendingRetryCount;
|
532
974
|
try
|
533
975
|
{
|
534
|
-
|
535
|
-
|
976
|
+
if(_traceLevel > 1)
|
977
|
+
{
|
978
|
+
Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
|
979
|
+
out << "retrying locator lookup:\nlookup = " << _lookup << "\nretry count = " << _pendingRetryCount;
|
980
|
+
if(!_instanceName.empty())
|
981
|
+
{
|
982
|
+
out << "\ninstance name = " << _instanceName;
|
983
|
+
}
|
984
|
+
}
|
985
|
+
_failureCount = 0;
|
986
|
+
for(vector<pair<LookupPrxPtr, LookupReplyPrxPtr> >::const_iterator l = _lookups.begin();
|
987
|
+
l != _lookups.end(); ++l)
|
988
|
+
{
|
989
|
+
#ifdef ICE_CPP11_MAPPING
|
990
|
+
auto self = shared_from_this();
|
991
|
+
l->first->findLocatorAsync(_instanceName, l->second, nullptr, [self](exception_ptr ex)
|
992
|
+
{
|
993
|
+
try
|
994
|
+
{
|
995
|
+
rethrow_exception(ex);
|
996
|
+
}
|
997
|
+
catch(const Ice::LocalException& e)
|
998
|
+
{
|
999
|
+
self->exception(e);
|
1000
|
+
}
|
1001
|
+
});
|
1002
|
+
#else
|
1003
|
+
l->first->begin_findLocator(_instanceName, l->second, Ice::newCallback(new CallbackI(this),
|
1004
|
+
&CallbackI::completed));
|
1005
|
+
#endif
|
1006
|
+
}
|
1007
|
+
_timer->schedule(ICE_SHARED_FROM_THIS, _timeout);
|
536
1008
|
return;
|
537
1009
|
}
|
538
1010
|
catch(const Ice::LocalException&)
|
@@ -541,16 +1013,36 @@ LocatorI::runTimerTask()
|
|
541
1013
|
_pendingRetryCount = 0;
|
542
1014
|
}
|
543
1015
|
|
544
|
-
|
1016
|
+
assert(_pendingRetryCount == 0);
|
1017
|
+
_pending = false;
|
1018
|
+
|
1019
|
+
if(_traceLevel > 0)
|
545
1020
|
{
|
546
|
-
(
|
1021
|
+
Ice::Trace out(_lookup->ice_getCommunicator()->getLogger(), "Lookup");
|
1022
|
+
out << "locator lookup timed out:\nlookup = " << _lookup;
|
1023
|
+
if(!_instanceName.empty())
|
1024
|
+
{
|
1025
|
+
out << "\ninstance name = " << _instanceName;
|
1026
|
+
}
|
1027
|
+
}
|
1028
|
+
|
1029
|
+
if(_pendingRequests.empty())
|
1030
|
+
{
|
1031
|
+
notify();
|
1032
|
+
}
|
1033
|
+
else
|
1034
|
+
{
|
1035
|
+
for(vector<RequestPtr>::const_iterator p = _pendingRequests.begin(); p != _pendingRequests.end(); ++p)
|
1036
|
+
{
|
1037
|
+
(*p)->invoke(_voidLocator); // Send pending requests on void locator.
|
1038
|
+
}
|
1039
|
+
_pendingRequests.clear();
|
547
1040
|
}
|
548
|
-
_pendingRequests.clear();
|
549
1041
|
_nextRetry = IceUtil::Time::now() + _retryDelay; // Only retry when the retry delay expires
|
550
1042
|
}
|
551
1043
|
|
552
1044
|
void
|
553
|
-
LookupReplyI::foundLocator(
|
1045
|
+
LookupReplyI::foundLocator(ICE_IN(Ice::LocatorPrxPtr) locator, const Ice::Current&)
|
554
1046
|
{
|
555
1047
|
_locator->foundLocator(locator);
|
556
1048
|
}
|