zeroc-ice 3.6.5 → 3.7.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/BZIP2_LICENSE +42 -0
- data/ICE_LICENSE +17 -17
- data/LICENSE +12 -12
- data/bin/slice2rb +1 -1
- data/ext/Communicator.cpp +150 -53
- data/ext/Communicator.h +1 -1
- data/ext/Config.h +2 -12
- data/ext/Connection.cpp +89 -68
- data/ext/Connection.h +1 -1
- data/ext/Endpoint.cpp +16 -45
- data/ext/Endpoint.h +1 -1
- data/ext/ImplicitContext.cpp +1 -5
- data/ext/ImplicitContext.h +1 -1
- data/ext/Init.cpp +4 -1
- data/ext/Logger.cpp +1 -1
- data/ext/Logger.h +1 -1
- data/ext/Operation.cpp +33 -44
- data/ext/Operation.h +1 -1
- data/ext/Properties.cpp +1 -1
- data/ext/Properties.h +1 -1
- data/ext/Proxy.cpp +22 -57
- data/ext/Proxy.h +1 -1
- data/ext/Slice.cpp +5 -5
- data/ext/Slice.h +1 -1
- data/ext/Types.cpp +244 -171
- data/ext/Types.h +118 -66
- data/ext/Util.cpp +13 -9
- data/ext/Util.h +10 -10
- data/ext/ValueFactoryManager.cpp +445 -0
- data/ext/ValueFactoryManager.h +100 -0
- data/ext/extconf.rb +47 -45
- data/ext/ice/bzip2/blocksort.c +1094 -0
- data/ext/ice/bzip2/bzlib.c +1572 -0
- data/ext/ice/bzip2/bzlib.h +282 -0
- data/ext/ice/bzip2/bzlib_private.h +509 -0
- data/ext/ice/bzip2/compress.c +672 -0
- data/ext/ice/bzip2/crctable.c +104 -0
- data/ext/ice/bzip2/decompress.c +646 -0
- data/ext/ice/bzip2/huffman.c +205 -0
- data/ext/ice/bzip2/randtable.c +84 -0
- data/ext/ice/cpp/include/Ice/Application.h +77 -60
- data/ext/ice/cpp/include/Ice/AsyncResult.h +34 -318
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -2
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +5 -10
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -1
- data/ext/ice/cpp/include/Ice/Buffer.h +10 -10
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +14 -12
- data/ext/ice/cpp/include/Ice/Comparable.h +130 -0
- data/ext/ice/cpp/include/Ice/Config.h +7 -36
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +107 -11
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +5 -1
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +28 -0
- data/ext/ice/cpp/include/Ice/{DefaultObjectFactory.h → DefaultValueFactory.h} +28 -14
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +4 -6
- data/ext/ice/cpp/include/Ice/Dispatcher.h +14 -13
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -5
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -1
- data/ext/ice/cpp/include/Ice/Exception.h +66 -56
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +69 -0
- data/ext/ice/cpp/include/Ice/FactoryTable.h +11 -12
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +27 -25
- data/ext/ice/cpp/include/Ice/Format.h +6 -1
- data/ext/ice/cpp/include/Ice/Functional.h +33 -33
- data/ext/ice/cpp/include/Ice/GCObject.h +9 -5
- data/ext/ice/cpp/include/Ice/Handle.h +6 -11
- data/ext/ice/cpp/include/Ice/Ice.h +9 -5
- data/ext/ice/cpp/include/{IceUtil → Ice}/IconvStringConverter.h +108 -62
- data/ext/ice/cpp/include/Ice/Incoming.h +109 -33
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +63 -23
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -1
- data/ext/ice/cpp/include/Ice/Initialize.h +178 -38
- data/ext/ice/cpp/include/Ice/InputStream.h +994 -0
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -2
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +46 -0
- data/ext/ice/cpp/include/Ice/LocalObject.h +9 -9
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -1
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +20 -14
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +114 -65
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +23 -5
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +99 -26
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +17 -4
- data/ext/ice/cpp/include/Ice/Object.h +105 -56
- data/ext/ice/cpp/include/Ice/ObjectF.h +8 -3
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -8
- data/ext/ice/cpp/include/Ice/Optional.h +1084 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +655 -84
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -6
- data/ext/ice/cpp/include/Ice/OutputStream.h +753 -0
- data/ext/ice/cpp/include/Ice/Protocol.h +19 -12
- data/ext/ice/cpp/include/Ice/Proxy.h +1329 -717
- data/ext/ice/cpp/include/Ice/ProxyF.h +11 -33
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -1
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +34 -50
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -1
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +22 -3
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -4
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -1
- data/ext/ice/cpp/include/{IceUtil → Ice}/SHA1.h +16 -16
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -1
- data/ext/ice/cpp/include/Ice/Service.h +13 -18
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -1
- data/ext/ice/cpp/include/Ice/SlicedData.h +46 -20
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +14 -6
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +159 -49
- data/ext/ice/cpp/include/Ice/StringConverter.h +52 -0
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -1
- data/{slice/Ice/ObjectFactoryF.ice → ext/ice/cpp/include/Ice/UUID.h} +9 -7
- data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +21 -22
- data/ext/ice/cpp/include/Ice/UniqueRef.h +98 -0
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +40 -8
- data/ext/ice/cpp/include/Ice/Value.h +104 -0
- data/{slice/Freeze/ConnectionF.ice → ext/ice/cpp/include/Ice/ValueF.h} +11 -7
- data/ext/ice/cpp/include/IceSSL/Config.h +8 -23
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -6
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +130 -0
- data/ext/ice/cpp/include/IceSSL/Plugin.h +172 -259
- data/ext/ice/cpp/include/IceSSL/SChannel.h +66 -0
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +66 -0
- data/ext/ice/cpp/include/IceSSL/UWP.h +58 -0
- data/ext/ice/cpp/include/IceUtil/Atomic.h +8 -10
- data/ext/ice/cpp/include/IceUtil/Cond.h +17 -18
- data/ext/ice/cpp/include/IceUtil/Config.h +138 -39
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +97 -0
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -5
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +23 -17
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +1 -3
- data/ext/ice/cpp/include/IceUtil/Exception.h +157 -67
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +148 -0
- data/ext/ice/cpp/include/IceUtil/Functional.h +1 -2
- data/ext/ice/cpp/include/IceUtil/Handle.h +11 -11
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -10
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -3
- data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -2
- data/ext/ice/cpp/include/IceUtil/Lock.h +8 -10
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -2
- data/ext/ice/cpp/include/IceUtil/Mutex.h +17 -11
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -2
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -4
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -4
- data/ext/ice/cpp/include/IceUtil/Optional.h +32 -18
- data/ext/ice/cpp/include/IceUtil/Options.h +17 -18
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +55 -29
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -6
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +11 -10
- data/ext/ice/cpp/include/IceUtil/Random.h +3 -3
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -8
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +58 -0
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +1 -9
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -2
- data/ext/ice/cpp/include/IceUtil/Shared.h +5 -7
- data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -2
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +77 -72
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -21
- data/ext/ice/cpp/include/IceUtil/Thread.h +10 -12
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -42
- data/ext/ice/cpp/include/IceUtil/Time.h +3 -3
- data/ext/ice/cpp/include/IceUtil/Timer.h +14 -13
- data/ext/ice/cpp/include/IceUtil/UUID.h +2 -2
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -1
- data/ext/ice/cpp/include/{Ice → generated/Ice}/BuiltinSequences.h +41 -8
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +364 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/Connection.h +872 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ConnectionF.h +46 -8
- data/ext/ice/cpp/include/{Ice → generated/Ice}/Current.h +71 -8
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +582 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/EndpointF.h +62 -8
- data/ext/ice/cpp/include/{Ice → generated/Ice}/EndpointTypes.h +31 -16
- data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +23 -8
- data/ext/ice/cpp/include/generated/Ice/Identity.h +221 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContext.h +72 -13
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +602 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/InstrumentationF.h +54 -8
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +2802 -0
- data/ext/ice/cpp/include/generated/Ice/Locator.h +2036 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LocatorF.h +53 -12
- data/ext/ice/cpp/include/{Ice → generated/Ice}/Logger.h +71 -13
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +2649 -0
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +302 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +142 -0
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +197 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/PluginF.h +43 -8
- data/ext/ice/cpp/include/generated/Ice/Process.h +536 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ProcessF.h +45 -10
- data/ext/ice/cpp/include/{Ice → generated/Ice}/Properties.h +88 -21
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +749 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/PropertiesF.h +48 -10
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +1449 -0
- data/ext/ice/cpp/include/generated/Ice/Router.h +1032 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/RouterF.h +45 -10
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocator.h +65 -13
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +40 -8
- data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +23 -8
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +169 -0
- data/ext/ice/cpp/include/generated/Ice/Version.h +334 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +172 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +98 -0
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +156 -0
- data/ext/ice/cpp/src/Ice/ACM.cpp +18 -14
- data/ext/ice/cpp/src/Ice/ACM.h +9 -2
- data/ext/ice/cpp/{include → src}/Ice/ACMF.h +10 -5
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -1
- data/ext/ice/cpp/src/Ice/Acceptor.h +4 -3
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
- data/ext/ice/cpp/src/{IceUtil → Ice}/ArgVector.cpp +9 -9
- data/ext/ice/cpp/src/{IceUtil → Ice}/ArgVector.h +7 -7
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -538
- data/ext/ice/cpp/src/Ice/Base64.cpp +11 -11
- data/ext/ice/cpp/src/Ice/Base64.h +1 -1
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +40 -12
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -10
- data/ext/ice/cpp/src/Ice/Buffer.cpp +74 -12
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +20 -6
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +85 -190
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -18
- data/ext/ice/cpp/src/Ice/Communicator.cpp +39 -8
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +271 -104
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +84 -28
- data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +58 -125
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +11 -22
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -2
- data/ext/ice/cpp/src/Ice/Connection.cpp +88 -8
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +158 -80
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +41 -23
- data/ext/ice/cpp/{include → src}/Ice/ConnectionFactoryF.h +8 -3
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +707 -653
- data/ext/ice/cpp/src/Ice/ConnectionI.h +97 -69
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -15
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +4 -3
- data/ext/ice/cpp/src/Ice/Connector.cpp +6 -1
- data/ext/ice/cpp/src/Ice/Connector.h +4 -3
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -1
- data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -4
- data/ext/ice/cpp/src/Ice/Current.cpp +29 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +6 -5
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -1
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -1
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +5 -25
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +29 -19
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +85 -6
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -1
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +35 -19
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -4
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +17 -1
- data/ext/ice/cpp/src/Ice/EndpointI.h +35 -9
- data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -5
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +18 -6
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -4
- data/ext/ice/cpp/src/Ice/EventHandler.h +13 -8
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -2
- data/ext/ice/cpp/src/Ice/Exception.cpp +95 -86
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +20 -6
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -28
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -4
- data/ext/ice/cpp/src/Ice/GCObject.cpp +28 -25
- data/ext/ice/cpp/src/Ice/HashUtil.h +2 -3
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -2
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -1
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +92 -53
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +19 -10
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -2
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +56 -0
- data/ext/ice/cpp/src/Ice/Identity.cpp +24 -10
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +37 -6
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +14 -14
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -5
- data/ext/ice/cpp/src/Ice/Incoming.cpp +276 -245
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -209
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -4
- data/ext/ice/cpp/src/Ice/Initialize.cpp +299 -172
- data/ext/ice/cpp/src/Ice/InputStream.cpp +2773 -0
- data/ext/ice/cpp/src/Ice/Instance.cpp +191 -231
- data/ext/ice/cpp/src/Ice/Instance.h +30 -18
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +106 -7
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +117 -99
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -31
- data/ext/ice/cpp/src/Ice/LocalException.cpp +1190 -416
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -2
- data/ext/ice/cpp/src/Ice/Locator.cpp +1167 -1215
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +129 -163
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +29 -29
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -1
- data/ext/ice/cpp/src/Ice/Logger.cpp +35 -5
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +178 -73
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -4
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +14 -44
- data/ext/ice/cpp/src/Ice/LoggerI.h +7 -13
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -12
- data/ext/ice/cpp/src/Ice/Metrics.cpp +1059 -1069
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +49 -19
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -2
- data/ext/ice/cpp/src/Ice/Network.cpp +534 -170
- data/ext/ice/cpp/src/Ice/Network.h +100 -23
- data/ext/ice/cpp/src/Ice/NetworkF.h +2 -2
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +21 -14
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -2
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -1
- data/ext/ice/cpp/src/Ice/Object.cpp +217 -221
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +41 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +35 -14
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -7
- data/ext/ice/cpp/{include → src}/Ice/ObjectAdapterFactoryF.h +5 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +184 -58
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +32 -26
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +37 -6
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -32
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +40 -18
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +14 -5
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +803 -365
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1399 -0
- data/ext/ice/cpp/src/Ice/Plugin.cpp +45 -6
- data/ext/ice/cpp/src/Ice/PluginF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +13 -13
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +5 -6
- data/ext/ice/cpp/src/Ice/Process.cpp +256 -114
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/Properties.cpp +38 -8
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +340 -328
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +81 -17
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -5
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +25 -26
- data/ext/ice/cpp/src/Ice/PropertiesI.h +8 -11
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +107 -50
- data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -2
- data/ext/ice/cpp/src/Ice/Protocol.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -2
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -20
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -1
- data/ext/ice/cpp/src/Ice/Proxy.cpp +690 -964
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +23 -32
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -11
- data/ext/ice/cpp/src/Ice/Reference.cpp +75 -69
- data/ext/ice/cpp/src/Ice/Reference.h +27 -22
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +18 -21
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -12
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +18 -4
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -1
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +672 -552
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -3
- data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -13
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -6
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -2
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -6
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -7
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +6 -12
- data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -6
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -1
- data/ext/ice/cpp/src/Ice/Router.cpp +523 -474
- data/ext/ice/cpp/src/Ice/RouterF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +91 -70
- data/ext/ice/cpp/src/Ice/RouterInfo.h +43 -32
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -1
- data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +21 -21
- data/ext/ice/cpp/src/Ice/Selector.cpp +989 -923
- data/ext/ice/cpp/src/Ice/Selector.h +100 -147
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +37 -6
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +9 -9
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -1
- data/ext/ice/cpp/src/Ice/SharedContext.h +2 -2
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +20 -6
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -2
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -20
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +173 -18
- data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -4
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +48 -17
- data/ext/ice/cpp/src/Ice/StringUtil.h +35 -0
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +8 -4
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -3
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +158 -32
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -5
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -7
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -2
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +40 -32
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +11 -8
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +12 -27
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -10
- data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +24 -41
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +175 -267
- data/ext/ice/cpp/src/Ice/ThreadPool.h +38 -43
- data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +28 -21
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -2
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -2
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -31
- data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -6
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -2
- data/ext/ice/cpp/src/Ice/Transceiver.h +8 -7
- data/ext/ice/cpp/src/Ice/TransceiverF.h +1 -1
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +2 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -2
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +92 -31
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +12 -4
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +150 -179
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -17
- data/ext/ice/cpp/src/Ice/Value.cpp +81 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +84 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +70 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +42 -0
- data/ext/ice/cpp/src/Ice/Version.cpp +24 -14
- data/ext/ice/cpp/src/Ice/VirtualShared.h +43 -0
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -9
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -7
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -11
- data/ext/ice/cpp/src/Ice/WSConnector.h +3 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +185 -80
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +21 -31
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +41 -37
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -21
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +526 -264
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +341 -455
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +86 -26
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -23
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -61
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -36
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -59
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -3
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +396 -159
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +251 -355
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +52 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +526 -131
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +19 -165
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -17
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +284 -0
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +69 -0
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +39 -11
- data/ext/ice/cpp/src/{Ice/ObjectFactoryF.cpp → IceSSL/ConnectionInfoF.cpp} +31 -9
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +14 -56
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -13
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +205 -197
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +41 -33
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +39 -10
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/Instance.h +7 -7
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -7
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +588 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +117 -152
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +64 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +32 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +132 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +400 -89
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +36 -21
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +291 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +63 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -41
- data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -18
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -54
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -7
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +585 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +491 -75
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +126 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +32 -0
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +78 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +126 -169
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +19 -22
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +79 -74
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +24 -187
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -19
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +862 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +56 -214
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +60 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +31 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +80 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +137 -144
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +25 -28
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +857 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +46 -0
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +9 -13
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -4
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -3
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +271 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +343 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +46 -0
- data/ext/ice/cpp/{include/Ice/ObjectFactoryManagerF.h → src/IceSSL/UWPEngineF.h} +13 -8
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +94 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +388 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +76 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +66 -1256
- data/ext/ice/cpp/src/IceSSL/Util.h +48 -137
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +162 -0
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -22
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -26
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +20 -31
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +25 -116
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Options.cpp +23 -46
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +7 -6
- data/ext/ice/cpp/src/IceUtil/Random.cpp +13 -13
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +3 -9
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -3
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -264
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +540 -235
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -74
- data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +10 -10
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +98 -97
- data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -35
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +838 -0
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +815 -163
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +76 -0
- data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -2
- data/ext/ice/cpp/{include → src}/Slice/Checksum.h +2 -2
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -78
- data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -9
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1994 -1943
- data/ext/ice/cpp/src/Slice/Grammar.h +44 -24
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -14
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2658 -1927
- data/ext/ice/cpp/{include → src}/Slice/JavaUtil.h +178 -59
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -1
- data/ext/ice/cpp/src/Slice/MD5.h +1 -1
- data/ext/ice/cpp/src/Slice/MD5I.cpp +0 -1
- data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +12 -15
- data/ext/ice/cpp/{include → src}/Slice/PHPUtil.h +6 -15
- data/ext/ice/cpp/src/Slice/Parser.cpp +802 -307
- data/ext/ice/cpp/{include → src}/Slice/Parser.h +76 -84
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +43 -21
- data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +7 -12
- data/ext/ice/cpp/src/Slice/Python.cpp +207 -86
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +683 -679
- data/ext/ice/cpp/{include → src}/Slice/PythonUtil.h +19 -8
- data/ext/ice/cpp/src/Slice/Ruby.cpp +38 -34
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +177 -445
- data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -6
- data/ext/ice/cpp/src/Slice/Scanner.cpp +218 -306
- data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +37 -64
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +374 -0
- data/ext/ice/cpp/src/Slice/Util.h +54 -0
- data/ext/ice/mcpp/Makefile +5 -2
- data/ice.gemspec +2 -7
- data/lib/Glacier2.rb +1 -1
- data/lib/Glacier2/Metrics.rb +7 -46
- data/lib/Glacier2/PermissionsVerifier.rb +24 -95
- data/lib/Glacier2/PermissionsVerifierF.rb +3 -3
- data/lib/Glacier2/Router.rb +32 -74
- data/lib/Glacier2/RouterF.rb +3 -3
- data/lib/Glacier2/SSLInfo.rb +4 -7
- data/lib/Glacier2/Session.rb +88 -307
- data/lib/Ice.rb +83 -52
- data/lib/Ice/BuiltinSequences.rb +4 -4
- data/lib/Ice/Communicator.rb +56 -58
- data/lib/Ice/CommunicatorF.rb +3 -3
- data/lib/Ice/Connection.rb +153 -162
- data/lib/Ice/ConnectionF.rb +3 -3
- data/lib/Ice/Current.rb +4 -11
- data/lib/Ice/Endpoint.rb +57 -133
- data/lib/Ice/EndpointF.rb +3 -3
- data/lib/Ice/EndpointTypes.rb +3 -7
- data/lib/Ice/FacetMap.rb +4 -4
- data/lib/Ice/Identity.rb +5 -8
- data/lib/Ice/ImplicitContext.rb +5 -34
- data/lib/Ice/ImplicitContextF.rb +3 -3
- data/lib/Ice/Instrumentation.rb +23 -275
- data/lib/Ice/InstrumentationF.rb +3 -3
- data/lib/Ice/LocalException.rb +95 -141
- data/lib/Ice/Locator.rb +51 -165
- data/lib/Ice/LocatorF.rb +3 -3
- data/lib/Ice/Logger.rb +5 -34
- data/lib/Ice/LoggerF.rb +3 -3
- data/lib/Ice/Metrics.rb +61 -416
- data/lib/Ice/ObjectAdapter.rb +34 -0
- data/lib/Ice/ObjectAdapterF.rb +3 -3
- data/lib/Ice/ObjectFactory.rb +5 -30
- data/lib/Ice/Plugin.rb +7 -60
- data/lib/Ice/PluginF.rb +3 -3
- data/lib/Ice/Process.rb +16 -52
- data/lib/Ice/ProcessF.rb +3 -3
- data/lib/Ice/Properties.rb +5 -41
- data/lib/Ice/PropertiesAdmin.rb +19 -56
- data/lib/Ice/PropertiesF.rb +3 -3
- data/lib/Ice/RemoteLogger.rb +34 -115
- data/lib/Ice/Router.rb +29 -101
- data/lib/Ice/RouterF.rb +3 -3
- data/lib/Ice/ServantLocator.rb +31 -0
- data/lib/Ice/{ObjectFactoryF.rb → ServantLocatorF.rb} +6 -6
- data/lib/Ice/SliceChecksumDict.rb +3 -3
- data/lib/Ice/ValueFactory.rb +33 -0
- data/lib/Ice/Version.rb +5 -11
- data/lib/IceBox.rb +1 -1
- data/lib/IceBox/IceBox.rb +44 -148
- data/lib/IceGrid.rb +1 -4
- data/lib/IceGrid/Admin.rb +551 -427
- data/lib/IceGrid/Descriptor.rb +62 -529
- data/lib/IceGrid/Exception.rb +24 -45
- data/lib/IceGrid/FileParser.rb +14 -50
- data/lib/IceGrid/PluginFacade.rb +40 -0
- data/lib/IceGrid/Registry.rb +151 -58
- data/lib/IceGrid/Session.rb +25 -64
- data/lib/IceGrid/UserAccountMapper.rb +14 -50
- data/lib/IcePatch2.rb +1 -1
- data/lib/IcePatch2/FileInfo.rb +5 -11
- data/lib/IcePatch2/FileServer.rb +33 -76
- data/lib/IceStorm.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +79 -206
- data/lib/IceStorm/Metrics.rb +11 -89
- data/slice/Glacier2/Metrics.ice +8 -4
- data/slice/Glacier2/PermissionsVerifier.ice +10 -7
- data/slice/Glacier2/PermissionsVerifierF.ice +7 -4
- data/slice/Glacier2/Router.ice +10 -8
- data/slice/Glacier2/RouterF.ice +7 -4
- data/slice/Glacier2/SSLInfo.ice +8 -5
- data/slice/Glacier2/Session.ice +15 -13
- data/slice/Ice/BuiltinSequences.ice +7 -4
- data/slice/Ice/Communicator.ice +141 -66
- data/slice/Ice/CommunicatorF.ice +7 -4
- data/slice/Ice/Connection.ice +183 -86
- data/slice/Ice/ConnectionF.ice +7 -4
- data/slice/Ice/Current.ice +13 -9
- data/slice/Ice/Endpoint.ice +63 -14
- data/slice/Ice/EndpointF.ice +7 -4
- data/slice/Ice/EndpointTypes.ice +8 -6
- data/slice/Ice/FacetMap.ice +7 -4
- data/slice/Ice/Identity.ice +13 -5
- data/slice/Ice/ImplicitContext.ice +20 -18
- data/slice/Ice/ImplicitContextF.ice +7 -4
- data/slice/Ice/Instrumentation.ice +20 -19
- data/slice/Ice/InstrumentationF.ice +8 -5
- data/slice/Ice/LocalException.ice +87 -87
- data/slice/Ice/Locator.ice +19 -18
- data/slice/Ice/LocatorF.ice +7 -4
- data/slice/Ice/Logger.ice +9 -7
- data/slice/Ice/LoggerF.ice +7 -4
- data/slice/Ice/Metrics.ice +18 -14
- data/slice/Ice/ObjectAdapter.ice +30 -13
- data/slice/Ice/ObjectAdapterF.ice +7 -4
- data/slice/Ice/ObjectFactory.ice +15 -12
- data/slice/Ice/Plugin.ice +9 -6
- data/slice/Ice/PluginF.ice +8 -5
- data/slice/Ice/Process.ice +9 -6
- data/slice/Ice/ProcessF.ice +7 -4
- data/slice/Ice/Properties.ice +15 -12
- data/slice/Ice/PropertiesAdmin.ice +9 -5
- data/slice/Ice/PropertiesF.ice +7 -4
- data/slice/Ice/RemoteLogger.ice +33 -24
- data/slice/Ice/Router.ice +16 -7
- data/slice/Ice/RouterF.ice +7 -4
- data/slice/Ice/ServantLocator.ice +13 -10
- data/slice/Ice/ServantLocatorF.ice +7 -4
- data/slice/Ice/SliceChecksumDict.ice +7 -4
- data/slice/Ice/ValueFactory.ice +127 -0
- data/slice/Ice/Version.ice +9 -5
- data/slice/IceBT/ConnectionInfo.ice +53 -0
- data/slice/IceBT/EndpointInfo.ice +51 -0
- data/slice/IceBT/Types.ice +39 -0
- data/slice/IceBox/IceBox.ice +20 -21
- data/slice/IceDiscovery/IceDiscovery.ice +9 -5
- data/slice/IceGrid/Admin.ice +390 -30
- data/slice/IceGrid/Descriptor.ice +37 -29
- data/slice/IceGrid/Exception.ice +33 -27
- data/slice/IceGrid/FileParser.ice +9 -6
- data/slice/IceGrid/PluginFacade.ice +11 -9
- data/slice/IceGrid/Registry.ice +139 -16
- data/slice/IceGrid/Session.ice +10 -8
- data/slice/IceGrid/UserAccountMapper.ice +9 -6
- data/slice/IceIAP/ConnectionInfo.ice +70 -0
- data/slice/IceIAP/EndpointInfo.ice +64 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +9 -7
- data/slice/IcePatch2/FileInfo.ice +9 -8
- data/slice/IcePatch2/FileServer.ice +17 -13
- data/slice/IceSSL/ConnectionInfo.ice +14 -17
- data/slice/IceSSL/ConnectionInfoF.ice +24 -0
- data/slice/IceSSL/EndpointInfo.ice +9 -30
- data/slice/IceStorm/IceStorm.ice +22 -18
- data/slice/IceStorm/Metrics.ice +9 -5
- metadata +154 -120
- data/ext/ObjectFactory.cpp +0 -140
- data/ext/ObjectFactory.h +0 -50
- data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
- 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/DeprecatedStringConverter.h +0 -62
- data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
- data/ext/ice/cpp/include/Ice/Identity.h +0 -168
- data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
- 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/Metrics.h +0 -2974
- data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
- 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/Outgoing.h +0 -225
- data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
- data/ext/ice/cpp/include/Ice/Process.h +0 -574
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
- 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/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/Slice/CPlusPlusUtil.h +0 -65
- 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/ObjCUtil.h +0 -127
- 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/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/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/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/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/IceGrid/Locator.ice +0 -57
- data/slice/IceGrid/Observer.ice +0 -395
- data/slice/IceGrid/Query.ice +0 -131
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -15,7 +15,8 @@
|
|
15
15
|
#include <Ice/ReferenceFactory.h>
|
16
16
|
#include <Ice/LocatorInfo.h>
|
17
17
|
#include <Ice/RouterInfo.h>
|
18
|
-
#include <Ice/
|
18
|
+
#include <Ice/OutputStream.h>
|
19
|
+
#include <Ice/InputStream.h>
|
19
20
|
#include <Ice/Properties.h>
|
20
21
|
#include <Ice/LoggerUtil.h>
|
21
22
|
#include <Ice/TraceLevels.h>
|
@@ -28,7 +29,7 @@ using namespace IceInternal;
|
|
28
29
|
|
29
30
|
IceUtil::Shared* IceInternal::upCast(ProxyFactory* p) { return p; }
|
30
31
|
|
31
|
-
|
32
|
+
ObjectPrxPtr
|
32
33
|
IceInternal::ProxyFactory::stringToProxy(const string& str) const
|
33
34
|
{
|
34
35
|
ReferencePtr ref = _instance->referenceFactory()->create(str, "");
|
@@ -36,11 +37,11 @@ IceInternal::ProxyFactory::stringToProxy(const string& str) const
|
|
36
37
|
}
|
37
38
|
|
38
39
|
string
|
39
|
-
IceInternal::ProxyFactory::proxyToString(const
|
40
|
+
IceInternal::ProxyFactory::proxyToString(const ObjectPrxPtr& proxy) const
|
40
41
|
{
|
41
42
|
if(proxy)
|
42
43
|
{
|
43
|
-
return proxy->
|
44
|
+
return proxy->_getReference()->toString();
|
44
45
|
}
|
45
46
|
else
|
46
47
|
{
|
@@ -48,7 +49,7 @@ IceInternal::ProxyFactory::proxyToString(const ObjectPrx& proxy) const
|
|
48
49
|
}
|
49
50
|
}
|
50
51
|
|
51
|
-
|
52
|
+
ObjectPrxPtr
|
52
53
|
IceInternal::ProxyFactory::propertyToProxy(const string& prefix) const
|
53
54
|
{
|
54
55
|
string proxy = _instance->initializationData().properties->getProperty(prefix);
|
@@ -57,11 +58,11 @@ IceInternal::ProxyFactory::propertyToProxy(const string& prefix) const
|
|
57
58
|
}
|
58
59
|
|
59
60
|
PropertyDict
|
60
|
-
IceInternal::ProxyFactory::proxyToProperty(const
|
61
|
+
IceInternal::ProxyFactory::proxyToProperty(const ObjectPrxPtr& proxy, const string& prefix) const
|
61
62
|
{
|
62
63
|
if(proxy)
|
63
64
|
{
|
64
|
-
return proxy->
|
65
|
+
return proxy->_getReference()->toProperty(prefix);
|
65
66
|
}
|
66
67
|
else
|
67
68
|
{
|
@@ -69,8 +70,8 @@ IceInternal::ProxyFactory::proxyToProperty(const ObjectPrx& proxy, const string&
|
|
69
70
|
}
|
70
71
|
}
|
71
72
|
|
72
|
-
|
73
|
-
IceInternal::ProxyFactory::streamToProxy(
|
73
|
+
ObjectPrxPtr
|
74
|
+
IceInternal::ProxyFactory::streamToProxy(InputStream* s) const
|
74
75
|
{
|
75
76
|
Identity ident;
|
76
77
|
s->read(ident);
|
@@ -79,33 +80,22 @@ IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const
|
|
79
80
|
return referenceToProxy(ref);
|
80
81
|
}
|
81
82
|
|
82
|
-
|
83
|
-
IceInternal::ProxyFactory::proxyToStream(const ObjectPrx& proxy, BasicStream* s) const
|
84
|
-
{
|
85
|
-
if(proxy)
|
86
|
-
{
|
87
|
-
s->write(proxy->__reference()->getIdentity());
|
88
|
-
proxy->__reference()->streamWrite(s);
|
89
|
-
}
|
90
|
-
else
|
91
|
-
{
|
92
|
-
Identity ident;
|
93
|
-
s->write(ident);
|
94
|
-
}
|
95
|
-
}
|
96
|
-
|
97
|
-
ObjectPrx
|
83
|
+
ObjectPrxPtr
|
98
84
|
IceInternal::ProxyFactory::referenceToProxy(const ReferencePtr& ref) const
|
99
85
|
{
|
100
86
|
if(ref)
|
101
87
|
{
|
102
|
-
|
88
|
+
#ifdef ICE_CPP11_MAPPING
|
89
|
+
auto proxy = createProxy<ObjectPrx>();
|
90
|
+
#else
|
91
|
+
ObjectPrx proxy = new ::IceProxy::Ice::Object();
|
92
|
+
#endif
|
103
93
|
proxy->setup(ref);
|
104
94
|
return proxy;
|
105
95
|
}
|
106
96
|
else
|
107
97
|
{
|
108
|
-
return
|
98
|
+
return ICE_NULLPTR;
|
109
99
|
}
|
110
100
|
}
|
111
101
|
|
@@ -211,11 +201,12 @@ IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex, co
|
|
211
201
|
}
|
212
202
|
|
213
203
|
//
|
214
|
-
// Don't retry if the communicator is destroyed
|
215
|
-
//
|
204
|
+
// Don't retry if the communicator is destroyed, object adapter is deactivated,
|
205
|
+
// or connection is manually closed.
|
216
206
|
//
|
217
207
|
if(dynamic_cast<const CommunicatorDestroyedException*>(&ex) ||
|
218
|
-
dynamic_cast<const ObjectAdapterDeactivatedException*>(&ex)
|
208
|
+
dynamic_cast<const ObjectAdapterDeactivatedException*>(&ex) ||
|
209
|
+
dynamic_cast<const ConnectionManuallyClosedException*>(&ex))
|
219
210
|
{
|
220
211
|
ex.ice_throw();
|
221
212
|
}
|
@@ -239,7 +230,7 @@ IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex, co
|
|
239
230
|
// limit is reached.
|
240
231
|
//
|
241
232
|
interval = 0;
|
242
|
-
}
|
233
|
+
}
|
243
234
|
else if(cnt > static_cast<int>(_retryIntervals.size()))
|
244
235
|
{
|
245
236
|
if(traceLevels->retry >= 1)
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -20,25 +20,30 @@
|
|
20
20
|
#include <Ice/OutgoingAsyncF.h>
|
21
21
|
#include <Ice/Properties.h>
|
22
22
|
|
23
|
-
namespace
|
23
|
+
namespace Ice
|
24
24
|
{
|
25
25
|
|
26
|
-
class
|
26
|
+
class OutputStream;
|
27
|
+
class InputStream;
|
28
|
+
|
29
|
+
}
|
30
|
+
|
31
|
+
namespace IceInternal
|
32
|
+
{
|
27
33
|
|
28
34
|
class ProxyFactory : public IceUtil::Shared
|
29
35
|
{
|
30
36
|
public:
|
31
|
-
|
32
|
-
Ice::ObjectPrx stringToProxy(const std::string&) const;
|
33
|
-
std::string proxyToString(const Ice::ObjectPrx&) const;
|
34
37
|
|
35
|
-
Ice::
|
36
|
-
|
38
|
+
Ice::ObjectPrxPtr stringToProxy(const std::string&) const;
|
39
|
+
std::string proxyToString(const Ice::ObjectPrxPtr&) const;
|
40
|
+
|
41
|
+
Ice::ObjectPrxPtr propertyToProxy(const std::string&) const;
|
42
|
+
Ice::PropertyDict proxyToProperty(const Ice::ObjectPrxPtr&, const std::string&) const;
|
37
43
|
|
38
|
-
Ice::
|
39
|
-
void proxyToStream(const Ice::ObjectPrx&, BasicStream*) const;
|
44
|
+
Ice::ObjectPrxPtr streamToProxy(Ice::InputStream*) const;
|
40
45
|
|
41
|
-
Ice::
|
46
|
+
Ice::ObjectPrxPtr referenceToProxy(const ReferencePtr&) const;
|
42
47
|
|
43
48
|
int checkRetryAfterException(const Ice::LocalException&, const ReferencePtr&, int&) const;
|
44
49
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -13,7 +13,7 @@
|
|
13
13
|
#include <Ice/Instance.h>
|
14
14
|
#include <Ice/EndpointI.h>
|
15
15
|
#include <Ice/OpaqueEndpointI.h>
|
16
|
-
#include <Ice/
|
16
|
+
#include <Ice/OutputStream.h>
|
17
17
|
#include <Ice/RouterInfo.h>
|
18
18
|
#include <Ice/Router.h>
|
19
19
|
#include <Ice/LocatorInfo.h>
|
@@ -27,11 +27,14 @@
|
|
27
27
|
#include <Ice/RequestHandlerFactory.h>
|
28
28
|
#include <Ice/ConnectionRequestHandler.h>
|
29
29
|
#include <Ice/DefaultsAndOverrides.h>
|
30
|
-
#include <
|
30
|
+
#include <Ice/Comparable.h>
|
31
|
+
#include <Ice/StringUtil.h>
|
32
|
+
|
31
33
|
#include <IceUtil/Random.h>
|
32
34
|
#include <IceUtil/MutexPtrLock.h>
|
33
35
|
|
34
36
|
#include <functional>
|
37
|
+
#include <algorithm>
|
35
38
|
|
36
39
|
using namespace std;
|
37
40
|
using namespace Ice;
|
@@ -171,6 +174,25 @@ IceInternal::Reference::changeCompress(bool newCompress) const
|
|
171
174
|
return r;
|
172
175
|
}
|
173
176
|
|
177
|
+
bool
|
178
|
+
IceInternal::Reference::getCompressOverride(bool& compress) const
|
179
|
+
{
|
180
|
+
DefaultsAndOverridesPtr defaultsAndOverrides = getInstance()->defaultsAndOverrides();
|
181
|
+
if(defaultsAndOverrides->overrideCompress)
|
182
|
+
{
|
183
|
+
compress = defaultsAndOverrides->overrideCompressValue;
|
184
|
+
}
|
185
|
+
else if(_overrideCompress)
|
186
|
+
{
|
187
|
+
compress = _compress;
|
188
|
+
}
|
189
|
+
else
|
190
|
+
{
|
191
|
+
return false;
|
192
|
+
}
|
193
|
+
return true;
|
194
|
+
}
|
195
|
+
|
174
196
|
Int
|
175
197
|
Reference::hash() const
|
176
198
|
{
|
@@ -184,7 +206,7 @@ Reference::hash() const
|
|
184
206
|
}
|
185
207
|
|
186
208
|
void
|
187
|
-
IceInternal::Reference::streamWrite(
|
209
|
+
IceInternal::Reference::streamWrite(OutputStream* s) const
|
188
210
|
{
|
189
211
|
//
|
190
212
|
// Don't write the identity here. Operations calling streamWrite
|
@@ -207,7 +229,7 @@ IceInternal::Reference::streamWrite(BasicStream* s) const
|
|
207
229
|
|
208
230
|
s->write(_secure);
|
209
231
|
|
210
|
-
if(s->
|
232
|
+
if(s->getEncoding() != Ice::Encoding_1_0)
|
211
233
|
{
|
212
234
|
s->write(_protocol);
|
213
235
|
s->write(_encoding);
|
@@ -228,13 +250,18 @@ IceInternal::Reference::toString() const
|
|
228
250
|
//
|
229
251
|
ostringstream s;
|
230
252
|
|
253
|
+
ToStringMode toStringMode = _instance->toStringMode();
|
254
|
+
const string separators = " :@";
|
255
|
+
|
256
|
+
string id = Ice::identityToString(_identity, toStringMode);
|
257
|
+
|
231
258
|
//
|
232
259
|
// If the encoded identity string contains characters which
|
233
260
|
// the reference parser uses as separators, then we enclose
|
234
261
|
// the identity string in quotes.
|
235
262
|
//
|
236
|
-
|
237
|
-
if(id.find_first_of(
|
263
|
+
|
264
|
+
if(id.find_first_of(separators) != string::npos)
|
238
265
|
{
|
239
266
|
s << '"' << id << '"';
|
240
267
|
}
|
@@ -247,14 +274,13 @@ IceInternal::Reference::toString() const
|
|
247
274
|
{
|
248
275
|
s << " -f ";
|
249
276
|
|
277
|
+
string fs = escapeString(_facet, "", toStringMode);
|
250
278
|
//
|
251
279
|
// If the encoded facet string contains characters which
|
252
280
|
// the reference parser uses as separators, then we enclose
|
253
281
|
// the facet string in quotes.
|
254
282
|
//
|
255
|
-
|
256
|
-
fs = IceUtilInternal::escapeString(fs, "");
|
257
|
-
if(fs.find_first_of(" :@") != string::npos)
|
283
|
+
if(fs.find_first_of(separators) != string::npos)
|
258
284
|
{
|
259
285
|
s << '"' << fs << '"';
|
260
286
|
}
|
@@ -376,16 +402,9 @@ IceInternal::Reference::operator==(const Reference& r) const
|
|
376
402
|
{
|
377
403
|
return false;
|
378
404
|
}
|
379
|
-
|
380
405
|
return true;
|
381
406
|
}
|
382
407
|
|
383
|
-
bool
|
384
|
-
IceInternal::Reference::operator!=(const Reference& r) const
|
385
|
-
{
|
386
|
-
return !operator==(r);
|
387
|
-
}
|
388
|
-
|
389
408
|
bool
|
390
409
|
IceInternal::Reference::operator<(const Reference& r) const
|
391
410
|
{
|
@@ -624,7 +643,7 @@ IceInternal::FixedReference::getPreferSecure() const
|
|
624
643
|
Ice::EndpointSelectionType
|
625
644
|
IceInternal::FixedReference::getEndpointSelection() const
|
626
645
|
{
|
627
|
-
return Random;
|
646
|
+
return ICE_ENUM(EndpointSelectionType, Random);
|
628
647
|
}
|
629
648
|
|
630
649
|
int
|
@@ -654,14 +673,14 @@ IceInternal::FixedReference::changeAdapterId(const string& /*newAdapterId*/) con
|
|
654
673
|
}
|
655
674
|
|
656
675
|
ReferencePtr
|
657
|
-
IceInternal::FixedReference::changeLocator(const
|
676
|
+
IceInternal::FixedReference::changeLocator(const LocatorPrxPtr&) const
|
658
677
|
{
|
659
678
|
throw FixedProxyException(__FILE__, __LINE__);
|
660
679
|
return 0; // Keep the compiler happy.
|
661
680
|
}
|
662
681
|
|
663
682
|
ReferencePtr
|
664
|
-
IceInternal::FixedReference::changeRouter(const
|
683
|
+
IceInternal::FixedReference::changeRouter(const RouterPrxPtr&) const
|
665
684
|
{
|
666
685
|
throw FixedProxyException(__FILE__, __LINE__);
|
667
686
|
return 0; // Keep the compiler happy.
|
@@ -729,18 +748,9 @@ IceInternal::FixedReference::isWellKnown() const
|
|
729
748
|
}
|
730
749
|
|
731
750
|
void
|
732
|
-
IceInternal::FixedReference::streamWrite(
|
733
|
-
{
|
734
|
-
throw FixedProxyException(__FILE__, __LINE__);
|
735
|
-
}
|
736
|
-
|
737
|
-
string
|
738
|
-
IceInternal::FixedReference::toString() const
|
751
|
+
IceInternal::FixedReference::streamWrite(OutputStream*) const
|
739
752
|
{
|
740
753
|
throw FixedProxyException(__FILE__, __LINE__);
|
741
|
-
|
742
|
-
assert(false); // Cannot be reached.
|
743
|
-
return string(); // To keep the compiler from complaining.
|
744
754
|
}
|
745
755
|
|
746
756
|
PropertyDict
|
@@ -753,7 +763,7 @@ IceInternal::FixedReference::toProperty(const string&) const
|
|
753
763
|
}
|
754
764
|
|
755
765
|
RequestHandlerPtr
|
756
|
-
IceInternal::FixedReference::getRequestHandler(const Ice::
|
766
|
+
IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrxPtr& proxy) const
|
757
767
|
{
|
758
768
|
switch(getMode())
|
759
769
|
{
|
@@ -800,7 +810,7 @@ IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrx& proxy) cons
|
|
800
810
|
|
801
811
|
_fixedConnection->throwException(); // Throw in case our connection is already destroyed.
|
802
812
|
|
803
|
-
bool compress;
|
813
|
+
bool compress = false;
|
804
814
|
if(defaultsAndOverrides->overrideCompress)
|
805
815
|
{
|
806
816
|
compress = defaultsAndOverrides->overrideCompressValue;
|
@@ -809,13 +819,9 @@ IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrx& proxy) cons
|
|
809
819
|
{
|
810
820
|
compress = _compress;
|
811
821
|
}
|
812
|
-
else
|
813
|
-
{
|
814
|
-
compress = _fixedConnection->endpoint()->compress();
|
815
|
-
}
|
816
822
|
|
817
823
|
ReferencePtr ref = const_cast<FixedReference*>(this);
|
818
|
-
return proxy->
|
824
|
+
return proxy->_setRequestHandler(ICE_MAKE_SHARED(ConnectionRequestHandler, ref, _fixedConnection, compress));
|
819
825
|
}
|
820
826
|
|
821
827
|
BatchRequestQueuePtr
|
@@ -839,12 +845,6 @@ IceInternal::FixedReference::operator==(const Reference& r) const
|
|
839
845
|
return _fixedConnection == rhs->_fixedConnection;
|
840
846
|
}
|
841
847
|
|
842
|
-
bool
|
843
|
-
IceInternal::FixedReference::operator!=(const Reference& r) const
|
844
|
-
{
|
845
|
-
return !operator==(r);
|
846
|
-
}
|
847
|
-
|
848
848
|
bool
|
849
849
|
IceInternal::FixedReference::operator<(const Reference& r) const
|
850
850
|
{
|
@@ -1039,7 +1039,7 @@ IceInternal::RoutableReference::changeAdapterId(const string& newAdapterId) cons
|
|
1039
1039
|
}
|
1040
1040
|
|
1041
1041
|
ReferencePtr
|
1042
|
-
IceInternal::RoutableReference::changeLocator(const
|
1042
|
+
IceInternal::RoutableReference::changeLocator(const LocatorPrxPtr& newLocator) const
|
1043
1043
|
{
|
1044
1044
|
LocatorInfoPtr newLocatorInfo = getInstance()->locatorManager()->get(newLocator);
|
1045
1045
|
if(newLocatorInfo == _locatorInfo)
|
@@ -1052,7 +1052,7 @@ IceInternal::RoutableReference::changeLocator(const LocatorPrx& newLocator) cons
|
|
1052
1052
|
}
|
1053
1053
|
|
1054
1054
|
ReferencePtr
|
1055
|
-
IceInternal::RoutableReference::changeRouter(const
|
1055
|
+
IceInternal::RoutableReference::changeRouter(const RouterPrxPtr& newRouter) const
|
1056
1056
|
{
|
1057
1057
|
RouterInfoPtr newRouterInfo = getInstance()->routerManager()->get(newRouter);
|
1058
1058
|
if(newRouterInfo == _routerInfo)
|
@@ -1180,7 +1180,7 @@ IceInternal::RoutableReference::isWellKnown() const
|
|
1180
1180
|
}
|
1181
1181
|
|
1182
1182
|
void
|
1183
|
-
IceInternal::RoutableReference::streamWrite(
|
1183
|
+
IceInternal::RoutableReference::streamWrite(OutputStream* s) const
|
1184
1184
|
{
|
1185
1185
|
Reference::streamWrite(s);
|
1186
1186
|
|
@@ -1234,8 +1234,7 @@ IceInternal::RoutableReference::toString() const
|
|
1234
1234
|
// reference parser uses as separators, then we enclose the
|
1235
1235
|
// adapter id string in quotes.
|
1236
1236
|
//
|
1237
|
-
string a =
|
1238
|
-
a = IceUtilInternal::escapeString(a, "");
|
1237
|
+
string a = escapeString(_adapterId, "", getInstance()->toStringMode());
|
1239
1238
|
if(a.find_first_of(" :@") != string::npos)
|
1240
1239
|
{
|
1241
1240
|
result.append("\"");
|
@@ -1263,7 +1262,7 @@ IceInternal::RoutableReference::toProperty(const string& prefix) const
|
|
1263
1262
|
properties[prefix + ".CollocationOptimized"] = _collocationOptimized ? "1" : "0";
|
1264
1263
|
properties[prefix + ".ConnectionCached"] = _cacheConnection ? "1" : "0";
|
1265
1264
|
properties[prefix + ".PreferSecure"] = _preferSecure ? "1" : "0";
|
1266
|
-
properties[prefix + ".EndpointSelection"] = _endpointSelection == Random ? "Random" : "Ordered";
|
1265
|
+
properties[prefix + ".EndpointSelection"] = _endpointSelection == ICE_ENUM(EndpointSelectionType, Random) ? "Random" : "Ordered";
|
1267
1266
|
{
|
1268
1267
|
ostringstream s;
|
1269
1268
|
s << _locatorCacheTimeout;
|
@@ -1276,7 +1275,7 @@ IceInternal::RoutableReference::toProperty(const string& prefix) const
|
|
1276
1275
|
}
|
1277
1276
|
if(_routerInfo)
|
1278
1277
|
{
|
1279
|
-
PropertyDict routerProperties = _routerInfo->getRouter()->
|
1278
|
+
PropertyDict routerProperties = _routerInfo->getRouter()->_getReference()->toProperty(prefix + ".Router");
|
1280
1279
|
for(PropertyDict::const_iterator p = routerProperties.begin(); p != routerProperties.end(); ++p)
|
1281
1280
|
{
|
1282
1281
|
properties[p->first] = p->second;
|
@@ -1285,7 +1284,7 @@ IceInternal::RoutableReference::toProperty(const string& prefix) const
|
|
1285
1284
|
|
1286
1285
|
if(_locatorInfo)
|
1287
1286
|
{
|
1288
|
-
PropertyDict locatorProperties = _locatorInfo->getLocator()->
|
1287
|
+
PropertyDict locatorProperties = _locatorInfo->getLocator()->_getReference()->toProperty(prefix + ".Locator");
|
1289
1288
|
for(PropertyDict::const_iterator p = locatorProperties.begin(); p != locatorProperties.end(); ++p)
|
1290
1289
|
{
|
1291
1290
|
properties[p->first] = p->second;
|
@@ -1351,7 +1350,16 @@ IceInternal::RoutableReference::operator==(const Reference& r) const
|
|
1351
1350
|
{
|
1352
1351
|
return false;
|
1353
1352
|
}
|
1353
|
+
#ifdef ICE_CPP11_MAPPING
|
1354
|
+
//
|
1355
|
+
// TODO: With C++14 we could use the version that receives four iterators and we don't need to explicitly
|
1356
|
+
// check the sizes are equal.
|
1357
|
+
//
|
1358
|
+
if(_endpoints.size() != rhs->_endpoints.size() ||
|
1359
|
+
!equal(_endpoints.begin(), _endpoints.end(), rhs->_endpoints.begin(), Ice::TargetCompare<shared_ptr<EndpointI>, std::equal_to>()))
|
1360
|
+
#else
|
1354
1361
|
if(_endpoints != rhs->_endpoints)
|
1362
|
+
#endif
|
1355
1363
|
{
|
1356
1364
|
return false;
|
1357
1365
|
}
|
@@ -1366,12 +1374,6 @@ IceInternal::RoutableReference::operator==(const Reference& r) const
|
|
1366
1374
|
return true;
|
1367
1375
|
}
|
1368
1376
|
|
1369
|
-
bool
|
1370
|
-
IceInternal::RoutableReference::operator!=(const Reference& r) const
|
1371
|
-
{
|
1372
|
-
return !operator==(r);
|
1373
|
-
}
|
1374
|
-
|
1375
1377
|
bool
|
1376
1378
|
IceInternal::RoutableReference::operator<(const Reference& r) const
|
1377
1379
|
{
|
@@ -1479,7 +1481,12 @@ IceInternal::RoutableReference::operator<(const Reference& r) const
|
|
1479
1481
|
{
|
1480
1482
|
return false;
|
1481
1483
|
}
|
1484
|
+
#ifdef ICE_CPP11_MAPPING
|
1485
|
+
if(lexicographical_compare(_endpoints.begin(), _endpoints.end(), rhs->_endpoints.begin(), rhs->_endpoints.end(),
|
1486
|
+
Ice::TargetCompare<shared_ptr<EndpointI>, std::less>()))
|
1487
|
+
#else
|
1482
1488
|
if(_endpoints < rhs->_endpoints)
|
1489
|
+
#endif
|
1483
1490
|
{
|
1484
1491
|
return true;
|
1485
1492
|
}
|
@@ -1505,7 +1512,7 @@ IceInternal::RoutableReference::clone() const
|
|
1505
1512
|
}
|
1506
1513
|
|
1507
1514
|
RequestHandlerPtr
|
1508
|
-
IceInternal::RoutableReference::getRequestHandler(const Ice::
|
1515
|
+
IceInternal::RoutableReference::getRequestHandler(const Ice::ObjectPrxPtr& proxy) const
|
1509
1516
|
{
|
1510
1517
|
return getInstance()->requestHandlerFactory()->getRequestHandler(const_cast<RoutableReference*>(this), proxy);
|
1511
1518
|
}
|
@@ -1604,10 +1611,10 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal
|
|
1604
1611
|
{
|
1605
1612
|
TraceLevelsPtr traceLvls = _reference->getInstance()->traceLevels();
|
1606
1613
|
if(traceLvls->retry >= 2)
|
1607
|
-
|
1614
|
+
{
|
1608
1615
|
Trace out(_reference->getInstance()->initializationData().logger, traceLvls->retryCat);
|
1609
1616
|
out << "connection to cached endpoints failed\n"
|
1610
|
-
<< "removing endpoints from cache and trying
|
1617
|
+
<< "removing endpoints from cache and trying again\n" << ex;
|
1611
1618
|
}
|
1612
1619
|
_reference->getConnectionNoRouterInfo(_callback); // Retry.
|
1613
1620
|
return;
|
@@ -1628,7 +1635,6 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal
|
|
1628
1635
|
const bool _cached;
|
1629
1636
|
};
|
1630
1637
|
|
1631
|
-
|
1632
1638
|
virtual void
|
1633
1639
|
setEndpoints(const vector<EndpointIPtr>& endpoints, bool cached)
|
1634
1640
|
{
|
@@ -1640,7 +1646,7 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal
|
|
1640
1646
|
|
1641
1647
|
vector<EndpointIPtr> endpts = endpoints;
|
1642
1648
|
_reference->applyOverrides(endpts);
|
1643
|
-
_reference->createConnection(endpts,
|
1649
|
+
_reference->createConnection(endpts, ICE_MAKE_SHARED(Callback2, _reference, _callback, cached));
|
1644
1650
|
}
|
1645
1651
|
|
1646
1652
|
virtual void
|
@@ -1669,7 +1675,7 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal
|
|
1669
1675
|
if(_locatorInfo)
|
1670
1676
|
{
|
1671
1677
|
RoutableReference* self = const_cast<RoutableReference*>(this);
|
1672
|
-
_locatorInfo->
|
1678
|
+
_locatorInfo->getEndpoints(self, _locatorCacheTimeout, new Callback(self, callback));
|
1673
1679
|
}
|
1674
1680
|
else
|
1675
1681
|
{
|
@@ -1761,14 +1767,14 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all
|
|
1761
1767
|
virtual void
|
1762
1768
|
setException(const Ice::LocalException& ex)
|
1763
1769
|
{
|
1764
|
-
if(!_exception
|
1770
|
+
if(!_exception)
|
1765
1771
|
{
|
1766
|
-
_exception
|
1772
|
+
ICE_SET_EXCEPTION_FROM_CLONE(_exception, ex.ice_clone());
|
1767
1773
|
}
|
1768
1774
|
|
1769
1775
|
if(++_i == _endpoints.size())
|
1770
1776
|
{
|
1771
|
-
_callback->setException(*_exception
|
1777
|
+
_callback->setException(*_exception);
|
1772
1778
|
return;
|
1773
1779
|
}
|
1774
1780
|
|
@@ -1795,7 +1801,7 @@ IceInternal::RoutableReference::createConnection(const vector<EndpointIPtr>& all
|
|
1795
1801
|
const vector<EndpointIPtr> _endpoints;
|
1796
1802
|
const GetConnectionCallbackPtr _callback;
|
1797
1803
|
size_t _i;
|
1798
|
-
|
1804
|
+
IceInternal::UniquePtr<Ice::LocalException> _exception;
|
1799
1805
|
};
|
1800
1806
|
|
1801
1807
|
//
|
@@ -1909,13 +1915,13 @@ IceInternal::RoutableReference::filterEndpoints(const vector<EndpointIPtr>& allE
|
|
1909
1915
|
//
|
1910
1916
|
switch(getEndpointSelection())
|
1911
1917
|
{
|
1912
|
-
case Random:
|
1918
|
+
case ICE_ENUM(EndpointSelectionType, Random):
|
1913
1919
|
{
|
1914
1920
|
RandomNumberGenerator rng;
|
1915
1921
|
random_shuffle(endpoints.begin(), endpoints.end(), rng);
|
1916
1922
|
break;
|
1917
1923
|
}
|
1918
|
-
case Ordered:
|
1924
|
+
case ICE_ENUM(EndpointSelectionType, Ordered):
|
1919
1925
|
{
|
1920
1926
|
// Nothing to do.
|
1921
1927
|
break;
|