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,672 @@
|
|
1
|
+
|
2
|
+
/*-------------------------------------------------------------*/
|
3
|
+
/*--- Compression machinery (not incl block sorting) ---*/
|
4
|
+
/*--- compress.c ---*/
|
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
|
+
/* CHANGES
|
23
|
+
0.9.0 -- original version.
|
24
|
+
0.9.0a/b -- no changes in this file.
|
25
|
+
0.9.0c -- changed setting of nGroups in sendMTFValues()
|
26
|
+
so as to do a bit better on small files
|
27
|
+
*/
|
28
|
+
|
29
|
+
#include "bzlib_private.h"
|
30
|
+
|
31
|
+
|
32
|
+
/*---------------------------------------------------*/
|
33
|
+
/*--- Bit stream I/O ---*/
|
34
|
+
/*---------------------------------------------------*/
|
35
|
+
|
36
|
+
/*---------------------------------------------------*/
|
37
|
+
void BZ2_bsInitWrite ( EState* s )
|
38
|
+
{
|
39
|
+
s->bsLive = 0;
|
40
|
+
s->bsBuff = 0;
|
41
|
+
}
|
42
|
+
|
43
|
+
|
44
|
+
/*---------------------------------------------------*/
|
45
|
+
static
|
46
|
+
void bsFinishWrite ( EState* s )
|
47
|
+
{
|
48
|
+
while (s->bsLive > 0) {
|
49
|
+
s->zbits[s->numZ] = (UChar)(s->bsBuff >> 24);
|
50
|
+
s->numZ++;
|
51
|
+
s->bsBuff <<= 8;
|
52
|
+
s->bsLive -= 8;
|
53
|
+
}
|
54
|
+
}
|
55
|
+
|
56
|
+
|
57
|
+
/*---------------------------------------------------*/
|
58
|
+
#define bsNEEDW(nz) \
|
59
|
+
{ \
|
60
|
+
while (s->bsLive >= 8) { \
|
61
|
+
s->zbits[s->numZ] \
|
62
|
+
= (UChar)(s->bsBuff >> 24); \
|
63
|
+
s->numZ++; \
|
64
|
+
s->bsBuff <<= 8; \
|
65
|
+
s->bsLive -= 8; \
|
66
|
+
} \
|
67
|
+
}
|
68
|
+
|
69
|
+
|
70
|
+
/*---------------------------------------------------*/
|
71
|
+
static
|
72
|
+
__inline__
|
73
|
+
void bsW ( EState* s, Int32 n, UInt32 v )
|
74
|
+
{
|
75
|
+
bsNEEDW ( n );
|
76
|
+
s->bsBuff |= (v << (32 - s->bsLive - n));
|
77
|
+
s->bsLive += n;
|
78
|
+
}
|
79
|
+
|
80
|
+
|
81
|
+
/*---------------------------------------------------*/
|
82
|
+
static
|
83
|
+
void bsPutUInt32 ( EState* s, UInt32 u )
|
84
|
+
{
|
85
|
+
bsW ( s, 8, (u >> 24) & 0xffL );
|
86
|
+
bsW ( s, 8, (u >> 16) & 0xffL );
|
87
|
+
bsW ( s, 8, (u >> 8) & 0xffL );
|
88
|
+
bsW ( s, 8, u & 0xffL );
|
89
|
+
}
|
90
|
+
|
91
|
+
|
92
|
+
/*---------------------------------------------------*/
|
93
|
+
static
|
94
|
+
void bsPutUChar ( EState* s, UChar c )
|
95
|
+
{
|
96
|
+
bsW( s, 8, (UInt32)c );
|
97
|
+
}
|
98
|
+
|
99
|
+
|
100
|
+
/*---------------------------------------------------*/
|
101
|
+
/*--- The back end proper ---*/
|
102
|
+
/*---------------------------------------------------*/
|
103
|
+
|
104
|
+
/*---------------------------------------------------*/
|
105
|
+
static
|
106
|
+
void makeMaps_e ( EState* s )
|
107
|
+
{
|
108
|
+
Int32 i;
|
109
|
+
s->nInUse = 0;
|
110
|
+
for (i = 0; i < 256; i++)
|
111
|
+
if (s->inUse[i]) {
|
112
|
+
s->unseqToSeq[i] = s->nInUse;
|
113
|
+
s->nInUse++;
|
114
|
+
}
|
115
|
+
}
|
116
|
+
|
117
|
+
|
118
|
+
/*---------------------------------------------------*/
|
119
|
+
static
|
120
|
+
void generateMTFValues ( EState* s )
|
121
|
+
{
|
122
|
+
UChar yy[256];
|
123
|
+
Int32 i, j;
|
124
|
+
Int32 zPend;
|
125
|
+
Int32 wr;
|
126
|
+
Int32 EOB;
|
127
|
+
|
128
|
+
/*
|
129
|
+
After sorting (eg, here),
|
130
|
+
s->arr1 [ 0 .. s->nblock-1 ] holds sorted order,
|
131
|
+
and
|
132
|
+
((UChar*)s->arr2) [ 0 .. s->nblock-1 ]
|
133
|
+
holds the original block data.
|
134
|
+
|
135
|
+
The first thing to do is generate the MTF values,
|
136
|
+
and put them in
|
137
|
+
((UInt16*)s->arr1) [ 0 .. s->nblock-1 ].
|
138
|
+
Because there are strictly fewer or equal MTF values
|
139
|
+
than block values, ptr values in this area are overwritten
|
140
|
+
with MTF values only when they are no longer needed.
|
141
|
+
|
142
|
+
The final compressed bitstream is generated into the
|
143
|
+
area starting at
|
144
|
+
(UChar*) (&((UChar*)s->arr2)[s->nblock])
|
145
|
+
|
146
|
+
These storage aliases are set up in bzCompressInit(),
|
147
|
+
except for the last one, which is arranged in
|
148
|
+
compressBlock().
|
149
|
+
*/
|
150
|
+
UInt32* ptr = s->ptr;
|
151
|
+
UChar* block = s->block;
|
152
|
+
UInt16* mtfv = s->mtfv;
|
153
|
+
|
154
|
+
makeMaps_e ( s );
|
155
|
+
EOB = s->nInUse+1;
|
156
|
+
|
157
|
+
for (i = 0; i <= EOB; i++) s->mtfFreq[i] = 0;
|
158
|
+
|
159
|
+
wr = 0;
|
160
|
+
zPend = 0;
|
161
|
+
for (i = 0; i < s->nInUse; i++) yy[i] = (UChar) i;
|
162
|
+
|
163
|
+
for (i = 0; i < s->nblock; i++) {
|
164
|
+
UChar ll_i;
|
165
|
+
AssertD ( wr <= i, "generateMTFValues(1)" );
|
166
|
+
j = ptr[i]-1; if (j < 0) j += s->nblock;
|
167
|
+
ll_i = s->unseqToSeq[block[j]];
|
168
|
+
AssertD ( ll_i < s->nInUse, "generateMTFValues(2a)" );
|
169
|
+
|
170
|
+
if (yy[0] == ll_i) {
|
171
|
+
zPend++;
|
172
|
+
} else {
|
173
|
+
|
174
|
+
if (zPend > 0) {
|
175
|
+
zPend--;
|
176
|
+
while (True) {
|
177
|
+
if (zPend & 1) {
|
178
|
+
mtfv[wr] = BZ_RUNB; wr++;
|
179
|
+
s->mtfFreq[BZ_RUNB]++;
|
180
|
+
} else {
|
181
|
+
mtfv[wr] = BZ_RUNA; wr++;
|
182
|
+
s->mtfFreq[BZ_RUNA]++;
|
183
|
+
}
|
184
|
+
if (zPend < 2) break;
|
185
|
+
zPend = (zPend - 2) / 2;
|
186
|
+
};
|
187
|
+
zPend = 0;
|
188
|
+
}
|
189
|
+
{
|
190
|
+
register UChar rtmp;
|
191
|
+
register UChar* ryy_j;
|
192
|
+
register UChar rll_i;
|
193
|
+
rtmp = yy[1];
|
194
|
+
yy[1] = yy[0];
|
195
|
+
ryy_j = &(yy[1]);
|
196
|
+
rll_i = ll_i;
|
197
|
+
while ( rll_i != rtmp ) {
|
198
|
+
register UChar rtmp2;
|
199
|
+
ryy_j++;
|
200
|
+
rtmp2 = rtmp;
|
201
|
+
rtmp = *ryy_j;
|
202
|
+
*ryy_j = rtmp2;
|
203
|
+
};
|
204
|
+
yy[0] = rtmp;
|
205
|
+
j = ryy_j - &(yy[0]);
|
206
|
+
mtfv[wr] = j+1; wr++; s->mtfFreq[j+1]++;
|
207
|
+
}
|
208
|
+
|
209
|
+
}
|
210
|
+
}
|
211
|
+
|
212
|
+
if (zPend > 0) {
|
213
|
+
zPend--;
|
214
|
+
while (True) {
|
215
|
+
if (zPend & 1) {
|
216
|
+
mtfv[wr] = BZ_RUNB; wr++;
|
217
|
+
s->mtfFreq[BZ_RUNB]++;
|
218
|
+
} else {
|
219
|
+
mtfv[wr] = BZ_RUNA; wr++;
|
220
|
+
s->mtfFreq[BZ_RUNA]++;
|
221
|
+
}
|
222
|
+
if (zPend < 2) break;
|
223
|
+
zPend = (zPend - 2) / 2;
|
224
|
+
};
|
225
|
+
zPend = 0;
|
226
|
+
}
|
227
|
+
|
228
|
+
mtfv[wr] = EOB; wr++; s->mtfFreq[EOB]++;
|
229
|
+
|
230
|
+
s->nMTF = wr;
|
231
|
+
}
|
232
|
+
|
233
|
+
|
234
|
+
/*---------------------------------------------------*/
|
235
|
+
#define BZ_LESSER_ICOST 0
|
236
|
+
#define BZ_GREATER_ICOST 15
|
237
|
+
|
238
|
+
static
|
239
|
+
void sendMTFValues ( EState* s )
|
240
|
+
{
|
241
|
+
Int32 v, t, i, j, gs, ge, totc, bt, bc, iter;
|
242
|
+
Int32 nSelectors, alphaSize, minLen, maxLen, selCtr;
|
243
|
+
Int32 nGroups, nBytes;
|
244
|
+
|
245
|
+
/*--
|
246
|
+
UChar len [BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
247
|
+
is a global since the decoder also needs it.
|
248
|
+
|
249
|
+
Int32 code[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
250
|
+
Int32 rfreq[BZ_N_GROUPS][BZ_MAX_ALPHA_SIZE];
|
251
|
+
are also globals only used in this proc.
|
252
|
+
Made global to keep stack frame size small.
|
253
|
+
--*/
|
254
|
+
|
255
|
+
|
256
|
+
UInt16 cost[BZ_N_GROUPS];
|
257
|
+
Int32 fave[BZ_N_GROUPS];
|
258
|
+
|
259
|
+
UInt16* mtfv = s->mtfv;
|
260
|
+
|
261
|
+
if (s->verbosity >= 3)
|
262
|
+
VPrintf3( " %d in block, %d after MTF & 1-2 coding, "
|
263
|
+
"%d+2 syms in use\n",
|
264
|
+
s->nblock, s->nMTF, s->nInUse );
|
265
|
+
|
266
|
+
alphaSize = s->nInUse+2;
|
267
|
+
for (t = 0; t < BZ_N_GROUPS; t++)
|
268
|
+
for (v = 0; v < alphaSize; v++)
|
269
|
+
s->len[t][v] = BZ_GREATER_ICOST;
|
270
|
+
|
271
|
+
/*--- Decide how many coding tables to use ---*/
|
272
|
+
AssertH ( s->nMTF > 0, 3001 );
|
273
|
+
if (s->nMTF < 200) nGroups = 2; else
|
274
|
+
if (s->nMTF < 600) nGroups = 3; else
|
275
|
+
if (s->nMTF < 1200) nGroups = 4; else
|
276
|
+
if (s->nMTF < 2400) nGroups = 5; else
|
277
|
+
nGroups = 6;
|
278
|
+
|
279
|
+
/*--- Generate an initial set of coding tables ---*/
|
280
|
+
{
|
281
|
+
Int32 nPart, remF, tFreq, aFreq;
|
282
|
+
|
283
|
+
nPart = nGroups;
|
284
|
+
remF = s->nMTF;
|
285
|
+
gs = 0;
|
286
|
+
while (nPart > 0) {
|
287
|
+
tFreq = remF / nPart;
|
288
|
+
ge = gs-1;
|
289
|
+
aFreq = 0;
|
290
|
+
while (aFreq < tFreq && ge < alphaSize-1) {
|
291
|
+
ge++;
|
292
|
+
aFreq += s->mtfFreq[ge];
|
293
|
+
}
|
294
|
+
|
295
|
+
if (ge > gs
|
296
|
+
&& nPart != nGroups && nPart != 1
|
297
|
+
&& ((nGroups-nPart) % 2 == 1)) {
|
298
|
+
aFreq -= s->mtfFreq[ge];
|
299
|
+
ge--;
|
300
|
+
}
|
301
|
+
|
302
|
+
if (s->verbosity >= 3)
|
303
|
+
VPrintf5( " initial group %d, [%d .. %d], "
|
304
|
+
"has %d syms (%4.1f%%)\n",
|
305
|
+
nPart, gs, ge, aFreq,
|
306
|
+
(100.0 * (float)aFreq) / (float)(s->nMTF) );
|
307
|
+
|
308
|
+
for (v = 0; v < alphaSize; v++)
|
309
|
+
if (v >= gs && v <= ge)
|
310
|
+
s->len[nPart-1][v] = BZ_LESSER_ICOST; else
|
311
|
+
s->len[nPart-1][v] = BZ_GREATER_ICOST;
|
312
|
+
|
313
|
+
nPart--;
|
314
|
+
gs = ge+1;
|
315
|
+
remF -= aFreq;
|
316
|
+
}
|
317
|
+
}
|
318
|
+
|
319
|
+
/*---
|
320
|
+
Iterate up to BZ_N_ITERS times to improve the tables.
|
321
|
+
---*/
|
322
|
+
for (iter = 0; iter < BZ_N_ITERS; iter++) {
|
323
|
+
|
324
|
+
for (t = 0; t < nGroups; t++) fave[t] = 0;
|
325
|
+
|
326
|
+
for (t = 0; t < nGroups; t++)
|
327
|
+
for (v = 0; v < alphaSize; v++)
|
328
|
+
s->rfreq[t][v] = 0;
|
329
|
+
|
330
|
+
/*---
|
331
|
+
Set up an auxiliary length table which is used to fast-track
|
332
|
+
the common case (nGroups == 6).
|
333
|
+
---*/
|
334
|
+
if (nGroups == 6) {
|
335
|
+
for (v = 0; v < alphaSize; v++) {
|
336
|
+
s->len_pack[v][0] = (s->len[1][v] << 16) | s->len[0][v];
|
337
|
+
s->len_pack[v][1] = (s->len[3][v] << 16) | s->len[2][v];
|
338
|
+
s->len_pack[v][2] = (s->len[5][v] << 16) | s->len[4][v];
|
339
|
+
}
|
340
|
+
}
|
341
|
+
|
342
|
+
nSelectors = 0;
|
343
|
+
totc = 0;
|
344
|
+
gs = 0;
|
345
|
+
while (True) {
|
346
|
+
|
347
|
+
/*--- Set group start & end marks. --*/
|
348
|
+
if (gs >= s->nMTF) break;
|
349
|
+
ge = gs + BZ_G_SIZE - 1;
|
350
|
+
if (ge >= s->nMTF) ge = s->nMTF-1;
|
351
|
+
|
352
|
+
/*--
|
353
|
+
Calculate the cost of this group as coded
|
354
|
+
by each of the coding tables.
|
355
|
+
--*/
|
356
|
+
for (t = 0; t < nGroups; t++) cost[t] = 0;
|
357
|
+
|
358
|
+
if (nGroups == 6 && 50 == ge-gs+1) {
|
359
|
+
/*--- fast track the common case ---*/
|
360
|
+
register UInt32 cost01, cost23, cost45;
|
361
|
+
register UInt16 icv;
|
362
|
+
cost01 = cost23 = cost45 = 0;
|
363
|
+
|
364
|
+
# define BZ_ITER(nn) \
|
365
|
+
icv = mtfv[gs+(nn)]; \
|
366
|
+
cost01 += s->len_pack[icv][0]; \
|
367
|
+
cost23 += s->len_pack[icv][1]; \
|
368
|
+
cost45 += s->len_pack[icv][2]; \
|
369
|
+
|
370
|
+
BZ_ITER(0); BZ_ITER(1); BZ_ITER(2); BZ_ITER(3); BZ_ITER(4);
|
371
|
+
BZ_ITER(5); BZ_ITER(6); BZ_ITER(7); BZ_ITER(8); BZ_ITER(9);
|
372
|
+
BZ_ITER(10); BZ_ITER(11); BZ_ITER(12); BZ_ITER(13); BZ_ITER(14);
|
373
|
+
BZ_ITER(15); BZ_ITER(16); BZ_ITER(17); BZ_ITER(18); BZ_ITER(19);
|
374
|
+
BZ_ITER(20); BZ_ITER(21); BZ_ITER(22); BZ_ITER(23); BZ_ITER(24);
|
375
|
+
BZ_ITER(25); BZ_ITER(26); BZ_ITER(27); BZ_ITER(28); BZ_ITER(29);
|
376
|
+
BZ_ITER(30); BZ_ITER(31); BZ_ITER(32); BZ_ITER(33); BZ_ITER(34);
|
377
|
+
BZ_ITER(35); BZ_ITER(36); BZ_ITER(37); BZ_ITER(38); BZ_ITER(39);
|
378
|
+
BZ_ITER(40); BZ_ITER(41); BZ_ITER(42); BZ_ITER(43); BZ_ITER(44);
|
379
|
+
BZ_ITER(45); BZ_ITER(46); BZ_ITER(47); BZ_ITER(48); BZ_ITER(49);
|
380
|
+
|
381
|
+
# undef BZ_ITER
|
382
|
+
|
383
|
+
cost[0] = cost01 & 0xffff; cost[1] = cost01 >> 16;
|
384
|
+
cost[2] = cost23 & 0xffff; cost[3] = cost23 >> 16;
|
385
|
+
cost[4] = cost45 & 0xffff; cost[5] = cost45 >> 16;
|
386
|
+
|
387
|
+
} else {
|
388
|
+
/*--- slow version which correctly handles all situations ---*/
|
389
|
+
for (i = gs; i <= ge; i++) {
|
390
|
+
UInt16 icv = mtfv[i];
|
391
|
+
for (t = 0; t < nGroups; t++) cost[t] += s->len[t][icv];
|
392
|
+
}
|
393
|
+
}
|
394
|
+
|
395
|
+
/*--
|
396
|
+
Find the coding table which is best for this group,
|
397
|
+
and record its identity in the selector table.
|
398
|
+
--*/
|
399
|
+
bc = 999999999; bt = -1;
|
400
|
+
for (t = 0; t < nGroups; t++)
|
401
|
+
if (cost[t] < bc) { bc = cost[t]; bt = t; };
|
402
|
+
totc += bc;
|
403
|
+
fave[bt]++;
|
404
|
+
s->selector[nSelectors] = bt;
|
405
|
+
nSelectors++;
|
406
|
+
|
407
|
+
/*--
|
408
|
+
Increment the symbol frequencies for the selected table.
|
409
|
+
--*/
|
410
|
+
if (nGroups == 6 && 50 == ge-gs+1) {
|
411
|
+
/*--- fast track the common case ---*/
|
412
|
+
|
413
|
+
# define BZ_ITUR(nn) s->rfreq[bt][ mtfv[gs+(nn)] ]++
|
414
|
+
|
415
|
+
BZ_ITUR(0); BZ_ITUR(1); BZ_ITUR(2); BZ_ITUR(3); BZ_ITUR(4);
|
416
|
+
BZ_ITUR(5); BZ_ITUR(6); BZ_ITUR(7); BZ_ITUR(8); BZ_ITUR(9);
|
417
|
+
BZ_ITUR(10); BZ_ITUR(11); BZ_ITUR(12); BZ_ITUR(13); BZ_ITUR(14);
|
418
|
+
BZ_ITUR(15); BZ_ITUR(16); BZ_ITUR(17); BZ_ITUR(18); BZ_ITUR(19);
|
419
|
+
BZ_ITUR(20); BZ_ITUR(21); BZ_ITUR(22); BZ_ITUR(23); BZ_ITUR(24);
|
420
|
+
BZ_ITUR(25); BZ_ITUR(26); BZ_ITUR(27); BZ_ITUR(28); BZ_ITUR(29);
|
421
|
+
BZ_ITUR(30); BZ_ITUR(31); BZ_ITUR(32); BZ_ITUR(33); BZ_ITUR(34);
|
422
|
+
BZ_ITUR(35); BZ_ITUR(36); BZ_ITUR(37); BZ_ITUR(38); BZ_ITUR(39);
|
423
|
+
BZ_ITUR(40); BZ_ITUR(41); BZ_ITUR(42); BZ_ITUR(43); BZ_ITUR(44);
|
424
|
+
BZ_ITUR(45); BZ_ITUR(46); BZ_ITUR(47); BZ_ITUR(48); BZ_ITUR(49);
|
425
|
+
|
426
|
+
# undef BZ_ITUR
|
427
|
+
|
428
|
+
} else {
|
429
|
+
/*--- slow version which correctly handles all situations ---*/
|
430
|
+
for (i = gs; i <= ge; i++)
|
431
|
+
s->rfreq[bt][ mtfv[i] ]++;
|
432
|
+
}
|
433
|
+
|
434
|
+
gs = ge+1;
|
435
|
+
}
|
436
|
+
if (s->verbosity >= 3) {
|
437
|
+
VPrintf2 ( " pass %d: size is %d, grp uses are ",
|
438
|
+
iter+1, totc/8 );
|
439
|
+
for (t = 0; t < nGroups; t++)
|
440
|
+
VPrintf1 ( "%d ", fave[t] );
|
441
|
+
VPrintf0 ( "\n" );
|
442
|
+
}
|
443
|
+
|
444
|
+
/*--
|
445
|
+
Recompute the tables based on the accumulated frequencies.
|
446
|
+
--*/
|
447
|
+
/* maxLen was changed from 20 to 17 in bzip2-1.0.3. See
|
448
|
+
comment in huffman.c for details. */
|
449
|
+
for (t = 0; t < nGroups; t++)
|
450
|
+
BZ2_hbMakeCodeLengths ( &(s->len[t][0]), &(s->rfreq[t][0]),
|
451
|
+
alphaSize, 17 /*20*/ );
|
452
|
+
}
|
453
|
+
|
454
|
+
|
455
|
+
AssertH( nGroups < 8, 3002 );
|
456
|
+
AssertH( nSelectors < 32768 &&
|
457
|
+
nSelectors <= (2 + (900000 / BZ_G_SIZE)),
|
458
|
+
3003 );
|
459
|
+
|
460
|
+
|
461
|
+
/*--- Compute MTF values for the selectors. ---*/
|
462
|
+
{
|
463
|
+
UChar pos[BZ_N_GROUPS], ll_i, tmp2, tmp;
|
464
|
+
for (i = 0; i < nGroups; i++) pos[i] = i;
|
465
|
+
for (i = 0; i < nSelectors; i++) {
|
466
|
+
ll_i = s->selector[i];
|
467
|
+
j = 0;
|
468
|
+
tmp = pos[j];
|
469
|
+
while ( ll_i != tmp ) {
|
470
|
+
j++;
|
471
|
+
tmp2 = tmp;
|
472
|
+
tmp = pos[j];
|
473
|
+
pos[j] = tmp2;
|
474
|
+
};
|
475
|
+
pos[0] = tmp;
|
476
|
+
s->selectorMtf[i] = j;
|
477
|
+
}
|
478
|
+
};
|
479
|
+
|
480
|
+
/*--- Assign actual codes for the tables. --*/
|
481
|
+
for (t = 0; t < nGroups; t++) {
|
482
|
+
minLen = 32;
|
483
|
+
maxLen = 0;
|
484
|
+
for (i = 0; i < alphaSize; i++) {
|
485
|
+
if (s->len[t][i] > maxLen) maxLen = s->len[t][i];
|
486
|
+
if (s->len[t][i] < minLen) minLen = s->len[t][i];
|
487
|
+
}
|
488
|
+
AssertH ( !(maxLen > 17 /*20*/ ), 3004 );
|
489
|
+
AssertH ( !(minLen < 1), 3005 );
|
490
|
+
BZ2_hbAssignCodes ( &(s->code[t][0]), &(s->len[t][0]),
|
491
|
+
minLen, maxLen, alphaSize );
|
492
|
+
}
|
493
|
+
|
494
|
+
/*--- Transmit the mapping table. ---*/
|
495
|
+
{
|
496
|
+
Bool inUse16[16];
|
497
|
+
for (i = 0; i < 16; i++) {
|
498
|
+
inUse16[i] = False;
|
499
|
+
for (j = 0; j < 16; j++)
|
500
|
+
if (s->inUse[i * 16 + j]) inUse16[i] = True;
|
501
|
+
}
|
502
|
+
|
503
|
+
nBytes = s->numZ;
|
504
|
+
for (i = 0; i < 16; i++)
|
505
|
+
if (inUse16[i]) bsW(s,1,1); else bsW(s,1,0);
|
506
|
+
|
507
|
+
for (i = 0; i < 16; i++)
|
508
|
+
if (inUse16[i])
|
509
|
+
for (j = 0; j < 16; j++) {
|
510
|
+
if (s->inUse[i * 16 + j]) bsW(s,1,1); else bsW(s,1,0);
|
511
|
+
}
|
512
|
+
|
513
|
+
if (s->verbosity >= 3)
|
514
|
+
VPrintf1( " bytes: mapping %d, ", s->numZ-nBytes );
|
515
|
+
}
|
516
|
+
|
517
|
+
/*--- Now the selectors. ---*/
|
518
|
+
nBytes = s->numZ;
|
519
|
+
bsW ( s, 3, nGroups );
|
520
|
+
bsW ( s, 15, nSelectors );
|
521
|
+
for (i = 0; i < nSelectors; i++) {
|
522
|
+
for (j = 0; j < s->selectorMtf[i]; j++) bsW(s,1,1);
|
523
|
+
bsW(s,1,0);
|
524
|
+
}
|
525
|
+
if (s->verbosity >= 3)
|
526
|
+
VPrintf1( "selectors %d, ", s->numZ-nBytes );
|
527
|
+
|
528
|
+
/*--- Now the coding tables. ---*/
|
529
|
+
nBytes = s->numZ;
|
530
|
+
|
531
|
+
for (t = 0; t < nGroups; t++) {
|
532
|
+
Int32 curr = s->len[t][0];
|
533
|
+
bsW ( s, 5, curr );
|
534
|
+
for (i = 0; i < alphaSize; i++) {
|
535
|
+
while (curr < s->len[t][i]) { bsW(s,2,2); curr++; /* 10 */ };
|
536
|
+
while (curr > s->len[t][i]) { bsW(s,2,3); curr--; /* 11 */ };
|
537
|
+
bsW ( s, 1, 0 );
|
538
|
+
}
|
539
|
+
}
|
540
|
+
|
541
|
+
if (s->verbosity >= 3)
|
542
|
+
VPrintf1 ( "code lengths %d, ", s->numZ-nBytes );
|
543
|
+
|
544
|
+
/*--- And finally, the block data proper ---*/
|
545
|
+
nBytes = s->numZ;
|
546
|
+
selCtr = 0;
|
547
|
+
gs = 0;
|
548
|
+
while (True) {
|
549
|
+
if (gs >= s->nMTF) break;
|
550
|
+
ge = gs + BZ_G_SIZE - 1;
|
551
|
+
if (ge >= s->nMTF) ge = s->nMTF-1;
|
552
|
+
AssertH ( s->selector[selCtr] < nGroups, 3006 );
|
553
|
+
|
554
|
+
if (nGroups == 6 && 50 == ge-gs+1) {
|
555
|
+
/*--- fast track the common case ---*/
|
556
|
+
UInt16 mtfv_i;
|
557
|
+
UChar* s_len_sel_selCtr
|
558
|
+
= &(s->len[s->selector[selCtr]][0]);
|
559
|
+
Int32* s_code_sel_selCtr
|
560
|
+
= &(s->code[s->selector[selCtr]][0]);
|
561
|
+
|
562
|
+
# define BZ_ITAH(nn) \
|
563
|
+
mtfv_i = mtfv[gs+(nn)]; \
|
564
|
+
bsW ( s, \
|
565
|
+
s_len_sel_selCtr[mtfv_i], \
|
566
|
+
s_code_sel_selCtr[mtfv_i] )
|
567
|
+
|
568
|
+
BZ_ITAH(0); BZ_ITAH(1); BZ_ITAH(2); BZ_ITAH(3); BZ_ITAH(4);
|
569
|
+
BZ_ITAH(5); BZ_ITAH(6); BZ_ITAH(7); BZ_ITAH(8); BZ_ITAH(9);
|
570
|
+
BZ_ITAH(10); BZ_ITAH(11); BZ_ITAH(12); BZ_ITAH(13); BZ_ITAH(14);
|
571
|
+
BZ_ITAH(15); BZ_ITAH(16); BZ_ITAH(17); BZ_ITAH(18); BZ_ITAH(19);
|
572
|
+
BZ_ITAH(20); BZ_ITAH(21); BZ_ITAH(22); BZ_ITAH(23); BZ_ITAH(24);
|
573
|
+
BZ_ITAH(25); BZ_ITAH(26); BZ_ITAH(27); BZ_ITAH(28); BZ_ITAH(29);
|
574
|
+
BZ_ITAH(30); BZ_ITAH(31); BZ_ITAH(32); BZ_ITAH(33); BZ_ITAH(34);
|
575
|
+
BZ_ITAH(35); BZ_ITAH(36); BZ_ITAH(37); BZ_ITAH(38); BZ_ITAH(39);
|
576
|
+
BZ_ITAH(40); BZ_ITAH(41); BZ_ITAH(42); BZ_ITAH(43); BZ_ITAH(44);
|
577
|
+
BZ_ITAH(45); BZ_ITAH(46); BZ_ITAH(47); BZ_ITAH(48); BZ_ITAH(49);
|
578
|
+
|
579
|
+
# undef BZ_ITAH
|
580
|
+
|
581
|
+
} else {
|
582
|
+
/*--- slow version which correctly handles all situations ---*/
|
583
|
+
for (i = gs; i <= ge; i++) {
|
584
|
+
bsW ( s,
|
585
|
+
s->len [s->selector[selCtr]] [mtfv[i]],
|
586
|
+
s->code [s->selector[selCtr]] [mtfv[i]] );
|
587
|
+
}
|
588
|
+
}
|
589
|
+
|
590
|
+
|
591
|
+
gs = ge+1;
|
592
|
+
selCtr++;
|
593
|
+
}
|
594
|
+
AssertH( selCtr == nSelectors, 3007 );
|
595
|
+
|
596
|
+
if (s->verbosity >= 3)
|
597
|
+
VPrintf1( "codes %d\n", s->numZ-nBytes );
|
598
|
+
}
|
599
|
+
|
600
|
+
|
601
|
+
/*---------------------------------------------------*/
|
602
|
+
void BZ2_compressBlock ( EState* s, Bool is_last_block )
|
603
|
+
{
|
604
|
+
if (s->nblock > 0) {
|
605
|
+
|
606
|
+
BZ_FINALISE_CRC ( s->blockCRC );
|
607
|
+
s->combinedCRC = (s->combinedCRC << 1) | (s->combinedCRC >> 31);
|
608
|
+
s->combinedCRC ^= s->blockCRC;
|
609
|
+
if (s->blockNo > 1) s->numZ = 0;
|
610
|
+
|
611
|
+
if (s->verbosity >= 2)
|
612
|
+
VPrintf4( " block %d: crc = 0x%08x, "
|
613
|
+
"combined CRC = 0x%08x, size = %d\n",
|
614
|
+
s->blockNo, s->blockCRC, s->combinedCRC, s->nblock );
|
615
|
+
|
616
|
+
BZ2_blockSort ( s );
|
617
|
+
}
|
618
|
+
|
619
|
+
s->zbits = (UChar*) (&((UChar*)s->arr2)[s->nblock]);
|
620
|
+
|
621
|
+
/*-- If this is the first block, create the stream header. --*/
|
622
|
+
if (s->blockNo == 1) {
|
623
|
+
BZ2_bsInitWrite ( s );
|
624
|
+
bsPutUChar ( s, BZ_HDR_B );
|
625
|
+
bsPutUChar ( s, BZ_HDR_Z );
|
626
|
+
bsPutUChar ( s, BZ_HDR_h );
|
627
|
+
bsPutUChar ( s, (UChar)(BZ_HDR_0 + s->blockSize100k) );
|
628
|
+
}
|
629
|
+
|
630
|
+
if (s->nblock > 0) {
|
631
|
+
|
632
|
+
bsPutUChar ( s, 0x31 ); bsPutUChar ( s, 0x41 );
|
633
|
+
bsPutUChar ( s, 0x59 ); bsPutUChar ( s, 0x26 );
|
634
|
+
bsPutUChar ( s, 0x53 ); bsPutUChar ( s, 0x59 );
|
635
|
+
|
636
|
+
/*-- Now the block's CRC, so it is in a known place. --*/
|
637
|
+
bsPutUInt32 ( s, s->blockCRC );
|
638
|
+
|
639
|
+
/*--
|
640
|
+
Now a single bit indicating (non-)randomisation.
|
641
|
+
As of version 0.9.5, we use a better sorting algorithm
|
642
|
+
which makes randomisation unnecessary. So always set
|
643
|
+
the randomised bit to 'no'. Of course, the decoder
|
644
|
+
still needs to be able to handle randomised blocks
|
645
|
+
so as to maintain backwards compatibility with
|
646
|
+
older versions of bzip2.
|
647
|
+
--*/
|
648
|
+
bsW(s,1,0);
|
649
|
+
|
650
|
+
bsW ( s, 24, s->origPtr );
|
651
|
+
generateMTFValues ( s );
|
652
|
+
sendMTFValues ( s );
|
653
|
+
}
|
654
|
+
|
655
|
+
|
656
|
+
/*-- If this is the last block, add the stream trailer. --*/
|
657
|
+
if (is_last_block) {
|
658
|
+
|
659
|
+
bsPutUChar ( s, 0x17 ); bsPutUChar ( s, 0x72 );
|
660
|
+
bsPutUChar ( s, 0x45 ); bsPutUChar ( s, 0x38 );
|
661
|
+
bsPutUChar ( s, 0x50 ); bsPutUChar ( s, 0x90 );
|
662
|
+
bsPutUInt32 ( s, s->combinedCRC );
|
663
|
+
if (s->verbosity >= 2)
|
664
|
+
VPrintf1( " final combined CRC = 0x%08x\n ", s->combinedCRC );
|
665
|
+
bsFinishWrite ( s );
|
666
|
+
}
|
667
|
+
}
|
668
|
+
|
669
|
+
|
670
|
+
/*-------------------------------------------------------------*/
|
671
|
+
/*--- end compress.c ---*/
|
672
|
+
/*-------------------------------------------------------------*/
|