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
data/ext/extconf.rb
CHANGED
@@ -2,59 +2,49 @@
|
|
2
2
|
#
|
3
3
|
# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
#
|
5
|
-
# This copy of Ice is licensed to you under the terms described in the
|
6
|
-
# ICE_LICENSE file included in this distribution.
|
7
|
-
#
|
8
5
|
# **********************************************************************
|
9
6
|
|
10
7
|
require "mkmf"
|
11
8
|
|
12
|
-
if
|
13
|
-
|
14
|
-
|
15
|
-
|
9
|
+
if RUBY_PLATFORM =~ /mswin|mingw/
|
10
|
+
puts "MinGW is not supported with Ice for Ruby."
|
11
|
+
exit 1
|
12
|
+
end
|
13
|
+
|
14
|
+
#
|
15
|
+
# On OSX & Linux bzlib.h is required.
|
16
|
+
#
|
17
|
+
if not have_header("bzlib.h") then
|
18
|
+
exit 1
|
16
19
|
end
|
17
20
|
|
18
21
|
if RUBY_PLATFORM =~ /linux/
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
22
|
+
#
|
23
|
+
# On Linux openssl is required for IceSSL.
|
24
|
+
#
|
25
|
+
if not have_header("openssl/ssl.h") then
|
26
|
+
exit 1
|
27
|
+
end
|
25
28
|
end
|
26
29
|
|
27
30
|
#
|
28
31
|
# Ice on OSX is built only with 64 bit support.
|
29
32
|
#
|
30
33
|
if RUBY_PLATFORM =~ /darwin/
|
31
|
-
|
34
|
+
$ARCH_FLAG = "-arch x86_64"
|
32
35
|
end
|
33
36
|
|
34
37
|
$INCFLAGS << ' -Iice/cpp/include'
|
38
|
+
$INCFLAGS << ' -Iice/cpp/include/generated'
|
35
39
|
$INCFLAGS << ' -Iice/cpp/src'
|
36
40
|
|
37
41
|
$CPPFLAGS << ' -DICE_STATIC_LIBS'
|
42
|
+
$CPPFLAGS << ' -DICE_GEM'
|
38
43
|
|
39
|
-
if RUBY_PLATFORM =~ /
|
40
|
-
|
41
|
-
$CPPFLAGS = $CPPFLAGS.sub("501", "601")
|
42
|
-
|
43
|
-
$CPPFLAGS << ' -DWIN32_LEAN_AND_MEAN'
|
44
|
-
$CPPFLAGS << ' -DICE_BUILDING_ICEUTIL'
|
45
|
-
$CPPFLAGS << ' -DICE_BUILDING_SLICE'
|
46
|
-
$CPPFLAGS << ' -DICE_BUILDING_ICE'
|
47
|
-
$CPPFLAGS << ' -DICE_BUILDING_ICESSL'
|
48
|
-
$CPPFLAGS << ' -mthreads'
|
49
|
-
|
50
|
-
# -lws2_32 must be in LOCAL_LIBS even though mkmk puts it at the end of the LIBS, otherwise
|
51
|
-
# you get error 6 when using the socket library.
|
52
|
-
$LOCAL_LIBS << ' -lbz2 -lShlwapi -lrpcrt4 -ladvapi32 -lIphlpapi -lsecur32 -lcrypt32 -lws2_32'
|
53
|
-
|
54
|
-
elsif RUBY_PLATFORM =~ /darwin/
|
55
|
-
$LOCAL_LIBS << ' -framework Security -framework CoreFoundation'
|
44
|
+
if RUBY_PLATFORM =~ /darwin/
|
45
|
+
$LOCAL_LIBS << ' -framework Security -framework CoreFoundation'
|
56
46
|
elsif RUBY_PLATFORM =~ /linux/
|
57
|
-
|
47
|
+
$LOCAL_LIBS << ' -lssl -lcrypto -lbz2 -lrt'
|
58
48
|
if RUBY_VERSION =~ /1.8/
|
59
49
|
# With 1.8 we need to link with C++ runtime, as gcc is used to link the extension
|
60
50
|
$LOCAL_LIBS << ' -lstdc++'
|
@@ -75,27 +65,39 @@ $srcs = []
|
|
75
65
|
|
76
66
|
# Add the plugin source.
|
77
67
|
Dir["*.cpp"].each do |f|
|
78
|
-
|
79
|
-
|
68
|
+
$objs << File.basename(f, ".*") + ".o"
|
69
|
+
$srcs << f
|
80
70
|
end
|
81
71
|
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
72
|
+
def filter(f)
|
73
|
+
#
|
74
|
+
# Filter IceSSL sources that doesn't match current OS default
|
75
|
+
# implementation
|
76
|
+
#
|
77
|
+
if f.start_with?("SChannel") or f.start_with?("UWP")
|
78
|
+
return false
|
79
|
+
end
|
80
|
+
if RUBY_PLATFORM =~ /darwin/ and f.start_with?("OpenSSL")
|
81
|
+
return false
|
82
|
+
end
|
83
|
+
if !(RUBY_PLATFORM =~ /darwin/) and f.start_with?("SecureTransport")
|
84
|
+
return false
|
85
|
+
end
|
86
|
+
return true
|
86
87
|
end
|
88
|
+
|
87
89
|
Dir["ice/**/*.cpp"].each do |f|
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
90
|
+
if filter File.basename(f)
|
91
|
+
$objs << File.dirname(f) + "/" + File.basename(f, ".*") + ".o"
|
92
|
+
$srcs << f
|
93
|
+
end
|
92
94
|
end
|
93
95
|
|
94
96
|
# The mcpp source.
|
95
97
|
Dir["ice/mcpp/*.c"].each do |f|
|
96
|
-
|
97
|
-
|
98
|
-
|
98
|
+
dir = "ice/mcpp"
|
99
|
+
$objs << File.join(dir, File.basename(f, ".*") + ".o")
|
100
|
+
$srcs << File.join(dir, f)
|
99
101
|
end
|
100
102
|
|
101
103
|
create_makefile "IceRuby"
|
@@ -0,0 +1,1094 @@
|
|
1
|
+
|
2
|
+
/*-------------------------------------------------------------*/
|
3
|
+
/*--- Block sorting machinery ---*/
|
4
|
+
/*--- blocksort.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
|
+
#include "bzlib_private.h"
|
23
|
+
|
24
|
+
/*---------------------------------------------*/
|
25
|
+
/*--- Fallback O(N log(N)^2) sorting ---*/
|
26
|
+
/*--- algorithm, for repetitive blocks ---*/
|
27
|
+
/*---------------------------------------------*/
|
28
|
+
|
29
|
+
/*---------------------------------------------*/
|
30
|
+
static
|
31
|
+
__inline__
|
32
|
+
void fallbackSimpleSort ( UInt32* fmap,
|
33
|
+
UInt32* eclass,
|
34
|
+
Int32 lo,
|
35
|
+
Int32 hi )
|
36
|
+
{
|
37
|
+
Int32 i, j, tmp;
|
38
|
+
UInt32 ec_tmp;
|
39
|
+
|
40
|
+
if (lo == hi) return;
|
41
|
+
|
42
|
+
if (hi - lo > 3) {
|
43
|
+
for ( i = hi-4; i >= lo; i-- ) {
|
44
|
+
tmp = fmap[i];
|
45
|
+
ec_tmp = eclass[tmp];
|
46
|
+
for ( j = i+4; j <= hi && ec_tmp > eclass[fmap[j]]; j += 4 )
|
47
|
+
fmap[j-4] = fmap[j];
|
48
|
+
fmap[j-4] = tmp;
|
49
|
+
}
|
50
|
+
}
|
51
|
+
|
52
|
+
for ( i = hi-1; i >= lo; i-- ) {
|
53
|
+
tmp = fmap[i];
|
54
|
+
ec_tmp = eclass[tmp];
|
55
|
+
for ( j = i+1; j <= hi && ec_tmp > eclass[fmap[j]]; j++ )
|
56
|
+
fmap[j-1] = fmap[j];
|
57
|
+
fmap[j-1] = tmp;
|
58
|
+
}
|
59
|
+
}
|
60
|
+
|
61
|
+
|
62
|
+
/*---------------------------------------------*/
|
63
|
+
#define fswap(zz1, zz2) \
|
64
|
+
{ Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; }
|
65
|
+
|
66
|
+
#define fvswap(zzp1, zzp2, zzn) \
|
67
|
+
{ \
|
68
|
+
Int32 yyp1 = (zzp1); \
|
69
|
+
Int32 yyp2 = (zzp2); \
|
70
|
+
Int32 yyn = (zzn); \
|
71
|
+
while (yyn > 0) { \
|
72
|
+
fswap(fmap[yyp1], fmap[yyp2]); \
|
73
|
+
yyp1++; yyp2++; yyn--; \
|
74
|
+
} \
|
75
|
+
}
|
76
|
+
|
77
|
+
|
78
|
+
#define fmin(a,b) ((a) < (b)) ? (a) : (b)
|
79
|
+
|
80
|
+
#define fpush(lz,hz) { stackLo[sp] = lz; \
|
81
|
+
stackHi[sp] = hz; \
|
82
|
+
sp++; }
|
83
|
+
|
84
|
+
#define fpop(lz,hz) { sp--; \
|
85
|
+
lz = stackLo[sp]; \
|
86
|
+
hz = stackHi[sp]; }
|
87
|
+
|
88
|
+
#define FALLBACK_QSORT_SMALL_THRESH 10
|
89
|
+
#define FALLBACK_QSORT_STACK_SIZE 100
|
90
|
+
|
91
|
+
|
92
|
+
static
|
93
|
+
void fallbackQSort3 ( UInt32* fmap,
|
94
|
+
UInt32* eclass,
|
95
|
+
Int32 loSt,
|
96
|
+
Int32 hiSt )
|
97
|
+
{
|
98
|
+
Int32 unLo, unHi, ltLo, gtHi, n, m;
|
99
|
+
Int32 sp, lo, hi;
|
100
|
+
UInt32 med, r, r3;
|
101
|
+
Int32 stackLo[FALLBACK_QSORT_STACK_SIZE];
|
102
|
+
Int32 stackHi[FALLBACK_QSORT_STACK_SIZE];
|
103
|
+
|
104
|
+
r = 0;
|
105
|
+
|
106
|
+
sp = 0;
|
107
|
+
fpush ( loSt, hiSt );
|
108
|
+
|
109
|
+
while (sp > 0) {
|
110
|
+
|
111
|
+
AssertH ( sp < FALLBACK_QSORT_STACK_SIZE - 1, 1004 );
|
112
|
+
|
113
|
+
fpop ( lo, hi );
|
114
|
+
if (hi - lo < FALLBACK_QSORT_SMALL_THRESH) {
|
115
|
+
fallbackSimpleSort ( fmap, eclass, lo, hi );
|
116
|
+
continue;
|
117
|
+
}
|
118
|
+
|
119
|
+
/* Random partitioning. Median of 3 sometimes fails to
|
120
|
+
avoid bad cases. Median of 9 seems to help but
|
121
|
+
looks rather expensive. This too seems to work but
|
122
|
+
is cheaper. Guidance for the magic constants
|
123
|
+
7621 and 32768 is taken from Sedgewick's algorithms
|
124
|
+
book, chapter 35.
|
125
|
+
*/
|
126
|
+
r = ((r * 7621) + 1) % 32768;
|
127
|
+
r3 = r % 3;
|
128
|
+
if (r3 == 0) med = eclass[fmap[lo]]; else
|
129
|
+
if (r3 == 1) med = eclass[fmap[(lo+hi)>>1]]; else
|
130
|
+
med = eclass[fmap[hi]];
|
131
|
+
|
132
|
+
unLo = ltLo = lo;
|
133
|
+
unHi = gtHi = hi;
|
134
|
+
|
135
|
+
while (1) {
|
136
|
+
while (1) {
|
137
|
+
if (unLo > unHi) break;
|
138
|
+
n = (Int32)eclass[fmap[unLo]] - (Int32)med;
|
139
|
+
if (n == 0) {
|
140
|
+
fswap(fmap[unLo], fmap[ltLo]);
|
141
|
+
ltLo++; unLo++;
|
142
|
+
continue;
|
143
|
+
};
|
144
|
+
if (n > 0) break;
|
145
|
+
unLo++;
|
146
|
+
}
|
147
|
+
while (1) {
|
148
|
+
if (unLo > unHi) break;
|
149
|
+
n = (Int32)eclass[fmap[unHi]] - (Int32)med;
|
150
|
+
if (n == 0) {
|
151
|
+
fswap(fmap[unHi], fmap[gtHi]);
|
152
|
+
gtHi--; unHi--;
|
153
|
+
continue;
|
154
|
+
};
|
155
|
+
if (n < 0) break;
|
156
|
+
unHi--;
|
157
|
+
}
|
158
|
+
if (unLo > unHi) break;
|
159
|
+
fswap(fmap[unLo], fmap[unHi]); unLo++; unHi--;
|
160
|
+
}
|
161
|
+
|
162
|
+
AssertD ( unHi == unLo-1, "fallbackQSort3(2)" );
|
163
|
+
|
164
|
+
if (gtHi < ltLo) continue;
|
165
|
+
|
166
|
+
n = fmin(ltLo-lo, unLo-ltLo); fvswap(lo, unLo-n, n);
|
167
|
+
m = fmin(hi-gtHi, gtHi-unHi); fvswap(unLo, hi-m+1, m);
|
168
|
+
|
169
|
+
n = lo + unLo - ltLo - 1;
|
170
|
+
m = hi - (gtHi - unHi) + 1;
|
171
|
+
|
172
|
+
if (n - lo > hi - m) {
|
173
|
+
fpush ( lo, n );
|
174
|
+
fpush ( m, hi );
|
175
|
+
} else {
|
176
|
+
fpush ( m, hi );
|
177
|
+
fpush ( lo, n );
|
178
|
+
}
|
179
|
+
}
|
180
|
+
}
|
181
|
+
|
182
|
+
#undef fmin
|
183
|
+
#undef fpush
|
184
|
+
#undef fpop
|
185
|
+
#undef fswap
|
186
|
+
#undef fvswap
|
187
|
+
#undef FALLBACK_QSORT_SMALL_THRESH
|
188
|
+
#undef FALLBACK_QSORT_STACK_SIZE
|
189
|
+
|
190
|
+
|
191
|
+
/*---------------------------------------------*/
|
192
|
+
/* Pre:
|
193
|
+
nblock > 0
|
194
|
+
eclass exists for [0 .. nblock-1]
|
195
|
+
((UChar*)eclass) [0 .. nblock-1] holds block
|
196
|
+
ptr exists for [0 .. nblock-1]
|
197
|
+
|
198
|
+
Post:
|
199
|
+
((UChar*)eclass) [0 .. nblock-1] holds block
|
200
|
+
All other areas of eclass destroyed
|
201
|
+
fmap [0 .. nblock-1] holds sorted order
|
202
|
+
bhtab [ 0 .. 2+(nblock/32) ] destroyed
|
203
|
+
*/
|
204
|
+
|
205
|
+
#define SET_BH(zz) bhtab[(zz) >> 5] |= (1 << ((zz) & 31))
|
206
|
+
#define CLEAR_BH(zz) bhtab[(zz) >> 5] &= ~(1 << ((zz) & 31))
|
207
|
+
#define ISSET_BH(zz) (bhtab[(zz) >> 5] & (1 << ((zz) & 31)))
|
208
|
+
#define WORD_BH(zz) bhtab[(zz) >> 5]
|
209
|
+
#define UNALIGNED_BH(zz) ((zz) & 0x01f)
|
210
|
+
|
211
|
+
static
|
212
|
+
void fallbackSort ( UInt32* fmap,
|
213
|
+
UInt32* eclass,
|
214
|
+
UInt32* bhtab,
|
215
|
+
Int32 nblock,
|
216
|
+
Int32 verb )
|
217
|
+
{
|
218
|
+
Int32 ftab[257];
|
219
|
+
Int32 ftabCopy[256];
|
220
|
+
Int32 H, i, j, k, l, r, cc, cc1;
|
221
|
+
Int32 nNotDone;
|
222
|
+
Int32 nBhtab;
|
223
|
+
UChar* eclass8 = (UChar*)eclass;
|
224
|
+
|
225
|
+
/*--
|
226
|
+
Initial 1-char radix sort to generate
|
227
|
+
initial fmap and initial BH bits.
|
228
|
+
--*/
|
229
|
+
if (verb >= 4)
|
230
|
+
VPrintf0 ( " bucket sorting ...\n" );
|
231
|
+
for (i = 0; i < 257; i++) ftab[i] = 0;
|
232
|
+
for (i = 0; i < nblock; i++) ftab[eclass8[i]]++;
|
233
|
+
for (i = 0; i < 256; i++) ftabCopy[i] = ftab[i];
|
234
|
+
for (i = 1; i < 257; i++) ftab[i] += ftab[i-1];
|
235
|
+
|
236
|
+
for (i = 0; i < nblock; i++) {
|
237
|
+
j = eclass8[i];
|
238
|
+
k = ftab[j] - 1;
|
239
|
+
ftab[j] = k;
|
240
|
+
fmap[k] = i;
|
241
|
+
}
|
242
|
+
|
243
|
+
nBhtab = 2 + (nblock / 32);
|
244
|
+
for (i = 0; i < nBhtab; i++) bhtab[i] = 0;
|
245
|
+
for (i = 0; i < 256; i++) SET_BH(ftab[i]);
|
246
|
+
|
247
|
+
/*--
|
248
|
+
Inductively refine the buckets. Kind-of an
|
249
|
+
"exponential radix sort" (!), inspired by the
|
250
|
+
Manber-Myers suffix array construction algorithm.
|
251
|
+
--*/
|
252
|
+
|
253
|
+
/*-- set sentinel bits for block-end detection --*/
|
254
|
+
for (i = 0; i < 32; i++) {
|
255
|
+
SET_BH(nblock + 2*i);
|
256
|
+
CLEAR_BH(nblock + 2*i + 1);
|
257
|
+
}
|
258
|
+
|
259
|
+
/*-- the log(N) loop --*/
|
260
|
+
H = 1;
|
261
|
+
while (1) {
|
262
|
+
|
263
|
+
if (verb >= 4)
|
264
|
+
VPrintf1 ( " depth %6d has ", H );
|
265
|
+
|
266
|
+
j = 0;
|
267
|
+
for (i = 0; i < nblock; i++) {
|
268
|
+
if (ISSET_BH(i)) j = i;
|
269
|
+
k = fmap[i] - H; if (k < 0) k += nblock;
|
270
|
+
eclass[k] = j;
|
271
|
+
}
|
272
|
+
|
273
|
+
nNotDone = 0;
|
274
|
+
r = -1;
|
275
|
+
while (1) {
|
276
|
+
|
277
|
+
/*-- find the next non-singleton bucket --*/
|
278
|
+
k = r + 1;
|
279
|
+
while (ISSET_BH(k) && UNALIGNED_BH(k)) k++;
|
280
|
+
if (ISSET_BH(k)) {
|
281
|
+
while (WORD_BH(k) == 0xffffffff) k += 32;
|
282
|
+
while (ISSET_BH(k)) k++;
|
283
|
+
}
|
284
|
+
l = k - 1;
|
285
|
+
if (l >= nblock) break;
|
286
|
+
while (!ISSET_BH(k) && UNALIGNED_BH(k)) k++;
|
287
|
+
if (!ISSET_BH(k)) {
|
288
|
+
while (WORD_BH(k) == 0x00000000) k += 32;
|
289
|
+
while (!ISSET_BH(k)) k++;
|
290
|
+
}
|
291
|
+
r = k - 1;
|
292
|
+
if (r >= nblock) break;
|
293
|
+
|
294
|
+
/*-- now [l, r] bracket current bucket --*/
|
295
|
+
if (r > l) {
|
296
|
+
nNotDone += (r - l + 1);
|
297
|
+
fallbackQSort3 ( fmap, eclass, l, r );
|
298
|
+
|
299
|
+
/*-- scan bucket and generate header bits-- */
|
300
|
+
cc = -1;
|
301
|
+
for (i = l; i <= r; i++) {
|
302
|
+
cc1 = eclass[fmap[i]];
|
303
|
+
if (cc != cc1) { SET_BH(i); cc = cc1; };
|
304
|
+
}
|
305
|
+
}
|
306
|
+
}
|
307
|
+
|
308
|
+
if (verb >= 4)
|
309
|
+
VPrintf1 ( "%6d unresolved strings\n", nNotDone );
|
310
|
+
|
311
|
+
H *= 2;
|
312
|
+
if (H > nblock || nNotDone == 0) break;
|
313
|
+
}
|
314
|
+
|
315
|
+
/*--
|
316
|
+
Reconstruct the original block in
|
317
|
+
eclass8 [0 .. nblock-1], since the
|
318
|
+
previous phase destroyed it.
|
319
|
+
--*/
|
320
|
+
if (verb >= 4)
|
321
|
+
VPrintf0 ( " reconstructing block ...\n" );
|
322
|
+
j = 0;
|
323
|
+
for (i = 0; i < nblock; i++) {
|
324
|
+
while (ftabCopy[j] == 0) j++;
|
325
|
+
ftabCopy[j]--;
|
326
|
+
eclass8[fmap[i]] = (UChar)j;
|
327
|
+
}
|
328
|
+
AssertH ( j < 256, 1005 );
|
329
|
+
}
|
330
|
+
|
331
|
+
#undef SET_BH
|
332
|
+
#undef CLEAR_BH
|
333
|
+
#undef ISSET_BH
|
334
|
+
#undef WORD_BH
|
335
|
+
#undef UNALIGNED_BH
|
336
|
+
|
337
|
+
|
338
|
+
/*---------------------------------------------*/
|
339
|
+
/*--- The main, O(N^2 log(N)) sorting ---*/
|
340
|
+
/*--- algorithm. Faster for "normal" ---*/
|
341
|
+
/*--- non-repetitive blocks. ---*/
|
342
|
+
/*---------------------------------------------*/
|
343
|
+
|
344
|
+
/*---------------------------------------------*/
|
345
|
+
static
|
346
|
+
__inline__
|
347
|
+
Bool mainGtU ( UInt32 i1,
|
348
|
+
UInt32 i2,
|
349
|
+
UChar* block,
|
350
|
+
UInt16* quadrant,
|
351
|
+
UInt32 nblock,
|
352
|
+
Int32* budget )
|
353
|
+
{
|
354
|
+
Int32 k;
|
355
|
+
UChar c1, c2;
|
356
|
+
UInt16 s1, s2;
|
357
|
+
|
358
|
+
AssertD ( i1 != i2, "mainGtU" );
|
359
|
+
/* 1 */
|
360
|
+
c1 = block[i1]; c2 = block[i2];
|
361
|
+
if (c1 != c2) return (c1 > c2);
|
362
|
+
i1++; i2++;
|
363
|
+
/* 2 */
|
364
|
+
c1 = block[i1]; c2 = block[i2];
|
365
|
+
if (c1 != c2) return (c1 > c2);
|
366
|
+
i1++; i2++;
|
367
|
+
/* 3 */
|
368
|
+
c1 = block[i1]; c2 = block[i2];
|
369
|
+
if (c1 != c2) return (c1 > c2);
|
370
|
+
i1++; i2++;
|
371
|
+
/* 4 */
|
372
|
+
c1 = block[i1]; c2 = block[i2];
|
373
|
+
if (c1 != c2) return (c1 > c2);
|
374
|
+
i1++; i2++;
|
375
|
+
/* 5 */
|
376
|
+
c1 = block[i1]; c2 = block[i2];
|
377
|
+
if (c1 != c2) return (c1 > c2);
|
378
|
+
i1++; i2++;
|
379
|
+
/* 6 */
|
380
|
+
c1 = block[i1]; c2 = block[i2];
|
381
|
+
if (c1 != c2) return (c1 > c2);
|
382
|
+
i1++; i2++;
|
383
|
+
/* 7 */
|
384
|
+
c1 = block[i1]; c2 = block[i2];
|
385
|
+
if (c1 != c2) return (c1 > c2);
|
386
|
+
i1++; i2++;
|
387
|
+
/* 8 */
|
388
|
+
c1 = block[i1]; c2 = block[i2];
|
389
|
+
if (c1 != c2) return (c1 > c2);
|
390
|
+
i1++; i2++;
|
391
|
+
/* 9 */
|
392
|
+
c1 = block[i1]; c2 = block[i2];
|
393
|
+
if (c1 != c2) return (c1 > c2);
|
394
|
+
i1++; i2++;
|
395
|
+
/* 10 */
|
396
|
+
c1 = block[i1]; c2 = block[i2];
|
397
|
+
if (c1 != c2) return (c1 > c2);
|
398
|
+
i1++; i2++;
|
399
|
+
/* 11 */
|
400
|
+
c1 = block[i1]; c2 = block[i2];
|
401
|
+
if (c1 != c2) return (c1 > c2);
|
402
|
+
i1++; i2++;
|
403
|
+
/* 12 */
|
404
|
+
c1 = block[i1]; c2 = block[i2];
|
405
|
+
if (c1 != c2) return (c1 > c2);
|
406
|
+
i1++; i2++;
|
407
|
+
|
408
|
+
k = nblock + 8;
|
409
|
+
|
410
|
+
do {
|
411
|
+
/* 1 */
|
412
|
+
c1 = block[i1]; c2 = block[i2];
|
413
|
+
if (c1 != c2) return (c1 > c2);
|
414
|
+
s1 = quadrant[i1]; s2 = quadrant[i2];
|
415
|
+
if (s1 != s2) return (s1 > s2);
|
416
|
+
i1++; i2++;
|
417
|
+
/* 2 */
|
418
|
+
c1 = block[i1]; c2 = block[i2];
|
419
|
+
if (c1 != c2) return (c1 > c2);
|
420
|
+
s1 = quadrant[i1]; s2 = quadrant[i2];
|
421
|
+
if (s1 != s2) return (s1 > s2);
|
422
|
+
i1++; i2++;
|
423
|
+
/* 3 */
|
424
|
+
c1 = block[i1]; c2 = block[i2];
|
425
|
+
if (c1 != c2) return (c1 > c2);
|
426
|
+
s1 = quadrant[i1]; s2 = quadrant[i2];
|
427
|
+
if (s1 != s2) return (s1 > s2);
|
428
|
+
i1++; i2++;
|
429
|
+
/* 4 */
|
430
|
+
c1 = block[i1]; c2 = block[i2];
|
431
|
+
if (c1 != c2) return (c1 > c2);
|
432
|
+
s1 = quadrant[i1]; s2 = quadrant[i2];
|
433
|
+
if (s1 != s2) return (s1 > s2);
|
434
|
+
i1++; i2++;
|
435
|
+
/* 5 */
|
436
|
+
c1 = block[i1]; c2 = block[i2];
|
437
|
+
if (c1 != c2) return (c1 > c2);
|
438
|
+
s1 = quadrant[i1]; s2 = quadrant[i2];
|
439
|
+
if (s1 != s2) return (s1 > s2);
|
440
|
+
i1++; i2++;
|
441
|
+
/* 6 */
|
442
|
+
c1 = block[i1]; c2 = block[i2];
|
443
|
+
if (c1 != c2) return (c1 > c2);
|
444
|
+
s1 = quadrant[i1]; s2 = quadrant[i2];
|
445
|
+
if (s1 != s2) return (s1 > s2);
|
446
|
+
i1++; i2++;
|
447
|
+
/* 7 */
|
448
|
+
c1 = block[i1]; c2 = block[i2];
|
449
|
+
if (c1 != c2) return (c1 > c2);
|
450
|
+
s1 = quadrant[i1]; s2 = quadrant[i2];
|
451
|
+
if (s1 != s2) return (s1 > s2);
|
452
|
+
i1++; i2++;
|
453
|
+
/* 8 */
|
454
|
+
c1 = block[i1]; c2 = block[i2];
|
455
|
+
if (c1 != c2) return (c1 > c2);
|
456
|
+
s1 = quadrant[i1]; s2 = quadrant[i2];
|
457
|
+
if (s1 != s2) return (s1 > s2);
|
458
|
+
i1++; i2++;
|
459
|
+
|
460
|
+
if (i1 >= nblock) i1 -= nblock;
|
461
|
+
if (i2 >= nblock) i2 -= nblock;
|
462
|
+
|
463
|
+
k -= 8;
|
464
|
+
(*budget)--;
|
465
|
+
}
|
466
|
+
while (k >= 0);
|
467
|
+
|
468
|
+
return False;
|
469
|
+
}
|
470
|
+
|
471
|
+
|
472
|
+
/*---------------------------------------------*/
|
473
|
+
/*--
|
474
|
+
Knuth's increments seem to work better
|
475
|
+
than Incerpi-Sedgewick here. Possibly
|
476
|
+
because the number of elems to sort is
|
477
|
+
usually small, typically <= 20.
|
478
|
+
--*/
|
479
|
+
static
|
480
|
+
Int32 incs[14] = { 1, 4, 13, 40, 121, 364, 1093, 3280,
|
481
|
+
9841, 29524, 88573, 265720,
|
482
|
+
797161, 2391484 };
|
483
|
+
|
484
|
+
static
|
485
|
+
void mainSimpleSort ( UInt32* ptr,
|
486
|
+
UChar* block,
|
487
|
+
UInt16* quadrant,
|
488
|
+
Int32 nblock,
|
489
|
+
Int32 lo,
|
490
|
+
Int32 hi,
|
491
|
+
Int32 d,
|
492
|
+
Int32* budget )
|
493
|
+
{
|
494
|
+
Int32 i, j, h, bigN, hp;
|
495
|
+
UInt32 v;
|
496
|
+
|
497
|
+
bigN = hi - lo + 1;
|
498
|
+
if (bigN < 2) return;
|
499
|
+
|
500
|
+
hp = 0;
|
501
|
+
while (incs[hp] < bigN) hp++;
|
502
|
+
hp--;
|
503
|
+
|
504
|
+
for (; hp >= 0; hp--) {
|
505
|
+
h = incs[hp];
|
506
|
+
|
507
|
+
i = lo + h;
|
508
|
+
while (True) {
|
509
|
+
|
510
|
+
/*-- copy 1 --*/
|
511
|
+
if (i > hi) break;
|
512
|
+
v = ptr[i];
|
513
|
+
j = i;
|
514
|
+
while ( mainGtU (
|
515
|
+
ptr[j-h]+d, v+d, block, quadrant, nblock, budget
|
516
|
+
) ) {
|
517
|
+
ptr[j] = ptr[j-h];
|
518
|
+
j = j - h;
|
519
|
+
if (j <= (lo + h - 1)) break;
|
520
|
+
}
|
521
|
+
ptr[j] = v;
|
522
|
+
i++;
|
523
|
+
|
524
|
+
/*-- copy 2 --*/
|
525
|
+
if (i > hi) break;
|
526
|
+
v = ptr[i];
|
527
|
+
j = i;
|
528
|
+
while ( mainGtU (
|
529
|
+
ptr[j-h]+d, v+d, block, quadrant, nblock, budget
|
530
|
+
) ) {
|
531
|
+
ptr[j] = ptr[j-h];
|
532
|
+
j = j - h;
|
533
|
+
if (j <= (lo + h - 1)) break;
|
534
|
+
}
|
535
|
+
ptr[j] = v;
|
536
|
+
i++;
|
537
|
+
|
538
|
+
/*-- copy 3 --*/
|
539
|
+
if (i > hi) break;
|
540
|
+
v = ptr[i];
|
541
|
+
j = i;
|
542
|
+
while ( mainGtU (
|
543
|
+
ptr[j-h]+d, v+d, block, quadrant, nblock, budget
|
544
|
+
) ) {
|
545
|
+
ptr[j] = ptr[j-h];
|
546
|
+
j = j - h;
|
547
|
+
if (j <= (lo + h - 1)) break;
|
548
|
+
}
|
549
|
+
ptr[j] = v;
|
550
|
+
i++;
|
551
|
+
|
552
|
+
if (*budget < 0) return;
|
553
|
+
}
|
554
|
+
}
|
555
|
+
}
|
556
|
+
|
557
|
+
|
558
|
+
/*---------------------------------------------*/
|
559
|
+
/*--
|
560
|
+
The following is an implementation of
|
561
|
+
an elegant 3-way quicksort for strings,
|
562
|
+
described in a paper "Fast Algorithms for
|
563
|
+
Sorting and Searching Strings", by Robert
|
564
|
+
Sedgewick and Jon L. Bentley.
|
565
|
+
--*/
|
566
|
+
|
567
|
+
#define mswap(zz1, zz2) \
|
568
|
+
{ Int32 zztmp = zz1; zz1 = zz2; zz2 = zztmp; }
|
569
|
+
|
570
|
+
#define mvswap(zzp1, zzp2, zzn) \
|
571
|
+
{ \
|
572
|
+
Int32 yyp1 = (zzp1); \
|
573
|
+
Int32 yyp2 = (zzp2); \
|
574
|
+
Int32 yyn = (zzn); \
|
575
|
+
while (yyn > 0) { \
|
576
|
+
mswap(ptr[yyp1], ptr[yyp2]); \
|
577
|
+
yyp1++; yyp2++; yyn--; \
|
578
|
+
} \
|
579
|
+
}
|
580
|
+
|
581
|
+
static
|
582
|
+
__inline__
|
583
|
+
UChar mmed3 ( UChar a, UChar b, UChar c )
|
584
|
+
{
|
585
|
+
UChar t;
|
586
|
+
if (a > b) { t = a; a = b; b = t; };
|
587
|
+
if (b > c) {
|
588
|
+
b = c;
|
589
|
+
if (a > b) b = a;
|
590
|
+
}
|
591
|
+
return b;
|
592
|
+
}
|
593
|
+
|
594
|
+
#define mmin(a,b) ((a) < (b)) ? (a) : (b)
|
595
|
+
|
596
|
+
#define mpush(lz,hz,dz) { stackLo[sp] = lz; \
|
597
|
+
stackHi[sp] = hz; \
|
598
|
+
stackD [sp] = dz; \
|
599
|
+
sp++; }
|
600
|
+
|
601
|
+
#define mpop(lz,hz,dz) { sp--; \
|
602
|
+
lz = stackLo[sp]; \
|
603
|
+
hz = stackHi[sp]; \
|
604
|
+
dz = stackD [sp]; }
|
605
|
+
|
606
|
+
|
607
|
+
#define mnextsize(az) (nextHi[az]-nextLo[az])
|
608
|
+
|
609
|
+
#define mnextswap(az,bz) \
|
610
|
+
{ Int32 tz; \
|
611
|
+
tz = nextLo[az]; nextLo[az] = nextLo[bz]; nextLo[bz] = tz; \
|
612
|
+
tz = nextHi[az]; nextHi[az] = nextHi[bz]; nextHi[bz] = tz; \
|
613
|
+
tz = nextD [az]; nextD [az] = nextD [bz]; nextD [bz] = tz; }
|
614
|
+
|
615
|
+
|
616
|
+
#define MAIN_QSORT_SMALL_THRESH 20
|
617
|
+
#define MAIN_QSORT_DEPTH_THRESH (BZ_N_RADIX + BZ_N_QSORT)
|
618
|
+
#define MAIN_QSORT_STACK_SIZE 100
|
619
|
+
|
620
|
+
static
|
621
|
+
void mainQSort3 ( UInt32* ptr,
|
622
|
+
UChar* block,
|
623
|
+
UInt16* quadrant,
|
624
|
+
Int32 nblock,
|
625
|
+
Int32 loSt,
|
626
|
+
Int32 hiSt,
|
627
|
+
Int32 dSt,
|
628
|
+
Int32* budget )
|
629
|
+
{
|
630
|
+
Int32 unLo, unHi, ltLo, gtHi, n, m, med;
|
631
|
+
Int32 sp, lo, hi, d;
|
632
|
+
|
633
|
+
Int32 stackLo[MAIN_QSORT_STACK_SIZE];
|
634
|
+
Int32 stackHi[MAIN_QSORT_STACK_SIZE];
|
635
|
+
Int32 stackD [MAIN_QSORT_STACK_SIZE];
|
636
|
+
|
637
|
+
Int32 nextLo[3];
|
638
|
+
Int32 nextHi[3];
|
639
|
+
Int32 nextD [3];
|
640
|
+
|
641
|
+
sp = 0;
|
642
|
+
mpush ( loSt, hiSt, dSt );
|
643
|
+
|
644
|
+
while (sp > 0) {
|
645
|
+
|
646
|
+
AssertH ( sp < MAIN_QSORT_STACK_SIZE - 2, 1001 );
|
647
|
+
|
648
|
+
mpop ( lo, hi, d );
|
649
|
+
if (hi - lo < MAIN_QSORT_SMALL_THRESH ||
|
650
|
+
d > MAIN_QSORT_DEPTH_THRESH) {
|
651
|
+
mainSimpleSort ( ptr, block, quadrant, nblock, lo, hi, d, budget );
|
652
|
+
if (*budget < 0) return;
|
653
|
+
continue;
|
654
|
+
}
|
655
|
+
|
656
|
+
med = (Int32)
|
657
|
+
mmed3 ( block[ptr[ lo ]+d],
|
658
|
+
block[ptr[ hi ]+d],
|
659
|
+
block[ptr[ (lo+hi)>>1 ]+d] );
|
660
|
+
|
661
|
+
unLo = ltLo = lo;
|
662
|
+
unHi = gtHi = hi;
|
663
|
+
|
664
|
+
while (True) {
|
665
|
+
while (True) {
|
666
|
+
if (unLo > unHi) break;
|
667
|
+
n = ((Int32)block[ptr[unLo]+d]) - med;
|
668
|
+
if (n == 0) {
|
669
|
+
mswap(ptr[unLo], ptr[ltLo]);
|
670
|
+
ltLo++; unLo++; continue;
|
671
|
+
};
|
672
|
+
if (n > 0) break;
|
673
|
+
unLo++;
|
674
|
+
}
|
675
|
+
while (True) {
|
676
|
+
if (unLo > unHi) break;
|
677
|
+
n = ((Int32)block[ptr[unHi]+d]) - med;
|
678
|
+
if (n == 0) {
|
679
|
+
mswap(ptr[unHi], ptr[gtHi]);
|
680
|
+
gtHi--; unHi--; continue;
|
681
|
+
};
|
682
|
+
if (n < 0) break;
|
683
|
+
unHi--;
|
684
|
+
}
|
685
|
+
if (unLo > unHi) break;
|
686
|
+
mswap(ptr[unLo], ptr[unHi]); unLo++; unHi--;
|
687
|
+
}
|
688
|
+
|
689
|
+
AssertD ( unHi == unLo-1, "mainQSort3(2)" );
|
690
|
+
|
691
|
+
if (gtHi < ltLo) {
|
692
|
+
mpush(lo, hi, d+1 );
|
693
|
+
continue;
|
694
|
+
}
|
695
|
+
|
696
|
+
n = mmin(ltLo-lo, unLo-ltLo); mvswap(lo, unLo-n, n);
|
697
|
+
m = mmin(hi-gtHi, gtHi-unHi); mvswap(unLo, hi-m+1, m);
|
698
|
+
|
699
|
+
n = lo + unLo - ltLo - 1;
|
700
|
+
m = hi - (gtHi - unHi) + 1;
|
701
|
+
|
702
|
+
nextLo[0] = lo; nextHi[0] = n; nextD[0] = d;
|
703
|
+
nextLo[1] = m; nextHi[1] = hi; nextD[1] = d;
|
704
|
+
nextLo[2] = n+1; nextHi[2] = m-1; nextD[2] = d+1;
|
705
|
+
|
706
|
+
if (mnextsize(0) < mnextsize(1)) mnextswap(0,1);
|
707
|
+
if (mnextsize(1) < mnextsize(2)) mnextswap(1,2);
|
708
|
+
if (mnextsize(0) < mnextsize(1)) mnextswap(0,1);
|
709
|
+
|
710
|
+
AssertD (mnextsize(0) >= mnextsize(1), "mainQSort3(8)" );
|
711
|
+
AssertD (mnextsize(1) >= mnextsize(2), "mainQSort3(9)" );
|
712
|
+
|
713
|
+
mpush (nextLo[0], nextHi[0], nextD[0]);
|
714
|
+
mpush (nextLo[1], nextHi[1], nextD[1]);
|
715
|
+
mpush (nextLo[2], nextHi[2], nextD[2]);
|
716
|
+
}
|
717
|
+
}
|
718
|
+
|
719
|
+
#undef mswap
|
720
|
+
#undef mvswap
|
721
|
+
#undef mpush
|
722
|
+
#undef mpop
|
723
|
+
#undef mmin
|
724
|
+
#undef mnextsize
|
725
|
+
#undef mnextswap
|
726
|
+
#undef MAIN_QSORT_SMALL_THRESH
|
727
|
+
#undef MAIN_QSORT_DEPTH_THRESH
|
728
|
+
#undef MAIN_QSORT_STACK_SIZE
|
729
|
+
|
730
|
+
|
731
|
+
/*---------------------------------------------*/
|
732
|
+
/* Pre:
|
733
|
+
nblock > N_OVERSHOOT
|
734
|
+
block32 exists for [0 .. nblock-1 +N_OVERSHOOT]
|
735
|
+
((UChar*)block32) [0 .. nblock-1] holds block
|
736
|
+
ptr exists for [0 .. nblock-1]
|
737
|
+
|
738
|
+
Post:
|
739
|
+
((UChar*)block32) [0 .. nblock-1] holds block
|
740
|
+
All other areas of block32 destroyed
|
741
|
+
ftab [0 .. 65536 ] destroyed
|
742
|
+
ptr [0 .. nblock-1] holds sorted order
|
743
|
+
if (*budget < 0), sorting was abandoned
|
744
|
+
*/
|
745
|
+
|
746
|
+
#define BIGFREQ(b) (ftab[((b)+1) << 8] - ftab[(b) << 8])
|
747
|
+
#define SETMASK (1 << 21)
|
748
|
+
#define CLEARMASK (~(SETMASK))
|
749
|
+
|
750
|
+
static
|
751
|
+
void mainSort ( UInt32* ptr,
|
752
|
+
UChar* block,
|
753
|
+
UInt16* quadrant,
|
754
|
+
UInt32* ftab,
|
755
|
+
Int32 nblock,
|
756
|
+
Int32 verb,
|
757
|
+
Int32* budget )
|
758
|
+
{
|
759
|
+
Int32 i, j, k, ss, sb;
|
760
|
+
Int32 runningOrder[256];
|
761
|
+
Bool bigDone[256];
|
762
|
+
Int32 copyStart[256];
|
763
|
+
Int32 copyEnd [256];
|
764
|
+
UChar c1;
|
765
|
+
Int32 numQSorted;
|
766
|
+
UInt16 s;
|
767
|
+
if (verb >= 4) VPrintf0 ( " main sort initialise ...\n" );
|
768
|
+
|
769
|
+
/*-- set up the 2-byte frequency table --*/
|
770
|
+
for (i = 65536; i >= 0; i--) ftab[i] = 0;
|
771
|
+
|
772
|
+
j = block[0] << 8;
|
773
|
+
i = nblock-1;
|
774
|
+
for (; i >= 3; i -= 4) {
|
775
|
+
quadrant[i] = 0;
|
776
|
+
j = (j >> 8) | ( ((UInt16)block[i]) << 8);
|
777
|
+
ftab[j]++;
|
778
|
+
quadrant[i-1] = 0;
|
779
|
+
j = (j >> 8) | ( ((UInt16)block[i-1]) << 8);
|
780
|
+
ftab[j]++;
|
781
|
+
quadrant[i-2] = 0;
|
782
|
+
j = (j >> 8) | ( ((UInt16)block[i-2]) << 8);
|
783
|
+
ftab[j]++;
|
784
|
+
quadrant[i-3] = 0;
|
785
|
+
j = (j >> 8) | ( ((UInt16)block[i-3]) << 8);
|
786
|
+
ftab[j]++;
|
787
|
+
}
|
788
|
+
for (; i >= 0; i--) {
|
789
|
+
quadrant[i] = 0;
|
790
|
+
j = (j >> 8) | ( ((UInt16)block[i]) << 8);
|
791
|
+
ftab[j]++;
|
792
|
+
}
|
793
|
+
|
794
|
+
/*-- (emphasises close relationship of block & quadrant) --*/
|
795
|
+
for (i = 0; i < BZ_N_OVERSHOOT; i++) {
|
796
|
+
block [nblock+i] = block[i];
|
797
|
+
quadrant[nblock+i] = 0;
|
798
|
+
}
|
799
|
+
|
800
|
+
if (verb >= 4) VPrintf0 ( " bucket sorting ...\n" );
|
801
|
+
|
802
|
+
/*-- Complete the initial radix sort --*/
|
803
|
+
for (i = 1; i <= 65536; i++) ftab[i] += ftab[i-1];
|
804
|
+
|
805
|
+
s = block[0] << 8;
|
806
|
+
i = nblock-1;
|
807
|
+
for (; i >= 3; i -= 4) {
|
808
|
+
s = (s >> 8) | (block[i] << 8);
|
809
|
+
j = ftab[s] -1;
|
810
|
+
ftab[s] = j;
|
811
|
+
ptr[j] = i;
|
812
|
+
s = (s >> 8) | (block[i-1] << 8);
|
813
|
+
j = ftab[s] -1;
|
814
|
+
ftab[s] = j;
|
815
|
+
ptr[j] = i-1;
|
816
|
+
s = (s >> 8) | (block[i-2] << 8);
|
817
|
+
j = ftab[s] -1;
|
818
|
+
ftab[s] = j;
|
819
|
+
ptr[j] = i-2;
|
820
|
+
s = (s >> 8) | (block[i-3] << 8);
|
821
|
+
j = ftab[s] -1;
|
822
|
+
ftab[s] = j;
|
823
|
+
ptr[j] = i-3;
|
824
|
+
}
|
825
|
+
for (; i >= 0; i--) {
|
826
|
+
s = (s >> 8) | (block[i] << 8);
|
827
|
+
j = ftab[s] -1;
|
828
|
+
ftab[s] = j;
|
829
|
+
ptr[j] = i;
|
830
|
+
}
|
831
|
+
|
832
|
+
/*--
|
833
|
+
Now ftab contains the first loc of every small bucket.
|
834
|
+
Calculate the running order, from smallest to largest
|
835
|
+
big bucket.
|
836
|
+
--*/
|
837
|
+
for (i = 0; i <= 255; i++) {
|
838
|
+
bigDone [i] = False;
|
839
|
+
runningOrder[i] = i;
|
840
|
+
}
|
841
|
+
|
842
|
+
{
|
843
|
+
Int32 vv;
|
844
|
+
Int32 h = 1;
|
845
|
+
do h = 3 * h + 1; while (h <= 256);
|
846
|
+
do {
|
847
|
+
h = h / 3;
|
848
|
+
for (i = h; i <= 255; i++) {
|
849
|
+
vv = runningOrder[i];
|
850
|
+
j = i;
|
851
|
+
while ( BIGFREQ(runningOrder[j-h]) > BIGFREQ(vv) ) {
|
852
|
+
runningOrder[j] = runningOrder[j-h];
|
853
|
+
j = j - h;
|
854
|
+
if (j <= (h - 1)) goto zero;
|
855
|
+
}
|
856
|
+
zero:
|
857
|
+
runningOrder[j] = vv;
|
858
|
+
}
|
859
|
+
} while (h != 1);
|
860
|
+
}
|
861
|
+
|
862
|
+
/*--
|
863
|
+
The main sorting loop.
|
864
|
+
--*/
|
865
|
+
|
866
|
+
numQSorted = 0;
|
867
|
+
|
868
|
+
for (i = 0; i <= 255; i++) {
|
869
|
+
|
870
|
+
/*--
|
871
|
+
Process big buckets, starting with the least full.
|
872
|
+
Basically this is a 3-step process in which we call
|
873
|
+
mainQSort3 to sort the small buckets [ss, j], but
|
874
|
+
also make a big effort to avoid the calls if we can.
|
875
|
+
--*/
|
876
|
+
ss = runningOrder[i];
|
877
|
+
|
878
|
+
/*--
|
879
|
+
Step 1:
|
880
|
+
Complete the big bucket [ss] by quicksorting
|
881
|
+
any unsorted small buckets [ss, j], for j != ss.
|
882
|
+
Hopefully previous pointer-scanning phases have already
|
883
|
+
completed many of the small buckets [ss, j], so
|
884
|
+
we don't have to sort them at all.
|
885
|
+
--*/
|
886
|
+
for (j = 0; j <= 255; j++) {
|
887
|
+
if (j != ss) {
|
888
|
+
sb = (ss << 8) + j;
|
889
|
+
if ( ! (ftab[sb] & SETMASK) ) {
|
890
|
+
Int32 lo = ftab[sb] & CLEARMASK;
|
891
|
+
Int32 hi = (ftab[sb+1] & CLEARMASK) - 1;
|
892
|
+
if (hi > lo) {
|
893
|
+
if (verb >= 4)
|
894
|
+
VPrintf4 ( " qsort [0x%x, 0x%x] "
|
895
|
+
"done %d this %d\n",
|
896
|
+
ss, j, numQSorted, hi - lo + 1 );
|
897
|
+
mainQSort3 (
|
898
|
+
ptr, block, quadrant, nblock,
|
899
|
+
lo, hi, BZ_N_RADIX, budget
|
900
|
+
);
|
901
|
+
numQSorted += (hi - lo + 1);
|
902
|
+
if (*budget < 0) return;
|
903
|
+
}
|
904
|
+
}
|
905
|
+
ftab[sb] |= SETMASK;
|
906
|
+
}
|
907
|
+
}
|
908
|
+
|
909
|
+
AssertH ( !bigDone[ss], 1006 );
|
910
|
+
|
911
|
+
/*--
|
912
|
+
Step 2:
|
913
|
+
Now scan this big bucket [ss] so as to synthesise the
|
914
|
+
sorted order for small buckets [t, ss] for all t,
|
915
|
+
including, magically, the bucket [ss,ss] too.
|
916
|
+
This will avoid doing Real Work in subsequent Step 1's.
|
917
|
+
--*/
|
918
|
+
{
|
919
|
+
for (j = 0; j <= 255; j++) {
|
920
|
+
copyStart[j] = ftab[(j << 8) + ss] & CLEARMASK;
|
921
|
+
copyEnd [j] = (ftab[(j << 8) + ss + 1] & CLEARMASK) - 1;
|
922
|
+
}
|
923
|
+
for (j = ftab[ss << 8] & CLEARMASK; j < copyStart[ss]; j++) {
|
924
|
+
k = ptr[j]-1; if (k < 0) k += nblock;
|
925
|
+
c1 = block[k];
|
926
|
+
if (!bigDone[c1])
|
927
|
+
ptr[ copyStart[c1]++ ] = k;
|
928
|
+
}
|
929
|
+
for (j = (ftab[(ss+1) << 8] & CLEARMASK) - 1; j > copyEnd[ss]; j--) {
|
930
|
+
k = ptr[j]-1; if (k < 0) k += nblock;
|
931
|
+
c1 = block[k];
|
932
|
+
if (!bigDone[c1])
|
933
|
+
ptr[ copyEnd[c1]-- ] = k;
|
934
|
+
}
|
935
|
+
}
|
936
|
+
|
937
|
+
AssertH ( (copyStart[ss]-1 == copyEnd[ss])
|
938
|
+
||
|
939
|
+
/* Extremely rare case missing in bzip2-1.0.0 and 1.0.1.
|
940
|
+
Necessity for this case is demonstrated by compressing
|
941
|
+
a sequence of approximately 48.5 million of character
|
942
|
+
251; 1.0.0/1.0.1 will then die here. */
|
943
|
+
(copyStart[ss] == 0 && copyEnd[ss] == nblock-1),
|
944
|
+
1007 )
|
945
|
+
|
946
|
+
for (j = 0; j <= 255; j++) ftab[(j << 8) + ss] |= SETMASK;
|
947
|
+
|
948
|
+
/*--
|
949
|
+
Step 3:
|
950
|
+
The [ss] big bucket is now done. Record this fact,
|
951
|
+
and update the quadrant descriptors. Remember to
|
952
|
+
update quadrants in the overshoot area too, if
|
953
|
+
necessary. The "if (i < 255)" test merely skips
|
954
|
+
this updating for the last bucket processed, since
|
955
|
+
updating for the last bucket is pointless.
|
956
|
+
|
957
|
+
The quadrant array provides a way to incrementally
|
958
|
+
cache sort orderings, as they appear, so as to
|
959
|
+
make subsequent comparisons in fullGtU() complete
|
960
|
+
faster. For repetitive blocks this makes a big
|
961
|
+
difference (but not big enough to be able to avoid
|
962
|
+
the fallback sorting mechanism, exponential radix sort).
|
963
|
+
|
964
|
+
The precise meaning is: at all times:
|
965
|
+
|
966
|
+
for 0 <= i < nblock and 0 <= j <= nblock
|
967
|
+
|
968
|
+
if block[i] != block[j],
|
969
|
+
|
970
|
+
then the relative values of quadrant[i] and
|
971
|
+
quadrant[j] are meaningless.
|
972
|
+
|
973
|
+
else {
|
974
|
+
if quadrant[i] < quadrant[j]
|
975
|
+
then the string starting at i lexicographically
|
976
|
+
precedes the string starting at j
|
977
|
+
|
978
|
+
else if quadrant[i] > quadrant[j]
|
979
|
+
then the string starting at j lexicographically
|
980
|
+
precedes the string starting at i
|
981
|
+
|
982
|
+
else
|
983
|
+
the relative ordering of the strings starting
|
984
|
+
at i and j has not yet been determined.
|
985
|
+
}
|
986
|
+
--*/
|
987
|
+
bigDone[ss] = True;
|
988
|
+
|
989
|
+
if (i < 255) {
|
990
|
+
Int32 bbStart = ftab[ss << 8] & CLEARMASK;
|
991
|
+
Int32 bbSize = (ftab[(ss+1) << 8] & CLEARMASK) - bbStart;
|
992
|
+
Int32 shifts = 0;
|
993
|
+
|
994
|
+
while ((bbSize >> shifts) > 65534) shifts++;
|
995
|
+
|
996
|
+
for (j = bbSize-1; j >= 0; j--) {
|
997
|
+
Int32 a2update = ptr[bbStart + j];
|
998
|
+
UInt16 qVal = (UInt16)(j >> shifts);
|
999
|
+
quadrant[a2update] = qVal;
|
1000
|
+
if (a2update < BZ_N_OVERSHOOT)
|
1001
|
+
quadrant[a2update + nblock] = qVal;
|
1002
|
+
}
|
1003
|
+
AssertH ( ((bbSize-1) >> shifts) <= 65535, 1002 );
|
1004
|
+
}
|
1005
|
+
|
1006
|
+
}
|
1007
|
+
|
1008
|
+
if (verb >= 4)
|
1009
|
+
VPrintf3 ( " %d pointers, %d sorted, %d scanned\n",
|
1010
|
+
nblock, numQSorted, nblock - numQSorted );
|
1011
|
+
}
|
1012
|
+
|
1013
|
+
#undef BIGFREQ
|
1014
|
+
#undef SETMASK
|
1015
|
+
#undef CLEARMASK
|
1016
|
+
|
1017
|
+
|
1018
|
+
/*---------------------------------------------*/
|
1019
|
+
/* Pre:
|
1020
|
+
nblock > 0
|
1021
|
+
arr2 exists for [0 .. nblock-1 +N_OVERSHOOT]
|
1022
|
+
((UChar*)arr2) [0 .. nblock-1] holds block
|
1023
|
+
arr1 exists for [0 .. nblock-1]
|
1024
|
+
|
1025
|
+
Post:
|
1026
|
+
((UChar*)arr2) [0 .. nblock-1] holds block
|
1027
|
+
All other areas of block destroyed
|
1028
|
+
ftab [ 0 .. 65536 ] destroyed
|
1029
|
+
arr1 [0 .. nblock-1] holds sorted order
|
1030
|
+
*/
|
1031
|
+
void BZ2_blockSort ( EState* s )
|
1032
|
+
{
|
1033
|
+
UInt32* ptr = s->ptr;
|
1034
|
+
UChar* block = s->block;
|
1035
|
+
UInt32* ftab = s->ftab;
|
1036
|
+
Int32 nblock = s->nblock;
|
1037
|
+
Int32 verb = s->verbosity;
|
1038
|
+
Int32 wfact = s->workFactor;
|
1039
|
+
UInt16* quadrant;
|
1040
|
+
Int32 budget;
|
1041
|
+
Int32 budgetInit;
|
1042
|
+
Int32 i;
|
1043
|
+
|
1044
|
+
if (nblock < 10000) {
|
1045
|
+
fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb );
|
1046
|
+
} else {
|
1047
|
+
/* Calculate the location for quadrant, remembering to get
|
1048
|
+
the alignment right. Assumes that &(block[0]) is at least
|
1049
|
+
2-byte aligned -- this should be ok since block is really
|
1050
|
+
the first section of arr2.
|
1051
|
+
*/
|
1052
|
+
i = nblock+BZ_N_OVERSHOOT;
|
1053
|
+
if (i & 1) i++;
|
1054
|
+
quadrant = (UInt16*)(&(block[i]));
|
1055
|
+
|
1056
|
+
/* (wfact-1) / 3 puts the default-factor-30
|
1057
|
+
transition point at very roughly the same place as
|
1058
|
+
with v0.1 and v0.9.0.
|
1059
|
+
Not that it particularly matters any more, since the
|
1060
|
+
resulting compressed stream is now the same regardless
|
1061
|
+
of whether or not we use the main sort or fallback sort.
|
1062
|
+
*/
|
1063
|
+
if (wfact < 1 ) wfact = 1;
|
1064
|
+
if (wfact > 100) wfact = 100;
|
1065
|
+
budgetInit = nblock * ((wfact-1) / 3);
|
1066
|
+
budget = budgetInit;
|
1067
|
+
|
1068
|
+
mainSort ( ptr, block, quadrant, ftab, nblock, verb, &budget );
|
1069
|
+
if (verb >= 3)
|
1070
|
+
VPrintf3 ( " %d work, %d block, ratio %5.2f\n",
|
1071
|
+
budgetInit - budget,
|
1072
|
+
nblock,
|
1073
|
+
(float)(budgetInit - budget) /
|
1074
|
+
(float)(nblock==0 ? 1 : nblock) );
|
1075
|
+
if (budget < 0) {
|
1076
|
+
if (verb >= 2)
|
1077
|
+
VPrintf0 ( " too repetitive; using fallback"
|
1078
|
+
" sorting algorithm\n" );
|
1079
|
+
fallbackSort ( s->arr1, s->arr2, ftab, nblock, verb );
|
1080
|
+
}
|
1081
|
+
}
|
1082
|
+
|
1083
|
+
s->origPtr = -1;
|
1084
|
+
for (i = 0; i < s->nblock; i++)
|
1085
|
+
if (ptr[i] == 0)
|
1086
|
+
{ s->origPtr = i; break; };
|
1087
|
+
|
1088
|
+
AssertH( s->origPtr != -1, 1003 );
|
1089
|
+
}
|
1090
|
+
|
1091
|
+
|
1092
|
+
/*-------------------------------------------------------------*/
|
1093
|
+
/*--- end blocksort.c ---*/
|
1094
|
+
/*-------------------------------------------------------------*/
|