zeroc-ice 3.6.5 → 3.7.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/BZIP2_LICENSE +42 -0
- data/ICE_LICENSE +17 -17
- data/LICENSE +12 -12
- data/bin/slice2rb +1 -1
- data/ext/Communicator.cpp +150 -53
- data/ext/Communicator.h +1 -1
- data/ext/Config.h +2 -12
- data/ext/Connection.cpp +89 -68
- data/ext/Connection.h +1 -1
- data/ext/Endpoint.cpp +16 -45
- data/ext/Endpoint.h +1 -1
- data/ext/ImplicitContext.cpp +1 -5
- data/ext/ImplicitContext.h +1 -1
- data/ext/Init.cpp +4 -1
- data/ext/Logger.cpp +1 -1
- data/ext/Logger.h +1 -1
- data/ext/Operation.cpp +33 -44
- data/ext/Operation.h +1 -1
- data/ext/Properties.cpp +1 -1
- data/ext/Properties.h +1 -1
- data/ext/Proxy.cpp +22 -57
- data/ext/Proxy.h +1 -1
- data/ext/Slice.cpp +5 -5
- data/ext/Slice.h +1 -1
- data/ext/Types.cpp +244 -171
- data/ext/Types.h +118 -66
- data/ext/Util.cpp +13 -9
- data/ext/Util.h +10 -10
- data/ext/ValueFactoryManager.cpp +445 -0
- data/ext/ValueFactoryManager.h +100 -0
- data/ext/extconf.rb +47 -45
- data/ext/ice/bzip2/blocksort.c +1094 -0
- data/ext/ice/bzip2/bzlib.c +1572 -0
- data/ext/ice/bzip2/bzlib.h +282 -0
- data/ext/ice/bzip2/bzlib_private.h +509 -0
- data/ext/ice/bzip2/compress.c +672 -0
- data/ext/ice/bzip2/crctable.c +104 -0
- data/ext/ice/bzip2/decompress.c +646 -0
- data/ext/ice/bzip2/huffman.c +205 -0
- data/ext/ice/bzip2/randtable.c +84 -0
- data/ext/ice/cpp/include/Ice/Application.h +77 -60
- data/ext/ice/cpp/include/Ice/AsyncResult.h +34 -318
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -2
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +5 -10
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -1
- data/ext/ice/cpp/include/Ice/Buffer.h +10 -10
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +14 -12
- data/ext/ice/cpp/include/Ice/Comparable.h +130 -0
- data/ext/ice/cpp/include/Ice/Config.h +7 -36
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +107 -11
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +5 -1
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +28 -0
- data/ext/ice/cpp/include/Ice/{DefaultObjectFactory.h → DefaultValueFactory.h} +28 -14
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +4 -6
- data/ext/ice/cpp/include/Ice/Dispatcher.h +14 -13
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -5
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -1
- data/ext/ice/cpp/include/Ice/Exception.h +66 -56
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +69 -0
- data/ext/ice/cpp/include/Ice/FactoryTable.h +11 -12
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +27 -25
- data/ext/ice/cpp/include/Ice/Format.h +6 -1
- data/ext/ice/cpp/include/Ice/Functional.h +33 -33
- data/ext/ice/cpp/include/Ice/GCObject.h +9 -5
- data/ext/ice/cpp/include/Ice/Handle.h +6 -11
- data/ext/ice/cpp/include/Ice/Ice.h +9 -5
- data/ext/ice/cpp/include/{IceUtil → Ice}/IconvStringConverter.h +108 -62
- data/ext/ice/cpp/include/Ice/Incoming.h +109 -33
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +63 -23
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -1
- data/ext/ice/cpp/include/Ice/Initialize.h +178 -38
- data/ext/ice/cpp/include/Ice/InputStream.h +994 -0
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -2
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +46 -0
- data/ext/ice/cpp/include/Ice/LocalObject.h +9 -9
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -1
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +20 -14
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +114 -65
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +23 -5
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +99 -26
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +17 -4
- data/ext/ice/cpp/include/Ice/Object.h +105 -56
- data/ext/ice/cpp/include/Ice/ObjectF.h +8 -3
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -8
- data/ext/ice/cpp/include/Ice/Optional.h +1084 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +655 -84
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -6
- data/ext/ice/cpp/include/Ice/OutputStream.h +753 -0
- data/ext/ice/cpp/include/Ice/Protocol.h +19 -12
- data/ext/ice/cpp/include/Ice/Proxy.h +1329 -717
- data/ext/ice/cpp/include/Ice/ProxyF.h +11 -33
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -1
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +34 -50
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -1
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +22 -3
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -4
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -1
- data/ext/ice/cpp/include/{IceUtil → Ice}/SHA1.h +16 -16
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -1
- data/ext/ice/cpp/include/Ice/Service.h +13 -18
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -1
- data/ext/ice/cpp/include/Ice/SlicedData.h +46 -20
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +14 -6
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +159 -49
- data/ext/ice/cpp/include/Ice/StringConverter.h +52 -0
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -1
- data/{slice/Ice/ObjectFactoryF.ice → ext/ice/cpp/include/Ice/UUID.h} +9 -7
- data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +21 -22
- data/ext/ice/cpp/include/Ice/UniqueRef.h +98 -0
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +40 -8
- data/ext/ice/cpp/include/Ice/Value.h +104 -0
- data/{slice/Freeze/ConnectionF.ice → ext/ice/cpp/include/Ice/ValueF.h} +11 -7
- data/ext/ice/cpp/include/IceSSL/Config.h +8 -23
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -6
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +130 -0
- data/ext/ice/cpp/include/IceSSL/Plugin.h +172 -259
- data/ext/ice/cpp/include/IceSSL/SChannel.h +66 -0
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +66 -0
- data/ext/ice/cpp/include/IceSSL/UWP.h +58 -0
- data/ext/ice/cpp/include/IceUtil/Atomic.h +8 -10
- data/ext/ice/cpp/include/IceUtil/Cond.h +17 -18
- data/ext/ice/cpp/include/IceUtil/Config.h +138 -39
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +97 -0
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -5
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +23 -17
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +1 -3
- data/ext/ice/cpp/include/IceUtil/Exception.h +157 -67
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +148 -0
- data/ext/ice/cpp/include/IceUtil/Functional.h +1 -2
- data/ext/ice/cpp/include/IceUtil/Handle.h +11 -11
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -10
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -3
- data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -2
- data/ext/ice/cpp/include/IceUtil/Lock.h +8 -10
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -2
- data/ext/ice/cpp/include/IceUtil/Mutex.h +17 -11
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -2
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -4
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -4
- data/ext/ice/cpp/include/IceUtil/Optional.h +32 -18
- data/ext/ice/cpp/include/IceUtil/Options.h +17 -18
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +55 -29
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -6
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +11 -10
- data/ext/ice/cpp/include/IceUtil/Random.h +3 -3
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -8
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +58 -0
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +1 -9
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -2
- data/ext/ice/cpp/include/IceUtil/Shared.h +5 -7
- data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -2
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +77 -72
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -21
- data/ext/ice/cpp/include/IceUtil/Thread.h +10 -12
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -42
- data/ext/ice/cpp/include/IceUtil/Time.h +3 -3
- data/ext/ice/cpp/include/IceUtil/Timer.h +14 -13
- data/ext/ice/cpp/include/IceUtil/UUID.h +2 -2
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -1
- data/ext/ice/cpp/include/{Ice → generated/Ice}/BuiltinSequences.h +41 -8
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +364 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/Connection.h +872 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ConnectionF.h +46 -8
- data/ext/ice/cpp/include/{Ice → generated/Ice}/Current.h +71 -8
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +582 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/EndpointF.h +62 -8
- data/ext/ice/cpp/include/{Ice → generated/Ice}/EndpointTypes.h +31 -16
- data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +23 -8
- data/ext/ice/cpp/include/generated/Ice/Identity.h +221 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContext.h +72 -13
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +602 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/InstrumentationF.h +54 -8
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +2802 -0
- data/ext/ice/cpp/include/generated/Ice/Locator.h +2036 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LocatorF.h +53 -12
- data/ext/ice/cpp/include/{Ice → generated/Ice}/Logger.h +71 -13
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +2649 -0
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +302 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +142 -0
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +197 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/PluginF.h +43 -8
- data/ext/ice/cpp/include/generated/Ice/Process.h +536 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ProcessF.h +45 -10
- data/ext/ice/cpp/include/{Ice → generated/Ice}/Properties.h +88 -21
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +749 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/PropertiesF.h +48 -10
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +1449 -0
- data/ext/ice/cpp/include/generated/Ice/Router.h +1032 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/RouterF.h +45 -10
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocator.h +65 -13
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +40 -8
- data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +23 -8
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +169 -0
- data/ext/ice/cpp/include/generated/Ice/Version.h +334 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +172 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +98 -0
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +156 -0
- data/ext/ice/cpp/src/Ice/ACM.cpp +18 -14
- data/ext/ice/cpp/src/Ice/ACM.h +9 -2
- data/ext/ice/cpp/{include → src}/Ice/ACMF.h +10 -5
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -1
- data/ext/ice/cpp/src/Ice/Acceptor.h +4 -3
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
- data/ext/ice/cpp/src/{IceUtil → Ice}/ArgVector.cpp +9 -9
- data/ext/ice/cpp/src/{IceUtil → Ice}/ArgVector.h +7 -7
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -538
- data/ext/ice/cpp/src/Ice/Base64.cpp +11 -11
- data/ext/ice/cpp/src/Ice/Base64.h +1 -1
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +40 -12
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -10
- data/ext/ice/cpp/src/Ice/Buffer.cpp +74 -12
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +20 -6
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +85 -190
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -18
- data/ext/ice/cpp/src/Ice/Communicator.cpp +39 -8
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +271 -104
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +84 -28
- data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +58 -125
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +11 -22
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -2
- data/ext/ice/cpp/src/Ice/Connection.cpp +88 -8
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +158 -80
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +41 -23
- data/ext/ice/cpp/{include → src}/Ice/ConnectionFactoryF.h +8 -3
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +707 -653
- data/ext/ice/cpp/src/Ice/ConnectionI.h +97 -69
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -15
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +4 -3
- data/ext/ice/cpp/src/Ice/Connector.cpp +6 -1
- data/ext/ice/cpp/src/Ice/Connector.h +4 -3
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -1
- data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -4
- data/ext/ice/cpp/src/Ice/Current.cpp +29 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +6 -5
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -1
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -1
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +5 -25
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +29 -19
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +85 -6
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -1
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +35 -19
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -4
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +17 -1
- data/ext/ice/cpp/src/Ice/EndpointI.h +35 -9
- data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -5
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +18 -6
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -4
- data/ext/ice/cpp/src/Ice/EventHandler.h +13 -8
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -2
- data/ext/ice/cpp/src/Ice/Exception.cpp +95 -86
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +20 -6
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -28
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -4
- data/ext/ice/cpp/src/Ice/GCObject.cpp +28 -25
- data/ext/ice/cpp/src/Ice/HashUtil.h +2 -3
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -2
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -1
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +92 -53
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +19 -10
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -2
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +56 -0
- data/ext/ice/cpp/src/Ice/Identity.cpp +24 -10
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +37 -6
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +14 -14
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -5
- data/ext/ice/cpp/src/Ice/Incoming.cpp +276 -245
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -209
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -4
- data/ext/ice/cpp/src/Ice/Initialize.cpp +299 -172
- data/ext/ice/cpp/src/Ice/InputStream.cpp +2773 -0
- data/ext/ice/cpp/src/Ice/Instance.cpp +191 -231
- data/ext/ice/cpp/src/Ice/Instance.h +30 -18
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +106 -7
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +117 -99
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -31
- data/ext/ice/cpp/src/Ice/LocalException.cpp +1190 -416
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -2
- data/ext/ice/cpp/src/Ice/Locator.cpp +1167 -1215
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +129 -163
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +29 -29
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -1
- data/ext/ice/cpp/src/Ice/Logger.cpp +35 -5
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +178 -73
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -4
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +14 -44
- data/ext/ice/cpp/src/Ice/LoggerI.h +7 -13
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -12
- data/ext/ice/cpp/src/Ice/Metrics.cpp +1059 -1069
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +49 -19
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -2
- data/ext/ice/cpp/src/Ice/Network.cpp +534 -170
- data/ext/ice/cpp/src/Ice/Network.h +100 -23
- data/ext/ice/cpp/src/Ice/NetworkF.h +2 -2
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +21 -14
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -2
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -1
- data/ext/ice/cpp/src/Ice/Object.cpp +217 -221
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +41 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +35 -14
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -7
- data/ext/ice/cpp/{include → src}/Ice/ObjectAdapterFactoryF.h +5 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +184 -58
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +32 -26
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +37 -6
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -32
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +40 -18
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +14 -5
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +803 -365
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1399 -0
- data/ext/ice/cpp/src/Ice/Plugin.cpp +45 -6
- data/ext/ice/cpp/src/Ice/PluginF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +13 -13
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +5 -6
- data/ext/ice/cpp/src/Ice/Process.cpp +256 -114
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/Properties.cpp +38 -8
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +340 -328
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +81 -17
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -5
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +25 -26
- data/ext/ice/cpp/src/Ice/PropertiesI.h +8 -11
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +107 -50
- data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -2
- data/ext/ice/cpp/src/Ice/Protocol.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -2
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -20
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -1
- data/ext/ice/cpp/src/Ice/Proxy.cpp +690 -964
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +23 -32
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -11
- data/ext/ice/cpp/src/Ice/Reference.cpp +75 -69
- data/ext/ice/cpp/src/Ice/Reference.h +27 -22
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +18 -21
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -12
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +18 -4
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -1
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +672 -552
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -3
- data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -13
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -6
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -2
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -6
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -7
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +6 -12
- data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -6
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -1
- data/ext/ice/cpp/src/Ice/Router.cpp +523 -474
- data/ext/ice/cpp/src/Ice/RouterF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +91 -70
- data/ext/ice/cpp/src/Ice/RouterInfo.h +43 -32
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -1
- data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +21 -21
- data/ext/ice/cpp/src/Ice/Selector.cpp +989 -923
- data/ext/ice/cpp/src/Ice/Selector.h +100 -147
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +37 -6
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +9 -9
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -1
- data/ext/ice/cpp/src/Ice/SharedContext.h +2 -2
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +20 -6
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -2
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -20
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +173 -18
- data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -4
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +48 -17
- data/ext/ice/cpp/src/Ice/StringUtil.h +35 -0
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +8 -4
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -3
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +158 -32
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -5
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -7
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -2
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +40 -32
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +11 -8
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +12 -27
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -10
- data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +24 -41
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +175 -267
- data/ext/ice/cpp/src/Ice/ThreadPool.h +38 -43
- data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +28 -21
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -2
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -2
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -31
- data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -6
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -2
- data/ext/ice/cpp/src/Ice/Transceiver.h +8 -7
- data/ext/ice/cpp/src/Ice/TransceiverF.h +1 -1
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +2 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -2
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +92 -31
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +12 -4
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +150 -179
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -17
- data/ext/ice/cpp/src/Ice/Value.cpp +81 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +84 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +70 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +42 -0
- data/ext/ice/cpp/src/Ice/Version.cpp +24 -14
- data/ext/ice/cpp/src/Ice/VirtualShared.h +43 -0
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -9
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -7
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -11
- data/ext/ice/cpp/src/Ice/WSConnector.h +3 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +185 -80
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +21 -31
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +41 -37
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -21
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +526 -264
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +341 -455
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +86 -26
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -23
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -61
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -36
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -59
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -3
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +396 -159
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +251 -355
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +52 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +526 -131
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +19 -165
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -17
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +284 -0
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +69 -0
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +39 -11
- data/ext/ice/cpp/src/{Ice/ObjectFactoryF.cpp → IceSSL/ConnectionInfoF.cpp} +31 -9
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +14 -56
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -13
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +205 -197
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +41 -33
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +39 -10
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/Instance.h +7 -7
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -7
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +588 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +117 -152
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +64 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +32 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +132 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +400 -89
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +36 -21
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +291 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +63 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -41
- data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -18
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -54
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -7
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +585 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +491 -75
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +126 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +32 -0
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +78 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +126 -169
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +19 -22
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +79 -74
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +24 -187
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -19
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +862 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +56 -214
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +60 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +31 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +80 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +137 -144
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +25 -28
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +857 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +46 -0
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +9 -13
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -4
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -3
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +271 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +343 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +46 -0
- data/ext/ice/cpp/{include/Ice/ObjectFactoryManagerF.h → src/IceSSL/UWPEngineF.h} +13 -8
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +94 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +388 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +76 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +66 -1256
- data/ext/ice/cpp/src/IceSSL/Util.h +48 -137
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +162 -0
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -22
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -26
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +20 -31
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +25 -116
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Options.cpp +23 -46
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +7 -6
- data/ext/ice/cpp/src/IceUtil/Random.cpp +13 -13
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +3 -9
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -3
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -264
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +540 -235
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -74
- data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +10 -10
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +98 -97
- data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -35
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +838 -0
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +815 -163
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +76 -0
- data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -2
- data/ext/ice/cpp/{include → src}/Slice/Checksum.h +2 -2
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -78
- data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -9
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1994 -1943
- data/ext/ice/cpp/src/Slice/Grammar.h +44 -24
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -14
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2658 -1927
- data/ext/ice/cpp/{include → src}/Slice/JavaUtil.h +178 -59
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -1
- data/ext/ice/cpp/src/Slice/MD5.h +1 -1
- data/ext/ice/cpp/src/Slice/MD5I.cpp +0 -1
- data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +12 -15
- data/ext/ice/cpp/{include → src}/Slice/PHPUtil.h +6 -15
- data/ext/ice/cpp/src/Slice/Parser.cpp +802 -307
- data/ext/ice/cpp/{include → src}/Slice/Parser.h +76 -84
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +43 -21
- data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +7 -12
- data/ext/ice/cpp/src/Slice/Python.cpp +207 -86
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +683 -679
- data/ext/ice/cpp/{include → src}/Slice/PythonUtil.h +19 -8
- data/ext/ice/cpp/src/Slice/Ruby.cpp +38 -34
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +177 -445
- data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -6
- data/ext/ice/cpp/src/Slice/Scanner.cpp +218 -306
- data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +37 -64
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +374 -0
- data/ext/ice/cpp/src/Slice/Util.h +54 -0
- data/ext/ice/mcpp/Makefile +5 -2
- data/ice.gemspec +2 -7
- data/lib/Glacier2.rb +1 -1
- data/lib/Glacier2/Metrics.rb +7 -46
- data/lib/Glacier2/PermissionsVerifier.rb +24 -95
- data/lib/Glacier2/PermissionsVerifierF.rb +3 -3
- data/lib/Glacier2/Router.rb +32 -74
- data/lib/Glacier2/RouterF.rb +3 -3
- data/lib/Glacier2/SSLInfo.rb +4 -7
- data/lib/Glacier2/Session.rb +88 -307
- data/lib/Ice.rb +83 -52
- data/lib/Ice/BuiltinSequences.rb +4 -4
- data/lib/Ice/Communicator.rb +56 -58
- data/lib/Ice/CommunicatorF.rb +3 -3
- data/lib/Ice/Connection.rb +153 -162
- data/lib/Ice/ConnectionF.rb +3 -3
- data/lib/Ice/Current.rb +4 -11
- data/lib/Ice/Endpoint.rb +57 -133
- data/lib/Ice/EndpointF.rb +3 -3
- data/lib/Ice/EndpointTypes.rb +3 -7
- data/lib/Ice/FacetMap.rb +4 -4
- data/lib/Ice/Identity.rb +5 -8
- data/lib/Ice/ImplicitContext.rb +5 -34
- data/lib/Ice/ImplicitContextF.rb +3 -3
- data/lib/Ice/Instrumentation.rb +23 -275
- data/lib/Ice/InstrumentationF.rb +3 -3
- data/lib/Ice/LocalException.rb +95 -141
- data/lib/Ice/Locator.rb +51 -165
- data/lib/Ice/LocatorF.rb +3 -3
- data/lib/Ice/Logger.rb +5 -34
- data/lib/Ice/LoggerF.rb +3 -3
- data/lib/Ice/Metrics.rb +61 -416
- data/lib/Ice/ObjectAdapter.rb +34 -0
- data/lib/Ice/ObjectAdapterF.rb +3 -3
- data/lib/Ice/ObjectFactory.rb +5 -30
- data/lib/Ice/Plugin.rb +7 -60
- data/lib/Ice/PluginF.rb +3 -3
- data/lib/Ice/Process.rb +16 -52
- data/lib/Ice/ProcessF.rb +3 -3
- data/lib/Ice/Properties.rb +5 -41
- data/lib/Ice/PropertiesAdmin.rb +19 -56
- data/lib/Ice/PropertiesF.rb +3 -3
- data/lib/Ice/RemoteLogger.rb +34 -115
- data/lib/Ice/Router.rb +29 -101
- data/lib/Ice/RouterF.rb +3 -3
- data/lib/Ice/ServantLocator.rb +31 -0
- data/lib/Ice/{ObjectFactoryF.rb → ServantLocatorF.rb} +6 -6
- data/lib/Ice/SliceChecksumDict.rb +3 -3
- data/lib/Ice/ValueFactory.rb +33 -0
- data/lib/Ice/Version.rb +5 -11
- data/lib/IceBox.rb +1 -1
- data/lib/IceBox/IceBox.rb +44 -148
- data/lib/IceGrid.rb +1 -4
- data/lib/IceGrid/Admin.rb +551 -427
- data/lib/IceGrid/Descriptor.rb +62 -529
- data/lib/IceGrid/Exception.rb +24 -45
- data/lib/IceGrid/FileParser.rb +14 -50
- data/lib/IceGrid/PluginFacade.rb +40 -0
- data/lib/IceGrid/Registry.rb +151 -58
- data/lib/IceGrid/Session.rb +25 -64
- data/lib/IceGrid/UserAccountMapper.rb +14 -50
- data/lib/IcePatch2.rb +1 -1
- data/lib/IcePatch2/FileInfo.rb +5 -11
- data/lib/IcePatch2/FileServer.rb +33 -76
- data/lib/IceStorm.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +79 -206
- data/lib/IceStorm/Metrics.rb +11 -89
- data/slice/Glacier2/Metrics.ice +8 -4
- data/slice/Glacier2/PermissionsVerifier.ice +10 -7
- data/slice/Glacier2/PermissionsVerifierF.ice +7 -4
- data/slice/Glacier2/Router.ice +10 -8
- data/slice/Glacier2/RouterF.ice +7 -4
- data/slice/Glacier2/SSLInfo.ice +8 -5
- data/slice/Glacier2/Session.ice +15 -13
- data/slice/Ice/BuiltinSequences.ice +7 -4
- data/slice/Ice/Communicator.ice +141 -66
- data/slice/Ice/CommunicatorF.ice +7 -4
- data/slice/Ice/Connection.ice +183 -86
- data/slice/Ice/ConnectionF.ice +7 -4
- data/slice/Ice/Current.ice +13 -9
- data/slice/Ice/Endpoint.ice +63 -14
- data/slice/Ice/EndpointF.ice +7 -4
- data/slice/Ice/EndpointTypes.ice +8 -6
- data/slice/Ice/FacetMap.ice +7 -4
- data/slice/Ice/Identity.ice +13 -5
- data/slice/Ice/ImplicitContext.ice +20 -18
- data/slice/Ice/ImplicitContextF.ice +7 -4
- data/slice/Ice/Instrumentation.ice +20 -19
- data/slice/Ice/InstrumentationF.ice +8 -5
- data/slice/Ice/LocalException.ice +87 -87
- data/slice/Ice/Locator.ice +19 -18
- data/slice/Ice/LocatorF.ice +7 -4
- data/slice/Ice/Logger.ice +9 -7
- data/slice/Ice/LoggerF.ice +7 -4
- data/slice/Ice/Metrics.ice +18 -14
- data/slice/Ice/ObjectAdapter.ice +30 -13
- data/slice/Ice/ObjectAdapterF.ice +7 -4
- data/slice/Ice/ObjectFactory.ice +15 -12
- data/slice/Ice/Plugin.ice +9 -6
- data/slice/Ice/PluginF.ice +8 -5
- data/slice/Ice/Process.ice +9 -6
- data/slice/Ice/ProcessF.ice +7 -4
- data/slice/Ice/Properties.ice +15 -12
- data/slice/Ice/PropertiesAdmin.ice +9 -5
- data/slice/Ice/PropertiesF.ice +7 -4
- data/slice/Ice/RemoteLogger.ice +33 -24
- data/slice/Ice/Router.ice +16 -7
- data/slice/Ice/RouterF.ice +7 -4
- data/slice/Ice/ServantLocator.ice +13 -10
- data/slice/Ice/ServantLocatorF.ice +7 -4
- data/slice/Ice/SliceChecksumDict.ice +7 -4
- data/slice/Ice/ValueFactory.ice +127 -0
- data/slice/Ice/Version.ice +9 -5
- data/slice/IceBT/ConnectionInfo.ice +53 -0
- data/slice/IceBT/EndpointInfo.ice +51 -0
- data/slice/IceBT/Types.ice +39 -0
- data/slice/IceBox/IceBox.ice +20 -21
- data/slice/IceDiscovery/IceDiscovery.ice +9 -5
- data/slice/IceGrid/Admin.ice +390 -30
- data/slice/IceGrid/Descriptor.ice +37 -29
- data/slice/IceGrid/Exception.ice +33 -27
- data/slice/IceGrid/FileParser.ice +9 -6
- data/slice/IceGrid/PluginFacade.ice +11 -9
- data/slice/IceGrid/Registry.ice +139 -16
- data/slice/IceGrid/Session.ice +10 -8
- data/slice/IceGrid/UserAccountMapper.ice +9 -6
- data/slice/IceIAP/ConnectionInfo.ice +70 -0
- data/slice/IceIAP/EndpointInfo.ice +64 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +9 -7
- data/slice/IcePatch2/FileInfo.ice +9 -8
- data/slice/IcePatch2/FileServer.ice +17 -13
- data/slice/IceSSL/ConnectionInfo.ice +14 -17
- data/slice/IceSSL/ConnectionInfoF.ice +24 -0
- data/slice/IceSSL/EndpointInfo.ice +9 -30
- data/slice/IceStorm/IceStorm.ice +22 -18
- data/slice/IceStorm/Metrics.ice +9 -5
- metadata +154 -120
- data/ext/ObjectFactory.cpp +0 -140
- data/ext/ObjectFactory.h +0 -50
- data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
- data/ext/ice/cpp/include/Ice/Communicator.h +0 -200
- data/ext/ice/cpp/include/Ice/Connection.h +0 -497
- data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +0 -62
- data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
- data/ext/ice/cpp/include/Ice/Identity.h +0 -168
- data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
- data/ext/ice/cpp/include/Ice/LocalException.h +0 -1030
- data/ext/ice/cpp/include/Ice/Locator.h +0 -2193
- data/ext/ice/cpp/include/Ice/Metrics.h +0 -2974
- data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
- data/ext/ice/cpp/include/Ice/ObjectFactory.h +0 -92
- data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +0 -66
- data/ext/ice/cpp/include/Ice/Outgoing.h +0 -225
- data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
- data/ext/ice/cpp/include/Ice/Process.h +0 -574
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
- data/ext/ice/cpp/include/Ice/RemoteLogger.h +0 -1500
- data/ext/ice/cpp/include/Ice/Router.h +0 -1159
- data/ext/ice/cpp/include/Ice/Stream.h +0 -447
- data/ext/ice/cpp/include/Ice/StreamF.h +0 -30
- data/ext/ice/cpp/include/Ice/Version.h +0 -262
- data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +0 -158
- data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +0 -142
- data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +0 -119
- data/ext/ice/cpp/include/IceUtil/Cache.h +0 -362
- data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +0 -65
- data/ext/ice/cpp/include/Slice/CsUtil.h +0 -92
- data/ext/ice/cpp/include/Slice/DotNetNames.h +0 -34
- data/ext/ice/cpp/include/Slice/ObjCUtil.h +0 -127
- data/ext/ice/cpp/include/Slice/Util.h +0 -56
- data/ext/ice/cpp/src/Ice/BasicStream.cpp +0 -3428
- data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +0 -62
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +0 -139
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +0 -43
- data/ext/ice/cpp/src/Ice/Outgoing.cpp +0 -694
- data/ext/ice/cpp/src/Ice/Stream.cpp +0 -53
- data/ext/ice/cpp/src/Ice/StreamI.cpp +0 -832
- data/ext/ice/cpp/src/Ice/StreamI.h +0 -198
- data/ext/ice/cpp/src/IceSSL/Certificate.cpp +0 -1336
- data/ext/ice/cpp/src/IceUtil/Exception.cpp +0 -792
- data/ext/ice/cpp/src/IceUtil/FileUtil.h +0 -185
- data/ext/ice/cpp/src/Slice/CsUtil.cpp +0 -2660
- data/ext/ice/cpp/src/Slice/DotNetNames.cpp +0 -146
- data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +0 -1310
- data/lib/IceGrid/Locator.rb +0 -106
- data/lib/IceGrid/Observer.rb +0 -572
- data/lib/IceGrid/Query.rb +0 -169
- data/slice/Freeze/BackgroundSaveEvictor.ice +0 -111
- data/slice/Freeze/CatalogData.ice +0 -49
- data/slice/Freeze/Connection.ice +0 -121
- data/slice/Freeze/DB.ice +0 -37
- data/slice/Freeze/Evictor.ice +0 -346
- data/slice/Freeze/EvictorF.ice +0 -22
- data/slice/Freeze/EvictorStorage.ice +0 -72
- data/slice/Freeze/Exception.ice +0 -100
- data/slice/Freeze/Transaction.ice +0 -58
- data/slice/Freeze/TransactionalEvictor.ice +0 -50
- data/slice/IceGrid/Locator.ice +0 -57
- data/slice/IceGrid/Observer.ice +0 -395
- data/slice/IceGrid/Query.ice +0 -131
@@ -0,0 +1,282 @@
|
|
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
|
+
/*-------------------------------------------------------------*/
|
@@ -0,0 +1,509 @@
|
|
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
|
+
/*-------------------------------------------------------------*/
|