zeroc-ice 3.6.5 → 3.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- 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.
|
|
@@ -11,28 +11,34 @@
|
|
|
11
11
|
#define ICE_OUTGOING_ASYNC_F_H
|
|
12
12
|
|
|
13
13
|
#include <IceUtil/Shared.h>
|
|
14
|
-
|
|
15
14
|
#include <Ice/Handle.h>
|
|
16
15
|
|
|
17
16
|
namespace IceInternal
|
|
18
17
|
{
|
|
19
18
|
|
|
20
19
|
class OutgoingAsyncBase;
|
|
20
|
+
class OutgoingAsync;
|
|
21
|
+
class ProxyOutgoingAsyncBase;
|
|
22
|
+
class CommunicatorFlushBatchAsync;
|
|
23
|
+
|
|
24
|
+
#ifdef ICE_CPP11_MAPPING
|
|
25
|
+
using OutgoingAsyncBasePtr = ::std::shared_ptr<OutgoingAsyncBase>;
|
|
26
|
+
using OutgoingAsyncPtr = ::std::shared_ptr<OutgoingAsync>;
|
|
27
|
+
using ProxyOutgoingAsyncBasePtr = ::std::shared_ptr<ProxyOutgoingAsyncBase>;
|
|
28
|
+
using CommunicatorFlushBatchAsyncPtr = ::std::shared_ptr<CommunicatorFlushBatchAsync>;
|
|
29
|
+
#else
|
|
21
30
|
ICE_API IceUtil::Shared* upCast(OutgoingAsyncBase*);
|
|
22
31
|
typedef IceInternal::Handle<OutgoingAsyncBase> OutgoingAsyncBasePtr;
|
|
23
32
|
|
|
24
|
-
class OutgoingAsync;
|
|
25
33
|
ICE_API IceUtil::Shared* upCast(OutgoingAsync*);
|
|
26
34
|
typedef IceInternal::Handle<OutgoingAsync> OutgoingAsyncPtr;
|
|
27
35
|
|
|
28
|
-
class ProxyOutgoingAsyncBase;
|
|
29
36
|
ICE_API IceUtil::Shared* upCast(ProxyOutgoingAsyncBase*);
|
|
30
37
|
typedef IceInternal::Handle<ProxyOutgoingAsyncBase> ProxyOutgoingAsyncBasePtr;
|
|
31
38
|
|
|
32
|
-
class CommunicatorFlushBatchAsync;
|
|
33
39
|
ICE_API IceUtil::Shared* upCast(CommunicatorFlushBatchAsync*);
|
|
34
40
|
typedef IceInternal::Handle<CommunicatorFlushBatchAsync> CommunicatorFlushBatchAsyncPtr;
|
|
35
|
-
|
|
41
|
+
#endif
|
|
36
42
|
}
|
|
37
43
|
|
|
38
44
|
#endif
|
|
@@ -0,0 +1,753 @@
|
|
|
1
|
+
// **********************************************************************
|
|
2
|
+
//
|
|
3
|
+
// Copyright (c) 2003-2017 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_OUTPUT_STREAM_H
|
|
11
|
+
#define ICE_OUTPUT_STREAM_H
|
|
12
|
+
|
|
13
|
+
#include <Ice/CommunicatorF.h>
|
|
14
|
+
#include <Ice/InstanceF.h>
|
|
15
|
+
#include <Ice/Object.h>
|
|
16
|
+
#include <Ice/ValueF.h>
|
|
17
|
+
#include <Ice/ProxyF.h>
|
|
18
|
+
#include <Ice/Buffer.h>
|
|
19
|
+
#include <Ice/Protocol.h>
|
|
20
|
+
#include <Ice/SlicedDataF.h>
|
|
21
|
+
#include <Ice/StreamHelpers.h>
|
|
22
|
+
|
|
23
|
+
namespace Ice
|
|
24
|
+
{
|
|
25
|
+
|
|
26
|
+
class UserException;
|
|
27
|
+
|
|
28
|
+
class ICE_API OutputStream : public IceInternal::Buffer
|
|
29
|
+
{
|
|
30
|
+
public:
|
|
31
|
+
|
|
32
|
+
typedef size_t size_type;
|
|
33
|
+
|
|
34
|
+
//
|
|
35
|
+
// Constructing an OutputStream without providing a communicator means the stream will
|
|
36
|
+
// use the default encoding version, the default format for class encoding, and the
|
|
37
|
+
// process string converters. You can supply a communicator later by calling initialize().
|
|
38
|
+
//
|
|
39
|
+
OutputStream();
|
|
40
|
+
|
|
41
|
+
//
|
|
42
|
+
// This constructor uses the communicator's default encoding version.
|
|
43
|
+
//
|
|
44
|
+
OutputStream(const CommunicatorPtr&);
|
|
45
|
+
|
|
46
|
+
//
|
|
47
|
+
// This constructor uses the given communicator and encoding version.
|
|
48
|
+
//
|
|
49
|
+
OutputStream(const CommunicatorPtr&, const EncodingVersion&);
|
|
50
|
+
|
|
51
|
+
//
|
|
52
|
+
// This constructor uses the given communicator and encoding version. The byte pair denotes
|
|
53
|
+
// application-supplied memory that the stream uses as its initial marshaling buffer. The
|
|
54
|
+
// stream will reallocate if the size of the marshaled data exceeds the application's buffer.
|
|
55
|
+
//
|
|
56
|
+
OutputStream(const CommunicatorPtr&, const EncodingVersion&, const std::pair<const Byte*, const Byte*>&);
|
|
57
|
+
|
|
58
|
+
~OutputStream()
|
|
59
|
+
{
|
|
60
|
+
// Inlined for performance reasons.
|
|
61
|
+
|
|
62
|
+
if(_currentEncaps != &_preAllocatedEncaps)
|
|
63
|
+
{
|
|
64
|
+
clear(); // Not inlined.
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
//
|
|
69
|
+
// Initializes the stream to use the communicator's default encoding version and class
|
|
70
|
+
// encoding format
|
|
71
|
+
//
|
|
72
|
+
void initialize(const CommunicatorPtr&);
|
|
73
|
+
|
|
74
|
+
//
|
|
75
|
+
// Initializes the stream to use the given encoding version and the communicator's
|
|
76
|
+
// default class encoding format and string converters.
|
|
77
|
+
//
|
|
78
|
+
void initialize(const CommunicatorPtr&, const EncodingVersion&);
|
|
79
|
+
|
|
80
|
+
void clear();
|
|
81
|
+
|
|
82
|
+
//
|
|
83
|
+
// Must return Instance*, because we don't hold an InstancePtr for
|
|
84
|
+
// optimization reasons (see comments below).
|
|
85
|
+
//
|
|
86
|
+
IceInternal::Instance* instance() const { return _instance; } // Inlined for performance reasons.
|
|
87
|
+
|
|
88
|
+
void setFormat(FormatType);
|
|
89
|
+
|
|
90
|
+
void* getClosure() const;
|
|
91
|
+
void* setClosure(void*);
|
|
92
|
+
|
|
93
|
+
void swap(OutputStream&);
|
|
94
|
+
void resetEncapsulation();
|
|
95
|
+
|
|
96
|
+
void resize(Container::size_type sz)
|
|
97
|
+
{
|
|
98
|
+
b.resize(sz);
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
void startValue(const SlicedDataPtr& data)
|
|
102
|
+
{
|
|
103
|
+
assert(_currentEncaps && _currentEncaps->encoder);
|
|
104
|
+
_currentEncaps->encoder->startInstance(ValueSlice, data);
|
|
105
|
+
}
|
|
106
|
+
void endValue()
|
|
107
|
+
{
|
|
108
|
+
assert(_currentEncaps && _currentEncaps->encoder);
|
|
109
|
+
_currentEncaps->encoder->endInstance();
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
void startException(const SlicedDataPtr& data)
|
|
113
|
+
{
|
|
114
|
+
assert(_currentEncaps && _currentEncaps->encoder);
|
|
115
|
+
_currentEncaps->encoder->startInstance(ExceptionSlice, data);
|
|
116
|
+
}
|
|
117
|
+
void endException()
|
|
118
|
+
{
|
|
119
|
+
assert(_currentEncaps && _currentEncaps->encoder);
|
|
120
|
+
_currentEncaps->encoder->endInstance();
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
void startEncapsulation();
|
|
124
|
+
|
|
125
|
+
void startEncapsulation(const EncodingVersion& encoding, FormatType format)
|
|
126
|
+
{
|
|
127
|
+
IceInternal::checkSupportedEncoding(encoding);
|
|
128
|
+
|
|
129
|
+
Encaps* oldEncaps = _currentEncaps;
|
|
130
|
+
if(!oldEncaps) // First allocated encaps?
|
|
131
|
+
{
|
|
132
|
+
_currentEncaps = &_preAllocatedEncaps;
|
|
133
|
+
}
|
|
134
|
+
else
|
|
135
|
+
{
|
|
136
|
+
_currentEncaps = new Encaps();
|
|
137
|
+
_currentEncaps->previous = oldEncaps;
|
|
138
|
+
}
|
|
139
|
+
_currentEncaps->format = format;
|
|
140
|
+
_currentEncaps->encoding = encoding;
|
|
141
|
+
_currentEncaps->start = b.size();
|
|
142
|
+
|
|
143
|
+
write(Int(0)); // Placeholder for the encapsulation length.
|
|
144
|
+
write(_currentEncaps->encoding);
|
|
145
|
+
}
|
|
146
|
+
void endEncapsulation()
|
|
147
|
+
{
|
|
148
|
+
assert(_currentEncaps);
|
|
149
|
+
|
|
150
|
+
// Size includes size and version.
|
|
151
|
+
const Int sz = static_cast<Int>(b.size() - _currentEncaps->start);
|
|
152
|
+
write(sz, &(*(b.begin() + _currentEncaps->start)));
|
|
153
|
+
|
|
154
|
+
Encaps* oldEncaps = _currentEncaps;
|
|
155
|
+
_currentEncaps = _currentEncaps->previous;
|
|
156
|
+
if(oldEncaps == &_preAllocatedEncaps)
|
|
157
|
+
{
|
|
158
|
+
oldEncaps->reset();
|
|
159
|
+
}
|
|
160
|
+
else
|
|
161
|
+
{
|
|
162
|
+
delete oldEncaps;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
void writeEmptyEncapsulation(const EncodingVersion& encoding)
|
|
167
|
+
{
|
|
168
|
+
IceInternal::checkSupportedEncoding(encoding);
|
|
169
|
+
write(Int(6)); // Size
|
|
170
|
+
write(encoding);
|
|
171
|
+
}
|
|
172
|
+
void writeEncapsulation(const Byte* v, Int sz)
|
|
173
|
+
{
|
|
174
|
+
if(sz < 6)
|
|
175
|
+
{
|
|
176
|
+
throwEncapsulationException(__FILE__, __LINE__);
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
Container::size_type position = b.size();
|
|
180
|
+
resize(position + sz);
|
|
181
|
+
memcpy(&b[position], &v[0], sz);
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
const EncodingVersion& getEncoding() const
|
|
185
|
+
{
|
|
186
|
+
return _currentEncaps ? _currentEncaps->encoding : _encoding;
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
void startSlice(const std::string& typeId, int compactId, bool last)
|
|
190
|
+
{
|
|
191
|
+
assert(_currentEncaps && _currentEncaps->encoder);
|
|
192
|
+
_currentEncaps->encoder->startSlice(typeId, compactId, last);
|
|
193
|
+
}
|
|
194
|
+
void endSlice()
|
|
195
|
+
{
|
|
196
|
+
assert(_currentEncaps && _currentEncaps->encoder);
|
|
197
|
+
_currentEncaps->encoder->endSlice();
|
|
198
|
+
}
|
|
199
|
+
|
|
200
|
+
void writePendingValues();
|
|
201
|
+
|
|
202
|
+
void writeSize(Int v) // Inlined for performance reasons.
|
|
203
|
+
{
|
|
204
|
+
assert(v >= 0);
|
|
205
|
+
if(v > 254)
|
|
206
|
+
{
|
|
207
|
+
write(Byte(255));
|
|
208
|
+
write(v);
|
|
209
|
+
}
|
|
210
|
+
else
|
|
211
|
+
{
|
|
212
|
+
write(static_cast<Byte>(v));
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
void rewriteSize(Int v, Container::iterator dest)
|
|
216
|
+
{
|
|
217
|
+
assert(v >= 0);
|
|
218
|
+
if(v > 254)
|
|
219
|
+
{
|
|
220
|
+
*dest++ = Byte(255);
|
|
221
|
+
write(v, dest);
|
|
222
|
+
}
|
|
223
|
+
else
|
|
224
|
+
{
|
|
225
|
+
*dest = static_cast<Byte>(v);
|
|
226
|
+
}
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
size_type startSize()
|
|
230
|
+
{
|
|
231
|
+
size_type position = b.size();
|
|
232
|
+
write(Int(0));
|
|
233
|
+
return position;
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
void endSize(size_type position)
|
|
237
|
+
{
|
|
238
|
+
rewrite(static_cast<Int>(b.size() - position) - 4, position);
|
|
239
|
+
}
|
|
240
|
+
|
|
241
|
+
void writeBlob(const std::vector<Byte>&);
|
|
242
|
+
|
|
243
|
+
void writeBlob(const Byte* v, Container::size_type sz)
|
|
244
|
+
{
|
|
245
|
+
if(sz > 0)
|
|
246
|
+
{
|
|
247
|
+
Container::size_type position = b.size();
|
|
248
|
+
resize(position + sz);
|
|
249
|
+
memcpy(&b[position], &v[0], sz);
|
|
250
|
+
}
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
template<typename T> void write(const T& v)
|
|
254
|
+
{
|
|
255
|
+
StreamHelper<T, StreamableTraits<T>::helper>::write(this, v);
|
|
256
|
+
}
|
|
257
|
+
|
|
258
|
+
template<typename T> void write(Int tag, const IceUtil::Optional<T>& v)
|
|
259
|
+
{
|
|
260
|
+
if(!v)
|
|
261
|
+
{
|
|
262
|
+
return; // Optional not set
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
if(writeOptional(tag, StreamOptionalHelper<T,
|
|
266
|
+
StreamableTraits<T>::helper,
|
|
267
|
+
StreamableTraits<T>::fixedLength>::optionalFormat))
|
|
268
|
+
{
|
|
269
|
+
StreamOptionalHelper<T,
|
|
270
|
+
StreamableTraits<T>::helper,
|
|
271
|
+
StreamableTraits<T>::fixedLength>::write(this, *v);
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
|
|
275
|
+
//
|
|
276
|
+
// Template functions for sequences and custom sequences
|
|
277
|
+
//
|
|
278
|
+
template<typename T> void write(const std::vector<T>& v)
|
|
279
|
+
{
|
|
280
|
+
if(v.empty())
|
|
281
|
+
{
|
|
282
|
+
writeSize(0);
|
|
283
|
+
}
|
|
284
|
+
else
|
|
285
|
+
{
|
|
286
|
+
write(&v[0], &v[0] + v.size());
|
|
287
|
+
}
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
template<typename T> void write(const T* begin, const T* end)
|
|
291
|
+
{
|
|
292
|
+
writeSize(static_cast<Int>(end - begin));
|
|
293
|
+
for(const T* p = begin; p != end; ++p)
|
|
294
|
+
{
|
|
295
|
+
write(*p);
|
|
296
|
+
}
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
#ifdef ICE_CPP11_MAPPING
|
|
300
|
+
|
|
301
|
+
template<typename T> void writeAll(const T& v)
|
|
302
|
+
{
|
|
303
|
+
write(v);
|
|
304
|
+
}
|
|
305
|
+
|
|
306
|
+
template<typename T, typename... Te> void writeAll(const T& v, const Te&... ve)
|
|
307
|
+
{
|
|
308
|
+
write(v);
|
|
309
|
+
writeAll(ve...);
|
|
310
|
+
}
|
|
311
|
+
|
|
312
|
+
template<size_t I = 0, typename... Te>
|
|
313
|
+
typename std::enable_if<I == sizeof...(Te), void>::type
|
|
314
|
+
writeAll(std::tuple<Te...>)
|
|
315
|
+
{
|
|
316
|
+
// Do nothing. Either tuple is empty or we are at the end.
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
template<size_t I = 0, typename... Te>
|
|
320
|
+
typename std::enable_if<I < sizeof...(Te), void>::type
|
|
321
|
+
writeAll(std::tuple<Te...> tuple)
|
|
322
|
+
{
|
|
323
|
+
write(std::get<I>(tuple));
|
|
324
|
+
writeAll<I + 1, Te...>(tuple);
|
|
325
|
+
}
|
|
326
|
+
|
|
327
|
+
template<typename T>
|
|
328
|
+
void writeAll(std::initializer_list<int> tags, const IceUtil::Optional<T>& v)
|
|
329
|
+
{
|
|
330
|
+
write(*(tags.begin() + tags.size() - 1), v);
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
template<typename T, typename... Te>
|
|
334
|
+
void writeAll(std::initializer_list<int> tags, const IceUtil::Optional<T>& v, const IceUtil::Optional<Te>&... ve)
|
|
335
|
+
{
|
|
336
|
+
size_t index = tags.size() - sizeof...(ve) - 1;
|
|
337
|
+
write(*(tags.begin() + index), v);
|
|
338
|
+
writeAll(tags, ve...);
|
|
339
|
+
}
|
|
340
|
+
|
|
341
|
+
#endif
|
|
342
|
+
|
|
343
|
+
// Write type and tag for optionals
|
|
344
|
+
bool writeOptional(Int tag, OptionalFormat format)
|
|
345
|
+
{
|
|
346
|
+
assert(_currentEncaps);
|
|
347
|
+
if(_currentEncaps->encoder)
|
|
348
|
+
{
|
|
349
|
+
return _currentEncaps->encoder->writeOptional(tag, format);
|
|
350
|
+
}
|
|
351
|
+
else
|
|
352
|
+
{
|
|
353
|
+
return writeOptImpl(tag, format);
|
|
354
|
+
}
|
|
355
|
+
}
|
|
356
|
+
|
|
357
|
+
// Byte
|
|
358
|
+
void write(Byte v)
|
|
359
|
+
{
|
|
360
|
+
b.push_back(v);
|
|
361
|
+
}
|
|
362
|
+
void write(const Byte*, const Byte*);
|
|
363
|
+
|
|
364
|
+
// Bool
|
|
365
|
+
void write(bool v)
|
|
366
|
+
{
|
|
367
|
+
b.push_back(static_cast<Byte>(v));
|
|
368
|
+
}
|
|
369
|
+
void write(const std::vector<bool>&);
|
|
370
|
+
void write(const bool*, const bool*);
|
|
371
|
+
|
|
372
|
+
// Short
|
|
373
|
+
void write(Short);
|
|
374
|
+
void write(const Short*, const Short*);
|
|
375
|
+
|
|
376
|
+
// Int
|
|
377
|
+
void write(Int v) // Inlined for performance reasons.
|
|
378
|
+
{
|
|
379
|
+
Container::size_type position = b.size();
|
|
380
|
+
resize(position + sizeof(Int));
|
|
381
|
+
write(v, &b[position]);
|
|
382
|
+
}
|
|
383
|
+
void write(Int v, Container::iterator dest)
|
|
384
|
+
{
|
|
385
|
+
#ifdef ICE_BIG_ENDIAN
|
|
386
|
+
const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Int) - 1;
|
|
387
|
+
*dest++ = *src--;
|
|
388
|
+
*dest++ = *src--;
|
|
389
|
+
*dest++ = *src--;
|
|
390
|
+
*dest = *src;
|
|
391
|
+
#else
|
|
392
|
+
const Byte* src = reinterpret_cast<const Byte*>(&v);
|
|
393
|
+
*dest++ = *src++;
|
|
394
|
+
*dest++ = *src++;
|
|
395
|
+
*dest++ = *src++;
|
|
396
|
+
*dest = *src;
|
|
397
|
+
#endif
|
|
398
|
+
}
|
|
399
|
+
|
|
400
|
+
void write(const Int*, const Int*);
|
|
401
|
+
|
|
402
|
+
// Long
|
|
403
|
+
void write(Long);
|
|
404
|
+
void write(const Long*, const Long*);
|
|
405
|
+
|
|
406
|
+
// Float
|
|
407
|
+
void write(Float);
|
|
408
|
+
void write(const Float*, const Float*);
|
|
409
|
+
|
|
410
|
+
// Double
|
|
411
|
+
void write(Double);
|
|
412
|
+
void write(const Double*, const Double*);
|
|
413
|
+
|
|
414
|
+
// String
|
|
415
|
+
void write(const std::string& v, bool convert = true)
|
|
416
|
+
{
|
|
417
|
+
Int sz = static_cast<Int>(v.size());
|
|
418
|
+
if(convert && sz > 0)
|
|
419
|
+
{
|
|
420
|
+
writeConverted(v.data(), static_cast<size_t>(sz));
|
|
421
|
+
}
|
|
422
|
+
else
|
|
423
|
+
{
|
|
424
|
+
writeSize(sz);
|
|
425
|
+
if(sz > 0)
|
|
426
|
+
{
|
|
427
|
+
Container::size_type position = b.size();
|
|
428
|
+
resize(position + sz);
|
|
429
|
+
memcpy(&b[position], v.data(), sz);
|
|
430
|
+
}
|
|
431
|
+
}
|
|
432
|
+
}
|
|
433
|
+
|
|
434
|
+
// for custom strings
|
|
435
|
+
void write(const char* vdata, size_t vsize, bool convert = true)
|
|
436
|
+
{
|
|
437
|
+
Int sz = static_cast<Int>(vsize);
|
|
438
|
+
if(convert && sz > 0)
|
|
439
|
+
{
|
|
440
|
+
writeConverted(vdata, vsize);
|
|
441
|
+
}
|
|
442
|
+
else
|
|
443
|
+
{
|
|
444
|
+
writeSize(sz);
|
|
445
|
+
if(sz > 0)
|
|
446
|
+
{
|
|
447
|
+
Container::size_type position = b.size();
|
|
448
|
+
resize(position + sz);
|
|
449
|
+
memcpy(&b[position], vdata, vsize);
|
|
450
|
+
}
|
|
451
|
+
}
|
|
452
|
+
}
|
|
453
|
+
|
|
454
|
+
// Null-terminated C string
|
|
455
|
+
void write(const char* vdata, bool convert = true)
|
|
456
|
+
{
|
|
457
|
+
write(vdata, strlen(vdata), convert);
|
|
458
|
+
}
|
|
459
|
+
|
|
460
|
+
void write(const std::string*, const std::string*, bool = true);
|
|
461
|
+
|
|
462
|
+
void write(const std::wstring& v);
|
|
463
|
+
void write(const std::wstring*, const std::wstring*);
|
|
464
|
+
|
|
465
|
+
// Proxy
|
|
466
|
+
#ifdef ICE_CPP11_MAPPING
|
|
467
|
+
void writeProxy(const ::std::shared_ptr<ObjectPrx>&);
|
|
468
|
+
|
|
469
|
+
template<typename T, typename ::std::enable_if<::std::is_base_of<ObjectPrx, T>::value>::type* = nullptr>
|
|
470
|
+
void write(const ::std::shared_ptr<T>& v)
|
|
471
|
+
{
|
|
472
|
+
writeProxy(::std::static_pointer_cast<ObjectPrx>(v));
|
|
473
|
+
}
|
|
474
|
+
#else
|
|
475
|
+
void write(const ObjectPrx&);
|
|
476
|
+
template<typename T> void write(const IceInternal::ProxyHandle<T>& v)
|
|
477
|
+
{
|
|
478
|
+
write(ObjectPrx(upCast(v.get())));
|
|
479
|
+
}
|
|
480
|
+
#endif
|
|
481
|
+
|
|
482
|
+
// Class
|
|
483
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
|
484
|
+
template<typename T, typename ::std::enable_if<::std::is_base_of<Value, T>::value>::type* = nullptr>
|
|
485
|
+
void write(const ::std::shared_ptr<T>& v)
|
|
486
|
+
{
|
|
487
|
+
initEncaps();
|
|
488
|
+
_currentEncaps->encoder->write(v);
|
|
489
|
+
}
|
|
490
|
+
#else // C++98 mapping
|
|
491
|
+
void write(const ObjectPtr& v)
|
|
492
|
+
{
|
|
493
|
+
initEncaps();
|
|
494
|
+
_currentEncaps->encoder->write(v);
|
|
495
|
+
}
|
|
496
|
+
template<typename T> void write(const IceInternal::Handle<T>& v)
|
|
497
|
+
{
|
|
498
|
+
write(ObjectPtr(upCast(v.get())));
|
|
499
|
+
}
|
|
500
|
+
#endif
|
|
501
|
+
|
|
502
|
+
// Enum
|
|
503
|
+
void writeEnum(Int, Int);
|
|
504
|
+
|
|
505
|
+
// Exception
|
|
506
|
+
void writeException(const UserException&);
|
|
507
|
+
|
|
508
|
+
size_type pos()
|
|
509
|
+
{
|
|
510
|
+
return b.size();
|
|
511
|
+
}
|
|
512
|
+
|
|
513
|
+
void rewrite(Int value, size_type p)
|
|
514
|
+
{
|
|
515
|
+
write(value, b.begin() + p);
|
|
516
|
+
}
|
|
517
|
+
|
|
518
|
+
OutputStream(IceInternal::Instance*, const EncodingVersion&);
|
|
519
|
+
|
|
520
|
+
void initialize(IceInternal::Instance*, const EncodingVersion&);
|
|
521
|
+
|
|
522
|
+
void finished(std::vector<Byte>&);
|
|
523
|
+
std::pair<const Byte*, const Byte*> finished();
|
|
524
|
+
|
|
525
|
+
// Optionals
|
|
526
|
+
bool writeOptImpl(Int, OptionalFormat);
|
|
527
|
+
|
|
528
|
+
private:
|
|
529
|
+
|
|
530
|
+
//
|
|
531
|
+
// String
|
|
532
|
+
//
|
|
533
|
+
void writeConverted(const char*, size_t);
|
|
534
|
+
|
|
535
|
+
//
|
|
536
|
+
// We can't throw this exception from inline functions from within
|
|
537
|
+
// this file, because we cannot include the header with the
|
|
538
|
+
// exceptions. Doing so would screw up the whole include file
|
|
539
|
+
// ordering.
|
|
540
|
+
//
|
|
541
|
+
void throwEncapsulationException(const char*, int);
|
|
542
|
+
|
|
543
|
+
//
|
|
544
|
+
// Optimization. The instance may not be deleted while a
|
|
545
|
+
// stack-allocated stream still holds it.
|
|
546
|
+
//
|
|
547
|
+
IceInternal::Instance* _instance;
|
|
548
|
+
|
|
549
|
+
//
|
|
550
|
+
// The public stream API needs to attach data to a stream.
|
|
551
|
+
//
|
|
552
|
+
void* _closure;
|
|
553
|
+
|
|
554
|
+
class Encaps;
|
|
555
|
+
enum SliceType { NoSlice, ValueSlice, ExceptionSlice };
|
|
556
|
+
|
|
557
|
+
typedef std::vector<ValuePtr> ValueList;
|
|
558
|
+
|
|
559
|
+
class ICE_API EncapsEncoder : private ::IceUtil::noncopyable
|
|
560
|
+
{
|
|
561
|
+
public:
|
|
562
|
+
|
|
563
|
+
virtual ~EncapsEncoder();
|
|
564
|
+
|
|
565
|
+
virtual void write(const ValuePtr&) = 0;
|
|
566
|
+
virtual void write(const UserException&) = 0;
|
|
567
|
+
|
|
568
|
+
virtual void startInstance(SliceType, const SlicedDataPtr&) = 0;
|
|
569
|
+
virtual void endInstance() = 0;
|
|
570
|
+
virtual void startSlice(const std::string&, int, bool) = 0;
|
|
571
|
+
virtual void endSlice() = 0;
|
|
572
|
+
|
|
573
|
+
virtual bool writeOptional(Int, OptionalFormat)
|
|
574
|
+
{
|
|
575
|
+
return false;
|
|
576
|
+
}
|
|
577
|
+
|
|
578
|
+
virtual void writePendingValues()
|
|
579
|
+
{
|
|
580
|
+
}
|
|
581
|
+
|
|
582
|
+
protected:
|
|
583
|
+
|
|
584
|
+
EncapsEncoder(OutputStream* stream, Encaps* encaps) : _stream(stream), _encaps(encaps), _typeIdIndex(0)
|
|
585
|
+
{
|
|
586
|
+
}
|
|
587
|
+
|
|
588
|
+
Int registerTypeId(const std::string&);
|
|
589
|
+
|
|
590
|
+
OutputStream* _stream;
|
|
591
|
+
Encaps* _encaps;
|
|
592
|
+
|
|
593
|
+
typedef std::map<ValuePtr, Int> PtrToIndexMap;
|
|
594
|
+
typedef std::map<std::string, Int> TypeIdMap;
|
|
595
|
+
|
|
596
|
+
// Encapsulation attributes for value marshaling.
|
|
597
|
+
PtrToIndexMap _marshaledMap;
|
|
598
|
+
|
|
599
|
+
private:
|
|
600
|
+
|
|
601
|
+
// Encapsulation attributes for value marshaling.
|
|
602
|
+
TypeIdMap _typeIdMap;
|
|
603
|
+
Int _typeIdIndex;
|
|
604
|
+
};
|
|
605
|
+
|
|
606
|
+
class ICE_API EncapsEncoder10 : public EncapsEncoder
|
|
607
|
+
{
|
|
608
|
+
public:
|
|
609
|
+
|
|
610
|
+
EncapsEncoder10(OutputStream* stream, Encaps* encaps) :
|
|
611
|
+
EncapsEncoder(stream, encaps), _sliceType(NoSlice), _valueIdIndex(0)
|
|
612
|
+
{
|
|
613
|
+
}
|
|
614
|
+
|
|
615
|
+
virtual void write(const ValuePtr&);
|
|
616
|
+
virtual void write(const UserException&);
|
|
617
|
+
|
|
618
|
+
virtual void startInstance(SliceType, const SlicedDataPtr&);
|
|
619
|
+
virtual void endInstance();
|
|
620
|
+
virtual void startSlice(const std::string&, int, bool);
|
|
621
|
+
virtual void endSlice();
|
|
622
|
+
|
|
623
|
+
virtual void writePendingValues();
|
|
624
|
+
|
|
625
|
+
private:
|
|
626
|
+
|
|
627
|
+
Int registerValue(const ValuePtr&);
|
|
628
|
+
|
|
629
|
+
// Instance attributes
|
|
630
|
+
SliceType _sliceType;
|
|
631
|
+
|
|
632
|
+
// Slice attributes
|
|
633
|
+
Container::size_type _writeSlice; // Position of the slice data members
|
|
634
|
+
|
|
635
|
+
// Encapsulation attributes for value marshaling.
|
|
636
|
+
Int _valueIdIndex;
|
|
637
|
+
PtrToIndexMap _toBeMarshaledMap;
|
|
638
|
+
};
|
|
639
|
+
|
|
640
|
+
class ICE_API EncapsEncoder11 : public EncapsEncoder
|
|
641
|
+
{
|
|
642
|
+
public:
|
|
643
|
+
|
|
644
|
+
EncapsEncoder11(OutputStream* stream, Encaps* encaps) :
|
|
645
|
+
EncapsEncoder(stream, encaps), _preAllocatedInstanceData(0), _current(0), _valueIdIndex(1)
|
|
646
|
+
{
|
|
647
|
+
}
|
|
648
|
+
|
|
649
|
+
virtual void write(const ValuePtr&);
|
|
650
|
+
virtual void write(const UserException&);
|
|
651
|
+
|
|
652
|
+
virtual void startInstance(SliceType, const SlicedDataPtr&);
|
|
653
|
+
virtual void endInstance();
|
|
654
|
+
virtual void startSlice(const std::string&, int, bool);
|
|
655
|
+
virtual void endSlice();
|
|
656
|
+
|
|
657
|
+
virtual bool writeOptional(Int, OptionalFormat);
|
|
658
|
+
|
|
659
|
+
private:
|
|
660
|
+
|
|
661
|
+
void writeSlicedData(const SlicedDataPtr&);
|
|
662
|
+
void writeInstance(const ValuePtr&);
|
|
663
|
+
|
|
664
|
+
struct InstanceData
|
|
665
|
+
{
|
|
666
|
+
InstanceData(InstanceData* p) : previous(p), next(0)
|
|
667
|
+
{
|
|
668
|
+
if(previous)
|
|
669
|
+
{
|
|
670
|
+
previous->next = this;
|
|
671
|
+
}
|
|
672
|
+
}
|
|
673
|
+
|
|
674
|
+
~InstanceData()
|
|
675
|
+
{
|
|
676
|
+
if(next)
|
|
677
|
+
{
|
|
678
|
+
delete next;
|
|
679
|
+
}
|
|
680
|
+
}
|
|
681
|
+
|
|
682
|
+
// Instance attributes
|
|
683
|
+
SliceType sliceType;
|
|
684
|
+
bool firstSlice;
|
|
685
|
+
|
|
686
|
+
// Slice attributes
|
|
687
|
+
Byte sliceFlags;
|
|
688
|
+
Container::size_type writeSlice; // Position of the slice data members
|
|
689
|
+
Container::size_type sliceFlagsPos; // Position of the slice flags
|
|
690
|
+
PtrToIndexMap indirectionMap;
|
|
691
|
+
ValueList indirectionTable;
|
|
692
|
+
|
|
693
|
+
InstanceData* previous;
|
|
694
|
+
InstanceData* next;
|
|
695
|
+
};
|
|
696
|
+
InstanceData _preAllocatedInstanceData;
|
|
697
|
+
InstanceData* _current;
|
|
698
|
+
|
|
699
|
+
Int _valueIdIndex; // The ID of the next value to marhsal
|
|
700
|
+
};
|
|
701
|
+
|
|
702
|
+
class Encaps : private ::IceUtil::noncopyable
|
|
703
|
+
{
|
|
704
|
+
|
|
705
|
+
public:
|
|
706
|
+
|
|
707
|
+
Encaps() : format(ICE_ENUM(FormatType, DefaultFormat)), encoder(0), previous(0)
|
|
708
|
+
{
|
|
709
|
+
// Inlined for performance reasons.
|
|
710
|
+
}
|
|
711
|
+
~Encaps()
|
|
712
|
+
{
|
|
713
|
+
// Inlined for performance reasons.
|
|
714
|
+
delete encoder;
|
|
715
|
+
}
|
|
716
|
+
void reset()
|
|
717
|
+
{
|
|
718
|
+
// Inlined for performance reasons.
|
|
719
|
+
delete encoder;
|
|
720
|
+
encoder = 0;
|
|
721
|
+
|
|
722
|
+
previous = 0;
|
|
723
|
+
}
|
|
724
|
+
|
|
725
|
+
Container::size_type start;
|
|
726
|
+
EncodingVersion encoding;
|
|
727
|
+
FormatType format;
|
|
728
|
+
|
|
729
|
+
EncapsEncoder* encoder;
|
|
730
|
+
|
|
731
|
+
Encaps* previous;
|
|
732
|
+
};
|
|
733
|
+
|
|
734
|
+
//
|
|
735
|
+
// The encoding version to use when there's no encapsulation to
|
|
736
|
+
// read from or write to. This is for example used to read message
|
|
737
|
+
// headers or when the user is using the streaming API with no
|
|
738
|
+
// encapsulation.
|
|
739
|
+
//
|
|
740
|
+
EncodingVersion _encoding;
|
|
741
|
+
|
|
742
|
+
FormatType _format;
|
|
743
|
+
|
|
744
|
+
Encaps* _currentEncaps;
|
|
745
|
+
|
|
746
|
+
void initEncaps();
|
|
747
|
+
|
|
748
|
+
Encaps _preAllocatedEncaps;
|
|
749
|
+
};
|
|
750
|
+
|
|
751
|
+
} // End namespace Ice
|
|
752
|
+
|
|
753
|
+
#endif
|