zeroc-ice 3.6.5 → 3.7.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ICE_LICENSE +17 -17
- data/LICENSE +12 -12
- data/bin/slice2rb +1 -6
- data/ext/Communicator.cpp +223 -61
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +23 -7
- data/ext/Connection.cpp +108 -76
- data/ext/Connection.h +4 -6
- data/ext/Endpoint.cpp +16 -54
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -10
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +4 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +38 -54
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +3 -8
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +111 -70
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +5 -20
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +313 -224
- data/ext/Types.h +118 -71
- data/ext/Util.cpp +69 -36
- data/ext/Util.h +117 -42
- data/ext/ValueFactoryManager.cpp +440 -0
- data/ext/ValueFactoryManager.h +95 -0
- data/ext/extconf.rb +52 -48
- data/ext/ice/cpp/include/Ice/Application.h +275 -105
- data/ext/ice/cpp/include/Ice/AsyncResult.h +124 -337
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -7
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +39 -16
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +10 -15
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +56 -17
- data/ext/ice/cpp/include/Ice/Comparable.h +205 -0
- data/ext/ice/cpp/include/Ice/Config.h +16 -39
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +203 -16
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +7 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +23 -0
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +57 -0
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +20 -12
- data/ext/ice/cpp/include/Ice/Dispatcher.h +35 -19
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -10
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +110 -63
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +74 -0
- data/ext/ice/cpp/include/Ice/FactoryTable.h +22 -18
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +28 -31
- data/ext/ice/cpp/include/Ice/Format.h +17 -18
- data/ext/ice/cpp/include/Ice/Functional.h +38 -38
- data/ext/ice/cpp/include/Ice/GCObject.h +9 -10
- data/ext/ice/cpp/include/Ice/Handle.h +6 -16
- data/ext/ice/cpp/include/Ice/Ice.h +9 -10
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +377 -0
- data/ext/ice/cpp/include/Ice/Incoming.h +132 -38
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +109 -31
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +872 -60
- data/ext/ice/cpp/include/Ice/InputStream.h +1514 -0
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -7
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +57 -0
- data/ext/ice/cpp/include/Ice/LocalObject.h +13 -14
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +56 -24
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +124 -71
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +25 -10
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +116 -32
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +61 -30
- data/ext/ice/cpp/include/Ice/Object.h +413 -78
- data/ext/ice/cpp/include/Ice/ObjectF.h +12 -8
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -13
- data/ext/ice/cpp/include/Ice/Optional.h +1114 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +684 -89
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -11
- data/ext/ice/cpp/include/Ice/OutputStream.h +1092 -0
- data/ext/ice/cpp/include/Ice/Protocol.h +49 -17
- data/ext/ice/cpp/include/Ice/Proxy.h +3438 -745
- data/ext/ice/cpp/include/Ice/ProxyF.h +13 -38
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +43 -55
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +84 -12
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -9
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +42 -0
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +273 -154
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +121 -53
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +17 -11
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +453 -140
- data/ext/ice/cpp/include/Ice/StringConverter.h +78 -0
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +19 -0
- data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +22 -28
- data/ext/ice/cpp/include/Ice/UniqueRef.h +97 -0
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +45 -13
- data/ext/ice/cpp/include/Ice/Value.h +139 -0
- data/ext/ice/cpp/include/Ice/ValueF.h +21 -0
- data/ext/ice/cpp/include/IceSSL/Config.h +8 -28
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -11
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +147 -0
- data/ext/ice/cpp/include/IceSSL/Plugin.h +461 -448
- data/ext/ice/cpp/include/IceSSL/SChannel.h +72 -0
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +72 -0
- data/ext/ice/cpp/include/IceSSL/UWP.h +62 -0
- data/ext/ice/cpp/include/IceUtil/Atomic.h +7 -14
- data/ext/ice/cpp/include/IceUtil/Cond.h +17 -23
- data/ext/ice/cpp/include/IceUtil/Config.h +166 -46
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +92 -0
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -10
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +63 -41
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -13
- data/ext/ice/cpp/include/IceUtil/Exception.h +284 -75
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +143 -0
- data/ext/ice/cpp/include/IceUtil/Functional.h +4 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +11 -16
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -15
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -7
- data/ext/ice/cpp/include/IceUtil/Lock.h +8 -15
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -7
- data/ext/ice/cpp/include/IceUtil/Mutex.h +19 -23
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -7
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/Optional.h +134 -23
- data/ext/ice/cpp/include/IceUtil/Options.h +17 -23
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +61 -37
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -11
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +18 -15
- data/ext/ice/cpp/include/IceUtil/Random.h +39 -8
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -13
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +53 -0
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +10 -15
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -7
- data/ext/ice/cpp/include/IceUtil/Shared.h +5 -12
- data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -7
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +146 -126
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -26
- data/ext/ice/cpp/include/IceUtil/Thread.h +10 -17
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -47
- data/ext/ice/cpp/include/IceUtil/Time.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Timer.h +18 -18
- data/ext/ice/cpp/include/IceUtil/UUID.h +6 -7
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +170 -0
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +1156 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Connection.h +1660 -0
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +119 -0
- data/ext/ice/cpp/include/generated/Ice/Current.h +322 -0
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +943 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +166 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +118 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +31 -15
- data/ext/ice/cpp/include/generated/Ice/Identity.h +264 -0
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +278 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +1143 -0
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +128 -0
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +7041 -0
- data/ext/ice/cpp/include/generated/Ice/Locator.h +3850 -0
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +147 -0
- data/ext/ice/cpp/include/generated/Ice/Logger.h +231 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +4717 -0
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1175 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +197 -0
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +306 -0
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +110 -0
- data/ext/ice/cpp/include/generated/Ice/Process.h +971 -0
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/Properties.h +446 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +1360 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +134 -0
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2689 -0
- data/ext/ice/cpp/include/generated/Ice/Router.h +1838 -0
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +299 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +51 -16
- data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +34 -14
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +318 -0
- data/ext/ice/cpp/include/generated/Ice/Version.h +357 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +223 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +101 -0
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +181 -0
- data/ext/ice/cpp/src/Ice/ACM.cpp +38 -27
- data/ext/ice/cpp/src/Ice/ACM.h +9 -7
- data/ext/ice/cpp/src/Ice/ACMF.h +30 -0
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +4 -8
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +59 -0
- data/ext/ice/cpp/src/Ice/ArgVector.h +36 -0
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -544
- data/ext/ice/cpp/src/Ice/Base64.cpp +22 -28
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +41 -18
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -15
- data/ext/ice/cpp/src/Ice/Buffer.cpp +75 -18
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +21 -12
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +86 -197
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -23
- data/ext/ice/cpp/src/Ice/Communicator.cpp +43 -15
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +318 -117
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +95 -40
- data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +55 -122
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +15 -31
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -7
- data/ext/ice/cpp/src/Ice/Connection.cpp +111 -20
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +300 -107
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +44 -28
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +30 -0
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +785 -713
- data/ext/ice/cpp/src/Ice/ConnectionI.h +105 -80
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -20
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +5 -9
- data/ext/ice/cpp/src/Ice/Connector.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Connector.h +4 -8
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -9
- data/ext/ice/cpp/src/Ice/Current.cpp +30 -12
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +10 -16
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +13 -25
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +34 -28
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +107 -19
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -11
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +41 -36
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -9
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +18 -7
- data/ext/ice/cpp/src/Ice/EndpointI.h +39 -18
- data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -10
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +19 -12
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -9
- data/ext/ice/cpp/src/Ice/EventHandler.h +13 -13
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -7
- data/ext/ice/cpp/src/Ice/Exception.cpp +102 -98
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +21 -12
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -33
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -9
- data/ext/ice/cpp/src/Ice/GCObject.cpp +29 -31
- data/ext/ice/cpp/src/Ice/HashUtil.h +3 -9
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -7
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +128 -111
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +23 -19
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -7
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +51 -0
- data/ext/ice/cpp/src/Ice/Identity.cpp +25 -16
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +11 -28
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -10
- data/ext/ice/cpp/src/Ice/Incoming.cpp +284 -255
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -214
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -9
- data/ext/ice/cpp/src/Ice/Initialize.cpp +309 -193
- data/ext/ice/cpp/src/Ice/InputStream.cpp +2726 -0
- data/ext/ice/cpp/src/Ice/Instance.cpp +243 -262
- data/ext/ice/cpp/src/Ice/Instance.h +30 -23
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +137 -23
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +118 -105
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -36
- data/ext/ice/cpp/src/Ice/LocalException.cpp +1191 -422
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Locator.cpp +1282 -1222
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +150 -186
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +31 -36
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +39 -12
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +182 -88
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -9
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +26 -55
- data/ext/ice/cpp/src/Ice/LoggerI.h +7 -18
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -17
- data/ext/ice/cpp/src/Ice/Metrics.cpp +1280 -1107
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +58 -33
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Network.cpp +753 -408
- data/ext/ice/cpp/src/Ice/Network.h +99 -36
- data/ext/ice/cpp/src/Ice/NetworkF.h +2 -7
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +20 -19
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -7
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
- data/ext/ice/cpp/src/Ice/Object.cpp +227 -232
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +45 -13
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +83 -33
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -12
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +25 -0
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +298 -191
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +44 -39
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -37
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +67 -67
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +15 -11
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +801 -366
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1367 -0
- data/ext/ice/cpp/src/Ice/Plugin.cpp +52 -14
- data/ext/ice/cpp/src/Ice/PluginF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +27 -51
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +7 -13
- data/ext/ice/cpp/src/Ice/Process.cpp +294 -128
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/Properties.cpp +42 -15
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +382 -340
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +83 -24
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -10
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +46 -57
- data/ext/ice/cpp/src/Ice/PropertiesI.h +18 -26
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +112 -19
- data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +6 -19
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -7
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -25
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +729 -957
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +33 -38
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -16
- data/ext/ice/cpp/src/Ice/Reference.cpp +190 -106
- data/ext/ice/cpp/src/Ice/Reference.h +39 -28
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +69 -118
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -17
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +19 -9
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +766 -565
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -8
- data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -18
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -11
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -7
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -11
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -12
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +12 -20
- data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -11
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
- data/ext/ice/cpp/src/Ice/Router.cpp +614 -492
- data/ext/ice/cpp/src/Ice/RouterF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +93 -99
- data/ext/ice/cpp/src/Ice/RouterInfo.h +42 -38
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +23 -28
- data/ext/ice/cpp/src/Ice/Selector.cpp +948 -855
- data/ext/ice/cpp/src/Ice/Selector.h +100 -152
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +24 -45
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +2 -7
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +21 -12
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -7
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -25
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +208 -76
- data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -9
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +57 -22
- data/ext/ice/cpp/src/Ice/StringUtil.h +30 -0
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +6 -7
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -8
- data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
- data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +169 -49
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -10
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -12
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +51 -46
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +12 -14
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +17 -32
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -15
- data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +41 -54
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +242 -274
- data/ext/ice/cpp/src/Ice/ThreadPool.h +46 -48
- data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +38 -26
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -7
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -7
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -36
- data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -11
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Transceiver.h +8 -12
- data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +5 -13
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +118 -60
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +13 -10
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +177 -236
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -22
- data/ext/ice/cpp/src/Ice/Value.cpp +76 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +83 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +61 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +37 -0
- data/ext/ice/cpp/src/Ice/Version.cpp +25 -20
- data/ext/ice/cpp/src/Ice/VirtualShared.h +38 -0
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -14
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -12
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -16
- data/ext/ice/cpp/src/Ice/WSConnector.h +3 -11
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +188 -89
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +22 -37
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +65 -66
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -27
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +596 -281
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1383 -543
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +89 -32
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -28
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -66
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -41
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -64
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -8
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +450 -172
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +863 -406
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +47 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +636 -144
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +20 -173
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -22
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +279 -0
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +64 -0
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +42 -17
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +61 -0
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +15 -64
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -18
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +207 -204
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +43 -40
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +42 -16
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -11
- data/ext/ice/cpp/src/IceSSL/Instance.h +7 -12
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -12
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +583 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +134 -115
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +27 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +127 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +477 -182
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +32 -26
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +286 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +58 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -46
- data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -23
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -60
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -12
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +580 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +523 -74
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +123 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +31 -0
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +73 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +187 -221
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +24 -26
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +97 -94
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +26 -192
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -24
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +868 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +69 -201
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +29 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +75 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +174 -161
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +29 -33
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +864 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +45 -0
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +12 -22
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -9
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -8
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +266 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +338 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +41 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +26 -0
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +89 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +383 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +71 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +71 -1260
- data/ext/ice/cpp/src/IceSSL/Util.h +48 -142
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +157 -0
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -27
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -31
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +22 -36
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +30 -126
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Options.cpp +20 -33
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +47 -21
- data/ext/ice/cpp/src/IceUtil/Random.cpp +15 -20
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +4 -19
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -8
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -269
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +582 -244
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -79
- data/ext/ice/cpp/src/IceUtil/Time.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +17 -22
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +97 -101
- data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -40
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +839 -0
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +894 -234
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +72 -0
- data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -7
- data/ext/ice/cpp/src/Slice/Checksum.h +21 -0
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -83
- data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -14
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1981 -1944
- data/ext/ice/cpp/src/Slice/Grammar.h +39 -19
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -20
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2752 -1948
- data/ext/ice/cpp/src/Slice/JavaUtil.h +398 -0
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
- data/ext/ice/cpp/src/Slice/MD5.h +1 -6
- data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -1
- data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +17 -20
- data/ext/ice/cpp/src/Slice/PHPUtil.h +36 -0
- data/ext/ice/cpp/src/Slice/Parser.cpp +1190 -426
- data/ext/ice/cpp/{include → src}/Slice/Parser.h +143 -91
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +67 -36
- data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +8 -18
- data/ext/ice/cpp/src/Slice/Python.cpp +218 -111
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +787 -699
- data/ext/ice/cpp/src/Slice/PythonUtil.h +70 -0
- data/ext/ice/cpp/src/Slice/Ruby.cpp +42 -43
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +175 -445
- data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -11
- data/ext/ice/cpp/src/Slice/Scanner.cpp +390 -399
- data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +36 -69
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +456 -0
- data/ext/ice/cpp/src/Slice/Util.h +50 -0
- data/ice.gemspec +2 -9
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +6 -50
- data/lib/Glacier2/PermissionsVerifier.rb +23 -99
- data/lib/Glacier2/PermissionsVerifierF.rb +2 -7
- data/lib/Glacier2/Router.rb +31 -78
- data/lib/Glacier2/RouterF.rb +2 -7
- data/lib/Glacier2/SSLInfo.rb +3 -11
- data/lib/Glacier2/Session.rb +87 -311
- data/lib/Ice.rb +84 -58
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +54 -61
- data/lib/Ice/CommunicatorF.rb +2 -7
- data/lib/Ice/Connection.rb +152 -166
- data/lib/Ice/ConnectionF.rb +2 -7
- data/lib/Ice/Current.rb +3 -15
- data/lib/Ice/Endpoint.rb +56 -137
- data/lib/Ice/EndpointF.rb +2 -7
- data/lib/Ice/EndpointTypes.rb +2 -11
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +4 -12
- data/lib/Ice/ImplicitContext.rb +4 -38
- data/lib/Ice/ImplicitContextF.rb +2 -7
- data/lib/Ice/Instrumentation.rb +22 -279
- data/lib/Ice/InstrumentationF.rb +2 -7
- data/lib/Ice/LocalException.rb +94 -145
- data/lib/Ice/Locator.rb +50 -169
- data/lib/Ice/LocatorF.rb +2 -7
- data/lib/Ice/Logger.rb +4 -38
- data/lib/Ice/LoggerF.rb +2 -7
- data/lib/Ice/Metrics.rb +60 -420
- data/lib/Ice/ObjectAdapter.rb +29 -0
- data/lib/Ice/ObjectAdapterF.rb +2 -7
- data/lib/Ice/ObjectFactory.rb +4 -34
- data/lib/Ice/Plugin.rb +6 -64
- data/lib/Ice/PluginF.rb +2 -7
- data/lib/Ice/Process.rb +15 -56
- data/lib/Ice/ProcessF.rb +2 -7
- data/lib/Ice/Properties.rb +4 -45
- data/lib/Ice/PropertiesAdmin.rb +18 -60
- data/lib/Ice/PropertiesF.rb +2 -7
- data/lib/Ice/RemoteLogger.rb +33 -119
- data/lib/Ice/Router.rb +28 -105
- data/lib/Ice/RouterF.rb +2 -7
- data/lib/Ice/ServantLocator.rb +26 -0
- data/lib/Ice/ServantLocatorF.rb +24 -0
- data/lib/Ice/SliceChecksumDict.rb +2 -7
- data/lib/Ice/ValueFactory.rb +28 -0
- data/lib/Ice/Version.rb +4 -15
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +43 -152
- data/lib/IceGrid.rb +1 -9
- data/lib/IceGrid/Admin.rb +550 -431
- data/lib/IceGrid/Descriptor.rb +61 -533
- data/lib/IceGrid/Exception.rb +23 -49
- data/lib/IceGrid/FileParser.rb +13 -54
- data/lib/IceGrid/PluginFacade.rb +35 -0
- data/lib/IceGrid/Registry.rb +150 -62
- data/lib/IceGrid/Session.rb +24 -68
- data/lib/IceGrid/UserAccountMapper.rb +13 -54
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +4 -15
- data/lib/IcePatch2/FileServer.rb +32 -80
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +78 -210
- data/lib/IceStorm/Metrics.rb +10 -93
- data/slice/Glacier2/Metrics.ice +20 -10
- data/slice/Glacier2/PermissionsVerifier.ice +19 -12
- data/slice/Glacier2/PermissionsVerifierF.ice +16 -9
- data/slice/Glacier2/Router.ice +19 -13
- data/slice/Glacier2/RouterF.ice +16 -9
- data/slice/Glacier2/SSLInfo.ice +17 -10
- data/slice/Glacier2/Session.ice +24 -18
- data/slice/Ice/BuiltinSequences.ice +18 -9
- data/slice/Ice/Communicator.ice +180 -64
- data/slice/Ice/CommunicatorF.ice +18 -9
- data/slice/Ice/Connection.ice +208 -75
- data/slice/Ice/ConnectionF.ice +18 -9
- data/slice/Ice/Current.ice +37 -28
- data/slice/Ice/Endpoint.ice +73 -21
- data/slice/Ice/EndpointF.ice +19 -10
- data/slice/Ice/EndpointTypes.ice +21 -13
- data/slice/Ice/FacetMap.ice +19 -10
- data/slice/Ice/Identity.ice +24 -10
- data/slice/Ice/ImplicitContext.ice +41 -33
- data/slice/Ice/ImplicitContextF.ice +17 -9
- data/slice/Ice/Instrumentation.ice +37 -30
- data/slice/Ice/InstrumentationF.ice +19 -10
- data/slice/Ice/LocalException.ice +118 -112
- data/slice/Ice/Locator.ice +28 -21
- data/slice/Ice/LocatorF.ice +18 -9
- data/slice/Ice/Logger.ice +26 -18
- data/slice/Ice/LoggerF.ice +18 -9
- data/slice/Ice/Metrics.ice +42 -30
- data/slice/Ice/ObjectAdapter.ice +88 -53
- data/slice/Ice/ObjectAdapterF.ice +18 -9
- data/slice/Ice/ObjectFactory.ice +28 -17
- data/slice/Ice/Plugin.ice +25 -13
- data/slice/Ice/PluginF.ice +22 -9
- data/slice/Ice/Process.ice +20 -11
- data/slice/Ice/ProcessF.ice +18 -9
- data/slice/Ice/Properties.ice +42 -28
- data/slice/Ice/PropertiesAdmin.ice +20 -10
- data/slice/Ice/PropertiesF.ice +18 -9
- data/slice/Ice/RemoteLogger.ice +23 -19
- data/slice/Ice/Router.ice +28 -13
- data/slice/Ice/RouterF.ice +18 -9
- data/slice/Ice/ServantLocator.ice +40 -29
- data/slice/Ice/ServantLocatorF.ice +18 -9
- data/slice/Ice/SliceChecksumDict.ice +18 -9
- data/slice/Ice/ValueFactory.ice +132 -0
- data/slice/Ice/Version.ice +20 -10
- data/slice/IceBT/ConnectionInfo.ice +58 -0
- data/slice/IceBT/EndpointInfo.ice +56 -0
- data/slice/IceBT/Types.ice +44 -0
- data/slice/IceBox/IceBox.ice +45 -27
- data/slice/IceDiscovery/IceDiscovery.ice +75 -10
- data/slice/IceGrid/Admin.ice +410 -44
- data/slice/IceGrid/Descriptor.ice +47 -34
- data/slice/IceGrid/Exception.ice +43 -32
- data/slice/IceGrid/FileParser.ice +21 -12
- data/slice/IceGrid/PluginFacade.ice +26 -18
- data/slice/IceGrid/Registry.ice +150 -21
- data/slice/IceGrid/Session.ice +25 -17
- data/slice/IceGrid/UserAccountMapper.ice +23 -14
- data/slice/IceIAP/ConnectionInfo.ice +73 -0
- data/slice/IceIAP/EndpointInfo.ice +67 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +19 -12
- data/slice/IcePatch2/FileInfo.ice +19 -13
- data/slice/IcePatch2/FileServer.ice +27 -18
- data/slice/IceSSL/ConnectionInfo.ice +27 -23
- data/slice/IceSSL/ConnectionInfoF.ice +30 -0
- data/slice/IceSSL/EndpointInfo.ice +21 -36
- data/slice/IceStorm/IceStorm.ice +33 -24
- data/slice/IceStorm/Metrics.ice +19 -11
- metadata +148 -120
- data/ext/ObjectFactory.cpp +0 -140
- data/ext/ObjectFactory.h +0 -50
- data/ext/ice/cpp/include/Ice/ACMF.h +0 -30
- data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
- data/ext/ice/cpp/include/Ice/BuiltinSequences.h +0 -82
- data/ext/ice/cpp/include/Ice/Communicator.h +0 -200
- data/ext/ice/cpp/include/Ice/Connection.h +0 -497
- data/ext/ice/cpp/include/Ice/ConnectionF.h +0 -74
- data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +0 -30
- data/ext/ice/cpp/include/Ice/Current.h +0 -102
- data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +0 -48
- data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +0 -62
- data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
- data/ext/ice/cpp/include/Ice/EndpointF.h +0 -93
- data/ext/ice/cpp/include/Ice/EndpointTypes.h +0 -82
- data/ext/ice/cpp/include/Ice/Identity.h +0 -168
- data/ext/ice/cpp/include/Ice/ImplicitContext.h +0 -102
- data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
- data/ext/ice/cpp/include/Ice/InstrumentationF.h +0 -75
- data/ext/ice/cpp/include/Ice/LocalException.h +0 -1030
- data/ext/ice/cpp/include/Ice/Locator.h +0 -2193
- data/ext/ice/cpp/include/Ice/LocatorF.h +0 -93
- data/ext/ice/cpp/include/Ice/Logger.h +0 -100
- data/ext/ice/cpp/include/Ice/Metrics.h +0 -2974
- data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
- data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.h +0 -26
- data/ext/ice/cpp/include/Ice/ObjectFactory.h +0 -92
- data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +0 -66
- data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.h +0 -26
- data/ext/ice/cpp/include/Ice/Outgoing.h +0 -225
- data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
- data/ext/ice/cpp/include/Ice/PluginF.h +0 -70
- data/ext/ice/cpp/include/Ice/Process.h +0 -574
- data/ext/ice/cpp/include/Ice/ProcessF.h +0 -83
- data/ext/ice/cpp/include/Ice/Properties.h +0 -136
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
- data/ext/ice/cpp/include/Ice/PropertiesF.h +0 -87
- data/ext/ice/cpp/include/Ice/RemoteLogger.h +0 -1500
- data/ext/ice/cpp/include/Ice/Router.h +0 -1159
- data/ext/ice/cpp/include/Ice/RouterF.h +0 -83
- data/ext/ice/cpp/include/Ice/ServantLocator.h +0 -96
- data/ext/ice/cpp/include/Ice/Stream.h +0 -447
- data/ext/ice/cpp/include/Ice/StreamF.h +0 -30
- data/ext/ice/cpp/include/Ice/Version.h +0 -262
- data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +0 -158
- data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +0 -142
- data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +0 -119
- data/ext/ice/cpp/include/IceUtil/Cache.h +0 -362
- data/ext/ice/cpp/include/IceUtil/IconvStringConverter.h +0 -302
- data/ext/ice/cpp/include/IceUtil/SHA1.h +0 -47
- data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +0 -65
- data/ext/ice/cpp/include/Slice/Checksum.h +0 -26
- data/ext/ice/cpp/include/Slice/CsUtil.h +0 -92
- data/ext/ice/cpp/include/Slice/DotNetNames.h +0 -34
- data/ext/ice/cpp/include/Slice/JavaUtil.h +0 -279
- data/ext/ice/cpp/include/Slice/ObjCUtil.h +0 -127
- data/ext/ice/cpp/include/Slice/PHPUtil.h +0 -50
- data/ext/ice/cpp/include/Slice/PythonUtil.h +0 -64
- data/ext/ice/cpp/include/Slice/Util.h +0 -56
- data/ext/ice/cpp/src/Ice/BasicStream.cpp +0 -3428
- data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +0 -62
- data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +0 -44
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +0 -139
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +0 -43
- data/ext/ice/cpp/src/Ice/Outgoing.cpp +0 -694
- data/ext/ice/cpp/src/Ice/Stream.cpp +0 -53
- data/ext/ice/cpp/src/Ice/StreamI.cpp +0 -832
- data/ext/ice/cpp/src/Ice/StreamI.h +0 -198
- data/ext/ice/cpp/src/IceSSL/Certificate.cpp +0 -1336
- data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +0 -64
- data/ext/ice/cpp/src/IceUtil/ArgVector.h +0 -41
- data/ext/ice/cpp/src/IceUtil/Exception.cpp +0 -792
- data/ext/ice/cpp/src/IceUtil/FileUtil.h +0 -185
- data/ext/ice/cpp/src/Slice/CsUtil.cpp +0 -2660
- data/ext/ice/cpp/src/Slice/DotNetNames.cpp +0 -146
- data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +0 -1310
- data/lib/Ice/ObjectFactoryF.rb +0 -29
- data/lib/IceGrid/Locator.rb +0 -106
- data/lib/IceGrid/Observer.rb +0 -572
- data/lib/IceGrid/Query.rb +0 -169
- data/slice/Freeze/BackgroundSaveEvictor.ice +0 -111
- data/slice/Freeze/CatalogData.ice +0 -49
- data/slice/Freeze/Connection.ice +0 -121
- data/slice/Freeze/ConnectionF.ice +0 -20
- data/slice/Freeze/DB.ice +0 -37
- data/slice/Freeze/Evictor.ice +0 -346
- data/slice/Freeze/EvictorF.ice +0 -22
- data/slice/Freeze/EvictorStorage.ice +0 -72
- data/slice/Freeze/Exception.ice +0 -100
- data/slice/Freeze/Transaction.ice +0 -58
- data/slice/Freeze/TransactionalEvictor.ice +0 -50
- data/slice/Ice/ObjectFactoryF.ice +0 -21
- data/slice/IceGrid/Locator.ice +0 -57
- data/slice/IceGrid/Observer.ice +0 -395
- data/slice/IceGrid/Query.ice +0 -131
@@ -0,0 +1,1514 @@
|
|
1
|
+
//
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
|
+
//
|
4
|
+
|
5
|
+
#ifndef ICE_INPUT_STREAM_H
|
6
|
+
#define ICE_INPUT_STREAM_H
|
7
|
+
|
8
|
+
#include <Ice/CommunicatorF.h>
|
9
|
+
#include <Ice/InstanceF.h>
|
10
|
+
#include <Ice/Object.h>
|
11
|
+
#include <Ice/ValueF.h>
|
12
|
+
#include <Ice/ProxyF.h>
|
13
|
+
#include <Ice/LoggerF.h>
|
14
|
+
#include <Ice/ValueFactory.h>
|
15
|
+
#include <Ice/Buffer.h>
|
16
|
+
#include <Ice/Protocol.h>
|
17
|
+
#include <Ice/SlicedDataF.h>
|
18
|
+
#include <Ice/UserExceptionFactory.h>
|
19
|
+
#include <Ice/StreamHelpers.h>
|
20
|
+
#include <Ice/FactoryTable.h>
|
21
|
+
|
22
|
+
namespace Ice
|
23
|
+
{
|
24
|
+
|
25
|
+
class UserException;
|
26
|
+
|
27
|
+
/// \cond INTERNAL
|
28
|
+
template<typename T> inline void
|
29
|
+
patchHandle(void* addr, const ValuePtr& v)
|
30
|
+
{
|
31
|
+
#ifdef ICE_CPP11_MAPPING
|
32
|
+
::std::shared_ptr<T>* handle = static_cast<::std::shared_ptr<T>*>(addr);
|
33
|
+
*handle = ::std::dynamic_pointer_cast<T>(v);
|
34
|
+
if(v && !(*handle))
|
35
|
+
{
|
36
|
+
IceInternal::Ex::throwUOE(T::ice_staticId(), v);
|
37
|
+
}
|
38
|
+
#else
|
39
|
+
IceInternal::Handle<T>* p = static_cast<IceInternal::Handle<T>*>(addr);
|
40
|
+
_icePatchObjectPtr(*p, v); // Generated _icePatchObjectPtr function, necessary for forward declarations.
|
41
|
+
#endif
|
42
|
+
}
|
43
|
+
/// \endcond
|
44
|
+
|
45
|
+
/**
|
46
|
+
* Interface for input streams used to extract Slice types from a sequence of bytes.
|
47
|
+
* \headerfile Ice/Ice.h
|
48
|
+
*/
|
49
|
+
class ICE_API InputStream : public IceInternal::Buffer
|
50
|
+
{
|
51
|
+
public:
|
52
|
+
|
53
|
+
typedef size_t size_type;
|
54
|
+
|
55
|
+
/**
|
56
|
+
* Signature for a patch function, used to receive an unmarshaled value.
|
57
|
+
* @param addr The target address.
|
58
|
+
* @param v The unmarshaled value.
|
59
|
+
*/
|
60
|
+
typedef void (*PatchFunc)(void* addr, const ValuePtr& v);
|
61
|
+
|
62
|
+
/**
|
63
|
+
* Constructs a stream using the latest encoding version but without a communicator.
|
64
|
+
* This stream will not be able to unmarshal a proxy. For other unmarshaling tasks,
|
65
|
+
* you can provide Helpers for objects that are normally provided by a communicator.
|
66
|
+
* You can supply a communicator later by calling initialize().
|
67
|
+
*/
|
68
|
+
InputStream();
|
69
|
+
|
70
|
+
/**
|
71
|
+
* Constructs a stream using the latest encoding version but without a communicator.
|
72
|
+
* This stream will not be able to unmarshal a proxy. For other unmarshaling tasks,
|
73
|
+
* you can provide Helpers for objects that are normally provided by a communicator.
|
74
|
+
* You can supply a communicator later by calling initialize().
|
75
|
+
* @param bytes The encoded data.
|
76
|
+
*/
|
77
|
+
InputStream(const std::vector<Byte>& bytes);
|
78
|
+
|
79
|
+
/**
|
80
|
+
* Constructs a stream using the latest encoding version but without a communicator.
|
81
|
+
* This stream will not be able to unmarshal a proxy. For other unmarshaling tasks,
|
82
|
+
* you can provide Helpers for objects that are normally provided by a communicator.
|
83
|
+
* You can supply a communicator later by calling initialize().
|
84
|
+
* @param bytes The encoded data.
|
85
|
+
*/
|
86
|
+
InputStream(const std::pair<const Byte*, const Byte*>& bytes);
|
87
|
+
|
88
|
+
/// \cond INTERNAL
|
89
|
+
InputStream(IceInternal::Buffer&, bool = false);
|
90
|
+
/// \endcond
|
91
|
+
|
92
|
+
/**
|
93
|
+
* Constructs a stream using the communicator's default encoding version.
|
94
|
+
* @param communicator The communicator to use for unmarshaling tasks.
|
95
|
+
*/
|
96
|
+
InputStream(const CommunicatorPtr& communicator);
|
97
|
+
|
98
|
+
/**
|
99
|
+
* Constructs a stream using the communicator's default encoding version.
|
100
|
+
* @param communicator The communicator to use for unmarshaling tasks.
|
101
|
+
* @param bytes The encoded data.
|
102
|
+
*/
|
103
|
+
InputStream(const CommunicatorPtr& communicator, const std::vector<Byte>& bytes);
|
104
|
+
|
105
|
+
/**
|
106
|
+
* Constructs a stream using the communicator's default encoding version.
|
107
|
+
* @param communicator The communicator to use for unmarshaling tasks.
|
108
|
+
* @param bytes The encoded data.
|
109
|
+
*/
|
110
|
+
InputStream(const CommunicatorPtr& communicator, const std::pair<const Byte*, const Byte*>& bytes);
|
111
|
+
|
112
|
+
/// \cond INTERNAL
|
113
|
+
InputStream(const CommunicatorPtr& communicator, IceInternal::Buffer&, bool = false);
|
114
|
+
/// \endcond
|
115
|
+
|
116
|
+
/**
|
117
|
+
* Constructs a stream using the given encoding version but without a communicator.
|
118
|
+
* This stream will not be able to unmarshal a proxy. For other unmarshaling tasks,
|
119
|
+
* you can provide Helpers for objects that are normally provided by a communicator.
|
120
|
+
* You can supply a communicator later by calling initialize().
|
121
|
+
* @param version The encoding version used to encode the data to be unmarshaled.
|
122
|
+
*/
|
123
|
+
InputStream(const EncodingVersion& version);
|
124
|
+
|
125
|
+
/**
|
126
|
+
* Constructs a stream using the given encoding version but without a communicator.
|
127
|
+
* This stream will not be able to unmarshal a proxy. For other unmarshaling tasks,
|
128
|
+
* you can provide Helpers for objects that are normally provided by a communicator.
|
129
|
+
* You can supply a communicator later by calling initialize().
|
130
|
+
* @param version The encoding version used to encode the data to be unmarshaled.
|
131
|
+
* @param bytes The encoded data.
|
132
|
+
*/
|
133
|
+
InputStream(const EncodingVersion& version, const std::vector<Byte>& bytes);
|
134
|
+
|
135
|
+
/**
|
136
|
+
* Constructs a stream using the given encoding version but without a communicator.
|
137
|
+
* This stream will not be able to unmarshal a proxy. For other unmarshaling tasks,
|
138
|
+
* you can provide Helpers for objects that are normally provided by a communicator.
|
139
|
+
* You can supply a communicator later by calling initialize().
|
140
|
+
* @param version The encoding version used to encode the data to be unmarshaled.
|
141
|
+
* @param bytes The encoded data.
|
142
|
+
*/
|
143
|
+
InputStream(const EncodingVersion& version, const std::pair<const Byte*, const Byte*>& bytes);
|
144
|
+
|
145
|
+
/// \cond INTERNAL
|
146
|
+
InputStream(const EncodingVersion&, IceInternal::Buffer&, bool = false);
|
147
|
+
/// \endcond
|
148
|
+
|
149
|
+
/**
|
150
|
+
* Constructs a stream using the given communicator and encoding version.
|
151
|
+
* @param communicator The communicator to use for unmarshaling tasks.
|
152
|
+
* @param version The encoding version used to encode the data to be unmarshaled.
|
153
|
+
*/
|
154
|
+
InputStream(const CommunicatorPtr& communicator, const EncodingVersion& version);
|
155
|
+
|
156
|
+
/**
|
157
|
+
* Constructs a stream using the given communicator and encoding version.
|
158
|
+
* @param communicator The communicator to use for unmarshaling tasks.
|
159
|
+
* @param version The encoding version used to encode the data to be unmarshaled.
|
160
|
+
* @param bytes The encoded data.
|
161
|
+
*/
|
162
|
+
InputStream(const CommunicatorPtr& communicator, const EncodingVersion& version, const std::vector<Byte>& bytes);
|
163
|
+
|
164
|
+
/**
|
165
|
+
* Constructs a stream using the given communicator and encoding version.
|
166
|
+
* @param communicator The communicator to use for unmarshaling tasks.
|
167
|
+
* @param version The encoding version used to encode the data to be unmarshaled.
|
168
|
+
* @param bytes The encoded data.
|
169
|
+
*/
|
170
|
+
InputStream(const CommunicatorPtr& communicator, const EncodingVersion& version,
|
171
|
+
const std::pair<const Byte*, const Byte*>& bytes);
|
172
|
+
|
173
|
+
/// \cond INTERNAL
|
174
|
+
InputStream(const CommunicatorPtr&, const EncodingVersion&, IceInternal::Buffer&, bool = false);
|
175
|
+
/// \endcond
|
176
|
+
|
177
|
+
~InputStream()
|
178
|
+
{
|
179
|
+
// Inlined for performance reasons.
|
180
|
+
|
181
|
+
if(_currentEncaps != &_preAllocatedEncaps)
|
182
|
+
{
|
183
|
+
clear(); // Not inlined.
|
184
|
+
}
|
185
|
+
|
186
|
+
#ifdef ICE_CPP11_MAPPING
|
187
|
+
|
188
|
+
for(auto d: _deleters)
|
189
|
+
{
|
190
|
+
d();
|
191
|
+
}
|
192
|
+
#endif
|
193
|
+
}
|
194
|
+
|
195
|
+
/**
|
196
|
+
* Initializes the stream to use the communicator's default encoding version.
|
197
|
+
* Use initialize() if you originally constructed the stream without a communicator.
|
198
|
+
* @param communicator The communicator to use for unmarshaling tasks.
|
199
|
+
*/
|
200
|
+
void initialize(const CommunicatorPtr& communicator);
|
201
|
+
|
202
|
+
/**
|
203
|
+
* Initializes the stream to use the given communicator and encoding version.
|
204
|
+
* Use initialize() if you originally constructed the stream without a communicator.
|
205
|
+
* @param communicator The communicator to use for unmarshaling tasks.
|
206
|
+
* @param version The encoding version used to encode the data to be unmarshaled.
|
207
|
+
*/
|
208
|
+
void initialize(const CommunicatorPtr& communicator, const EncodingVersion& version);
|
209
|
+
|
210
|
+
/**
|
211
|
+
* Releases any data retained by encapsulations.
|
212
|
+
*/
|
213
|
+
void clear();
|
214
|
+
|
215
|
+
/// \cond INTERNAL
|
216
|
+
//
|
217
|
+
// Must return Instance*, because we don't hold an InstancePtr for
|
218
|
+
// optimization reasons (see comments below).
|
219
|
+
//
|
220
|
+
IceInternal::Instance* instance() const { return _instance; } // Inlined for performance reasons.
|
221
|
+
/// \endcond
|
222
|
+
|
223
|
+
/**
|
224
|
+
* Sets the value factory manager to use when unmarshaling value instances. If the stream
|
225
|
+
* was initialized with a communicator, the communicator's value factory manager will
|
226
|
+
* be used by default.
|
227
|
+
*
|
228
|
+
* @param vfm The value factory manager.
|
229
|
+
*/
|
230
|
+
void setValueFactoryManager(const ValueFactoryManagerPtr& vfm);
|
231
|
+
|
232
|
+
/**
|
233
|
+
* Sets the logger to use when logging trace messages. If the stream
|
234
|
+
* was initialized with a communicator, the communicator's logger will
|
235
|
+
* be used by default.
|
236
|
+
*
|
237
|
+
* @param logger The logger to use for logging trace messages.
|
238
|
+
*/
|
239
|
+
void setLogger(const LoggerPtr& logger);
|
240
|
+
|
241
|
+
/**
|
242
|
+
* Sets the compact ID resolver to use when unmarshaling value and exception
|
243
|
+
* instances. If the stream was initialized with a communicator, the communicator's
|
244
|
+
* resolver will be used by default.
|
245
|
+
*
|
246
|
+
* @param r The compact ID resolver.
|
247
|
+
*/
|
248
|
+
#ifdef ICE_CPP11_MAPPING
|
249
|
+
void setCompactIdResolver(std::function<std::string(int)> r);
|
250
|
+
#else
|
251
|
+
void setCompactIdResolver(const CompactIdResolverPtr& r);
|
252
|
+
#endif
|
253
|
+
|
254
|
+
#ifndef ICE_CPP11_MAPPING
|
255
|
+
/**
|
256
|
+
* Indicates whether to mark instances of Slice classes as collectable. If the stream is
|
257
|
+
* initialized with a communicator, this setting defaults to the value of the
|
258
|
+
* Ice.CollectObjects property, otherwise the setting defaults to false.
|
259
|
+
* @param b True to mark instances as collectable, false otherwise.
|
260
|
+
*/
|
261
|
+
void setCollectObjects(bool b);
|
262
|
+
#endif
|
263
|
+
|
264
|
+
/**
|
265
|
+
* Indicates whether to slice instances of Slice classes to a known Slice type when a more
|
266
|
+
* derived type is unknown. An instance is "sliced" when no static information is available
|
267
|
+
* for a Slice type ID and no factory can be found for that type, resulting in the creation
|
268
|
+
* of an instance of a less-derived type. If slicing is disabled in this situation, the
|
269
|
+
* stream raises the exception NoValueFactoryException. The default behavior is to allow slicing.
|
270
|
+
* @param b True to enable slicing, false otherwise.
|
271
|
+
*/
|
272
|
+
void setSliceValues(bool b);
|
273
|
+
|
274
|
+
/**
|
275
|
+
* Indicates whether to log messages when instances of Slice classes are sliced. If the stream
|
276
|
+
* is initialized with a communicator, this setting defaults to the value of the Ice.Trace.Slicing
|
277
|
+
* property, otherwise the setting defaults to false.
|
278
|
+
* @param b True to enable logging, false otherwise.
|
279
|
+
*/
|
280
|
+
void setTraceSlicing(bool b);
|
281
|
+
|
282
|
+
/**
|
283
|
+
* Sets an upper limit on the depth of a class graph. If this limit is exceeded during
|
284
|
+
* unmarshaling, the stream raises MarshalException.
|
285
|
+
* @param n The maximum depth.
|
286
|
+
*/
|
287
|
+
void setClassGraphDepthMax(size_t n);
|
288
|
+
|
289
|
+
/**
|
290
|
+
* Obtains the closure data associated with this stream.
|
291
|
+
* @return The data as a void pointer.
|
292
|
+
*/
|
293
|
+
void* getClosure() const;
|
294
|
+
|
295
|
+
/**
|
296
|
+
* Associates closure data with this stream.
|
297
|
+
* @param p The data as a void pointer.
|
298
|
+
* @return The previous closure data, or nil.
|
299
|
+
*/
|
300
|
+
void* setClosure(void* p);
|
301
|
+
|
302
|
+
/**
|
303
|
+
* Swaps the contents of one stream with another.
|
304
|
+
*
|
305
|
+
* @param other The other stream.
|
306
|
+
*/
|
307
|
+
void swap(InputStream& other);
|
308
|
+
|
309
|
+
/// \cond INTERNAL
|
310
|
+
void resetEncapsulation();
|
311
|
+
/// \endcond
|
312
|
+
|
313
|
+
/**
|
314
|
+
* Resizes the stream to a new size.
|
315
|
+
*
|
316
|
+
* @param sz The new size.
|
317
|
+
*/
|
318
|
+
void resize(Container::size_type sz)
|
319
|
+
{
|
320
|
+
b.resize(sz);
|
321
|
+
i = b.end();
|
322
|
+
}
|
323
|
+
|
324
|
+
/**
|
325
|
+
* Marks the start of a class instance.
|
326
|
+
*/
|
327
|
+
void startValue()
|
328
|
+
{
|
329
|
+
assert(_currentEncaps && _currentEncaps->decoder);
|
330
|
+
_currentEncaps->decoder->startInstance(ValueSlice);
|
331
|
+
}
|
332
|
+
|
333
|
+
/**
|
334
|
+
* Marks the end of a class instance.
|
335
|
+
*
|
336
|
+
* @param preserve Pass true and the stream will preserve the unknown slices of the instance, or false
|
337
|
+
* to discard the unknown slices.
|
338
|
+
* @return An object that encapsulates the unknown slice data.
|
339
|
+
*/
|
340
|
+
SlicedDataPtr endValue(bool preserve)
|
341
|
+
{
|
342
|
+
assert(_currentEncaps && _currentEncaps->decoder);
|
343
|
+
return _currentEncaps->decoder->endInstance(preserve);
|
344
|
+
}
|
345
|
+
|
346
|
+
/**
|
347
|
+
* Marks the start of a user exception.
|
348
|
+
*/
|
349
|
+
void startException()
|
350
|
+
{
|
351
|
+
assert(_currentEncaps && _currentEncaps->decoder);
|
352
|
+
_currentEncaps->decoder->startInstance(ExceptionSlice);
|
353
|
+
}
|
354
|
+
|
355
|
+
/**
|
356
|
+
* Marks the end of a user exception.
|
357
|
+
*
|
358
|
+
* @param preserve Pass true and the stream will preserve the unknown slices of the exception, or false
|
359
|
+
* to discard the unknown slices.
|
360
|
+
* @return An object that encapsulates the unknown slice data.
|
361
|
+
*/
|
362
|
+
SlicedDataPtr endException(bool preserve)
|
363
|
+
{
|
364
|
+
assert(_currentEncaps && _currentEncaps->decoder);
|
365
|
+
return _currentEncaps->decoder->endInstance(preserve);
|
366
|
+
}
|
367
|
+
|
368
|
+
/**
|
369
|
+
* Reads the start of an encapsulation.
|
370
|
+
*
|
371
|
+
* @return The encoding version used by the encapsulation.
|
372
|
+
*/
|
373
|
+
const EncodingVersion& startEncapsulation()
|
374
|
+
{
|
375
|
+
Encaps* oldEncaps = _currentEncaps;
|
376
|
+
if(!oldEncaps) // First allocated encaps?
|
377
|
+
{
|
378
|
+
_currentEncaps = &_preAllocatedEncaps;
|
379
|
+
}
|
380
|
+
else
|
381
|
+
{
|
382
|
+
_currentEncaps = new Encaps();
|
383
|
+
_currentEncaps->previous = oldEncaps;
|
384
|
+
}
|
385
|
+
_currentEncaps->start = static_cast<size_t>(i - b.begin());
|
386
|
+
|
387
|
+
//
|
388
|
+
// I don't use readSize() and writeSize() for encapsulations,
|
389
|
+
// because when creating an encapsulation, I must know in advance
|
390
|
+
// how many bytes the size information will require in the data
|
391
|
+
// stream. If I use an Int, it is always 4 bytes. For
|
392
|
+
// readSize()/writeSize(), it could be 1 or 5 bytes.
|
393
|
+
//
|
394
|
+
Int sz;
|
395
|
+
read(sz);
|
396
|
+
if(sz < 6)
|
397
|
+
{
|
398
|
+
throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
|
399
|
+
}
|
400
|
+
if(i - sizeof(Int) + sz > b.end())
|
401
|
+
{
|
402
|
+
throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
|
403
|
+
}
|
404
|
+
_currentEncaps->sz = sz;
|
405
|
+
|
406
|
+
read(_currentEncaps->encoding);
|
407
|
+
IceInternal::checkSupportedEncoding(_currentEncaps->encoding); // Make sure the encoding is supported
|
408
|
+
|
409
|
+
return _currentEncaps->encoding;
|
410
|
+
}
|
411
|
+
|
412
|
+
/**
|
413
|
+
* Ends the current encapsulation.
|
414
|
+
*/
|
415
|
+
void endEncapsulation()
|
416
|
+
{
|
417
|
+
assert(_currentEncaps);
|
418
|
+
|
419
|
+
if(_currentEncaps->encoding != Encoding_1_0)
|
420
|
+
{
|
421
|
+
skipOptionals();
|
422
|
+
if(i != b.begin() + _currentEncaps->start + _currentEncaps->sz)
|
423
|
+
{
|
424
|
+
throwEncapsulationException(__FILE__, __LINE__);
|
425
|
+
}
|
426
|
+
}
|
427
|
+
else if(i != b.begin() + _currentEncaps->start + _currentEncaps->sz)
|
428
|
+
{
|
429
|
+
if(i + 1 != b.begin() + _currentEncaps->start + _currentEncaps->sz)
|
430
|
+
{
|
431
|
+
throwEncapsulationException(__FILE__, __LINE__);
|
432
|
+
}
|
433
|
+
|
434
|
+
//
|
435
|
+
// Ice version < 3.3 had a bug where user exceptions with
|
436
|
+
// class members could be encoded with a trailing byte
|
437
|
+
// when dispatched with AMD. So we tolerate an extra byte
|
438
|
+
// in the encapsulation.
|
439
|
+
//
|
440
|
+
++i;
|
441
|
+
}
|
442
|
+
|
443
|
+
Encaps* oldEncaps = _currentEncaps;
|
444
|
+
_currentEncaps = _currentEncaps->previous;
|
445
|
+
if(oldEncaps == &_preAllocatedEncaps)
|
446
|
+
{
|
447
|
+
oldEncaps->reset();
|
448
|
+
}
|
449
|
+
else
|
450
|
+
{
|
451
|
+
delete oldEncaps;
|
452
|
+
}
|
453
|
+
}
|
454
|
+
|
455
|
+
/**
|
456
|
+
* Skips an empty encapsulation.
|
457
|
+
*
|
458
|
+
* @return The encapsulation's encoding version.
|
459
|
+
*/
|
460
|
+
EncodingVersion skipEmptyEncapsulation()
|
461
|
+
{
|
462
|
+
Ice::Int sz;
|
463
|
+
read(sz);
|
464
|
+
if(sz < 6)
|
465
|
+
{
|
466
|
+
throwEncapsulationException(__FILE__, __LINE__);
|
467
|
+
}
|
468
|
+
if(i - sizeof(Ice::Int) + sz > b.end())
|
469
|
+
{
|
470
|
+
throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
|
471
|
+
}
|
472
|
+
Ice::EncodingVersion encoding;
|
473
|
+
read(encoding);
|
474
|
+
IceInternal::checkSupportedEncoding(encoding); // Make sure the encoding is supported
|
475
|
+
|
476
|
+
if(encoding == Ice::Encoding_1_0)
|
477
|
+
{
|
478
|
+
if(sz != static_cast<Ice::Int>(sizeof(Ice::Int)) + 2)
|
479
|
+
{
|
480
|
+
throwEncapsulationException(__FILE__, __LINE__);
|
481
|
+
}
|
482
|
+
}
|
483
|
+
else
|
484
|
+
{
|
485
|
+
// Skip the optional content of the encapsulation if we are expecting an
|
486
|
+
// empty encapsulation.
|
487
|
+
i += static_cast<size_t>(sz) - sizeof(Ice::Int) - 2;
|
488
|
+
}
|
489
|
+
return encoding;
|
490
|
+
}
|
491
|
+
|
492
|
+
/**
|
493
|
+
* Returns a blob of bytes representing an encapsulation.
|
494
|
+
*
|
495
|
+
* @param v A pointer into the internal marshaling buffer representing the start of the encoded encapsulation.
|
496
|
+
* @param sz The number of bytes in the encapsulation.
|
497
|
+
* @return encoding The encapsulation's encoding version.
|
498
|
+
*/
|
499
|
+
EncodingVersion readEncapsulation(const Byte*& v, Int& sz)
|
500
|
+
{
|
501
|
+
EncodingVersion encoding;
|
502
|
+
v = i;
|
503
|
+
read(sz);
|
504
|
+
if(sz < 6)
|
505
|
+
{
|
506
|
+
throwEncapsulationException(__FILE__, __LINE__);
|
507
|
+
}
|
508
|
+
if(i - sizeof(Int) + sz > b.end())
|
509
|
+
{
|
510
|
+
throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
|
511
|
+
}
|
512
|
+
|
513
|
+
read(encoding);
|
514
|
+
i += static_cast<size_t>(sz) - sizeof(Int) - 2;
|
515
|
+
return encoding;
|
516
|
+
}
|
517
|
+
|
518
|
+
/**
|
519
|
+
* Determines the current encoding version.
|
520
|
+
*
|
521
|
+
* @return The encoding version.
|
522
|
+
*/
|
523
|
+
const EncodingVersion& getEncoding() const
|
524
|
+
{
|
525
|
+
return _currentEncaps ? _currentEncaps->encoding : _encoding;
|
526
|
+
}
|
527
|
+
|
528
|
+
/**
|
529
|
+
* Determines the size of the current encapsulation, excluding the encapsulation header.
|
530
|
+
*
|
531
|
+
* @return The size of the encapsulated data.
|
532
|
+
*/
|
533
|
+
Int getEncapsulationSize();
|
534
|
+
|
535
|
+
/**
|
536
|
+
* Skips over an encapsulation.
|
537
|
+
*
|
538
|
+
* @return The encoding version of the skipped encapsulation.
|
539
|
+
*/
|
540
|
+
EncodingVersion skipEncapsulation();
|
541
|
+
|
542
|
+
/**
|
543
|
+
* Reads the start of a value or exception slice.
|
544
|
+
*
|
545
|
+
* @return The Slice type ID for this slice.
|
546
|
+
*/
|
547
|
+
std::string startSlice()
|
548
|
+
{
|
549
|
+
assert(_currentEncaps && _currentEncaps->decoder);
|
550
|
+
return _currentEncaps->decoder->startSlice();
|
551
|
+
}
|
552
|
+
|
553
|
+
/**
|
554
|
+
* Indicates that the end of a value or exception slice has been reached.
|
555
|
+
*/
|
556
|
+
void endSlice()
|
557
|
+
{
|
558
|
+
assert(_currentEncaps && _currentEncaps->decoder);
|
559
|
+
_currentEncaps->decoder->endSlice();
|
560
|
+
}
|
561
|
+
|
562
|
+
/**
|
563
|
+
* Skips over a value or exception slice.
|
564
|
+
*/
|
565
|
+
void skipSlice()
|
566
|
+
{
|
567
|
+
assert(_currentEncaps && _currentEncaps->decoder);
|
568
|
+
_currentEncaps->decoder->skipSlice();
|
569
|
+
}
|
570
|
+
|
571
|
+
/**
|
572
|
+
* Indicates that unmarshaling is complete, except for any class instances. The application must call this method
|
573
|
+
* only if the stream actually contains class instances. Calling readPendingValues triggers the
|
574
|
+
* patch callbacks to inform the application that unmarshaling of an instance is complete.
|
575
|
+
*/
|
576
|
+
void readPendingValues();
|
577
|
+
|
578
|
+
/**
|
579
|
+
* Extracts a size from the stream.
|
580
|
+
*
|
581
|
+
* @return The extracted size.
|
582
|
+
*/
|
583
|
+
Int readSize() // Inlined for performance reasons.
|
584
|
+
{
|
585
|
+
Byte byte;
|
586
|
+
read(byte);
|
587
|
+
unsigned char val = static_cast<unsigned char>(byte);
|
588
|
+
if(val == 255)
|
589
|
+
{
|
590
|
+
Int v;
|
591
|
+
read(v);
|
592
|
+
if(v < 0)
|
593
|
+
{
|
594
|
+
throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
|
595
|
+
}
|
596
|
+
return v;
|
597
|
+
}
|
598
|
+
else
|
599
|
+
{
|
600
|
+
return static_cast<Int>(static_cast<unsigned char>(byte));
|
601
|
+
}
|
602
|
+
}
|
603
|
+
|
604
|
+
/**
|
605
|
+
* Reads and validates a sequence size.
|
606
|
+
*
|
607
|
+
* @param minSize The minimum size required by the sequence type.
|
608
|
+
* @return The extracted size.
|
609
|
+
*/
|
610
|
+
Int readAndCheckSeqSize(int minSize);
|
611
|
+
|
612
|
+
/**
|
613
|
+
* Reads a blob of bytes from the stream.
|
614
|
+
*
|
615
|
+
* @param bytes The vector to hold a copy of the bytes from the marshaling buffer.
|
616
|
+
* @param sz The number of bytes to read.
|
617
|
+
*/
|
618
|
+
void readBlob(std::vector<Byte>& bytes, Int sz);
|
619
|
+
|
620
|
+
/**
|
621
|
+
* Reads a blob of bytes from the stream.
|
622
|
+
*
|
623
|
+
* @param v A pointer into the internal marshaling buffer representing the start of the blob.
|
624
|
+
* @param sz The number of bytes to read.
|
625
|
+
*/
|
626
|
+
void readBlob(const Byte*& v, Container::size_type sz)
|
627
|
+
{
|
628
|
+
if(sz > 0)
|
629
|
+
{
|
630
|
+
v = i;
|
631
|
+
if(static_cast<Container::size_type>(b.end() - i) < sz)
|
632
|
+
{
|
633
|
+
throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
|
634
|
+
}
|
635
|
+
i += sz;
|
636
|
+
}
|
637
|
+
else
|
638
|
+
{
|
639
|
+
v = i;
|
640
|
+
}
|
641
|
+
}
|
642
|
+
|
643
|
+
/**
|
644
|
+
* Reads a data value from the stream.
|
645
|
+
* @param v Holds the extracted data.
|
646
|
+
*/
|
647
|
+
template<typename T> void read(T& v)
|
648
|
+
{
|
649
|
+
StreamHelper<T, StreamableTraits<T>::helper>::read(this, v);
|
650
|
+
}
|
651
|
+
|
652
|
+
/**
|
653
|
+
* Reads an optional data value from the stream.
|
654
|
+
* @param tag The tag ID.
|
655
|
+
* @param v Holds the extracted data (if any).
|
656
|
+
*/
|
657
|
+
template<typename T> void read(Int tag, IceUtil::Optional<T>& v)
|
658
|
+
{
|
659
|
+
if(readOptional(tag, StreamOptionalHelper<T,
|
660
|
+
StreamableTraits<T>::helper,
|
661
|
+
StreamableTraits<T>::fixedLength>::optionalFormat))
|
662
|
+
{
|
663
|
+
#ifdef ICE_CPP11_MAPPING
|
664
|
+
v.emplace();
|
665
|
+
#else
|
666
|
+
v.__setIsSet();
|
667
|
+
#endif
|
668
|
+
StreamOptionalHelper<T,
|
669
|
+
StreamableTraits<T>::helper,
|
670
|
+
StreamableTraits<T>::fixedLength>::read(this, *v);
|
671
|
+
}
|
672
|
+
else
|
673
|
+
{
|
674
|
+
v = IceUtil::None;
|
675
|
+
}
|
676
|
+
}
|
677
|
+
|
678
|
+
#ifdef ICE_CPP11_MAPPING
|
679
|
+
|
680
|
+
/**
|
681
|
+
* Extracts a sequence of data values from the stream.
|
682
|
+
* @param v A pair of pointers representing the beginning and end of the sequence elements.
|
683
|
+
*/
|
684
|
+
template<typename T> void read(std::pair<const T*, const T*>& v)
|
685
|
+
{
|
686
|
+
auto holder = new std::vector<T>;
|
687
|
+
_deleters.push_back([holder] { delete holder; });
|
688
|
+
read(*holder);
|
689
|
+
if(holder->size() > 0)
|
690
|
+
{
|
691
|
+
v.first = holder->data();
|
692
|
+
v.second = holder->data() + holder->size();
|
693
|
+
}
|
694
|
+
else
|
695
|
+
{
|
696
|
+
v.first = 0;
|
697
|
+
v.second = 0;
|
698
|
+
}
|
699
|
+
}
|
700
|
+
|
701
|
+
/**
|
702
|
+
* Reads a list of mandatory data values.
|
703
|
+
*/
|
704
|
+
template<typename T> void readAll(T& v)
|
705
|
+
{
|
706
|
+
read(v);
|
707
|
+
}
|
708
|
+
|
709
|
+
/**
|
710
|
+
* Reads a list of mandatory data values.
|
711
|
+
*/
|
712
|
+
template<typename T, typename... Te> void readAll(T& v, Te&... ve)
|
713
|
+
{
|
714
|
+
read(v);
|
715
|
+
readAll(ve...);
|
716
|
+
}
|
717
|
+
|
718
|
+
/**
|
719
|
+
* Reads a list of optional data values.
|
720
|
+
*/
|
721
|
+
template<typename T>
|
722
|
+
void readAll(std::initializer_list<int> tags, IceUtil::Optional<T>& v)
|
723
|
+
{
|
724
|
+
read(*(tags.begin() + tags.size() - 1), v);
|
725
|
+
}
|
726
|
+
|
727
|
+
/**
|
728
|
+
* Reads a list of optional data values.
|
729
|
+
*/
|
730
|
+
template<typename T, typename... Te>
|
731
|
+
void readAll(std::initializer_list<int> tags, IceUtil::Optional<T>& v, IceUtil::Optional<Te>&... ve)
|
732
|
+
{
|
733
|
+
size_t index = tags.size() - sizeof...(ve) - 1;
|
734
|
+
read(*(tags.begin() + index), v);
|
735
|
+
readAll(tags, ve...);
|
736
|
+
}
|
737
|
+
|
738
|
+
#endif
|
739
|
+
|
740
|
+
/**
|
741
|
+
* Determine if an optional value is available for reading.
|
742
|
+
*
|
743
|
+
* @param tag The tag associated with the value.
|
744
|
+
* @param expectedFormat The optional format for the value.
|
745
|
+
* @return True if the value is present, false otherwise.
|
746
|
+
*/
|
747
|
+
bool readOptional(Int tag, OptionalFormat expectedFormat)
|
748
|
+
{
|
749
|
+
assert(_currentEncaps);
|
750
|
+
if(_currentEncaps->decoder)
|
751
|
+
{
|
752
|
+
return _currentEncaps->decoder->readOptional(tag, expectedFormat);
|
753
|
+
}
|
754
|
+
else
|
755
|
+
{
|
756
|
+
return readOptImpl(tag, expectedFormat);
|
757
|
+
}
|
758
|
+
}
|
759
|
+
|
760
|
+
/**
|
761
|
+
* Reads a byte from the stream.
|
762
|
+
* @param v The extracted byte.
|
763
|
+
*/
|
764
|
+
void read(Byte& v)
|
765
|
+
{
|
766
|
+
if(i >= b.end())
|
767
|
+
{
|
768
|
+
throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
|
769
|
+
}
|
770
|
+
v = *i++;
|
771
|
+
}
|
772
|
+
|
773
|
+
/**
|
774
|
+
* Reads a sequence of bytes from the stream.
|
775
|
+
* @param v A vector to hold a copy of the bytes.
|
776
|
+
*/
|
777
|
+
void read(std::vector<Byte>& v);
|
778
|
+
|
779
|
+
/**
|
780
|
+
* Reads a sequence of bytes from the stream.
|
781
|
+
* @param v A pair of pointers into the internal marshaling buffer representing the start and end of the
|
782
|
+
* sequence elements.
|
783
|
+
*/
|
784
|
+
void read(std::pair<const Byte*, const Byte*>& v);
|
785
|
+
|
786
|
+
#ifndef ICE_CPP11_MAPPING
|
787
|
+
/**
|
788
|
+
* Reads a sequence of bytes from the stream.
|
789
|
+
* @param v A pair of pointers into the internal marshaling buffer representing the start and end of the
|
790
|
+
* sequence elements.
|
791
|
+
* @param arr A scoped array.
|
792
|
+
*/
|
793
|
+
void read(std::pair<const Byte*, const Byte*>& v, ::IceUtil::ScopedArray<Byte>& arr)
|
794
|
+
{
|
795
|
+
arr.reset();
|
796
|
+
read(v);
|
797
|
+
}
|
798
|
+
#endif
|
799
|
+
|
800
|
+
/**
|
801
|
+
* Reads a bool from the stream.
|
802
|
+
* @param v The extracted bool.
|
803
|
+
*/
|
804
|
+
void read(bool& v)
|
805
|
+
{
|
806
|
+
if(i >= b.end())
|
807
|
+
{
|
808
|
+
throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
|
809
|
+
}
|
810
|
+
v = (0 != *i++);
|
811
|
+
}
|
812
|
+
|
813
|
+
/**
|
814
|
+
* Reads a sequence of boolean values from the stream.
|
815
|
+
* @param v A vector to hold a copy of the boolean values.
|
816
|
+
*/
|
817
|
+
void read(std::vector<bool>& v);
|
818
|
+
|
819
|
+
#ifdef ICE_CPP11_MAPPING
|
820
|
+
/**
|
821
|
+
* Reads a sequence of boolean values from the stream.
|
822
|
+
* @param v A pair of pointers into the internal marshaling buffer representing the start and end of the
|
823
|
+
* sequence elements.
|
824
|
+
*/
|
825
|
+
void read(std::pair<const bool*, const bool*>& v);
|
826
|
+
#else
|
827
|
+
/**
|
828
|
+
* Reads a sequence of boolean values from the stream.
|
829
|
+
* @param v A pair of pointers into the internal marshaling buffer representing the start and end of the
|
830
|
+
* sequence elements.
|
831
|
+
* @param arr A scoped array.
|
832
|
+
*/
|
833
|
+
void read(std::pair<const bool*, const bool*>& v, ::IceUtil::ScopedArray<bool>& arr);
|
834
|
+
#endif
|
835
|
+
|
836
|
+
/**
|
837
|
+
* Reads a short from the stream.
|
838
|
+
* @param v The extracted short.
|
839
|
+
*/
|
840
|
+
void read(Short& v);
|
841
|
+
|
842
|
+
/**
|
843
|
+
* Reads a sequence of shorts from the stream.
|
844
|
+
* @param v A vector to hold a copy of the short values.
|
845
|
+
*/
|
846
|
+
void read(std::vector<Short>& v);
|
847
|
+
|
848
|
+
#ifdef ICE_CPP11_MAPPING
|
849
|
+
/**
|
850
|
+
* Reads a sequence of boolean values from the stream.
|
851
|
+
* @param v A pair of pointers representing the start and end of the sequence elements.
|
852
|
+
*/
|
853
|
+
void read(std::pair<const short*, const short*>& v);
|
854
|
+
#else
|
855
|
+
/**
|
856
|
+
* Reads a sequence of shorts from the stream.
|
857
|
+
* @param v A pair of pointers representing the start and end of the sequence elements.
|
858
|
+
* @param arr A scoped array.
|
859
|
+
*/
|
860
|
+
void read(std::pair<const Short*, const Short*>& v, ::IceUtil::ScopedArray<Short>& arr);
|
861
|
+
#endif
|
862
|
+
|
863
|
+
/**
|
864
|
+
* Reads an int from the stream.
|
865
|
+
* @param v The extracted int.
|
866
|
+
*/
|
867
|
+
void read(Int& v) // Inlined for performance reasons.
|
868
|
+
{
|
869
|
+
if(b.end() - i < static_cast<int>(sizeof(Int)))
|
870
|
+
{
|
871
|
+
throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
|
872
|
+
}
|
873
|
+
const Byte* src = &(*i);
|
874
|
+
i += sizeof(Int);
|
875
|
+
#ifdef ICE_BIG_ENDIAN
|
876
|
+
Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Int) - 1;
|
877
|
+
*dest-- = *src++;
|
878
|
+
*dest-- = *src++;
|
879
|
+
*dest-- = *src++;
|
880
|
+
*dest = *src;
|
881
|
+
#else
|
882
|
+
Byte* dest = reinterpret_cast<Byte*>(&v);
|
883
|
+
*dest++ = *src++;
|
884
|
+
*dest++ = *src++;
|
885
|
+
*dest++ = *src++;
|
886
|
+
*dest = *src;
|
887
|
+
#endif
|
888
|
+
}
|
889
|
+
|
890
|
+
/**
|
891
|
+
* Reads a sequence of ints from the stream.
|
892
|
+
* @param v A vector to hold a copy of the int values.
|
893
|
+
*/
|
894
|
+
void read(std::vector<Int>& v);
|
895
|
+
|
896
|
+
#ifdef ICE_CPP11_MAPPING
|
897
|
+
/**
|
898
|
+
* Reads a sequence of ints from the stream.
|
899
|
+
* @param v A pair of pointers representing the start and end of the sequence elements.
|
900
|
+
*/
|
901
|
+
void read(std::pair<const int*, const int*>& v);
|
902
|
+
#else
|
903
|
+
/**
|
904
|
+
* Reads a sequence of ints from the stream.
|
905
|
+
* @param v A pair of pointers representing the start and end of the sequence elements.
|
906
|
+
* @param arr A scoped array.
|
907
|
+
*/
|
908
|
+
void read(std::pair<const Int*, const Int*>& v, ::IceUtil::ScopedArray<Int>& arr);
|
909
|
+
#endif
|
910
|
+
|
911
|
+
/**
|
912
|
+
* Reads a long from the stream.
|
913
|
+
* @param v The extracted long.
|
914
|
+
*/
|
915
|
+
void read(Long& v);
|
916
|
+
|
917
|
+
/**
|
918
|
+
* Reads a sequence of longs from the stream.
|
919
|
+
* @param v A vector to hold a copy of the long values.
|
920
|
+
*/
|
921
|
+
void read(std::vector<Long>& v);
|
922
|
+
|
923
|
+
#ifdef ICE_CPP11_MAPPING
|
924
|
+
/**
|
925
|
+
* Reads a sequence of longs from the stream.
|
926
|
+
* @param v A pair of pointers representing the start and end of the sequence elements.
|
927
|
+
*/
|
928
|
+
void read(std::pair<const long long*, const long long*>& v);
|
929
|
+
#else
|
930
|
+
/**
|
931
|
+
* Reads a sequence of longs from the stream.
|
932
|
+
* @param v A pair of pointers representing the start and end of the sequence elements.
|
933
|
+
* @param arr A scoped array.
|
934
|
+
*/
|
935
|
+
void read(std::pair<const Long*, const Long*>& v, ::IceUtil::ScopedArray<Long>& arr);
|
936
|
+
#endif
|
937
|
+
|
938
|
+
/**
|
939
|
+
* Reads a float from the stream.
|
940
|
+
* @param v The extracted float.
|
941
|
+
*/
|
942
|
+
void read(Float& v);
|
943
|
+
|
944
|
+
/**
|
945
|
+
* Reads a sequence of floats from the stream.
|
946
|
+
* @param v A vector to hold a copy of the float values.
|
947
|
+
*/
|
948
|
+
void read(std::vector<Float>& v);
|
949
|
+
|
950
|
+
#ifdef ICE_CPP11_MAPPING
|
951
|
+
/**
|
952
|
+
* Reads a sequence of floats from the stream.
|
953
|
+
* @param v A pair of pointers representing the start and end of the sequence elements.
|
954
|
+
*/
|
955
|
+
void read(std::pair<const float*, const float*>& v);
|
956
|
+
#else
|
957
|
+
/**
|
958
|
+
* Reads a sequence of floats from the stream.
|
959
|
+
* @param v A pair of pointers representing the start and end of the sequence elements.
|
960
|
+
* @param arr A scoped array.
|
961
|
+
*/
|
962
|
+
void read(std::pair<const Float*, const Float*>& v, ::IceUtil::ScopedArray<Float>& arr);
|
963
|
+
#endif
|
964
|
+
|
965
|
+
/**
|
966
|
+
* Reads a double from the stream.
|
967
|
+
* @param v The extracted double.
|
968
|
+
*/
|
969
|
+
void read(Double& v);
|
970
|
+
|
971
|
+
/**
|
972
|
+
* Reads a sequence of doubles from the stream.
|
973
|
+
* @param v A vector to hold a copy of the double values.
|
974
|
+
*/
|
975
|
+
void read(std::vector<Double>& v);
|
976
|
+
|
977
|
+
#ifdef ICE_CPP11_MAPPING
|
978
|
+
/**
|
979
|
+
* Reads a sequence of doubles from the stream.
|
980
|
+
* @param v A pair of pointers representing the start and end of the sequence elements.
|
981
|
+
*/
|
982
|
+
void read(std::pair<const double*, const double*>& v);
|
983
|
+
#else
|
984
|
+
/**
|
985
|
+
* Reads a sequence of doubles from the stream.
|
986
|
+
* @param v A pair of pointers representing the start and end of the sequence elements.
|
987
|
+
* @param arr A scoped array.
|
988
|
+
*/
|
989
|
+
void read(std::pair<const Double*, const Double*>& v, ::IceUtil::ScopedArray<Double>& arr);
|
990
|
+
#endif
|
991
|
+
|
992
|
+
/**
|
993
|
+
* Reads a string from the stream.
|
994
|
+
* @param v The extracted string.
|
995
|
+
* @param convert Determines whether the string is processed by the string converter, if one
|
996
|
+
* is installed. The default behavior is to convert strings.
|
997
|
+
*/
|
998
|
+
void read(std::string& v, bool convert = true);
|
999
|
+
|
1000
|
+
#ifdef ICE_CPP11_MAPPING
|
1001
|
+
/**
|
1002
|
+
* Reads a string from the stream.
|
1003
|
+
* @param vdata A pointer to the beginning of the string.
|
1004
|
+
* @param vsize The number of bytes in the string.
|
1005
|
+
* @param convert Determines whether the string is processed by the string converter, if one
|
1006
|
+
* is installed. The default behavior is to convert strings.
|
1007
|
+
*/
|
1008
|
+
void read(const char*& vdata, size_t& vsize, bool convert = true);
|
1009
|
+
#else
|
1010
|
+
// For custom strings, convert = false
|
1011
|
+
/**
|
1012
|
+
* Reads a string from the stream. String conversion is disabled.
|
1013
|
+
* @param vdata A pointer to the beginning of the string.
|
1014
|
+
* @param vsize The number of bytes in the string.
|
1015
|
+
*/
|
1016
|
+
void read(const char*& vdata, size_t& vsize);
|
1017
|
+
|
1018
|
+
// For custom strings, convert = true
|
1019
|
+
/**
|
1020
|
+
* Reads a string from the stream. String conversion is enabled.
|
1021
|
+
* @param vdata A pointer to the beginning of the string.
|
1022
|
+
* @param vsize The number of bytes in the string.
|
1023
|
+
* @param holder Holds the string contents.
|
1024
|
+
*/
|
1025
|
+
void read(const char*& vdata, size_t& vsize, std::string& holder);
|
1026
|
+
#endif
|
1027
|
+
|
1028
|
+
/**
|
1029
|
+
* Reads a sequence of strings from the stream.
|
1030
|
+
* @param v The extracted string sequence.
|
1031
|
+
* @param convert Determines whether strings are processed by the string converter, if one
|
1032
|
+
* is installed. The default behavior is to convert the strings.
|
1033
|
+
*/
|
1034
|
+
void read(std::vector<std::string>& v, bool convert = true);
|
1035
|
+
|
1036
|
+
/**
|
1037
|
+
* Reads a wide string from the stream.
|
1038
|
+
* @param v The extracted string.
|
1039
|
+
*/
|
1040
|
+
void read(std::wstring& v);
|
1041
|
+
|
1042
|
+
/**
|
1043
|
+
* Reads a sequence of wide strings from the stream.
|
1044
|
+
* @param v The extracted sequence.
|
1045
|
+
*/
|
1046
|
+
void read(std::vector<std::wstring>& v);
|
1047
|
+
|
1048
|
+
#ifdef ICE_CPP11_MAPPING
|
1049
|
+
/**
|
1050
|
+
* Reads a proxy from the stream.
|
1051
|
+
* @return The proxy as the base ObjectPrx type.
|
1052
|
+
*/
|
1053
|
+
std::shared_ptr<ObjectPrx> readProxy();
|
1054
|
+
|
1055
|
+
/**
|
1056
|
+
* Reads a typed proxy from the stream.
|
1057
|
+
* @param v The proxy as a user-defined type.
|
1058
|
+
*/
|
1059
|
+
template<typename T, typename ::std::enable_if<::std::is_base_of<ObjectPrx, T>::value>::type* = nullptr>
|
1060
|
+
void read(::std::shared_ptr<T>& v)
|
1061
|
+
{
|
1062
|
+
::std::shared_ptr<ObjectPrx> proxy(readProxy());
|
1063
|
+
if(!proxy)
|
1064
|
+
{
|
1065
|
+
v = 0;
|
1066
|
+
}
|
1067
|
+
else
|
1068
|
+
{
|
1069
|
+
v = ::IceInternal::createProxy<T>();
|
1070
|
+
v->_copyFrom(proxy);
|
1071
|
+
}
|
1072
|
+
}
|
1073
|
+
#else
|
1074
|
+
/**
|
1075
|
+
* Reads a proxy from the stream.
|
1076
|
+
* @param v The proxy as the base ObjectPrx type.
|
1077
|
+
*/
|
1078
|
+
void read(ObjectPrx& v);
|
1079
|
+
|
1080
|
+
/**
|
1081
|
+
* Reads a typed proxy from the stream.
|
1082
|
+
* @param v The proxy as a user-defined type.
|
1083
|
+
*/
|
1084
|
+
template<typename T> void read(IceInternal::ProxyHandle<T>& v)
|
1085
|
+
{
|
1086
|
+
_readProxy(this, v); // Generated _readProxy method, necessary for forward declarations.
|
1087
|
+
}
|
1088
|
+
#endif
|
1089
|
+
|
1090
|
+
/**
|
1091
|
+
* Reads a value (instance of a Slice class) from the stream.
|
1092
|
+
* @param v The instance.
|
1093
|
+
*/
|
1094
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
1095
|
+
template<typename T, typename ::std::enable_if<::std::is_base_of<Value, T>::value>::type* = nullptr>
|
1096
|
+
void read(::std::shared_ptr<T>& v)
|
1097
|
+
{
|
1098
|
+
read(&patchHandle<T>, &v);
|
1099
|
+
}
|
1100
|
+
#else // C++98 mapping
|
1101
|
+
template<typename T> void read(IceInternal::Handle<T>& v)
|
1102
|
+
{
|
1103
|
+
read(&patchHandle<T>, &v);
|
1104
|
+
}
|
1105
|
+
#endif
|
1106
|
+
|
1107
|
+
/**
|
1108
|
+
* Reads a value (instance of a Slice class) from the stream.
|
1109
|
+
* @param patchFunc The patch callback function.
|
1110
|
+
* @param patchAddr Closure data passed to the callback.
|
1111
|
+
*/
|
1112
|
+
void read(PatchFunc patchFunc, void* patchAddr)
|
1113
|
+
{
|
1114
|
+
initEncaps();
|
1115
|
+
_currentEncaps->decoder->read(patchFunc, patchAddr);
|
1116
|
+
}
|
1117
|
+
|
1118
|
+
/**
|
1119
|
+
* Reads an enumerator from the stream.
|
1120
|
+
* @param maxValue The maximum enumerator value in the definition.
|
1121
|
+
* @return The enumerator value.
|
1122
|
+
*/
|
1123
|
+
Int readEnum(Int maxValue);
|
1124
|
+
|
1125
|
+
/**
|
1126
|
+
* Extracts a user exception from the stream and throws it.
|
1127
|
+
* @param factory If provided, this factory is given the first opportunity to instantiate
|
1128
|
+
* the exception. If not provided, or if the factory does not throw an exception when invoked,
|
1129
|
+
* the stream will attempt to instantiate the exception using static type information.
|
1130
|
+
* @throws UserException The user exception that was unmarshaled.
|
1131
|
+
*/
|
1132
|
+
void throwException(ICE_IN(ICE_DELEGATE(UserExceptionFactory)) factory = ICE_NULLPTR);
|
1133
|
+
|
1134
|
+
/**
|
1135
|
+
* Skips one optional value with the given format.
|
1136
|
+
* @param format The expected format of the optional, if present.
|
1137
|
+
*/
|
1138
|
+
void skipOptional(OptionalFormat format);
|
1139
|
+
|
1140
|
+
/**
|
1141
|
+
* Skips all remaining optional values.
|
1142
|
+
*/
|
1143
|
+
void skipOptionals();
|
1144
|
+
|
1145
|
+
/**
|
1146
|
+
* Advances the current stream position by the given number of bytes.
|
1147
|
+
* @param size The number of bytes to skip.
|
1148
|
+
*/
|
1149
|
+
void skip(size_type size)
|
1150
|
+
{
|
1151
|
+
if(i + size > b.end())
|
1152
|
+
{
|
1153
|
+
throwUnmarshalOutOfBoundsException(__FILE__, __LINE__);
|
1154
|
+
}
|
1155
|
+
i += size;
|
1156
|
+
}
|
1157
|
+
|
1158
|
+
/**
|
1159
|
+
* Reads a size at the current position and skips that number of bytes.
|
1160
|
+
*/
|
1161
|
+
void skipSize()
|
1162
|
+
{
|
1163
|
+
Byte bt;
|
1164
|
+
read(bt);
|
1165
|
+
if(static_cast<unsigned char>(bt) == 255)
|
1166
|
+
{
|
1167
|
+
skip(4);
|
1168
|
+
}
|
1169
|
+
}
|
1170
|
+
|
1171
|
+
/**
|
1172
|
+
* Obtains the current position of the stream.
|
1173
|
+
* @return The current position.
|
1174
|
+
*/
|
1175
|
+
size_type pos()
|
1176
|
+
{
|
1177
|
+
return static_cast<size_t>(i - b.begin());
|
1178
|
+
}
|
1179
|
+
|
1180
|
+
/**
|
1181
|
+
* Sets a new position for the stream.
|
1182
|
+
* @param p The new position.
|
1183
|
+
*/
|
1184
|
+
void pos(size_type p)
|
1185
|
+
{
|
1186
|
+
i = b.begin() + p;
|
1187
|
+
}
|
1188
|
+
|
1189
|
+
/// \cond INTERNAL
|
1190
|
+
InputStream(IceInternal::Instance*, const EncodingVersion&);
|
1191
|
+
InputStream(IceInternal::Instance*, const EncodingVersion&, IceInternal::Buffer&, bool = false);
|
1192
|
+
|
1193
|
+
void initialize(IceInternal::Instance*, const EncodingVersion&);
|
1194
|
+
|
1195
|
+
bool readOptImpl(Int, OptionalFormat);
|
1196
|
+
/// \endcond
|
1197
|
+
|
1198
|
+
private:
|
1199
|
+
|
1200
|
+
void initialize(const EncodingVersion&);
|
1201
|
+
|
1202
|
+
//
|
1203
|
+
// String
|
1204
|
+
//
|
1205
|
+
bool readConverted(std::string&, Int);
|
1206
|
+
|
1207
|
+
//
|
1208
|
+
// We can't throw these exception from inline functions from within
|
1209
|
+
// this file, because we cannot include the header with the
|
1210
|
+
// exceptions. Doing so would screw up the whole include file
|
1211
|
+
// ordering.
|
1212
|
+
//
|
1213
|
+
void throwUnmarshalOutOfBoundsException(const char*, int);
|
1214
|
+
void throwEncapsulationException(const char*, int);
|
1215
|
+
|
1216
|
+
std::string resolveCompactId(int) const;
|
1217
|
+
|
1218
|
+
void postUnmarshal(const ValuePtr&) const;
|
1219
|
+
|
1220
|
+
class Encaps;
|
1221
|
+
enum SliceType { NoSlice, ValueSlice, ExceptionSlice };
|
1222
|
+
|
1223
|
+
void traceSkipSlice(const std::string&, SliceType) const;
|
1224
|
+
|
1225
|
+
ValueFactoryManagerPtr valueFactoryManager() const;
|
1226
|
+
|
1227
|
+
LoggerPtr logger() const;
|
1228
|
+
|
1229
|
+
#ifdef ICE_CPP11_MAPPING
|
1230
|
+
std::function<std::string(int)> compactIdResolver() const;
|
1231
|
+
#else
|
1232
|
+
CompactIdResolverPtr compactIdResolver() const;
|
1233
|
+
#endif
|
1234
|
+
|
1235
|
+
typedef std::vector<ValuePtr> ValueList;
|
1236
|
+
|
1237
|
+
class ICE_API EncapsDecoder : private ::IceUtil::noncopyable
|
1238
|
+
{
|
1239
|
+
public:
|
1240
|
+
|
1241
|
+
virtual ~EncapsDecoder();
|
1242
|
+
|
1243
|
+
virtual void read(PatchFunc, void*) = 0;
|
1244
|
+
virtual void throwException(ICE_IN(ICE_DELEGATE(UserExceptionFactory))) = 0;
|
1245
|
+
|
1246
|
+
virtual void startInstance(SliceType) = 0;
|
1247
|
+
virtual SlicedDataPtr endInstance(bool) = 0;
|
1248
|
+
virtual const std::string& startSlice() = 0;
|
1249
|
+
virtual void endSlice() = 0;
|
1250
|
+
virtual void skipSlice() = 0;
|
1251
|
+
|
1252
|
+
virtual bool readOptional(Int, OptionalFormat)
|
1253
|
+
{
|
1254
|
+
return false;
|
1255
|
+
}
|
1256
|
+
|
1257
|
+
virtual void readPendingValues()
|
1258
|
+
{
|
1259
|
+
}
|
1260
|
+
|
1261
|
+
protected:
|
1262
|
+
|
1263
|
+
EncapsDecoder(InputStream* stream, Encaps* encaps, bool sliceValues, size_t classGraphDepthMax,
|
1264
|
+
const Ice::ValueFactoryManagerPtr& f) :
|
1265
|
+
_stream(stream), _encaps(encaps), _sliceValues(sliceValues), _classGraphDepthMax(classGraphDepthMax),
|
1266
|
+
_classGraphDepth(0), _valueFactoryManager(f), _typeIdIndex(0)
|
1267
|
+
{
|
1268
|
+
}
|
1269
|
+
|
1270
|
+
std::string readTypeId(bool);
|
1271
|
+
ValuePtr newInstance(const std::string&);
|
1272
|
+
|
1273
|
+
void addPatchEntry(Int, PatchFunc, void*);
|
1274
|
+
void unmarshal(Int, const ValuePtr&);
|
1275
|
+
|
1276
|
+
typedef std::map<Int, ValuePtr> IndexToPtrMap;
|
1277
|
+
typedef std::map<Int, std::string> TypeIdMap;
|
1278
|
+
|
1279
|
+
struct PatchEntry
|
1280
|
+
{
|
1281
|
+
PatchFunc patchFunc;
|
1282
|
+
void* patchAddr;
|
1283
|
+
size_t classGraphDepth;
|
1284
|
+
};
|
1285
|
+
typedef std::vector<PatchEntry> PatchList;
|
1286
|
+
typedef std::map<Int, PatchList> PatchMap;
|
1287
|
+
|
1288
|
+
InputStream* _stream;
|
1289
|
+
Encaps* _encaps;
|
1290
|
+
const bool _sliceValues;
|
1291
|
+
const size_t _classGraphDepthMax;
|
1292
|
+
size_t _classGraphDepth;
|
1293
|
+
Ice::ValueFactoryManagerPtr _valueFactoryManager;
|
1294
|
+
|
1295
|
+
// Encapsulation attributes for object un-marshalling
|
1296
|
+
PatchMap _patchMap;
|
1297
|
+
|
1298
|
+
private:
|
1299
|
+
|
1300
|
+
// Encapsulation attributes for object un-marshalling
|
1301
|
+
IndexToPtrMap _unmarshaledMap;
|
1302
|
+
TypeIdMap _typeIdMap;
|
1303
|
+
Int _typeIdIndex;
|
1304
|
+
ValueList _valueList;
|
1305
|
+
};
|
1306
|
+
|
1307
|
+
class ICE_API EncapsDecoder10 : public EncapsDecoder
|
1308
|
+
{
|
1309
|
+
public:
|
1310
|
+
|
1311
|
+
EncapsDecoder10(InputStream* stream, Encaps* encaps, bool sliceValues, size_t classGraphDepthMax,
|
1312
|
+
const Ice::ValueFactoryManagerPtr& f) :
|
1313
|
+
EncapsDecoder(stream, encaps, sliceValues, classGraphDepthMax, f),
|
1314
|
+
_sliceType(NoSlice)
|
1315
|
+
{
|
1316
|
+
}
|
1317
|
+
|
1318
|
+
virtual void read(PatchFunc, void*);
|
1319
|
+
virtual void throwException(ICE_IN(ICE_DELEGATE(UserExceptionFactory)));
|
1320
|
+
|
1321
|
+
virtual void startInstance(SliceType);
|
1322
|
+
virtual SlicedDataPtr endInstance(bool);
|
1323
|
+
virtual const std::string& startSlice();
|
1324
|
+
virtual void endSlice();
|
1325
|
+
virtual void skipSlice();
|
1326
|
+
|
1327
|
+
virtual void readPendingValues();
|
1328
|
+
|
1329
|
+
private:
|
1330
|
+
|
1331
|
+
void readInstance();
|
1332
|
+
|
1333
|
+
// Instance attributes
|
1334
|
+
SliceType _sliceType;
|
1335
|
+
bool _skipFirstSlice;
|
1336
|
+
|
1337
|
+
// Slice attributes
|
1338
|
+
Int _sliceSize;
|
1339
|
+
std::string _typeId;
|
1340
|
+
};
|
1341
|
+
|
1342
|
+
class ICE_API EncapsDecoder11 : public EncapsDecoder
|
1343
|
+
{
|
1344
|
+
public:
|
1345
|
+
|
1346
|
+
EncapsDecoder11(InputStream* stream, Encaps* encaps, bool sliceValues, size_t classGraphDepthMax,
|
1347
|
+
const Ice::ValueFactoryManagerPtr& f) :
|
1348
|
+
EncapsDecoder(stream, encaps, sliceValues, classGraphDepthMax, f),
|
1349
|
+
_preAllocatedInstanceData(0), _current(0), _valueIdIndex(1)
|
1350
|
+
{
|
1351
|
+
}
|
1352
|
+
|
1353
|
+
virtual void read(PatchFunc, void*);
|
1354
|
+
virtual void throwException(ICE_IN(ICE_DELEGATE(UserExceptionFactory)));
|
1355
|
+
|
1356
|
+
virtual void startInstance(SliceType);
|
1357
|
+
virtual SlicedDataPtr endInstance(bool);
|
1358
|
+
virtual const std::string& startSlice();
|
1359
|
+
virtual void endSlice();
|
1360
|
+
virtual void skipSlice();
|
1361
|
+
|
1362
|
+
virtual bool readOptional(Int, OptionalFormat);
|
1363
|
+
|
1364
|
+
private:
|
1365
|
+
|
1366
|
+
Int readInstance(Int, PatchFunc, void*);
|
1367
|
+
SlicedDataPtr readSlicedData();
|
1368
|
+
|
1369
|
+
struct IndirectPatchEntry
|
1370
|
+
{
|
1371
|
+
Int index;
|
1372
|
+
PatchFunc patchFunc;
|
1373
|
+
void* patchAddr;
|
1374
|
+
};
|
1375
|
+
typedef std::vector<IndirectPatchEntry> IndirectPatchList;
|
1376
|
+
|
1377
|
+
typedef std::vector<Int> IndexList;
|
1378
|
+
typedef std::vector<IndexList> IndexListList;
|
1379
|
+
|
1380
|
+
struct InstanceData
|
1381
|
+
{
|
1382
|
+
InstanceData(InstanceData* p) : previous(p), next(0)
|
1383
|
+
{
|
1384
|
+
if(previous)
|
1385
|
+
{
|
1386
|
+
previous->next = this;
|
1387
|
+
}
|
1388
|
+
}
|
1389
|
+
|
1390
|
+
~InstanceData()
|
1391
|
+
{
|
1392
|
+
if(next)
|
1393
|
+
{
|
1394
|
+
delete next;
|
1395
|
+
}
|
1396
|
+
}
|
1397
|
+
|
1398
|
+
// Instance attributes
|
1399
|
+
SliceType sliceType;
|
1400
|
+
bool skipFirstSlice;
|
1401
|
+
SliceInfoSeq slices; // Preserved slices.
|
1402
|
+
IndexListList indirectionTables;
|
1403
|
+
|
1404
|
+
// Slice attributes
|
1405
|
+
Byte sliceFlags;
|
1406
|
+
Int sliceSize;
|
1407
|
+
std::string typeId;
|
1408
|
+
int compactId;
|
1409
|
+
IndirectPatchList indirectPatchList;
|
1410
|
+
|
1411
|
+
InstanceData* previous;
|
1412
|
+
InstanceData* next;
|
1413
|
+
};
|
1414
|
+
InstanceData _preAllocatedInstanceData;
|
1415
|
+
InstanceData* _current;
|
1416
|
+
|
1417
|
+
void push(SliceType sliceType)
|
1418
|
+
{
|
1419
|
+
if(!_current)
|
1420
|
+
{
|
1421
|
+
_current = &_preAllocatedInstanceData;
|
1422
|
+
}
|
1423
|
+
else
|
1424
|
+
{
|
1425
|
+
_current = _current->next ? _current->next : new InstanceData(_current);
|
1426
|
+
}
|
1427
|
+
_current->sliceType = sliceType;
|
1428
|
+
_current->skipFirstSlice = false;
|
1429
|
+
}
|
1430
|
+
|
1431
|
+
Int _valueIdIndex; // The ID of the next value to unmarshal.
|
1432
|
+
};
|
1433
|
+
|
1434
|
+
class Encaps : private ::IceUtil::noncopyable
|
1435
|
+
{
|
1436
|
+
public:
|
1437
|
+
|
1438
|
+
Encaps() : start(0), decoder(0), previous(0)
|
1439
|
+
{
|
1440
|
+
// Inlined for performance reasons.
|
1441
|
+
}
|
1442
|
+
~Encaps()
|
1443
|
+
{
|
1444
|
+
// Inlined for performance reasons.
|
1445
|
+
delete decoder;
|
1446
|
+
}
|
1447
|
+
void reset()
|
1448
|
+
{
|
1449
|
+
// Inlined for performance reasons.
|
1450
|
+
delete decoder;
|
1451
|
+
decoder = 0;
|
1452
|
+
|
1453
|
+
previous = 0;
|
1454
|
+
}
|
1455
|
+
|
1456
|
+
Container::size_type start;
|
1457
|
+
Int sz;
|
1458
|
+
EncodingVersion encoding;
|
1459
|
+
|
1460
|
+
EncapsDecoder* decoder;
|
1461
|
+
|
1462
|
+
Encaps* previous;
|
1463
|
+
};
|
1464
|
+
|
1465
|
+
//
|
1466
|
+
// Optimization. The instance may not be deleted while a
|
1467
|
+
// stack-allocated stream still holds it.
|
1468
|
+
//
|
1469
|
+
IceInternal::Instance* _instance;
|
1470
|
+
|
1471
|
+
//
|
1472
|
+
// The encoding version to use when there's no encapsulation to
|
1473
|
+
// read from. This is for example used to read message headers.
|
1474
|
+
//
|
1475
|
+
EncodingVersion _encoding;
|
1476
|
+
|
1477
|
+
Encaps* _currentEncaps;
|
1478
|
+
|
1479
|
+
void initEncaps();
|
1480
|
+
|
1481
|
+
Encaps _preAllocatedEncaps;
|
1482
|
+
|
1483
|
+
#ifndef ICE_CPP11_MAPPING
|
1484
|
+
bool _collectObjects;
|
1485
|
+
#endif
|
1486
|
+
|
1487
|
+
bool _traceSlicing;
|
1488
|
+
|
1489
|
+
size_t _classGraphDepthMax;
|
1490
|
+
|
1491
|
+
void* _closure;
|
1492
|
+
|
1493
|
+
bool _sliceValues;
|
1494
|
+
|
1495
|
+
int _startSeq;
|
1496
|
+
int _minSeqSize;
|
1497
|
+
|
1498
|
+
ValueFactoryManagerPtr _valueFactoryManager;
|
1499
|
+
LoggerPtr _logger;
|
1500
|
+
#ifdef ICE_CPP11_MAPPING
|
1501
|
+
std::function<std::string(int)> _compactIdResolver;
|
1502
|
+
#else
|
1503
|
+
CompactIdResolverPtr _compactIdResolver;
|
1504
|
+
#endif
|
1505
|
+
|
1506
|
+
#ifdef ICE_CPP11_MAPPING
|
1507
|
+
std::vector<std::function<void()>> _deleters;
|
1508
|
+
#endif
|
1509
|
+
|
1510
|
+
};
|
1511
|
+
|
1512
|
+
} // End namespace Ice
|
1513
|
+
|
1514
|
+
#endif
|