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,62 +0,0 @@
|
|
1
|
-
// **********************************************************************
|
2
|
-
//
|
3
|
-
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
|
-
//
|
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
|
-
|
10
|
-
#include <IceUtil/DisableWarnings.h>
|
11
|
-
#include <Ice/DeprecatedStringConverter.h>
|
12
|
-
|
13
|
-
#include <Ice/Initialize.h>
|
14
|
-
#include <Ice/Instance.h>
|
15
|
-
#include <IceUtil/StringConverter.h>
|
16
|
-
|
17
|
-
namespace Ice
|
18
|
-
{
|
19
|
-
|
20
|
-
StringConverterPlugin::StringConverterPlugin(const CommunicatorPtr& /*notused*/,
|
21
|
-
const StringConverterPtr& stringConverter,
|
22
|
-
const WstringConverterPtr& wstringConverter)
|
23
|
-
{
|
24
|
-
IceUtil::setProcessStringConverter(stringConverter);
|
25
|
-
IceUtil::setProcessWstringConverter(wstringConverter);
|
26
|
-
}
|
27
|
-
|
28
|
-
void StringConverterPlugin::initialize()
|
29
|
-
{
|
30
|
-
// no op
|
31
|
-
}
|
32
|
-
|
33
|
-
void StringConverterPlugin::destroy()
|
34
|
-
{
|
35
|
-
// no op
|
36
|
-
}
|
37
|
-
|
38
|
-
std::string
|
39
|
-
nativeToUTF8(const StringConverterPtr& converter, const std::string& s)
|
40
|
-
{
|
41
|
-
return IceUtil::nativeToUTF8(s, converter);
|
42
|
-
}
|
43
|
-
|
44
|
-
std::string
|
45
|
-
nativeToUTF8(const CommunicatorPtr& communicator, const std::string& s)
|
46
|
-
{
|
47
|
-
return IceUtil::nativeToUTF8(s, IceInternal::getInstance(communicator)->getStringConverter());
|
48
|
-
}
|
49
|
-
|
50
|
-
std::string
|
51
|
-
UTF8toNative(const StringConverterPtr& converter, const std::string& s)
|
52
|
-
{
|
53
|
-
return IceUtil::UTF8ToNative(s, converter);
|
54
|
-
}
|
55
|
-
|
56
|
-
std::string
|
57
|
-
UTF8ToNative(const CommunicatorPtr& communicator, const std::string& s)
|
58
|
-
{
|
59
|
-
return IceUtil::UTF8ToNative(s, IceInternal::getInstance(communicator)->getStringConverter());
|
60
|
-
}
|
61
|
-
|
62
|
-
}
|
@@ -1,139 +0,0 @@
|
|
1
|
-
|
2
|
-
// **********************************************************************
|
3
|
-
//
|
4
|
-
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
5
|
-
//
|
6
|
-
// This copy of Ice is licensed to you under the terms described in the
|
7
|
-
// ICE_LICENSE file included in this distribution.
|
8
|
-
//
|
9
|
-
// **********************************************************************
|
10
|
-
|
11
|
-
#include <Ice/ObjectFactoryManager.h>
|
12
|
-
#include <Ice/ObjectFactory.h>
|
13
|
-
#include <Ice/Functional.h>
|
14
|
-
#include <Ice/LocalException.h>
|
15
|
-
using namespace std;
|
16
|
-
using namespace Ice;
|
17
|
-
using namespace IceInternal;
|
18
|
-
|
19
|
-
IceUtil::Shared* IceInternal::upCast(ObjectFactoryManager* p) { return p; }
|
20
|
-
|
21
|
-
void
|
22
|
-
IceInternal::ObjectFactoryManager::add(const ObjectFactoryPtr& factory, const string& id)
|
23
|
-
{
|
24
|
-
IceUtil::Mutex::Lock sync(*this);
|
25
|
-
|
26
|
-
if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id)
|
27
|
-
|| _factoryMap.find(id) != _factoryMap.end())
|
28
|
-
{
|
29
|
-
AlreadyRegisteredException ex(__FILE__, __LINE__);
|
30
|
-
ex.kindOfObject = "object factory";
|
31
|
-
ex.id = id;
|
32
|
-
throw ex;
|
33
|
-
}
|
34
|
-
|
35
|
-
_factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ObjectFactoryPtr>(id, factory));
|
36
|
-
}
|
37
|
-
|
38
|
-
void
|
39
|
-
IceInternal::ObjectFactoryManager::remove(const string& id)
|
40
|
-
{
|
41
|
-
ObjectFactoryPtr factory = 0;
|
42
|
-
{
|
43
|
-
IceUtil::Mutex::Lock sync(*this);
|
44
|
-
|
45
|
-
FactoryMap::iterator p = _factoryMap.end();
|
46
|
-
if(_factoryMapHint != _factoryMap.end())
|
47
|
-
{
|
48
|
-
if(_factoryMapHint->first == id)
|
49
|
-
{
|
50
|
-
p = _factoryMapHint;
|
51
|
-
}
|
52
|
-
}
|
53
|
-
|
54
|
-
if(p == _factoryMap.end())
|
55
|
-
{
|
56
|
-
p = _factoryMap.find(id);
|
57
|
-
if(p == _factoryMap.end())
|
58
|
-
{
|
59
|
-
NotRegisteredException ex(__FILE__, __LINE__);
|
60
|
-
ex.kindOfObject = "object factory";
|
61
|
-
ex.id = id;
|
62
|
-
throw ex;
|
63
|
-
}
|
64
|
-
}
|
65
|
-
assert(p != _factoryMap.end());
|
66
|
-
|
67
|
-
factory = p->second;
|
68
|
-
|
69
|
-
if(p == _factoryMapHint)
|
70
|
-
{
|
71
|
-
_factoryMap.erase(p++);
|
72
|
-
_factoryMapHint = p;
|
73
|
-
}
|
74
|
-
else
|
75
|
-
{
|
76
|
-
_factoryMap.erase(p);
|
77
|
-
}
|
78
|
-
}
|
79
|
-
|
80
|
-
//
|
81
|
-
// Destroy outside the lock
|
82
|
-
//
|
83
|
-
assert(factory != 0);
|
84
|
-
factory->destroy();
|
85
|
-
}
|
86
|
-
|
87
|
-
ObjectFactoryPtr
|
88
|
-
IceInternal::ObjectFactoryManager::find(const string& id) const
|
89
|
-
{
|
90
|
-
IceUtil::Mutex::Lock sync(*this);
|
91
|
-
|
92
|
-
FactoryMap& factoryMap = const_cast<FactoryMap&>(_factoryMap);
|
93
|
-
|
94
|
-
FactoryMap::iterator p = factoryMap.end();
|
95
|
-
if(_factoryMapHint != factoryMap.end())
|
96
|
-
{
|
97
|
-
if(_factoryMapHint->first == id)
|
98
|
-
{
|
99
|
-
p = _factoryMapHint;
|
100
|
-
}
|
101
|
-
}
|
102
|
-
|
103
|
-
if(p == factoryMap.end())
|
104
|
-
{
|
105
|
-
p = factoryMap.find(id);
|
106
|
-
}
|
107
|
-
|
108
|
-
if(p != factoryMap.end())
|
109
|
-
{
|
110
|
-
_factoryMapHint = p;
|
111
|
-
return p->second;
|
112
|
-
}
|
113
|
-
else
|
114
|
-
{
|
115
|
-
return 0;
|
116
|
-
}
|
117
|
-
}
|
118
|
-
|
119
|
-
IceInternal::ObjectFactoryManager::ObjectFactoryManager() :
|
120
|
-
_factoryMapHint(_factoryMap.end())
|
121
|
-
{
|
122
|
-
}
|
123
|
-
|
124
|
-
void
|
125
|
-
IceInternal::ObjectFactoryManager::destroy()
|
126
|
-
{
|
127
|
-
FactoryMap oldMap;
|
128
|
-
{
|
129
|
-
IceUtil::Mutex::Lock sync(*this);
|
130
|
-
oldMap.swap(_factoryMap);
|
131
|
-
_factoryMapHint = _factoryMap.end();
|
132
|
-
}
|
133
|
-
|
134
|
-
//
|
135
|
-
// Destroy all outside lock
|
136
|
-
//
|
137
|
-
for_each(oldMap.begin(), oldMap.end(),
|
138
|
-
Ice::secondVoidMemFun<const string, ObjectFactory>(&ObjectFactory::destroy));
|
139
|
-
}
|
@@ -1,43 +0,0 @@
|
|
1
|
-
// **********************************************************************
|
2
|
-
//
|
3
|
-
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
|
-
//
|
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
|
-
|
10
|
-
#ifndef ICE_OBJECT_FACTORY_MANAGER_H
|
11
|
-
#define ICE_OBJECT_FACTORY_MANAGER_H
|
12
|
-
|
13
|
-
#include <IceUtil/Shared.h>
|
14
|
-
#include <IceUtil/Mutex.h>
|
15
|
-
#include <Ice/ObjectFactoryManagerF.h>
|
16
|
-
#include <Ice/ObjectFactoryF.h>
|
17
|
-
|
18
|
-
namespace IceInternal
|
19
|
-
{
|
20
|
-
|
21
|
-
class ObjectFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex
|
22
|
-
{
|
23
|
-
public:
|
24
|
-
|
25
|
-
void add(const ::Ice::ObjectFactoryPtr&, const std::string&);
|
26
|
-
void remove(const std::string&);
|
27
|
-
::Ice::ObjectFactoryPtr find(const std::string&) const;
|
28
|
-
|
29
|
-
typedef std::map<std::string, ::Ice::ObjectFactoryPtr> FactoryMap;
|
30
|
-
|
31
|
-
private:
|
32
|
-
|
33
|
-
ObjectFactoryManager();
|
34
|
-
void destroy();
|
35
|
-
friend class Instance;
|
36
|
-
|
37
|
-
FactoryMap _factoryMap;
|
38
|
-
mutable FactoryMap::iterator _factoryMapHint;
|
39
|
-
};
|
40
|
-
|
41
|
-
}
|
42
|
-
|
43
|
-
#endif
|
@@ -1,694 +0,0 @@
|
|
1
|
-
// **********************************************************************
|
2
|
-
//
|
3
|
-
// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
|
4
|
-
//
|
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
|
-
|
10
|
-
#include <Ice/Outgoing.h>
|
11
|
-
#include <Ice/ConnectionI.h>
|
12
|
-
#include <Ice/CollocatedRequestHandler.h>
|
13
|
-
#include <Ice/Reference.h>
|
14
|
-
#include <Ice/Instance.h>
|
15
|
-
#include <Ice/LocalException.h>
|
16
|
-
#include <Ice/ReplyStatus.h>
|
17
|
-
#include <Ice/ImplicitContextI.h>
|
18
|
-
|
19
|
-
using namespace std;
|
20
|
-
using namespace IceUtil;
|
21
|
-
using namespace Ice;
|
22
|
-
using namespace Ice::Instrumentation;
|
23
|
-
using namespace IceInternal;
|
24
|
-
|
25
|
-
OutgoingBase::OutgoingBase(Instance* instance) : _os(instance, Ice::currentProtocolEncoding), _sent(false)
|
26
|
-
{
|
27
|
-
}
|
28
|
-
|
29
|
-
ProxyOutgoingBase::ProxyOutgoingBase(IceProxy::Ice::Object* proxy, OperationMode mode) :
|
30
|
-
OutgoingBase(proxy->__reference()->getInstance().get()),
|
31
|
-
_proxy(proxy),
|
32
|
-
_mode(mode),
|
33
|
-
_state(StateUnsent)
|
34
|
-
{
|
35
|
-
int invocationTimeout = _proxy->__reference()->getInvocationTimeout();
|
36
|
-
if(invocationTimeout > 0)
|
37
|
-
{
|
38
|
-
_invocationTimeoutDeadline = Time::now(Time::Monotonic) + Time::milliSeconds(invocationTimeout);
|
39
|
-
}
|
40
|
-
}
|
41
|
-
|
42
|
-
ProxyOutgoingBase::~ProxyOutgoingBase()
|
43
|
-
{
|
44
|
-
}
|
45
|
-
|
46
|
-
void
|
47
|
-
ProxyOutgoingBase::sent()
|
48
|
-
{
|
49
|
-
Monitor<Mutex>::Lock sync(_monitor);
|
50
|
-
if(_proxy->__reference()->getMode() != Reference::ModeTwoway)
|
51
|
-
{
|
52
|
-
_childObserver.detach();
|
53
|
-
_state = StateOK;
|
54
|
-
}
|
55
|
-
_sent = true;
|
56
|
-
_monitor.notify();
|
57
|
-
|
58
|
-
//
|
59
|
-
// NOTE: At this point the stack allocated ProxyOutgoingBase object can be destroyed
|
60
|
-
// since the notify() on the monitor will release the thread waiting on the
|
61
|
-
// synchronous Ice call.
|
62
|
-
//
|
63
|
-
}
|
64
|
-
|
65
|
-
void
|
66
|
-
ProxyOutgoingBase::completed(const Ice::Exception& ex)
|
67
|
-
{
|
68
|
-
Monitor<Mutex>::Lock sync(_monitor);
|
69
|
-
//assert(_state <= StateInProgress);
|
70
|
-
if(_state > StateInProgress)
|
71
|
-
{
|
72
|
-
//
|
73
|
-
// Response was already received but message
|
74
|
-
// didn't get removed first from the connection
|
75
|
-
// send message queue so it's possible we can be
|
76
|
-
// notified of failures. In this case, ignore the
|
77
|
-
// failure and assume the outgoing has been sent.
|
78
|
-
//
|
79
|
-
assert(_state != StateFailed);
|
80
|
-
_sent = true;
|
81
|
-
_monitor.notify();
|
82
|
-
return;
|
83
|
-
}
|
84
|
-
|
85
|
-
_childObserver.failed(ex.ice_name());
|
86
|
-
_childObserver.detach();
|
87
|
-
|
88
|
-
_state = StateFailed;
|
89
|
-
_exception.reset(ex.ice_clone());
|
90
|
-
_monitor.notify();
|
91
|
-
}
|
92
|
-
|
93
|
-
void
|
94
|
-
ProxyOutgoingBase::completed(BasicStream& is)
|
95
|
-
{
|
96
|
-
assert(false); // Must be overriden
|
97
|
-
}
|
98
|
-
|
99
|
-
void
|
100
|
-
ProxyOutgoingBase::retryException(const Ice::Exception&)
|
101
|
-
{
|
102
|
-
Monitor<Mutex>::Lock sync(_monitor);
|
103
|
-
assert(_state <= StateInProgress);
|
104
|
-
_state = StateRetry;
|
105
|
-
_monitor.notify();
|
106
|
-
}
|
107
|
-
|
108
|
-
bool
|
109
|
-
ProxyOutgoingBase::invokeImpl()
|
110
|
-
{
|
111
|
-
assert(_state == StateUnsent);
|
112
|
-
|
113
|
-
const int invocationTimeout = _proxy->__reference()->getInvocationTimeout();
|
114
|
-
int cnt = 0;
|
115
|
-
while(true)
|
116
|
-
{
|
117
|
-
try
|
118
|
-
{
|
119
|
-
if(invocationTimeout > 0 && _invocationTimeoutDeadline <= Time::now(Time::Monotonic))
|
120
|
-
{
|
121
|
-
throw Ice::InvocationTimeoutException(__FILE__, __LINE__);
|
122
|
-
}
|
123
|
-
|
124
|
-
_state = StateInProgress;
|
125
|
-
_exception.reset(0);
|
126
|
-
_sent = false;
|
127
|
-
|
128
|
-
_handler = _proxy->__getRequestHandler();
|
129
|
-
|
130
|
-
if(_handler->sendRequest(this)) // Request sent and no response expected, we're done.
|
131
|
-
{
|
132
|
-
return true;
|
133
|
-
}
|
134
|
-
|
135
|
-
if(invocationTimeout == -2) // Use the connection timeout
|
136
|
-
{
|
137
|
-
try
|
138
|
-
{
|
139
|
-
_invocationTimeoutDeadline = Time(); // Reset any previously set value
|
140
|
-
Ice::ConnectionIPtr connection = _handler->waitForConnection();
|
141
|
-
if(connection)
|
142
|
-
{
|
143
|
-
int timeout = connection->timeout();
|
144
|
-
if(timeout > 0)
|
145
|
-
{
|
146
|
-
_invocationTimeoutDeadline = Time::now(Time::Monotonic) + Time::milliSeconds(timeout);
|
147
|
-
}
|
148
|
-
}
|
149
|
-
}
|
150
|
-
catch(const Ice::LocalException&)
|
151
|
-
{
|
152
|
-
}
|
153
|
-
}
|
154
|
-
|
155
|
-
bool timedOut = false;
|
156
|
-
{
|
157
|
-
Monitor<Mutex>::Lock sync(_monitor);
|
158
|
-
//
|
159
|
-
// If the handler says it's not finished, we wait until we're done.
|
160
|
-
//
|
161
|
-
if(_invocationTimeoutDeadline != Time())
|
162
|
-
{
|
163
|
-
Time now = Time::now(Time::Monotonic);
|
164
|
-
timedOut = now >= _invocationTimeoutDeadline;
|
165
|
-
while((_state == StateInProgress || !_sent) && _state != StateFailed && _state != StateRetry)
|
166
|
-
{
|
167
|
-
if(timedOut)
|
168
|
-
{
|
169
|
-
break;
|
170
|
-
}
|
171
|
-
_monitor.timedWait(_invocationTimeoutDeadline - now);
|
172
|
-
|
173
|
-
if((_state == StateInProgress || !_sent) && _state != StateFailed)
|
174
|
-
{
|
175
|
-
now = Time::now(Time::Monotonic);
|
176
|
-
timedOut = now >= _invocationTimeoutDeadline;
|
177
|
-
}
|
178
|
-
}
|
179
|
-
}
|
180
|
-
else
|
181
|
-
{
|
182
|
-
while((_state == StateInProgress || !_sent) && _state != StateFailed && _state != StateRetry)
|
183
|
-
{
|
184
|
-
_monitor.wait();
|
185
|
-
}
|
186
|
-
}
|
187
|
-
}
|
188
|
-
|
189
|
-
if(timedOut)
|
190
|
-
{
|
191
|
-
if(invocationTimeout == -2)
|
192
|
-
{
|
193
|
-
_handler->requestCanceled(this, ConnectionTimeoutException(__FILE__, __LINE__));
|
194
|
-
}
|
195
|
-
else
|
196
|
-
{
|
197
|
-
_handler->requestCanceled(this, InvocationTimeoutException(__FILE__, __LINE__));
|
198
|
-
}
|
199
|
-
|
200
|
-
//
|
201
|
-
// Wait for the exception to propagate. It's possible the request handler ignores
|
202
|
-
// the timeout if there was a failure shortly before requestCanceled got called.
|
203
|
-
// In this case, the exception should be set on the ProxyOutgoingBase.
|
204
|
-
//
|
205
|
-
Monitor<Mutex>::Lock sync(_monitor);
|
206
|
-
while(_state == StateInProgress)
|
207
|
-
{
|
208
|
-
_monitor.wait();
|
209
|
-
}
|
210
|
-
}
|
211
|
-
|
212
|
-
if(_exception.get())
|
213
|
-
{
|
214
|
-
_exception->ice_throw();
|
215
|
-
}
|
216
|
-
else if(_state == StateRetry)
|
217
|
-
{
|
218
|
-
_proxy->__updateRequestHandler(_handler, 0); // Clear request handler and retry.
|
219
|
-
continue;
|
220
|
-
}
|
221
|
-
else
|
222
|
-
{
|
223
|
-
assert(_state != StateInProgress);
|
224
|
-
return _state == StateOK;
|
225
|
-
}
|
226
|
-
}
|
227
|
-
catch(const RetryException&)
|
228
|
-
{
|
229
|
-
_proxy->__updateRequestHandler(_handler, 0); // Clear request handler and retry.
|
230
|
-
}
|
231
|
-
catch(const Ice::Exception& ex)
|
232
|
-
{
|
233
|
-
try
|
234
|
-
{
|
235
|
-
Time interval;
|
236
|
-
interval = Time::milliSeconds(_proxy->__handleException(ex, _handler, _mode, _sent, cnt));
|
237
|
-
if(interval > Time())
|
238
|
-
{
|
239
|
-
if(invocationTimeout > 0)
|
240
|
-
{
|
241
|
-
IceUtil::Time now = Time::now(Time::Monotonic);
|
242
|
-
IceUtil::Time retryDeadline = now + interval;
|
243
|
-
|
244
|
-
//
|
245
|
-
// Wait until either the retry and invocation timeout deadline is reached.
|
246
|
-
// Note that we're using a loop here because sleep() precision isn't as
|
247
|
-
// good as the motonic clock and it can return few hundred micro-seconds
|
248
|
-
// earlier which breaks the check for the invocation timeout.
|
249
|
-
//
|
250
|
-
while(retryDeadline > now && _invocationTimeoutDeadline > now)
|
251
|
-
{
|
252
|
-
if(retryDeadline < _invocationTimeoutDeadline)
|
253
|
-
{
|
254
|
-
ThreadControl::sleep(retryDeadline - now);
|
255
|
-
}
|
256
|
-
else if(_invocationTimeoutDeadline > now)
|
257
|
-
{
|
258
|
-
ThreadControl::sleep(_invocationTimeoutDeadline - now);
|
259
|
-
}
|
260
|
-
now = Time::now(Time::Monotonic);
|
261
|
-
}
|
262
|
-
if(now >= _invocationTimeoutDeadline)
|
263
|
-
{
|
264
|
-
throw Ice::InvocationTimeoutException(__FILE__, __LINE__);
|
265
|
-
}
|
266
|
-
}
|
267
|
-
else
|
268
|
-
{
|
269
|
-
ThreadControl::sleep(interval);
|
270
|
-
}
|
271
|
-
}
|
272
|
-
_observer.retried();
|
273
|
-
}
|
274
|
-
catch(const Ice::Exception& ex)
|
275
|
-
{
|
276
|
-
_observer.failed(ex.ice_name());
|
277
|
-
throw;
|
278
|
-
}
|
279
|
-
}
|
280
|
-
}
|
281
|
-
|
282
|
-
assert(false);
|
283
|
-
return false;
|
284
|
-
}
|
285
|
-
|
286
|
-
Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, OperationMode mode, const Context* context) :
|
287
|
-
ProxyOutgoingBase(proxy, mode),
|
288
|
-
_encoding(getCompatibleEncoding(proxy->__reference()->getEncoding())),
|
289
|
-
_is(proxy->__reference()->getInstance().get(), Ice::currentProtocolEncoding),
|
290
|
-
_operation(operation)
|
291
|
-
{
|
292
|
-
checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol()));
|
293
|
-
_observer.attach(proxy, operation, context);
|
294
|
-
|
295
|
-
switch(_proxy->__reference()->getMode())
|
296
|
-
{
|
297
|
-
case Reference::ModeTwoway:
|
298
|
-
case Reference::ModeOneway:
|
299
|
-
case Reference::ModeDatagram:
|
300
|
-
{
|
301
|
-
_os.writeBlob(requestHdr, sizeof(requestHdr));
|
302
|
-
break;
|
303
|
-
}
|
304
|
-
|
305
|
-
case Reference::ModeBatchOneway:
|
306
|
-
case Reference::ModeBatchDatagram:
|
307
|
-
{
|
308
|
-
_proxy->__getBatchRequestQueue()->prepareBatchRequest(&_os);
|
309
|
-
break;
|
310
|
-
}
|
311
|
-
}
|
312
|
-
|
313
|
-
try
|
314
|
-
{
|
315
|
-
_os.write(_proxy->__reference()->getIdentity());
|
316
|
-
|
317
|
-
//
|
318
|
-
// For compatibility with the old FacetPath.
|
319
|
-
//
|
320
|
-
if(_proxy->__reference()->getFacet().empty())
|
321
|
-
{
|
322
|
-
_os.write(static_cast<string*>(0), static_cast<string*>(0));
|
323
|
-
}
|
324
|
-
else
|
325
|
-
{
|
326
|
-
string facet = _proxy->__reference()->getFacet();
|
327
|
-
_os.write(&facet, &facet + 1);
|
328
|
-
}
|
329
|
-
|
330
|
-
_os.write(operation, false);
|
331
|
-
|
332
|
-
_os.write(static_cast<Ice::Byte>(mode));
|
333
|
-
|
334
|
-
if(context != 0)
|
335
|
-
{
|
336
|
-
//
|
337
|
-
// Explicit context
|
338
|
-
//
|
339
|
-
_os.write(*context);
|
340
|
-
}
|
341
|
-
else
|
342
|
-
{
|
343
|
-
//
|
344
|
-
// Implicit context
|
345
|
-
//
|
346
|
-
const ImplicitContextIPtr& implicitContext = _proxy->__reference()->getInstance()->getImplicitContext();
|
347
|
-
const Context& prxContext = _proxy->__reference()->getContext()->getValue();
|
348
|
-
if(implicitContext == 0)
|
349
|
-
{
|
350
|
-
_os.write(prxContext);
|
351
|
-
}
|
352
|
-
else
|
353
|
-
{
|
354
|
-
implicitContext->write(prxContext, &_os);
|
355
|
-
}
|
356
|
-
}
|
357
|
-
}
|
358
|
-
catch(const LocalException& ex)
|
359
|
-
{
|
360
|
-
abort(ex);
|
361
|
-
}
|
362
|
-
}
|
363
|
-
|
364
|
-
Outgoing::~Outgoing()
|
365
|
-
{
|
366
|
-
}
|
367
|
-
|
368
|
-
bool
|
369
|
-
Outgoing::invokeRemote(const Ice::ConnectionIPtr& connection, bool compress, bool response)
|
370
|
-
{
|
371
|
-
return connection->sendRequest(this, compress, response, 0);
|
372
|
-
}
|
373
|
-
|
374
|
-
void
|
375
|
-
Outgoing::invokeCollocated(CollocatedRequestHandler* handler)
|
376
|
-
{
|
377
|
-
handler->invokeRequest(this, 0);
|
378
|
-
}
|
379
|
-
|
380
|
-
bool
|
381
|
-
Outgoing::invoke()
|
382
|
-
{
|
383
|
-
const Reference::Mode mode = _proxy->__reference()->getMode();
|
384
|
-
if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram)
|
385
|
-
{
|
386
|
-
_state = StateInProgress;
|
387
|
-
_proxy->__getBatchRequestQueue()->finishBatchRequest(&_os, _proxy, _operation);
|
388
|
-
return true;
|
389
|
-
}
|
390
|
-
return invokeImpl();
|
391
|
-
}
|
392
|
-
|
393
|
-
void
|
394
|
-
Outgoing::abort(const LocalException& ex)
|
395
|
-
{
|
396
|
-
assert(_state == StateUnsent);
|
397
|
-
|
398
|
-
//
|
399
|
-
// If we didn't finish a batch oneway or datagram request, we must
|
400
|
-
// notify the connection about that we give up ownership of the
|
401
|
-
// batch stream.
|
402
|
-
//
|
403
|
-
const Reference::Mode mode = _proxy->__reference()->getMode();
|
404
|
-
if(mode == Reference::ModeBatchOneway || mode == Reference::ModeBatchDatagram)
|
405
|
-
{
|
406
|
-
_proxy->__getBatchRequestQueue()->abortBatchRequest(&_os);
|
407
|
-
}
|
408
|
-
|
409
|
-
ex.ice_throw();
|
410
|
-
}
|
411
|
-
|
412
|
-
void
|
413
|
-
Outgoing::completed(BasicStream& is)
|
414
|
-
{
|
415
|
-
Monitor<Mutex>::Lock sync(_monitor);
|
416
|
-
|
417
|
-
assert(_proxy->__reference()->getMode() == Reference::ModeTwoway); // Can only be called for twoways.
|
418
|
-
|
419
|
-
assert(_state <= StateInProgress);
|
420
|
-
if(_childObserver)
|
421
|
-
{
|
422
|
-
_childObserver->reply(static_cast<Int>(is.b.size() - headerSize - 4));
|
423
|
-
}
|
424
|
-
_childObserver.detach();
|
425
|
-
|
426
|
-
_is.swap(is);
|
427
|
-
|
428
|
-
Ice::Byte replyStatus;
|
429
|
-
_is.read(replyStatus);
|
430
|
-
|
431
|
-
switch(replyStatus)
|
432
|
-
{
|
433
|
-
case replyOK:
|
434
|
-
{
|
435
|
-
_state = StateOK; // The state must be set last, in case there is an exception.
|
436
|
-
break;
|
437
|
-
}
|
438
|
-
|
439
|
-
case replyUserException:
|
440
|
-
{
|
441
|
-
_observer.userException();
|
442
|
-
_state = StateUserException; // The state must be set last, in case there is an exception.
|
443
|
-
break;
|
444
|
-
}
|
445
|
-
|
446
|
-
case replyObjectNotExist:
|
447
|
-
case replyFacetNotExist:
|
448
|
-
case replyOperationNotExist:
|
449
|
-
{
|
450
|
-
//
|
451
|
-
// Don't read the exception members directly into the
|
452
|
-
// exception. Otherwise if reading fails and raises an
|
453
|
-
// exception, you will have a memory leak.
|
454
|
-
//
|
455
|
-
Identity ident;
|
456
|
-
_is.read(ident);
|
457
|
-
|
458
|
-
//
|
459
|
-
// For compatibility with the old FacetPath.
|
460
|
-
//
|
461
|
-
vector<string> facetPath;
|
462
|
-
_is.read(facetPath);
|
463
|
-
string facet;
|
464
|
-
if(!facetPath.empty())
|
465
|
-
{
|
466
|
-
if(facetPath.size() > 1)
|
467
|
-
{
|
468
|
-
throw MarshalException(__FILE__, __LINE__);
|
469
|
-
}
|
470
|
-
facet.swap(facetPath[0]);
|
471
|
-
}
|
472
|
-
|
473
|
-
string operation;
|
474
|
-
_is.read(operation, false);
|
475
|
-
|
476
|
-
RequestFailedException* ex;
|
477
|
-
switch(replyStatus)
|
478
|
-
{
|
479
|
-
case replyObjectNotExist:
|
480
|
-
{
|
481
|
-
ex = new ObjectNotExistException(__FILE__, __LINE__);
|
482
|
-
break;
|
483
|
-
}
|
484
|
-
|
485
|
-
case replyFacetNotExist:
|
486
|
-
{
|
487
|
-
ex = new FacetNotExistException(__FILE__, __LINE__);
|
488
|
-
break;
|
489
|
-
}
|
490
|
-
|
491
|
-
case replyOperationNotExist:
|
492
|
-
{
|
493
|
-
ex = new OperationNotExistException(__FILE__, __LINE__);
|
494
|
-
break;
|
495
|
-
}
|
496
|
-
|
497
|
-
default:
|
498
|
-
{
|
499
|
-
ex = 0; // To keep the compiler from complaining.
|
500
|
-
assert(false);
|
501
|
-
break;
|
502
|
-
}
|
503
|
-
}
|
504
|
-
|
505
|
-
ex->id = ident;
|
506
|
-
ex->facet = facet;
|
507
|
-
ex->operation = operation;
|
508
|
-
_exception.reset(ex);
|
509
|
-
|
510
|
-
_state = StateLocalException; // The state must be set last, in case there is an exception.
|
511
|
-
break;
|
512
|
-
}
|
513
|
-
|
514
|
-
case replyUnknownException:
|
515
|
-
case replyUnknownLocalException:
|
516
|
-
case replyUnknownUserException:
|
517
|
-
{
|
518
|
-
//
|
519
|
-
// Don't read the exception members directly into the
|
520
|
-
// exception. Otherwise if reading fails and raises an
|
521
|
-
// exception, you will have a memory leak.
|
522
|
-
//
|
523
|
-
string unknown;
|
524
|
-
_is.read(unknown, false);
|
525
|
-
|
526
|
-
UnknownException* ex;
|
527
|
-
switch(replyStatus)
|
528
|
-
{
|
529
|
-
case replyUnknownException:
|
530
|
-
{
|
531
|
-
ex = new UnknownException(__FILE__, __LINE__);
|
532
|
-
break;
|
533
|
-
}
|
534
|
-
|
535
|
-
case replyUnknownLocalException:
|
536
|
-
{
|
537
|
-
ex = new UnknownLocalException(__FILE__, __LINE__);
|
538
|
-
break;
|
539
|
-
}
|
540
|
-
|
541
|
-
case replyUnknownUserException:
|
542
|
-
{
|
543
|
-
ex = new UnknownUserException(__FILE__, __LINE__);
|
544
|
-
break;
|
545
|
-
}
|
546
|
-
|
547
|
-
default:
|
548
|
-
{
|
549
|
-
ex = 0; // To keep the compiler from complaining.
|
550
|
-
assert(false);
|
551
|
-
break;
|
552
|
-
}
|
553
|
-
}
|
554
|
-
|
555
|
-
ex->unknown = unknown;
|
556
|
-
_exception.reset(ex);
|
557
|
-
|
558
|
-
_state = StateLocalException; // The state must be set last, in case there is an exception.
|
559
|
-
break;
|
560
|
-
}
|
561
|
-
|
562
|
-
default:
|
563
|
-
{
|
564
|
-
_exception.reset(new UnknownReplyStatusException(__FILE__, __LINE__));
|
565
|
-
_state = StateLocalException;
|
566
|
-
break;
|
567
|
-
}
|
568
|
-
}
|
569
|
-
|
570
|
-
_monitor.notify();
|
571
|
-
}
|
572
|
-
|
573
|
-
void
|
574
|
-
Outgoing::throwUserException()
|
575
|
-
{
|
576
|
-
try
|
577
|
-
{
|
578
|
-
_is.startReadEncaps();
|
579
|
-
_is.throwException();
|
580
|
-
}
|
581
|
-
catch(const Ice::UserException&)
|
582
|
-
{
|
583
|
-
_is.endReadEncaps();
|
584
|
-
throw;
|
585
|
-
}
|
586
|
-
}
|
587
|
-
|
588
|
-
ProxyFlushBatch::ProxyFlushBatch(IceProxy::Ice::Object* proxy, const string& operation) :
|
589
|
-
ProxyOutgoingBase(proxy, Ice::Normal)
|
590
|
-
{
|
591
|
-
checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol()));
|
592
|
-
_observer.attach(proxy, operation, 0);
|
593
|
-
|
594
|
-
_batchRequestNum = proxy->__getBatchRequestQueue()->swap(&_os);
|
595
|
-
}
|
596
|
-
|
597
|
-
bool
|
598
|
-
ProxyFlushBatch::invokeRemote(const Ice::ConnectionIPtr& connection, bool compress, bool response)
|
599
|
-
{
|
600
|
-
return connection->sendRequest(this, compress, response, _batchRequestNum);
|
601
|
-
}
|
602
|
-
|
603
|
-
void
|
604
|
-
ProxyFlushBatch::invokeCollocated(CollocatedRequestHandler* handler)
|
605
|
-
{
|
606
|
-
handler->invokeRequest(this, _batchRequestNum);
|
607
|
-
}
|
608
|
-
|
609
|
-
void
|
610
|
-
ProxyFlushBatch::invoke()
|
611
|
-
{
|
612
|
-
if(_batchRequestNum == 0)
|
613
|
-
{
|
614
|
-
sent();
|
615
|
-
}
|
616
|
-
else
|
617
|
-
{
|
618
|
-
invokeImpl();
|
619
|
-
}
|
620
|
-
}
|
621
|
-
|
622
|
-
ConnectionFlushBatch::ConnectionFlushBatch(ConnectionI* connection, Instance* instance, const string& operation) :
|
623
|
-
OutgoingBase(instance), _connection(connection)
|
624
|
-
{
|
625
|
-
_observer.attach(instance, operation);
|
626
|
-
}
|
627
|
-
|
628
|
-
void
|
629
|
-
ConnectionFlushBatch::invoke()
|
630
|
-
{
|
631
|
-
int batchRequestNum = _connection->getBatchRequestQueue()->swap(&_os);
|
632
|
-
|
633
|
-
try
|
634
|
-
{
|
635
|
-
if(batchRequestNum == 0)
|
636
|
-
{
|
637
|
-
sent();
|
638
|
-
}
|
639
|
-
else if(!_connection->sendRequest(this, false, false, batchRequestNum))
|
640
|
-
{
|
641
|
-
Monitor<Mutex>::Lock sync(_monitor);
|
642
|
-
while(!_exception.get() && !_sent)
|
643
|
-
{
|
644
|
-
_monitor.wait();
|
645
|
-
}
|
646
|
-
if(_exception.get())
|
647
|
-
{
|
648
|
-
_exception->ice_throw();
|
649
|
-
}
|
650
|
-
}
|
651
|
-
}
|
652
|
-
catch(const RetryException& ex)
|
653
|
-
{
|
654
|
-
ex.get()->ice_throw();
|
655
|
-
}
|
656
|
-
}
|
657
|
-
|
658
|
-
void
|
659
|
-
ConnectionFlushBatch::sent()
|
660
|
-
{
|
661
|
-
Monitor<Mutex>::Lock sync(_monitor);
|
662
|
-
_childObserver.detach();
|
663
|
-
|
664
|
-
_sent = true;
|
665
|
-
_monitor.notify();
|
666
|
-
|
667
|
-
//
|
668
|
-
// NOTE: At this point the stack allocated ConnectionFlushBatch
|
669
|
-
// object can be destroyed since the notify() on the monitor will
|
670
|
-
// release the thread waiting on the synchronous Ice call.
|
671
|
-
//
|
672
|
-
}
|
673
|
-
|
674
|
-
void
|
675
|
-
ConnectionFlushBatch::completed(const Ice::Exception& ex)
|
676
|
-
{
|
677
|
-
Monitor<Mutex>::Lock sync(_monitor);
|
678
|
-
_childObserver.failed(ex.ice_name());
|
679
|
-
_childObserver.detach();
|
680
|
-
_exception.reset(ex.ice_clone());
|
681
|
-
_monitor.notify();
|
682
|
-
}
|
683
|
-
|
684
|
-
void
|
685
|
-
ConnectionFlushBatch::completed(BasicStream& is)
|
686
|
-
{
|
687
|
-
assert(false);
|
688
|
-
}
|
689
|
-
|
690
|
-
void
|
691
|
-
ConnectionFlushBatch::retryException(const Ice::Exception& ex)
|
692
|
-
{
|
693
|
-
completed(ex);
|
694
|
-
}
|