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,13 +1,8 @@
|
|
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
4
|
//
|
8
|
-
//
|
9
|
-
//
|
10
|
-
// Ice version 3.6.5
|
5
|
+
// Ice version 3.7.4
|
11
6
|
//
|
12
7
|
// <auto-generated>
|
13
8
|
//
|
@@ -23,23 +18,46 @@
|
|
23
18
|
#endif
|
24
19
|
#include <Ice/LocatorF.h>
|
25
20
|
#include <IceUtil/PushDisableWarnings.h>
|
26
|
-
#include <Ice/
|
27
|
-
#include <
|
21
|
+
#include <Ice/InputStream.h>
|
22
|
+
#include <Ice/OutputStream.h>
|
28
23
|
#include <IceUtil/PopDisableWarnings.h>
|
29
24
|
|
25
|
+
#if defined(_MSC_VER)
|
26
|
+
# pragma warning(disable:4458) // declaration of ... hides class member
|
27
|
+
#elif defined(__clang__)
|
28
|
+
# pragma clang diagnostic ignored "-Wshadow"
|
29
|
+
#elif defined(__GNUC__)
|
30
|
+
# pragma GCC diagnostic ignored "-Wshadow"
|
31
|
+
#endif
|
32
|
+
|
30
33
|
#ifndef ICE_IGNORE_VERSION
|
31
|
-
# if ICE_INT_VERSION / 100 !=
|
34
|
+
# if ICE_INT_VERSION / 100 != 307
|
32
35
|
# error Ice version mismatch!
|
33
36
|
# endif
|
34
|
-
# if ICE_INT_VERSION % 100
|
37
|
+
# if ICE_INT_VERSION % 100 >= 50
|
35
38
|
# error Beta header file detected
|
36
39
|
# endif
|
37
|
-
# if ICE_INT_VERSION % 100 <
|
40
|
+
# if ICE_INT_VERSION % 100 < 4
|
38
41
|
# error Ice patch level mismatch!
|
39
42
|
# endif
|
40
43
|
#endif
|
41
44
|
|
45
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
46
|
+
|
42
47
|
namespace
|
43
48
|
{
|
44
49
|
|
45
50
|
}
|
51
|
+
|
52
|
+
#else // C++98 mapping
|
53
|
+
|
54
|
+
namespace
|
55
|
+
{
|
56
|
+
|
57
|
+
}
|
58
|
+
|
59
|
+
namespace Ice
|
60
|
+
{
|
61
|
+
}
|
62
|
+
|
63
|
+
#endif
|
@@ -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 <IceUtil/DisableWarnings.h>
|
11
6
|
#include <Ice/LocatorInfo.h>
|
@@ -18,6 +13,7 @@
|
|
18
13
|
#include <Ice/Reference.h>
|
19
14
|
#include <Ice/Functional.h>
|
20
15
|
#include <Ice/Properties.h>
|
16
|
+
#include <Ice/Comparable.h>
|
21
17
|
#include <iterator>
|
22
18
|
|
23
19
|
using namespace std;
|
@@ -44,11 +40,32 @@ public:
|
|
44
40
|
{
|
45
41
|
try
|
46
42
|
{
|
43
|
+
#ifdef ICE_CPP11_MAPPING
|
44
|
+
LocatorInfo::RequestPtr request = this;
|
45
|
+
_locatorInfo->getLocator()->findObjectByIdAsync(
|
46
|
+
_reference->getIdentity(),
|
47
|
+
[request](const ObjectPrxPtr& object)
|
48
|
+
{
|
49
|
+
request->response(object);
|
50
|
+
},
|
51
|
+
[request](exception_ptr e)
|
52
|
+
{
|
53
|
+
try
|
54
|
+
{
|
55
|
+
rethrow_exception(e);
|
56
|
+
}
|
57
|
+
catch(const Exception& ex)
|
58
|
+
{
|
59
|
+
request->exception(ex);
|
60
|
+
}
|
61
|
+
});
|
62
|
+
#else
|
47
63
|
_locatorInfo->getLocator()->begin_findObjectById(
|
48
|
-
|
64
|
+
_reference->getIdentity(),
|
49
65
|
newCallback_Locator_findObjectById(static_cast<LocatorInfo::Request*>(this),
|
50
66
|
&LocatorInfo::Request::response,
|
51
67
|
&LocatorInfo::Request::exception));
|
68
|
+
#endif
|
52
69
|
}
|
53
70
|
catch(const Ice::Exception& ex)
|
54
71
|
{
|
@@ -70,11 +87,31 @@ public:
|
|
70
87
|
{
|
71
88
|
try
|
72
89
|
{
|
90
|
+
#ifdef ICE_CPP11_MAPPING
|
91
|
+
LocatorInfo::RequestPtr request = this;
|
92
|
+
_locatorInfo->getLocator()->findAdapterByIdAsync(_reference->getAdapterId(),
|
93
|
+
[request](const shared_ptr<Ice::ObjectPrx>& object)
|
94
|
+
{
|
95
|
+
request->response(object);
|
96
|
+
},
|
97
|
+
[request](exception_ptr e)
|
98
|
+
{
|
99
|
+
try
|
100
|
+
{
|
101
|
+
rethrow_exception(e);
|
102
|
+
}
|
103
|
+
catch(const Exception& ex)
|
104
|
+
{
|
105
|
+
request->exception(ex);
|
106
|
+
}
|
107
|
+
});
|
108
|
+
#else
|
73
109
|
_locatorInfo->getLocator()->begin_findAdapterById(
|
74
|
-
|
110
|
+
_reference->getAdapterId(),
|
75
111
|
newCallback_Locator_findAdapterById(static_cast<LocatorInfo::Request*>(this),
|
76
112
|
&LocatorInfo::Request::response,
|
77
113
|
&LocatorInfo::Request::exception));
|
114
|
+
#endif
|
78
115
|
}
|
79
116
|
catch(const Ice::Exception& ex)
|
80
117
|
{
|
@@ -96,8 +133,11 @@ IceInternal::LocatorManager::destroy()
|
|
96
133
|
{
|
97
134
|
IceUtil::Mutex::Lock sync(*this);
|
98
135
|
|
136
|
+
#ifdef ICE_CPP11_MAPPING
|
137
|
+
for_each(_table.begin(), _table.end(), [](pair<shared_ptr<Ice::LocatorPrx>, LocatorInfoPtr> it){ it.second->destroy(); });
|
138
|
+
#else
|
99
139
|
for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun<const LocatorPrx, LocatorInfo>(&LocatorInfo::destroy));
|
100
|
-
|
140
|
+
#endif
|
101
141
|
_table.clear();
|
102
142
|
_tableHint = _table.end();
|
103
143
|
|
@@ -105,14 +145,14 @@ IceInternal::LocatorManager::destroy()
|
|
105
145
|
}
|
106
146
|
|
107
147
|
LocatorInfoPtr
|
108
|
-
IceInternal::LocatorManager::get(const
|
148
|
+
IceInternal::LocatorManager::get(const LocatorPrxPtr& loc)
|
109
149
|
{
|
110
150
|
if(!loc)
|
111
151
|
{
|
112
152
|
return 0;
|
113
153
|
}
|
114
154
|
|
115
|
-
|
155
|
+
LocatorPrxPtr locator = loc->ice_locator(0); // The locator can't be located.
|
116
156
|
|
117
157
|
//
|
118
158
|
// TODO: reap unused locator info objects?
|
@@ -120,11 +160,11 @@ IceInternal::LocatorManager::get(const LocatorPrx& loc)
|
|
120
160
|
|
121
161
|
IceUtil::Mutex::Lock sync(*this);
|
122
162
|
|
123
|
-
|
163
|
+
LocatorInfoTable::iterator p = _table.end();
|
124
164
|
|
125
165
|
if(_tableHint != _table.end())
|
126
166
|
{
|
127
|
-
if(_tableHint->first
|
167
|
+
if(targetEqualTo(_tableHint->first, locator))
|
128
168
|
{
|
129
169
|
p = _tableHint;
|
130
170
|
}
|
@@ -152,7 +192,7 @@ IceInternal::LocatorManager::get(const LocatorPrx& loc)
|
|
152
192
|
}
|
153
193
|
|
154
194
|
_tableHint = _table.insert(_tableHint,
|
155
|
-
pair<const
|
195
|
+
pair<const LocatorPrxPtr, LocatorInfoPtr>(locator,
|
156
196
|
new LocatorInfo(locator, t->second,
|
157
197
|
_background)));
|
158
198
|
}
|
@@ -301,13 +341,13 @@ IceInternal::LocatorTable::checkTTL(const IceUtil::Time& time, int ttl) const
|
|
301
341
|
}
|
302
342
|
|
303
343
|
void
|
304
|
-
IceInternal::LocatorInfo::RequestCallback::response(const LocatorInfoPtr& locatorInfo, const Ice::
|
344
|
+
IceInternal::LocatorInfo::RequestCallback::response(const LocatorInfoPtr& locatorInfo, const Ice::ObjectPrxPtr& proxy)
|
305
345
|
{
|
306
346
|
vector<EndpointIPtr> endpoints;
|
307
347
|
if(proxy)
|
308
348
|
{
|
309
|
-
ReferencePtr r = proxy->
|
310
|
-
if(
|
349
|
+
ReferencePtr r = proxy->_getReference();
|
350
|
+
if(_reference->isWellKnown() && !isSupported(_reference->getEncoding(), r->getEncoding()))
|
311
351
|
{
|
312
352
|
//
|
313
353
|
// If a well-known proxy and the returned proxy encoding
|
@@ -319,21 +359,26 @@ IceInternal::LocatorInfo::RequestCallback::response(const LocatorInfoPtr& locato
|
|
319
359
|
{
|
320
360
|
endpoints = r->getEndpoints();
|
321
361
|
}
|
322
|
-
else if(
|
362
|
+
else if(_reference->isWellKnown() && !r->isWellKnown())
|
323
363
|
{
|
324
364
|
//
|
325
365
|
// We're resolving the endpoints of a well-known object and the proxy returned
|
326
366
|
// by the locator is an indirect proxy. We now need to resolve the endpoints
|
327
367
|
// of this indirect proxy.
|
328
368
|
//
|
329
|
-
|
369
|
+
if(_reference->getInstance()->traceLevels()->location >= 1)
|
370
|
+
{
|
371
|
+
locatorInfo->trace("retrieved adapter for well-known object from locator, adding to locator cache",
|
372
|
+
_reference, r);
|
373
|
+
}
|
374
|
+
locatorInfo->getEndpoints(r, _reference, _ttl, _callback);
|
330
375
|
return;
|
331
376
|
}
|
332
377
|
}
|
333
378
|
|
334
|
-
if(
|
379
|
+
if(_reference->getInstance()->traceLevels()->location >= 1)
|
335
380
|
{
|
336
|
-
locatorInfo->getEndpointsTrace(
|
381
|
+
locatorInfo->getEndpointsTrace(_reference, endpoints, false);
|
337
382
|
}
|
338
383
|
if(_callback)
|
339
384
|
{
|
@@ -346,7 +391,7 @@ IceInternal::LocatorInfo::RequestCallback::exception(const LocatorInfoPtr& locat
|
|
346
391
|
{
|
347
392
|
try
|
348
393
|
{
|
349
|
-
locatorInfo->getEndpointsException(
|
394
|
+
locatorInfo->getEndpointsException(_reference, exc); // This throws.
|
350
395
|
}
|
351
396
|
catch(const Ice::LocalException& ex)
|
352
397
|
{
|
@@ -360,7 +405,7 @@ IceInternal::LocatorInfo::RequestCallback::exception(const LocatorInfoPtr& locat
|
|
360
405
|
IceInternal::LocatorInfo::RequestCallback::RequestCallback(const ReferencePtr& ref,
|
361
406
|
int ttl,
|
362
407
|
const GetEndpointsCallbackPtr& cb) :
|
363
|
-
|
408
|
+
_reference(ref), _ttl(ttl), _callback(cb)
|
364
409
|
{
|
365
410
|
}
|
366
411
|
|
@@ -373,7 +418,7 @@ IceInternal::LocatorInfo::Request::addCallback(const ReferencePtr& ref,
|
|
373
418
|
RequestCallbackPtr callback = new RequestCallback(ref, ttl, cb);
|
374
419
|
{
|
375
420
|
IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
|
376
|
-
if(!_response && !_exception
|
421
|
+
if(!_response && !_exception)
|
377
422
|
{
|
378
423
|
_callbacks.push_back(callback);
|
379
424
|
if(wellKnownRef) // This request is to resolve the endpoints of a cached well-known object reference
|
@@ -396,82 +441,22 @@ IceInternal::LocatorInfo::Request::addCallback(const ReferencePtr& ref,
|
|
396
441
|
}
|
397
442
|
else
|
398
443
|
{
|
399
|
-
assert(_exception
|
400
|
-
callback->exception(_locatorInfo, *_exception
|
401
|
-
}
|
402
|
-
}
|
403
|
-
|
404
|
-
vector<EndpointIPtr>
|
405
|
-
IceInternal::LocatorInfo::Request::getEndpoints(const ReferencePtr& ref,
|
406
|
-
const ReferencePtr& wellKnownRef,
|
407
|
-
int ttl,
|
408
|
-
bool& cached)
|
409
|
-
{
|
410
|
-
IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
|
411
|
-
if(!_response && !_exception.get())
|
412
|
-
{
|
413
|
-
if(wellKnownRef) // This request is to resolve the endpoints of a cached well-known object reference
|
414
|
-
{
|
415
|
-
_wellKnownRefs.push_back(wellKnownRef);
|
416
|
-
}
|
417
|
-
if(!_sent)
|
418
|
-
{
|
419
|
-
_sent = true;
|
420
|
-
sync.release();
|
421
|
-
send(); // send() might call exception() from this thread so we need to release the mutex.
|
422
|
-
sync.acquire();
|
423
|
-
}
|
424
|
-
|
425
|
-
while(!_response && !_exception.get())
|
426
|
-
{
|
427
|
-
_monitor.wait();
|
428
|
-
}
|
429
|
-
}
|
430
|
-
|
431
|
-
if(_exception.get())
|
432
|
-
{
|
433
|
-
_locatorInfo->getEndpointsException(ref, *_exception.get()); // This throws.
|
434
|
-
}
|
435
|
-
|
436
|
-
assert(_response);
|
437
|
-
vector<EndpointIPtr> endpoints;
|
438
|
-
if(_proxy)
|
439
|
-
{
|
440
|
-
ReferencePtr r = _proxy->__reference();
|
441
|
-
if(!r->isIndirect())
|
442
|
-
{
|
443
|
-
endpoints = r->getEndpoints();
|
444
|
-
}
|
445
|
-
else if(ref->isWellKnown() && !r->isWellKnown())
|
446
|
-
{
|
447
|
-
//
|
448
|
-
// We're resolving the endpoints of a well-known object and the proxy returned
|
449
|
-
// by the locator is an indirect proxy. We now need to resolve the endpoints
|
450
|
-
// of this indirect proxy.
|
451
|
-
//
|
452
|
-
return _locatorInfo->getEndpoints(r, ref, ttl, cached);
|
453
|
-
}
|
454
|
-
}
|
455
|
-
|
456
|
-
cached = false;
|
457
|
-
if(_ref->getInstance()->traceLevels()->location >= 1)
|
458
|
-
{
|
459
|
-
_locatorInfo->getEndpointsTrace(ref, endpoints, false);
|
444
|
+
assert(_exception);
|
445
|
+
callback->exception(_locatorInfo, *_exception);
|
460
446
|
}
|
461
|
-
return endpoints;
|
462
447
|
}
|
463
448
|
|
464
449
|
IceInternal::LocatorInfo::Request::Request(const LocatorInfoPtr& locatorInfo, const ReferencePtr& ref) :
|
465
|
-
_locatorInfo(locatorInfo),
|
450
|
+
_locatorInfo(locatorInfo), _reference(ref), _sent(false), _response(false)
|
466
451
|
{
|
467
452
|
}
|
468
453
|
|
469
454
|
void
|
470
|
-
IceInternal::LocatorInfo::Request::response(const Ice::
|
455
|
+
IceInternal::LocatorInfo::Request::response(const Ice::ObjectPrxPtr& proxy)
|
471
456
|
{
|
472
457
|
{
|
473
458
|
IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
|
474
|
-
_locatorInfo->finishRequest(
|
459
|
+
_locatorInfo->finishRequest(_reference, _wellKnownRefs, proxy, false);
|
475
460
|
_response = true;
|
476
461
|
_proxy = proxy;
|
477
462
|
_monitor.notifyAll();
|
@@ -487,8 +472,9 @@ IceInternal::LocatorInfo::Request::exception(const Ice::Exception& ex)
|
|
487
472
|
{
|
488
473
|
{
|
489
474
|
IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
|
490
|
-
_locatorInfo->finishRequest(
|
491
|
-
|
475
|
+
_locatorInfo->finishRequest(_reference, _wellKnownRefs, 0, dynamic_cast<const Ice::UserException*>(&ex));
|
476
|
+
|
477
|
+
ICE_SET_EXCEPTION_FROM_CLONE(_exception, ex.ice_clone());
|
492
478
|
_monitor.notifyAll();
|
493
479
|
}
|
494
480
|
for(vector<RequestCallbackPtr>::const_iterator p = _callbacks.begin(); p != _callbacks.end(); ++p)
|
@@ -497,7 +483,7 @@ IceInternal::LocatorInfo::Request::exception(const Ice::Exception& ex)
|
|
497
483
|
}
|
498
484
|
}
|
499
485
|
|
500
|
-
IceInternal::LocatorInfo::LocatorInfo(const
|
486
|
+
IceInternal::LocatorInfo::LocatorInfo(const LocatorPrxPtr& locator, const LocatorTablePtr& table, bool background) :
|
501
487
|
_locator(locator),
|
502
488
|
_table(table),
|
503
489
|
_background(background)
|
@@ -518,22 +504,16 @@ IceInternal::LocatorInfo::destroy()
|
|
518
504
|
bool
|
519
505
|
IceInternal::LocatorInfo::operator==(const LocatorInfo& rhs) const
|
520
506
|
{
|
521
|
-
return _locator
|
522
|
-
}
|
523
|
-
|
524
|
-
bool
|
525
|
-
IceInternal::LocatorInfo::operator!=(const LocatorInfo& rhs) const
|
526
|
-
{
|
527
|
-
return _locator != rhs._locator;
|
507
|
+
return Ice::targetEqualTo(_locator, rhs._locator);
|
528
508
|
}
|
529
509
|
|
530
510
|
bool
|
531
511
|
IceInternal::LocatorInfo::operator<(const LocatorInfo& rhs) const
|
532
512
|
{
|
533
|
-
return _locator
|
513
|
+
return Ice::targetLess(_locator, rhs._locator);
|
534
514
|
}
|
535
515
|
|
536
|
-
|
516
|
+
LocatorRegistryPrxPtr
|
537
517
|
IceInternal::LocatorInfo::getLocatorRegistry()
|
538
518
|
{
|
539
519
|
{
|
@@ -547,7 +527,7 @@ IceInternal::LocatorInfo::getLocatorRegistry()
|
|
547
527
|
//
|
548
528
|
// Do not make locator calls from within sync.
|
549
529
|
//
|
550
|
-
|
530
|
+
LocatorRegistryPrxPtr locatorRegistry = _locator->getRegistry();
|
551
531
|
if(!locatorRegistry)
|
552
532
|
{
|
553
533
|
return 0;
|
@@ -561,69 +541,16 @@ IceInternal::LocatorInfo::getLocatorRegistry()
|
|
561
541
|
// endpoint selection in case the locator returned a proxy
|
562
542
|
// with some endpoints which are prefered to be tried first.
|
563
543
|
//
|
564
|
-
_locatorRegistry = locatorRegistry->ice_locator(0)->ice_endpointSelection(Ice::Ordered);
|
544
|
+
_locatorRegistry = locatorRegistry->ice_locator(0)->ice_endpointSelection(Ice::ICE_ENUM(EndpointSelectionType, Ordered));
|
565
545
|
return _locatorRegistry;
|
566
546
|
}
|
567
547
|
}
|
568
548
|
|
569
|
-
vector<EndpointIPtr>
|
570
|
-
IceInternal::LocatorInfo::getEndpoints(const ReferencePtr& ref, const ReferencePtr& wellKnownRef, int ttl, bool& cached)
|
571
|
-
{
|
572
|
-
assert(ref->isIndirect());
|
573
|
-
vector<EndpointIPtr> endpoints;
|
574
|
-
if(!ref->isWellKnown())
|
575
|
-
{
|
576
|
-
if(!_table->getAdapterEndpoints(ref->getAdapterId(), ttl, endpoints))
|
577
|
-
{
|
578
|
-
if(_background && !endpoints.empty())
|
579
|
-
{
|
580
|
-
getAdapterRequest(ref)->addCallback(ref, wellKnownRef, ttl, 0);
|
581
|
-
}
|
582
|
-
else
|
583
|
-
{
|
584
|
-
return getAdapterRequest(ref)->getEndpoints(ref, wellKnownRef, ttl, cached);
|
585
|
-
}
|
586
|
-
}
|
587
|
-
}
|
588
|
-
else
|
589
|
-
{
|
590
|
-
ReferencePtr r;
|
591
|
-
if(!_table->getObjectReference(ref->getIdentity(), ttl, r))
|
592
|
-
{
|
593
|
-
if(_background && r)
|
594
|
-
{
|
595
|
-
getObjectRequest(ref)->addCallback(ref, 0, ttl, 0);
|
596
|
-
}
|
597
|
-
else
|
598
|
-
{
|
599
|
-
return getObjectRequest(ref)->getEndpoints(ref, 0, ttl, cached);
|
600
|
-
}
|
601
|
-
}
|
602
|
-
|
603
|
-
if(!r->isIndirect())
|
604
|
-
{
|
605
|
-
endpoints = r->getEndpoints();
|
606
|
-
}
|
607
|
-
else if(!r->isWellKnown())
|
608
|
-
{
|
609
|
-
return getEndpoints(r, ref, ttl, cached);
|
610
|
-
}
|
611
|
-
}
|
612
|
-
|
613
|
-
assert(!endpoints.empty());
|
614
|
-
cached = true;
|
615
|
-
if(ref->getInstance()->traceLevels()->location >= 1)
|
616
|
-
{
|
617
|
-
getEndpointsTrace(ref, endpoints, true);
|
618
|
-
}
|
619
|
-
return endpoints;
|
620
|
-
}
|
621
|
-
|
622
549
|
void
|
623
|
-
IceInternal::LocatorInfo::
|
624
|
-
|
625
|
-
|
626
|
-
|
550
|
+
IceInternal::LocatorInfo::getEndpoints(const ReferencePtr& ref,
|
551
|
+
const ReferencePtr& wellKnownRef,
|
552
|
+
int ttl,
|
553
|
+
const GetEndpointsCallbackPtr& callback)
|
627
554
|
{
|
628
555
|
assert(ref->isIndirect());
|
629
556
|
vector<EndpointIPtr> endpoints;
|
@@ -664,7 +591,11 @@ IceInternal::LocatorInfo::getEndpointsWithCallback(const ReferencePtr& ref,
|
|
664
591
|
}
|
665
592
|
else if(!r->isWellKnown())
|
666
593
|
{
|
667
|
-
|
594
|
+
if(ref->getInstance()->traceLevels()->location >= 1)
|
595
|
+
{
|
596
|
+
trace("found adapter for well-known object in locator cache", ref, r);
|
597
|
+
}
|
598
|
+
getEndpoints(r, ref, ttl, callback);
|
668
599
|
return;
|
669
600
|
}
|
670
601
|
}
|
@@ -691,7 +622,7 @@ IceInternal::LocatorInfo::clearCache(const ReferencePtr& ref)
|
|
691
622
|
|
692
623
|
if(!endpoints.empty() && ref->getInstance()->traceLevels()->location >= 2)
|
693
624
|
{
|
694
|
-
trace("removed endpoints from locator
|
625
|
+
trace("removed endpoints for adapter from locator cache", ref, endpoints);
|
695
626
|
}
|
696
627
|
}
|
697
628
|
else
|
@@ -703,11 +634,15 @@ IceInternal::LocatorInfo::clearCache(const ReferencePtr& ref)
|
|
703
634
|
{
|
704
635
|
if(ref->getInstance()->traceLevels()->location >= 2)
|
705
636
|
{
|
706
|
-
trace("removed endpoints from locator
|
637
|
+
trace("removed endpoints for well-known object from locator cache", ref, r->getEndpoints());
|
707
638
|
}
|
708
639
|
}
|
709
640
|
else if(!r->isWellKnown())
|
710
641
|
{
|
642
|
+
if(ref->getInstance()->traceLevels()->location >= 2)
|
643
|
+
{
|
644
|
+
trace("removed adapter for well-known object from locator cache", ref, r);
|
645
|
+
}
|
711
646
|
clearCache(r);
|
712
647
|
}
|
713
648
|
}
|
@@ -733,10 +668,7 @@ IceInternal::LocatorInfo::getEndpointsException(const ReferencePtr& ref, const I
|
|
733
668
|
out << "adapter = " << ref->getAdapterId();
|
734
669
|
}
|
735
670
|
|
736
|
-
NotRegisteredException
|
737
|
-
ex.kindOfObject = "object adapter";
|
738
|
-
ex.id = ref->getAdapterId();
|
739
|
-
throw ex;
|
671
|
+
throw NotRegisteredException(__FILE__, __LINE__, "object adapter", ref->getAdapterId());
|
740
672
|
}
|
741
673
|
catch(const ObjectNotFoundException&)
|
742
674
|
{
|
@@ -745,13 +677,12 @@ IceInternal::LocatorInfo::getEndpointsException(const ReferencePtr& ref, const I
|
|
745
677
|
Trace out(ref->getInstance()->initializationData().logger,
|
746
678
|
ref->getInstance()->traceLevels()->locationCat);
|
747
679
|
out << "object not found" << "\n";
|
748
|
-
out << "object = " <<
|
680
|
+
out << "object = " << Ice::identityToString(ref->getIdentity(),
|
681
|
+
ref->getInstance()->toStringMode());
|
749
682
|
}
|
750
683
|
|
751
|
-
NotRegisteredException
|
752
|
-
|
753
|
-
ex.id = ref->getInstance()->identityToString(ref->getIdentity());
|
754
|
-
throw ex;
|
684
|
+
throw NotRegisteredException(__FILE__, __LINE__, "object",
|
685
|
+
Ice::identityToString(ref->getIdentity(), ref->getInstance()->toStringMode()));
|
755
686
|
}
|
756
687
|
catch(const NotRegisteredException&)
|
757
688
|
{
|
@@ -762,10 +693,10 @@ IceInternal::LocatorInfo::getEndpointsException(const ReferencePtr& ref, const I
|
|
762
693
|
if(ref->getInstance()->traceLevels()->location >= 1)
|
763
694
|
{
|
764
695
|
Trace out(ref->getInstance()->initializationData().logger, ref->getInstance()->traceLevels()->locationCat);
|
765
|
-
out << "couldn't contact the locator to retrieve
|
696
|
+
out << "couldn't contact the locator to retrieve endpoints\n";
|
766
697
|
if(ref->getAdapterId().empty())
|
767
698
|
{
|
768
|
-
out << "
|
699
|
+
out << "well-known proxy = " << ref->toString() << "\n";
|
769
700
|
}
|
770
701
|
else
|
771
702
|
{
|
@@ -786,11 +717,25 @@ IceInternal::LocatorInfo::getEndpointsTrace(const ReferencePtr& ref,
|
|
786
717
|
{
|
787
718
|
if(cached)
|
788
719
|
{
|
789
|
-
|
720
|
+
if(ref->isWellKnown())
|
721
|
+
{
|
722
|
+
trace("found endpoints for well-known proxy in locator cache", ref, endpoints);
|
723
|
+
}
|
724
|
+
else
|
725
|
+
{
|
726
|
+
trace("found endpoints for adapter in locator cache", ref, endpoints);
|
727
|
+
}
|
790
728
|
}
|
791
729
|
else
|
792
730
|
{
|
793
|
-
|
731
|
+
if(ref->isWellKnown())
|
732
|
+
{
|
733
|
+
trace("retrieved endpoints for well-known proxy from locator, adding to locator cache", ref, endpoints);
|
734
|
+
}
|
735
|
+
else
|
736
|
+
{
|
737
|
+
trace("retrieved endpoints for adapter from locator, adding to locator cache", ref, endpoints);
|
738
|
+
}
|
794
739
|
}
|
795
740
|
}
|
796
741
|
else
|
@@ -799,8 +744,8 @@ IceInternal::LocatorInfo::getEndpointsTrace(const ReferencePtr& ref,
|
|
799
744
|
out << "no endpoints configured for ";
|
800
745
|
if(ref->getAdapterId().empty())
|
801
746
|
{
|
802
|
-
out << "object\n";
|
803
|
-
out << "
|
747
|
+
out << "well-known object\n";
|
748
|
+
out << "well-known proxy = " << ref->toString();
|
804
749
|
}
|
805
750
|
else
|
806
751
|
{
|
@@ -823,16 +768,35 @@ IceInternal::LocatorInfo::trace(const string& msg, const ReferencePtr& ref, cons
|
|
823
768
|
}
|
824
769
|
else
|
825
770
|
{
|
826
|
-
out << "
|
771
|
+
out << "well-known proxy = " << ref->toString() << '\n';
|
827
772
|
}
|
828
773
|
|
829
774
|
const char* sep = endpoints.size() > 1 ? ":" : "";
|
830
775
|
ostringstream o;
|
776
|
+
#ifdef ICE_CPP11_MAPPING
|
777
|
+
transform(endpoints.begin(), endpoints.end(), ostream_iterator<string>(o, sep),
|
778
|
+
[](const EndpointPtr& endpoint)
|
779
|
+
{
|
780
|
+
return endpoint->toString();
|
781
|
+
});
|
782
|
+
#else
|
831
783
|
transform(endpoints.begin(), endpoints.end(), ostream_iterator<string>(o, sep),
|
832
784
|
Ice::constMemFun(&Endpoint::toString));
|
785
|
+
#endif
|
833
786
|
out << "endpoints = " << o.str();
|
834
787
|
}
|
835
788
|
|
789
|
+
void
|
790
|
+
IceInternal::LocatorInfo::trace(const string& msg, const ReferencePtr& ref, const ReferencePtr& resolved)
|
791
|
+
{
|
792
|
+
assert(ref->isWellKnown());
|
793
|
+
|
794
|
+
Trace out(ref->getInstance()->initializationData().logger, ref->getInstance()->traceLevels()->locationCat);
|
795
|
+
out << msg << '\n';
|
796
|
+
out << "well-known proxy = " << ref->toString() << '\n';
|
797
|
+
out << "adapter = " << resolved->getAdapterId();
|
798
|
+
}
|
799
|
+
|
836
800
|
IceInternal::LocatorInfo::RequestPtr
|
837
801
|
IceInternal::LocatorInfo::getAdapterRequest(const ReferencePtr& ref)
|
838
802
|
{
|
@@ -861,7 +825,7 @@ IceInternal::LocatorInfo::getObjectRequest(const ReferencePtr& ref)
|
|
861
825
|
if(ref->getInstance()->traceLevels()->location >= 1)
|
862
826
|
{
|
863
827
|
Trace out(ref->getInstance()->initializationData().logger, ref->getInstance()->traceLevels()->locationCat);
|
864
|
-
out << "searching for object
|
828
|
+
out << "searching for well-known object\nwell-known proxy = " << ref->toString();
|
865
829
|
}
|
866
830
|
|
867
831
|
map<Ice::Identity, RequestPtr>::const_iterator p = _objectRequests.find(ref->getIdentity());
|
@@ -877,10 +841,10 @@ IceInternal::LocatorInfo::getObjectRequest(const ReferencePtr& ref)
|
|
877
841
|
void
|
878
842
|
IceInternal::LocatorInfo::finishRequest(const ReferencePtr& ref,
|
879
843
|
const vector<ReferencePtr>& wellKnownRefs,
|
880
|
-
const Ice::
|
844
|
+
const Ice::ObjectPrxPtr& proxy,
|
881
845
|
bool notRegistered)
|
882
846
|
{
|
883
|
-
if(!proxy || proxy->
|
847
|
+
if(!proxy || proxy->_getReference()->isIndirect())
|
884
848
|
{
|
885
849
|
//
|
886
850
|
// Remove the cached references of well-known objects for which we tried
|
@@ -894,9 +858,9 @@ IceInternal::LocatorInfo::finishRequest(const ReferencePtr& ref,
|
|
894
858
|
|
895
859
|
if(!ref->isWellKnown())
|
896
860
|
{
|
897
|
-
if(proxy && !proxy->
|
861
|
+
if(proxy && !proxy->_getReference()->isIndirect()) // Cache the adapter endpoints.
|
898
862
|
{
|
899
|
-
_table->addAdapterEndpoints(ref->getAdapterId(), proxy->
|
863
|
+
_table->addAdapterEndpoints(ref->getAdapterId(), proxy->_getReference()->getEndpoints());
|
900
864
|
}
|
901
865
|
else if(notRegistered) // If the adapter isn't registered anymore, remove it from the cache.
|
902
866
|
{
|
@@ -909,9 +873,9 @@ IceInternal::LocatorInfo::finishRequest(const ReferencePtr& ref,
|
|
909
873
|
}
|
910
874
|
else
|
911
875
|
{
|
912
|
-
if(proxy && !proxy->
|
876
|
+
if(proxy && !proxy->_getReference()->isWellKnown()) // Cache the well-known object reference.
|
913
877
|
{
|
914
|
-
_table->addObjectReference(ref->getIdentity(), proxy->
|
878
|
+
_table->addObjectReference(ref->getIdentity(), proxy->_getReference());
|
915
879
|
}
|
916
880
|
else if(notRegistered) // If the well-known object isn't registered anymore, remove it from the cache.
|
917
881
|
{
|