zeroc-ice 3.7.0 → 3.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ICE_LICENSE +1 -1
- data/bin/slice2rb +1 -1
- data/ext/Communicator.cpp +72 -2
- data/ext/Communicator.h +1 -1
- data/ext/Config.h +11 -1
- data/ext/Connection.cpp +22 -2
- data/ext/Connection.h +4 -1
- data/ext/Endpoint.cpp +1 -1
- data/ext/Endpoint.h +1 -1
- data/ext/ImplicitContext.cpp +1 -1
- data/ext/ImplicitContext.h +1 -1
- data/ext/Init.cpp +1 -1
- data/ext/Logger.cpp +1 -1
- data/ext/Logger.h +1 -1
- data/ext/Operation.cpp +1 -1
- data/ext/Operation.h +1 -1
- data/ext/Properties.cpp +1 -1
- data/ext/Properties.h +1 -1
- data/ext/Proxy.cpp +70 -1
- data/ext/Proxy.h +1 -1
- data/ext/Slice.cpp +1 -1
- data/ext/Slice.h +1 -1
- data/ext/Types.cpp +21 -5
- data/ext/Types.h +1 -1
- data/ext/Util.cpp +1 -1
- data/ext/Util.h +1 -1
- data/ext/ValueFactoryManager.cpp +2 -2
- data/ext/ValueFactoryManager.h +2 -2
- data/ext/ice/cpp/include/Ice/Application.h +234 -76
- data/ext/ice/cpp/include/Ice/AsyncResult.h +77 -1
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -1
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +35 -2
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -1
- data/ext/ice/cpp/include/Ice/Buffer.h +1 -1
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +43 -1
- data/ext/ice/cpp/include/Ice/Comparable.h +81 -1
- data/ext/ice/cpp/include/Ice/Config.h +8 -1
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +97 -1
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +3 -1
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -1
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -1
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +17 -2
- data/ext/ice/cpp/include/Ice/Dispatcher.h +22 -2
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -1
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -1
- data/ext/ice/cpp/include/Ice/Exception.h +57 -15
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +19 -1
- data/ext/ice/cpp/include/Ice/FactoryTable.h +12 -2
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -1
- data/ext/ice/cpp/include/Ice/Format.h +13 -14
- data/ext/ice/cpp/include/Ice/Functional.h +6 -1
- data/ext/ice/cpp/include/Ice/GCObject.h +1 -1
- data/ext/ice/cpp/include/Ice/Handle.h +1 -1
- data/ext/ice/cpp/include/Ice/Ice.h +1 -1
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +38 -3
- data/ext/ice/cpp/include/Ice/Incoming.h +15 -2
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +37 -4
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -1
- data/ext/ice/cpp/include/Ice/Initialize.h +764 -98
- data/ext/ice/cpp/include/Ice/InputStream.h +637 -112
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -1
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +17 -1
- data/ext/ice/cpp/include/Ice/LocalObject.h +5 -1
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -1
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +37 -6
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +3 -1
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +3 -1
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +3 -1
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +46 -23
- data/ext/ice/cpp/include/Ice/Object.h +338 -47
- data/ext/ice/cpp/include/Ice/ObjectF.h +5 -1
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -1
- data/ext/ice/cpp/include/Ice/Optional.h +22 -6
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +15 -1
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -1
- data/ext/ice/cpp/include/Ice/OutputStream.h +436 -92
- data/ext/ice/cpp/include/Ice/Protocol.h +31 -1
- data/ext/ice/cpp/include/Ice/Proxy.h +2244 -190
- data/ext/ice/cpp/include/Ice/ProxyF.h +3 -1
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -1
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +10 -1
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -1
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +67 -9
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -1
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -1
- data/ext/ice/cpp/include/Ice/SHA1.h +1 -1
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -1
- data/ext/ice/cpp/include/Ice/Service.h +267 -138
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -1
- data/ext/ice/cpp/include/Ice/SlicedData.h +80 -33
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +4 -1
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +324 -116
- data/ext/ice/cpp/include/Ice/StringConverter.h +32 -1
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -1
- data/ext/ice/cpp/include/Ice/UUID.h +2 -1
- data/ext/ice/cpp/include/Ice/UniquePtr.h +2 -2
- data/ext/ice/cpp/include/Ice/UniqueRef.h +6 -2
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +6 -1
- data/ext/ice/cpp/include/Ice/Value.h +41 -1
- data/ext/ice/cpp/include/Ice/ValueF.h +3 -1
- data/ext/ice/cpp/include/IceSSL/Config.h +1 -1
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -1
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +75 -53
- data/ext/ice/cpp/include/IceSSL/Plugin.h +323 -218
- data/ext/ice/cpp/include/IceSSL/SChannel.h +34 -27
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +35 -28
- data/ext/ice/cpp/include/IceSSL/UWP.h +33 -24
- data/ext/ice/cpp/include/IceUtil/Atomic.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Cond.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Config.h +11 -3
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -1
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +59 -31
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Exception.h +1 -1
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Functional.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Handle.h +1 -1
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Lock.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Mutex.h +2 -5
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -1
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -1
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Optional.h +95 -1
- data/ext/ice/cpp/include/IceUtil/Options.h +1 -1
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -1
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Random.h +1 -1
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -1
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +4 -4
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +5 -3
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Shared.h +1 -1
- data/ext/ice/cpp/include/IceUtil/StopWatch.h +1 -1
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +106 -86
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Thread.h +1 -1
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Time.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Timer.h +5 -1
- data/ext/ice/cpp/include/IceUtil/UUID.h +5 -1
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -1
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +80 -20
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +927 -130
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/Connection.h +990 -194
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +21 -9
- data/ext/ice/cpp/include/generated/Ice/Current.h +180 -17
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +484 -118
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +41 -17
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +29 -3
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +11 -5
- data/ext/ice/cpp/include/generated/Ice/Identity.h +56 -7
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +150 -28
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +629 -83
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +19 -7
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +5104 -794
- data/ext/ice/cpp/include/generated/Ice/Locator.h +2222 -443
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +27 -9
- data/ext/ice/cpp/include/generated/Ice/Logger.h +104 -26
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +2534 -455
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1004 -126
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +72 -12
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +142 -28
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +17 -7
- data/ext/ice/cpp/include/generated/Ice/Process.h +511 -71
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +18 -6
- data/ext/ice/cpp/include/generated/Ice/Properties.h +306 -58
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +737 -121
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +22 -8
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +1526 -279
- data/ext/ice/cpp/include/generated/Ice/Router.h +1009 -198
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +18 -6
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +174 -18
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +13 -3
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +177 -23
- data/ext/ice/cpp/include/generated/Ice/Version.h +43 -13
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +71 -15
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +13 -5
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +39 -9
- data/ext/ice/cpp/src/Ice/ACM.cpp +12 -3
- data/ext/ice/cpp/src/Ice/ACM.h +1 -1
- data/ext/ice/cpp/src/Ice/ACMF.h +1 -1
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Acceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ArgVector.h +1 -1
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Base64.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Base64.h +1 -1
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +1 -1
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -1
- data/ext/ice/cpp/src/Ice/Buffer.cpp +1 -1
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +3 -3
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/Communicator.cpp +6 -4
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +34 -13
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +10 -10
- data/ext/ice/cpp/src/Ice/Cond.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +11 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -1
- data/ext/ice/cpp/src/Ice/Connection.cpp +27 -11
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +24 -19
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +45 -37
- data/ext/ice/cpp/src/Ice/ConnectionI.h +10 -8
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/Connector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Connector.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -1
- data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Current.cpp +3 -3
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +5 -7
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -1
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -1
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +24 -10
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +7 -13
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +2 -2
- data/ext/ice/cpp/src/Ice/EndpointI.h +5 -5
- data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +3 -3
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/EventHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -1
- data/ext/ice/cpp/src/Ice/Exception.cpp +1 -1
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +3 -3
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -1
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -1
- data/ext/ice/cpp/src/Ice/GCObject.cpp +1 -1
- data/ext/ice/cpp/src/Ice/HashUtil.h +1 -1
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -1
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -1
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +24 -29
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +5 -5
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -1
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Identity.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +2 -13
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -1
- data/ext/ice/cpp/src/Ice/Incoming.cpp +1 -1
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -1
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -1
- data/ext/ice/cpp/src/Ice/Initialize.cpp +10 -16
- data/ext/ice/cpp/src/Ice/InputStream.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Instance.cpp +13 -34
- data/ext/ice/cpp/src/Ice/Instance.h +1 -1
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +33 -13
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -1
- data/ext/ice/cpp/src/Ice/LocalException.cpp +279 -279
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Locator.cpp +287 -174
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +4 -9
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +1 -1
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -1
- data/ext/ice/cpp/src/Ice/Logger.cpp +6 -4
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -1
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/LoggerI.h +1 -1
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Metrics.cpp +297 -109
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +2 -7
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Network.cpp +188 -225
- data/ext/ice/cpp/src/Ice/Network.h +3 -12
- data/ext/ice/cpp/src/Ice/NetworkF.h +1 -1
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +1 -1
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -1
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -1
- data/ext/ice/cpp/src/Ice/Object.cpp +7 -4
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +53 -19
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +116 -150
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +11 -11
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -1
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +25 -42
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +2 -2
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +1 -1
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Plugin.cpp +9 -5
- data/ext/ice/cpp/src/Ice/PluginF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +15 -34
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +3 -3
- data/ext/ice/cpp/src/Ice/Process.cpp +69 -40
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Properties.cpp +6 -4
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +89 -54
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -1
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +15 -21
- data/ext/ice/cpp/src/Ice/PropertiesI.h +10 -10
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +4 -2
- data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -2
- data/ext/ice/cpp/src/Ice/Protocol.cpp +5 -13
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -1
- data/ext/ice/cpp/src/Ice/Proxy.cpp +46 -1
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/Reference.cpp +56 -6
- data/ext/ice/cpp/src/Ice/Reference.h +13 -2
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +51 -90
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -1
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +203 -117
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -1
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -1
- data/ext/ice/cpp/src/Ice/Router.cpp +167 -89
- data/ext/ice/cpp/src/Ice/RouterF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +6 -28
- data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -3
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -1
- data/ext/ice/cpp/src/Ice/SHA1.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Selector.cpp +19 -26
- data/ext/ice/cpp/src/Ice/Selector.h +1 -1
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +15 -31
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -1
- data/ext/ice/cpp/src/Ice/SharedContext.h +1 -1
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +3 -3
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -1
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -1
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +32 -52
- data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -1
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +10 -1
- data/ext/ice/cpp/src/Ice/StringUtil.h +1 -1
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -1
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +5 -13
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -1
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +8 -11
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +2 -2
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -1
- data/ext/ice/cpp/src/Ice/Thread.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +13 -13
- data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -1
- data/ext/ice/cpp/src/Ice/Timer.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -1
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Transceiver.h +1 -1
- data/ext/ice/cpp/src/Ice/TransceiverF.h +1 -1
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -1
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +19 -27
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +2 -2
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +17 -54
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -1
- data/ext/ice/cpp/src/Ice/Value.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +9 -5
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +3 -6
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +2 -2
- data/ext/ice/cpp/src/Ice/Version.cpp +3 -3
- data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -1
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/WSConnector.h +1 -1
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +4 -5
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +2 -2
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +8 -9
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +85 -27
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +599 -113
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -1
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +70 -24
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +635 -69
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -1
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +71 -9
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +2 -4
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +6 -4
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +3 -3
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +2 -4
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +2 -2
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +6 -4
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/Instance.h +1 -1
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +25 -62
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +1 -1
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/PluginI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +19 -27
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +7 -16
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +7 -10
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +1 -1
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +4 -5
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -1
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/Util.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/Util.h +1 -1
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -1
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +5 -5
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Options.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Random.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +1 -5
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +3 -3
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -1
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +1 -1
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +160 -150
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +9 -8
- data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -1
- data/ext/ice/cpp/src/Slice/Checksum.h +1 -1
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -1
- data/ext/ice/cpp/src/Slice/FileTracker.h +1 -1
- data/ext/ice/cpp/src/Slice/Grammar.cpp +567 -585
- data/ext/ice/cpp/src/Slice/Grammar.h +2 -2
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +131 -47
- data/ext/ice/cpp/src/Slice/JavaUtil.h +10 -5
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -1
- data/ext/ice/cpp/src/Slice/MD5.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/Parser.cpp +383 -101
- data/ext/ice/cpp/src/Slice/Parser.h +40 -3
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +2 -1
- data/ext/ice/cpp/src/Slice/Preprocessor.h +2 -2
- data/ext/ice/cpp/src/Slice/Python.cpp +7 -15
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +66 -9
- data/ext/ice/cpp/src/Slice/PythonUtil.h +2 -2
- data/ext/ice/cpp/src/Slice/Ruby.cpp +1 -1
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +2 -2
- data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/Scanner.cpp +214 -135
- data/ext/ice/cpp/src/Slice/SliceUtil.cpp +1 -1
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +99 -17
- data/ext/ice/cpp/src/Slice/Util.h +5 -4
- data/ice.gemspec +2 -2
- data/lib/Glacier2.rb +1 -1
- data/lib/Glacier2/Metrics.rb +2 -2
- data/lib/Glacier2/PermissionsVerifier.rb +2 -2
- data/lib/Glacier2/PermissionsVerifierF.rb +2 -2
- data/lib/Glacier2/Router.rb +2 -2
- data/lib/Glacier2/RouterF.rb +2 -2
- data/lib/Glacier2/SSLInfo.rb +2 -2
- data/lib/Glacier2/Session.rb +2 -2
- data/lib/Ice.rb +2 -2
- data/lib/Ice/BuiltinSequences.rb +2 -2
- data/lib/Ice/Communicator.rb +2 -2
- data/lib/Ice/CommunicatorF.rb +2 -2
- data/lib/Ice/Connection.rb +2 -2
- data/lib/Ice/ConnectionF.rb +2 -2
- data/lib/Ice/Current.rb +2 -2
- data/lib/Ice/Endpoint.rb +2 -2
- data/lib/Ice/EndpointF.rb +2 -2
- data/lib/Ice/EndpointTypes.rb +2 -2
- data/lib/Ice/FacetMap.rb +2 -2
- data/lib/Ice/Identity.rb +2 -2
- data/lib/Ice/ImplicitContext.rb +2 -2
- data/lib/Ice/ImplicitContextF.rb +2 -2
- data/lib/Ice/Instrumentation.rb +2 -2
- data/lib/Ice/InstrumentationF.rb +2 -2
- data/lib/Ice/LocalException.rb +2 -2
- data/lib/Ice/Locator.rb +2 -2
- data/lib/Ice/LocatorF.rb +2 -2
- data/lib/Ice/Logger.rb +2 -2
- data/lib/Ice/LoggerF.rb +2 -2
- data/lib/Ice/Metrics.rb +2 -2
- data/lib/Ice/ObjectAdapter.rb +2 -2
- data/lib/Ice/ObjectAdapterF.rb +2 -2
- data/lib/Ice/ObjectFactory.rb +2 -2
- data/lib/Ice/Plugin.rb +2 -2
- data/lib/Ice/PluginF.rb +2 -2
- data/lib/Ice/Process.rb +2 -2
- data/lib/Ice/ProcessF.rb +2 -2
- data/lib/Ice/Properties.rb +2 -2
- data/lib/Ice/PropertiesAdmin.rb +2 -2
- data/lib/Ice/PropertiesF.rb +2 -2
- data/lib/Ice/RemoteLogger.rb +2 -2
- data/lib/Ice/Router.rb +2 -2
- data/lib/Ice/RouterF.rb +2 -2
- data/lib/Ice/ServantLocator.rb +2 -2
- data/lib/Ice/ServantLocatorF.rb +2 -2
- data/lib/Ice/SliceChecksumDict.rb +2 -2
- data/lib/Ice/ValueFactory.rb +2 -2
- data/lib/Ice/Version.rb +2 -2
- data/lib/IceBox.rb +1 -1
- data/lib/IceBox/IceBox.rb +2 -2
- data/lib/IceGrid.rb +1 -1
- data/lib/IceGrid/Admin.rb +2 -2
- data/lib/IceGrid/Descriptor.rb +2 -2
- data/lib/IceGrid/Exception.rb +2 -2
- data/lib/IceGrid/FileParser.rb +2 -2
- data/lib/IceGrid/PluginFacade.rb +2 -2
- data/lib/IceGrid/Registry.rb +2 -2
- data/lib/IceGrid/Session.rb +2 -2
- data/lib/IceGrid/UserAccountMapper.rb +2 -2
- data/lib/IcePatch2.rb +1 -1
- data/lib/IcePatch2/FileInfo.rb +2 -2
- data/lib/IcePatch2/FileServer.rb +2 -2
- data/lib/IceStorm.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +2 -2
- data/lib/IceStorm/Metrics.rb +2 -2
- data/slice/Glacier2/Metrics.ice +2 -2
- data/slice/Glacier2/PermissionsVerifier.ice +2 -2
- data/slice/Glacier2/PermissionsVerifierF.ice +2 -2
- data/slice/Glacier2/Router.ice +2 -2
- data/slice/Glacier2/RouterF.ice +2 -2
- data/slice/Glacier2/SSLInfo.ice +2 -2
- data/slice/Glacier2/Session.ice +2 -2
- data/slice/Ice/BuiltinSequences.ice +2 -2
- data/slice/Ice/Communicator.ice +66 -73
- data/slice/Ice/CommunicatorF.ice +2 -2
- data/slice/Ice/Connection.ice +47 -17
- data/slice/Ice/ConnectionF.ice +2 -2
- data/slice/Ice/Current.ice +4 -5
- data/slice/Ice/Endpoint.ice +16 -16
- data/slice/Ice/EndpointF.ice +2 -2
- data/slice/Ice/EndpointTypes.ice +2 -2
- data/slice/Ice/FacetMap.ice +2 -2
- data/slice/Ice/Identity.ice +2 -2
- data/slice/Ice/ImplicitContext.ice +6 -6
- data/slice/Ice/ImplicitContextF.ice +2 -2
- data/slice/Ice/Instrumentation.ice +2 -2
- data/slice/Ice/InstrumentationF.ice +2 -2
- data/slice/Ice/LocalException.ice +2 -2
- data/slice/Ice/Locator.ice +3 -3
- data/slice/Ice/LocatorF.ice +2 -2
- data/slice/Ice/Logger.ice +2 -2
- data/slice/Ice/LoggerF.ice +2 -2
- data/slice/Ice/Metrics.ice +2 -2
- data/slice/Ice/ObjectAdapter.ice +10 -10
- data/slice/Ice/ObjectAdapterF.ice +2 -2
- data/slice/Ice/ObjectFactory.ice +3 -3
- data/slice/Ice/Plugin.ice +4 -4
- data/slice/Ice/PluginF.ice +2 -2
- data/slice/Ice/Process.ice +2 -2
- data/slice/Ice/ProcessF.ice +2 -2
- data/slice/Ice/Properties.ice +11 -11
- data/slice/Ice/PropertiesAdmin.ice +2 -2
- data/slice/Ice/PropertiesF.ice +2 -2
- data/slice/Ice/RemoteLogger.ice +12 -23
- data/slice/Ice/Router.ice +2 -2
- data/slice/Ice/RouterF.ice +2 -2
- data/slice/Ice/ServantLocator.ice +2 -2
- data/slice/Ice/ServantLocatorF.ice +2 -2
- data/slice/Ice/SliceChecksumDict.ice +2 -2
- data/slice/Ice/ValueFactory.ice +14 -16
- data/slice/Ice/Version.ice +2 -2
- data/slice/IceBT/ConnectionInfo.ice +2 -2
- data/slice/IceBT/EndpointInfo.ice +2 -2
- data/slice/IceBT/Types.ice +2 -2
- data/slice/IceBox/IceBox.ice +3 -4
- data/slice/IceDiscovery/IceDiscovery.ice +2 -2
- data/slice/IceGrid/Admin.ice +2 -2
- data/slice/IceGrid/Descriptor.ice +2 -2
- data/slice/IceGrid/Exception.ice +2 -2
- data/slice/IceGrid/FileParser.ice +2 -2
- data/slice/IceGrid/PluginFacade.ice +6 -6
- data/slice/IceGrid/Registry.ice +2 -2
- data/slice/IceGrid/Session.ice +2 -2
- data/slice/IceGrid/UserAccountMapper.ice +2 -2
- data/slice/IceIAP/ConnectionInfo.ice +2 -2
- data/slice/IceIAP/EndpointInfo.ice +2 -2
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +2 -2
- data/slice/IcePatch2/FileInfo.ice +2 -2
- data/slice/IcePatch2/FileServer.ice +2 -2
- data/slice/IceSSL/ConnectionInfo.ice +2 -2
- data/slice/IceSSL/ConnectionInfoF.ice +2 -2
- data/slice/IceSSL/EndpointInfo.ice +2 -2
- data/slice/IceStorm/IceStorm.ice +5 -6
- data/slice/IceStorm/Metrics.ice +2 -2
- metadata +3 -13
- data/BZIP2_LICENSE +0 -42
- data/ext/ice/bzip2/blocksort.c +0 -1094
- data/ext/ice/bzip2/bzlib.c +0 -1572
- data/ext/ice/bzip2/bzlib.h +0 -282
- data/ext/ice/bzip2/bzlib_private.h +0 -509
- data/ext/ice/bzip2/compress.c +0 -672
- data/ext/ice/bzip2/crctable.c +0 -104
- data/ext/ice/bzip2/decompress.c +0 -646
- data/ext/ice/bzip2/huffman.c +0 -205
- data/ext/ice/bzip2/randtable.c +0 -84
data/ext/ice/bzip2/bzlib.h
DELETED
@@ -1,282 +0,0 @@
|
|
1
|
-
|
2
|
-
/*-------------------------------------------------------------*/
|
3
|
-
/*--- Public header file for the library. ---*/
|
4
|
-
/*--- bzlib.h ---*/
|
5
|
-
/*-------------------------------------------------------------*/
|
6
|
-
|
7
|
-
/* ------------------------------------------------------------------
|
8
|
-
This file is part of bzip2/libbzip2, a program and library for
|
9
|
-
lossless, block-sorting data compression.
|
10
|
-
|
11
|
-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
|
12
|
-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
|
13
|
-
|
14
|
-
Please read the WARNING, DISCLAIMER and PATENTS sections in the
|
15
|
-
README file.
|
16
|
-
|
17
|
-
This program is released under the terms of the license contained
|
18
|
-
in the file LICENSE.
|
19
|
-
------------------------------------------------------------------ */
|
20
|
-
|
21
|
-
|
22
|
-
#ifndef _BZLIB_H
|
23
|
-
#define _BZLIB_H
|
24
|
-
|
25
|
-
#ifdef __cplusplus
|
26
|
-
extern "C" {
|
27
|
-
#endif
|
28
|
-
|
29
|
-
#define BZ_RUN 0
|
30
|
-
#define BZ_FLUSH 1
|
31
|
-
#define BZ_FINISH 2
|
32
|
-
|
33
|
-
#define BZ_OK 0
|
34
|
-
#define BZ_RUN_OK 1
|
35
|
-
#define BZ_FLUSH_OK 2
|
36
|
-
#define BZ_FINISH_OK 3
|
37
|
-
#define BZ_STREAM_END 4
|
38
|
-
#define BZ_SEQUENCE_ERROR (-1)
|
39
|
-
#define BZ_PARAM_ERROR (-2)
|
40
|
-
#define BZ_MEM_ERROR (-3)
|
41
|
-
#define BZ_DATA_ERROR (-4)
|
42
|
-
#define BZ_DATA_ERROR_MAGIC (-5)
|
43
|
-
#define BZ_IO_ERROR (-6)
|
44
|
-
#define BZ_UNEXPECTED_EOF (-7)
|
45
|
-
#define BZ_OUTBUFF_FULL (-8)
|
46
|
-
#define BZ_CONFIG_ERROR (-9)
|
47
|
-
|
48
|
-
typedef
|
49
|
-
struct {
|
50
|
-
char *next_in;
|
51
|
-
unsigned int avail_in;
|
52
|
-
unsigned int total_in_lo32;
|
53
|
-
unsigned int total_in_hi32;
|
54
|
-
|
55
|
-
char *next_out;
|
56
|
-
unsigned int avail_out;
|
57
|
-
unsigned int total_out_lo32;
|
58
|
-
unsigned int total_out_hi32;
|
59
|
-
|
60
|
-
void *state;
|
61
|
-
|
62
|
-
void *(*bzalloc)(void *,int,int);
|
63
|
-
void (*bzfree)(void *,void *);
|
64
|
-
void *opaque;
|
65
|
-
}
|
66
|
-
bz_stream;
|
67
|
-
|
68
|
-
|
69
|
-
#ifndef BZ_IMPORT
|
70
|
-
#define BZ_EXPORT
|
71
|
-
#endif
|
72
|
-
|
73
|
-
#ifndef BZ_NO_STDIO
|
74
|
-
/* Need a definitition for FILE */
|
75
|
-
#include <stdio.h>
|
76
|
-
#endif
|
77
|
-
|
78
|
-
#ifdef _WIN32
|
79
|
-
# include <windows.h>
|
80
|
-
# ifdef small
|
81
|
-
/* windows.h define small to char */
|
82
|
-
# undef small
|
83
|
-
# endif
|
84
|
-
# ifdef BZ_EXPORT
|
85
|
-
# define BZ_API(func) WINAPI func
|
86
|
-
# define BZ_EXTERN extern
|
87
|
-
# else
|
88
|
-
/* import windows dll dynamically */
|
89
|
-
# define BZ_API(func) (WINAPI * func)
|
90
|
-
# define BZ_EXTERN
|
91
|
-
# endif
|
92
|
-
#else
|
93
|
-
# define BZ_API(func) func
|
94
|
-
# define BZ_EXTERN extern
|
95
|
-
#endif
|
96
|
-
|
97
|
-
|
98
|
-
/*-- Core (low-level) library functions --*/
|
99
|
-
|
100
|
-
BZ_EXTERN int BZ_API(BZ2_bzCompressInit) (
|
101
|
-
bz_stream* strm,
|
102
|
-
int blockSize100k,
|
103
|
-
int verbosity,
|
104
|
-
int workFactor
|
105
|
-
);
|
106
|
-
|
107
|
-
BZ_EXTERN int BZ_API(BZ2_bzCompress) (
|
108
|
-
bz_stream* strm,
|
109
|
-
int action
|
110
|
-
);
|
111
|
-
|
112
|
-
BZ_EXTERN int BZ_API(BZ2_bzCompressEnd) (
|
113
|
-
bz_stream* strm
|
114
|
-
);
|
115
|
-
|
116
|
-
BZ_EXTERN int BZ_API(BZ2_bzDecompressInit) (
|
117
|
-
bz_stream *strm,
|
118
|
-
int verbosity,
|
119
|
-
int small
|
120
|
-
);
|
121
|
-
|
122
|
-
BZ_EXTERN int BZ_API(BZ2_bzDecompress) (
|
123
|
-
bz_stream* strm
|
124
|
-
);
|
125
|
-
|
126
|
-
BZ_EXTERN int BZ_API(BZ2_bzDecompressEnd) (
|
127
|
-
bz_stream *strm
|
128
|
-
);
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
/*-- High(er) level library functions --*/
|
133
|
-
|
134
|
-
#ifndef BZ_NO_STDIO
|
135
|
-
#define BZ_MAX_UNUSED 5000
|
136
|
-
|
137
|
-
typedef void BZFILE;
|
138
|
-
|
139
|
-
BZ_EXTERN BZFILE* BZ_API(BZ2_bzReadOpen) (
|
140
|
-
int* bzerror,
|
141
|
-
FILE* f,
|
142
|
-
int verbosity,
|
143
|
-
int small,
|
144
|
-
void* unused,
|
145
|
-
int nUnused
|
146
|
-
);
|
147
|
-
|
148
|
-
BZ_EXTERN void BZ_API(BZ2_bzReadClose) (
|
149
|
-
int* bzerror,
|
150
|
-
BZFILE* b
|
151
|
-
);
|
152
|
-
|
153
|
-
BZ_EXTERN void BZ_API(BZ2_bzReadGetUnused) (
|
154
|
-
int* bzerror,
|
155
|
-
BZFILE* b,
|
156
|
-
void** unused,
|
157
|
-
int* nUnused
|
158
|
-
);
|
159
|
-
|
160
|
-
BZ_EXTERN int BZ_API(BZ2_bzRead) (
|
161
|
-
int* bzerror,
|
162
|
-
BZFILE* b,
|
163
|
-
void* buf,
|
164
|
-
int len
|
165
|
-
);
|
166
|
-
|
167
|
-
BZ_EXTERN BZFILE* BZ_API(BZ2_bzWriteOpen) (
|
168
|
-
int* bzerror,
|
169
|
-
FILE* f,
|
170
|
-
int blockSize100k,
|
171
|
-
int verbosity,
|
172
|
-
int workFactor
|
173
|
-
);
|
174
|
-
|
175
|
-
BZ_EXTERN void BZ_API(BZ2_bzWrite) (
|
176
|
-
int* bzerror,
|
177
|
-
BZFILE* b,
|
178
|
-
void* buf,
|
179
|
-
int len
|
180
|
-
);
|
181
|
-
|
182
|
-
BZ_EXTERN void BZ_API(BZ2_bzWriteClose) (
|
183
|
-
int* bzerror,
|
184
|
-
BZFILE* b,
|
185
|
-
int abandon,
|
186
|
-
unsigned int* nbytes_in,
|
187
|
-
unsigned int* nbytes_out
|
188
|
-
);
|
189
|
-
|
190
|
-
BZ_EXTERN void BZ_API(BZ2_bzWriteClose64) (
|
191
|
-
int* bzerror,
|
192
|
-
BZFILE* b,
|
193
|
-
int abandon,
|
194
|
-
unsigned int* nbytes_in_lo32,
|
195
|
-
unsigned int* nbytes_in_hi32,
|
196
|
-
unsigned int* nbytes_out_lo32,
|
197
|
-
unsigned int* nbytes_out_hi32
|
198
|
-
);
|
199
|
-
#endif
|
200
|
-
|
201
|
-
|
202
|
-
/*-- Utility functions --*/
|
203
|
-
|
204
|
-
BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffCompress) (
|
205
|
-
char* dest,
|
206
|
-
unsigned int* destLen,
|
207
|
-
char* source,
|
208
|
-
unsigned int sourceLen,
|
209
|
-
int blockSize100k,
|
210
|
-
int verbosity,
|
211
|
-
int workFactor
|
212
|
-
);
|
213
|
-
|
214
|
-
BZ_EXTERN int BZ_API(BZ2_bzBuffToBuffDecompress) (
|
215
|
-
char* dest,
|
216
|
-
unsigned int* destLen,
|
217
|
-
char* source,
|
218
|
-
unsigned int sourceLen,
|
219
|
-
int small,
|
220
|
-
int verbosity
|
221
|
-
);
|
222
|
-
|
223
|
-
|
224
|
-
/*--
|
225
|
-
Code contributed by Yoshioka Tsuneo (tsuneo@rr.iij4u.or.jp)
|
226
|
-
to support better zlib compatibility.
|
227
|
-
This code is not _officially_ part of libbzip2 (yet);
|
228
|
-
I haven't tested it, documented it, or considered the
|
229
|
-
threading-safeness of it.
|
230
|
-
If this code breaks, please contact both Yoshioka and me.
|
231
|
-
--*/
|
232
|
-
|
233
|
-
BZ_EXTERN const char * BZ_API(BZ2_bzlibVersion) (
|
234
|
-
void
|
235
|
-
);
|
236
|
-
|
237
|
-
#ifndef BZ_NO_STDIO
|
238
|
-
BZ_EXTERN BZFILE * BZ_API(BZ2_bzopen) (
|
239
|
-
const char *path,
|
240
|
-
const char *mode
|
241
|
-
);
|
242
|
-
|
243
|
-
BZ_EXTERN BZFILE * BZ_API(BZ2_bzdopen) (
|
244
|
-
int fd,
|
245
|
-
const char *mode
|
246
|
-
);
|
247
|
-
|
248
|
-
BZ_EXTERN int BZ_API(BZ2_bzread) (
|
249
|
-
BZFILE* b,
|
250
|
-
void* buf,
|
251
|
-
int len
|
252
|
-
);
|
253
|
-
|
254
|
-
BZ_EXTERN int BZ_API(BZ2_bzwrite) (
|
255
|
-
BZFILE* b,
|
256
|
-
void* buf,
|
257
|
-
int len
|
258
|
-
);
|
259
|
-
|
260
|
-
BZ_EXTERN int BZ_API(BZ2_bzflush) (
|
261
|
-
BZFILE* b
|
262
|
-
);
|
263
|
-
|
264
|
-
BZ_EXTERN void BZ_API(BZ2_bzclose) (
|
265
|
-
BZFILE* b
|
266
|
-
);
|
267
|
-
|
268
|
-
BZ_EXTERN const char * BZ_API(BZ2_bzerror) (
|
269
|
-
BZFILE *b,
|
270
|
-
int *errnum
|
271
|
-
);
|
272
|
-
#endif
|
273
|
-
|
274
|
-
#ifdef __cplusplus
|
275
|
-
}
|
276
|
-
#endif
|
277
|
-
|
278
|
-
#endif
|
279
|
-
|
280
|
-
/*-------------------------------------------------------------*/
|
281
|
-
/*--- end bzlib.h ---*/
|
282
|
-
/*-------------------------------------------------------------*/
|
@@ -1,509 +0,0 @@
|
|
1
|
-
|
2
|
-
/*-------------------------------------------------------------*/
|
3
|
-
/*--- Private header file for the library. ---*/
|
4
|
-
/*--- bzlib_private.h ---*/
|
5
|
-
/*-------------------------------------------------------------*/
|
6
|
-
|
7
|
-
/* ------------------------------------------------------------------
|
8
|
-
This file is part of bzip2/libbzip2, a program and library for
|
9
|
-
lossless, block-sorting data compression.
|
10
|
-
|
11
|
-
bzip2/libbzip2 version 1.0.6 of 6 September 2010
|
12
|
-
Copyright (C) 1996-2010 Julian Seward <jseward@bzip.org>
|
13
|
-
|
14
|
-
Please read the WARNING, DISCLAIMER and PATENTS sections in the
|
15
|
-
README file.
|
16
|
-
|
17
|
-
This program is released under the terms of the license contained
|
18
|
-
in the file LICENSE.
|
19
|
-
------------------------------------------------------------------ */
|
20
|
-
|
21
|
-
|
22
|
-
#ifndef _BZLIB_PRIVATE_H
|
23
|
-
#define _BZLIB_PRIVATE_H
|
24
|
-
|
25
|
-
#include <stdlib.h>
|
26
|
-
|
27
|
-
#ifndef BZ_NO_STDIO
|
28
|
-
#include <stdio.h>
|
29
|
-
#include <ctype.h>
|
30
|
-
#include <string.h>
|
31
|
-
#endif
|
32
|
-
|
33
|
-
#include "bzlib.h"
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
/*-- General stuff. --*/
|
38
|
-
|
39
|
-
#define BZ_VERSION "1.0.6, 6-Sept-2010"
|
40
|
-
|
41
|
-
typedef char Char;
|
42
|
-
typedef unsigned char Bool;
|
43
|
-
typedef unsigned char UChar;
|
44
|
-
typedef int Int32;
|
45
|
-
typedef unsigned int UInt32;
|
46
|
-
typedef short Int16;
|
47
|
-
typedef unsigned short UInt16;
|
48
|
-
|
49
|
-
#define True ((Bool)1)
|
50
|
-
#define False ((Bool)0)
|
51
|
-
|
52
|
-
#ifndef __GNUC__
|
53
|
-
#define __inline__ /* */
|
54
|
-
#endif
|
55
|
-
|
56
|
-
#ifndef BZ_NO_STDIO
|
57
|
-
|
58
|
-
extern void BZ2_bz__AssertH__fail ( int errcode );
|
59
|
-
#define AssertH(cond,errcode) \
|
60
|
-
{ if (!(cond)) BZ2_bz__AssertH__fail ( errcode ); }
|
61
|
-
|
62
|
-
#if BZ_DEBUG
|
63
|
-
#define AssertD(cond,msg) \
|
64
|
-
{ if (!(cond)) { \
|
65
|
-
fprintf ( stderr, \
|
66
|
-
"\n\nlibbzip2(debug build): internal error\n\t%s\n", msg );\
|
67
|
-
exit(1); \
|
68
|
-
}}
|
69
|
-
#else
|
70
|
-
#define AssertD(cond,msg) /* */
|
71
|
-
#endif
|
72
|
-
|
73
|
-
#define VPrintf0(zf) \
|
74
|
-
fprintf(stderr,zf)
|
75
|
-
#define VPrintf1(zf,za1) \
|
76
|
-
fprintf(stderr,zf,za1)
|
77
|
-
#define VPrintf2(zf,za1,za2) \
|
78
|
-
fprintf(stderr,zf,za1,za2)
|
79
|
-
#define VPrintf3(zf,za1,za2,za3) \
|
80
|
-
fprintf(stderr,zf,za1,za2,za3)
|
81
|
-
#define VPrintf4(zf,za1,za2,za3,za4) \
|
82
|
-
fprintf(stderr,zf,za1,za2,za3,za4)
|
83
|
-
#define VPrintf5(zf,za1,za2,za3,za4,za5) \
|
84
|
-
fprintf(stderr,zf,za1,za2,za3,za4,za5)
|
85
|
-
|
86
|
-
#else
|
87
|
-
|
88
|
-
extern void bz_internal_error ( int errcode );
|
89
|
-
#define AssertH(cond,errcode) \
|
90
|
-
{ if (!(cond)) bz_internal_error ( errcode ); }
|
91
|
-
#define AssertD(cond,msg) do { } while (0)
|
92
|
-
#define VPrintf0(zf) do { } while (0)
|
93
|
-
#define VPrintf1(zf,za1) do { } while (0)
|
94
|
-
#define VPrintf2(zf,za1,za2) do { } while (0)
|
95
|
-
#define VPrintf3(zf,za1,za2,za3) do { } while (0)
|
96
|
-
#define VPrintf4(zf,za1,za2,za3,za4) do { } while (0)
|
97
|
-
#define VPrintf5(zf,za1,za2,za3,za4,za5) do { } while (0)
|
98
|
-
|
99
|
-
#endif
|
100
|
-
|
101
|
-
|
102
|
-
#define BZALLOC(nnn) (strm->bzalloc)(strm->opaque,(nnn),1)
|
103
|
-
#define BZFREE(ppp) (strm->bzfree)(strm->opaque,(ppp))
|
104
|
-
|
105
|
-
|
106
|
-
/*-- Header bytes. --*/
|
107
|
-
|
108
|
-
#define BZ_HDR_B 0x42 /* 'B' */
|
109
|
-
#define BZ_HDR_Z 0x5a /* 'Z' */
|
110
|
-
#define BZ_HDR_h 0x68 /* 'h' */
|
111
|
-
#define BZ_HDR_0 0x30 /* '0' */
|
112
|
-
|
113
|
-
/*-- Constants for the back end. --*/
|
114
|
-
|
115
|
-
#define BZ_MAX_ALPHA_SIZE 258
|
116
|
-
#define BZ_MAX_CODE_LEN 23
|
117
|
-
|
118
|
-
#define BZ_RUNA 0
|
119
|
-
#define BZ_RUNB 1
|
120
|
-
|
121
|
-
#define BZ_N_GROUPS 6
|
122
|
-
#define BZ_G_SIZE 50
|
123
|
-
#define BZ_N_ITERS 4
|
124
|
-
|
125
|
-
#define BZ_MAX_SELECTORS (2 + (900000 / BZ_G_SIZE))
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
/*-- Stuff for randomising repetitive blocks. --*/
|
130
|
-
|
131
|
-
extern Int32 BZ2_rNums[512];
|
132
|
-
|
133
|
-
#define BZ_RAND_DECLS \
|
134
|
-
Int32 rNToGo; \
|
135
|
-
Int32 rTPos \
|
136
|
-
|
137
|
-
#define BZ_RAND_INIT_MASK \
|
138
|
-
s->rNToGo = 0; \
|
139
|
-
s->rTPos = 0 \
|
140
|
-
|
141
|
-
#define BZ_RAND_MASK ((s->rNToGo == 1) ? 1 : 0)
|
142
|
-
|
143
|
-
#define BZ_RAND_UPD_MASK \
|
144
|
-
if (s->rNToGo == 0) { \
|
145
|
-
s->rNToGo = BZ2_rNums[s->rTPos]; \
|
146
|
-
s->rTPos++; \
|
147
|
-
if (s->rTPos == 512) s->rTPos = 0; \
|
148
|
-
} \
|
149
|
-
s->rNToGo--;
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
/*-- Stuff for doing CRCs. --*/
|
154
|
-
|
155
|
-
extern UInt32 BZ2_crc32Table[256];
|
156
|
-
|
157
|
-
#define BZ_INITIALISE_CRC(crcVar) \
|
158
|
-
{ \
|
159
|
-
crcVar = 0xffffffffL; \
|
160
|
-
}
|
161
|
-
|
162
|
-
#define BZ_FINALISE_CRC(crcVar) \
|
163
|
-
{ \
|
164
|
-
crcVar = ~(crcVar); \
|
165
|
-
}
|
166
|
-
|
167
|
-
#define BZ_UPDATE_CRC(crcVar,cha) \
|
168
|
-
{ \
|
169
|
-
crcVar = (crcVar << 8) ^ \
|
170
|
-
BZ2_crc32Table[(crcVar >> 24) ^ \
|
171
|
-
((UChar)cha)]; \
|
172
|
-
}
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
/*-- States and modes for compression. --*/
|
177
|
-
|
178
|
-
#define BZ_M_IDLE 1
|
179
|
-
#define BZ_M_RUNNING 2
|
180
|
-
#define BZ_M_FLUSHING 3
|
181
|
-
#define BZ_M_FINISHING 4
|
182
|
-
|
183
|
-
#define BZ_S_OUTPUT 1
|
184
|
-
#define BZ_S_INPUT 2
|
185
|
-
|
186
|
-
#define BZ_N_RADIX 2
|
187
|
-
#define BZ_N_QSORT 12
|
188
|
-
#define BZ_N_SHELL 18
|
189
|
-
#define BZ_N_OVERSHOOT (BZ_N_RADIX + BZ_N_QSORT + BZ_N_SHELL + 2)
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
/*-- Structure holding all the compression-side stuff. --*/
|
195
|
-
|
196
|
-
typedef
|
197
|
-
struct {
|
198
|
-
/* pointer back to the struct bz_stream */
|
199
|
-
bz_stream* strm;
|
200
|
-
|
201
|
-
/* mode this stream is in, and whether inputting */
|
202
|
-
/* or outputting data */
|
203
|
-
Int32 mode;
|
204
|
-
Int32 state;
|
205
|
-
|
206
|
-
/* remembers avail_in when flush/finish requested */
|
207
|
-
UInt32 avail_in_expect;
|
208
|
-
|
209
|
-
/* for doing the block sorting */
|
210
|
-
UInt32* arr1;
|
211
|
-
UInt32* arr2;
|
212
|
-
UInt32* ftab;
|
213
|
-
Int32 origPtr;
|
214
|
-
|
215
|
-
/* aliases for arr1 and arr2 */
|
216
|
-
UInt32* ptr;
|
217
|
-
UChar* block;
|
218
|
-
UInt16* mtfv;
|
219
|
-
UChar* zbits;
|
220
|
-
|
221
|
-
/* for deciding when to use the fallback sorting algorithm */
|
222
|
-
Int32 workFactor;
|
223
|
-
|
224
|
-
/* run-length-encoding of the input */
|
225
|
-
UInt32 state_in_ch;
|
226
|
-
Int32 state_in_len;
|
227
|
-
BZ_RAND_DECLS;
|
228
|
-
|
229
|
-
/* input and output limits and current posns */
|
230
|
-
Int32 nblock;
|
231
|
-
Int32 nblockMAX;
|
232
|
-
Int32 numZ;
|
233
|
-
Int32 state_out_pos;
|
234
|
-
|
235
|
-
/* map of bytes used in block */
|
236
|
-
Int32 nInUse;
|
237
|
-
Bool inUse[256];
|
238
|
-
UChar unseqToSeq[256];
|
239
|
-
|
240
|
-
/* the buffer for bit stream creation */
|
241
|
-
UInt32 bsBuff;
|
242
|
-
Int32 bsLive;
|
243
|
-
|
244
|
-
/* block and combined CRCs */
|
245
|
-
UInt32 blockCRC;
|
246
|
-
UInt32 combinedCRC;
|
247
|
-
|
248
|
-
/* misc administratium */
|
249
|
-
Int32 verbosity;
|
250
|
-
Int32 blockNo;
|
251
|
-
Int32 blockSize100k;
|
252
|
-
|
253
|
-
/* stuff for coding the MTF values */
|
254
|
-
Int32 nMTF;
|
255
|
-
Int32 mtfFreq [BZ_MAX_ALPHA_SIZE];
|
256
|
-
UChar selector [BZ_MAX_SELECTORS];
|
257
|
-
UChar selectorMtf[BZ_MAX_SELECTORS];
|
258
|
-
|
259
|
-
UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
260
|
-
Int32 code [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
261
|
-
Int32 rfreq [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
262
|
-
/* second dimension: only 3 needed; 4 makes index calculations faster */
|
263
|
-
UInt32 len_pack[BZ_MAX_ALPHA_SIZE][4];
|
264
|
-
|
265
|
-
}
|
266
|
-
EState;
|
267
|
-
|
268
|
-
|
269
|
-
|
270
|
-
/*-- externs for compression. --*/
|
271
|
-
|
272
|
-
extern void
|
273
|
-
BZ2_blockSort ( EState* );
|
274
|
-
|
275
|
-
extern void
|
276
|
-
BZ2_compressBlock ( EState*, Bool );
|
277
|
-
|
278
|
-
extern void
|
279
|
-
BZ2_bsInitWrite ( EState* );
|
280
|
-
|
281
|
-
extern void
|
282
|
-
BZ2_hbAssignCodes ( Int32*, UChar*, Int32, Int32, Int32 );
|
283
|
-
|
284
|
-
extern void
|
285
|
-
BZ2_hbMakeCodeLengths ( UChar*, Int32*, Int32, Int32 );
|
286
|
-
|
287
|
-
|
288
|
-
|
289
|
-
/*-- states for decompression. --*/
|
290
|
-
|
291
|
-
#define BZ_X_IDLE 1
|
292
|
-
#define BZ_X_OUTPUT 2
|
293
|
-
|
294
|
-
#define BZ_X_MAGIC_1 10
|
295
|
-
#define BZ_X_MAGIC_2 11
|
296
|
-
#define BZ_X_MAGIC_3 12
|
297
|
-
#define BZ_X_MAGIC_4 13
|
298
|
-
#define BZ_X_BLKHDR_1 14
|
299
|
-
#define BZ_X_BLKHDR_2 15
|
300
|
-
#define BZ_X_BLKHDR_3 16
|
301
|
-
#define BZ_X_BLKHDR_4 17
|
302
|
-
#define BZ_X_BLKHDR_5 18
|
303
|
-
#define BZ_X_BLKHDR_6 19
|
304
|
-
#define BZ_X_BCRC_1 20
|
305
|
-
#define BZ_X_BCRC_2 21
|
306
|
-
#define BZ_X_BCRC_3 22
|
307
|
-
#define BZ_X_BCRC_4 23
|
308
|
-
#define BZ_X_RANDBIT 24
|
309
|
-
#define BZ_X_ORIGPTR_1 25
|
310
|
-
#define BZ_X_ORIGPTR_2 26
|
311
|
-
#define BZ_X_ORIGPTR_3 27
|
312
|
-
#define BZ_X_MAPPING_1 28
|
313
|
-
#define BZ_X_MAPPING_2 29
|
314
|
-
#define BZ_X_SELECTOR_1 30
|
315
|
-
#define BZ_X_SELECTOR_2 31
|
316
|
-
#define BZ_X_SELECTOR_3 32
|
317
|
-
#define BZ_X_CODING_1 33
|
318
|
-
#define BZ_X_CODING_2 34
|
319
|
-
#define BZ_X_CODING_3 35
|
320
|
-
#define BZ_X_MTF_1 36
|
321
|
-
#define BZ_X_MTF_2 37
|
322
|
-
#define BZ_X_MTF_3 38
|
323
|
-
#define BZ_X_MTF_4 39
|
324
|
-
#define BZ_X_MTF_5 40
|
325
|
-
#define BZ_X_MTF_6 41
|
326
|
-
#define BZ_X_ENDHDR_2 42
|
327
|
-
#define BZ_X_ENDHDR_3 43
|
328
|
-
#define BZ_X_ENDHDR_4 44
|
329
|
-
#define BZ_X_ENDHDR_5 45
|
330
|
-
#define BZ_X_ENDHDR_6 46
|
331
|
-
#define BZ_X_CCRC_1 47
|
332
|
-
#define BZ_X_CCRC_2 48
|
333
|
-
#define BZ_X_CCRC_3 49
|
334
|
-
#define BZ_X_CCRC_4 50
|
335
|
-
|
336
|
-
|
337
|
-
|
338
|
-
/*-- Constants for the fast MTF decoder. --*/
|
339
|
-
|
340
|
-
#define MTFA_SIZE 4096
|
341
|
-
#define MTFL_SIZE 16
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
/*-- Structure holding all the decompression-side stuff. --*/
|
346
|
-
|
347
|
-
typedef
|
348
|
-
struct {
|
349
|
-
/* pointer back to the struct bz_stream */
|
350
|
-
bz_stream* strm;
|
351
|
-
|
352
|
-
/* state indicator for this stream */
|
353
|
-
Int32 state;
|
354
|
-
|
355
|
-
/* for doing the final run-length decoding */
|
356
|
-
UChar state_out_ch;
|
357
|
-
Int32 state_out_len;
|
358
|
-
Bool blockRandomised;
|
359
|
-
BZ_RAND_DECLS;
|
360
|
-
|
361
|
-
/* the buffer for bit stream reading */
|
362
|
-
UInt32 bsBuff;
|
363
|
-
Int32 bsLive;
|
364
|
-
|
365
|
-
/* misc administratium */
|
366
|
-
Int32 blockSize100k;
|
367
|
-
Bool smallDecompress;
|
368
|
-
Int32 currBlockNo;
|
369
|
-
Int32 verbosity;
|
370
|
-
|
371
|
-
/* for undoing the Burrows-Wheeler transform */
|
372
|
-
Int32 origPtr;
|
373
|
-
UInt32 tPos;
|
374
|
-
Int32 k0;
|
375
|
-
Int32 unzftab[256];
|
376
|
-
Int32 nblock_used;
|
377
|
-
Int32 cftab[257];
|
378
|
-
Int32 cftabCopy[257];
|
379
|
-
|
380
|
-
/* for undoing the Burrows-Wheeler transform (FAST) */
|
381
|
-
UInt32 *tt;
|
382
|
-
|
383
|
-
/* for undoing the Burrows-Wheeler transform (SMALL) */
|
384
|
-
UInt16 *ll16;
|
385
|
-
UChar *ll4;
|
386
|
-
|
387
|
-
/* stored and calculated CRCs */
|
388
|
-
UInt32 storedBlockCRC;
|
389
|
-
UInt32 storedCombinedCRC;
|
390
|
-
UInt32 calculatedBlockCRC;
|
391
|
-
UInt32 calculatedCombinedCRC;
|
392
|
-
|
393
|
-
/* map of bytes used in block */
|
394
|
-
Int32 nInUse;
|
395
|
-
Bool inUse[256];
|
396
|
-
Bool inUse16[16];
|
397
|
-
UChar seqToUnseq[256];
|
398
|
-
|
399
|
-
/* for decoding the MTF values */
|
400
|
-
UChar mtfa [MTFA_SIZE];
|
401
|
-
Int32 mtfbase[256 / MTFL_SIZE];
|
402
|
-
UChar selector [BZ_MAX_SELECTORS];
|
403
|
-
UChar selectorMtf[BZ_MAX_SELECTORS];
|
404
|
-
UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
405
|
-
|
406
|
-
Int32 limit [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
407
|
-
Int32 base [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
408
|
-
Int32 perm [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
409
|
-
Int32 minLens[BZ_N_GROUPS];
|
410
|
-
|
411
|
-
/* save area for scalars in the main decompress code */
|
412
|
-
Int32 save_i;
|
413
|
-
Int32 save_j;
|
414
|
-
Int32 save_t;
|
415
|
-
Int32 save_alphaSize;
|
416
|
-
Int32 save_nGroups;
|
417
|
-
Int32 save_nSelectors;
|
418
|
-
Int32 save_EOB;
|
419
|
-
Int32 save_groupNo;
|
420
|
-
Int32 save_groupPos;
|
421
|
-
Int32 save_nextSym;
|
422
|
-
Int32 save_nblockMAX;
|
423
|
-
Int32 save_nblock;
|
424
|
-
Int32 save_es;
|
425
|
-
Int32 save_N;
|
426
|
-
Int32 save_curr;
|
427
|
-
Int32 save_zt;
|
428
|
-
Int32 save_zn;
|
429
|
-
Int32 save_zvec;
|
430
|
-
Int32 save_zj;
|
431
|
-
Int32 save_gSel;
|
432
|
-
Int32 save_gMinlen;
|
433
|
-
Int32* save_gLimit;
|
434
|
-
Int32* save_gBase;
|
435
|
-
Int32* save_gPerm;
|
436
|
-
|
437
|
-
}
|
438
|
-
DState;
|
439
|
-
|
440
|
-
|
441
|
-
|
442
|
-
/*-- Macros for decompression. --*/
|
443
|
-
|
444
|
-
#define BZ_GET_FAST(cccc) \
|
445
|
-
/* c_tPos is unsigned, hence test < 0 is pointless. */ \
|
446
|
-
if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
|
447
|
-
s->tPos = s->tt[s->tPos]; \
|
448
|
-
cccc = (UChar)(s->tPos & 0xff); \
|
449
|
-
s->tPos >>= 8;
|
450
|
-
|
451
|
-
#define BZ_GET_FAST_C(cccc) \
|
452
|
-
/* c_tPos is unsigned, hence test < 0 is pointless. */ \
|
453
|
-
if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \
|
454
|
-
c_tPos = c_tt[c_tPos]; \
|
455
|
-
cccc = (UChar)(c_tPos & 0xff); \
|
456
|
-
c_tPos >>= 8;
|
457
|
-
|
458
|
-
#define SET_LL4(i,n) \
|
459
|
-
{ if (((i) & 0x1) == 0) \
|
460
|
-
s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0xf0) | (n); else \
|
461
|
-
s->ll4[(i) >> 1] = (s->ll4[(i) >> 1] & 0x0f) | ((n) << 4); \
|
462
|
-
}
|
463
|
-
|
464
|
-
#define GET_LL4(i) \
|
465
|
-
((((UInt32)(s->ll4[(i) >> 1])) >> (((i) << 2) & 0x4)) & 0xF)
|
466
|
-
|
467
|
-
#define SET_LL(i,n) \
|
468
|
-
{ s->ll16[i] = (UInt16)(n & 0x0000ffff); \
|
469
|
-
SET_LL4(i, n >> 16); \
|
470
|
-
}
|
471
|
-
|
472
|
-
#define GET_LL(i) \
|
473
|
-
(((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
|
474
|
-
|
475
|
-
#define BZ_GET_SMALL(cccc) \
|
476
|
-
/* c_tPos is unsigned, hence test < 0 is pointless. */ \
|
477
|
-
if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
|
478
|
-
cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \
|
479
|
-
s->tPos = GET_LL(s->tPos);
|
480
|
-
|
481
|
-
|
482
|
-
/*-- externs for decompression. --*/
|
483
|
-
|
484
|
-
extern Int32
|
485
|
-
BZ2_indexIntoF ( Int32, Int32* );
|
486
|
-
|
487
|
-
extern Int32
|
488
|
-
BZ2_decompress ( DState* );
|
489
|
-
|
490
|
-
extern void
|
491
|
-
BZ2_hbCreateDecodeTables ( Int32*, Int32*, Int32*, UChar*,
|
492
|
-
Int32, Int32, Int32 );
|
493
|
-
|
494
|
-
|
495
|
-
#endif
|
496
|
-
|
497
|
-
|
498
|
-
/*-- BZ_NO_STDIO seems to make NULL disappear on some platforms. --*/
|
499
|
-
|
500
|
-
#ifdef BZ_NO_STDIO
|
501
|
-
#ifndef NULL
|
502
|
-
#define NULL 0
|
503
|
-
#endif
|
504
|
-
#endif
|
505
|
-
|
506
|
-
|
507
|
-
/*-------------------------------------------------------------*/
|
508
|
-
/*--- end bzlib_private.h ---*/
|
509
|
-
/*-------------------------------------------------------------*/
|