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,66 @@
|
|
1
|
+
// **********************************************************************
|
2
|
+
//
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
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
|
+
// **********************************************************************
|
9
|
+
|
10
|
+
#ifndef ICESSL_SCHANNEL_H
|
11
|
+
#define ICESSL_SCHANNEL_H
|
12
|
+
|
13
|
+
#include <IceSSL/Plugin.h>
|
14
|
+
|
15
|
+
#include <wincrypt.h>
|
16
|
+
|
17
|
+
namespace IceSSL
|
18
|
+
{
|
19
|
+
|
20
|
+
namespace SChannel
|
21
|
+
{
|
22
|
+
|
23
|
+
class Certificate;
|
24
|
+
ICE_DEFINE_PTR(CertificatePtr, Certificate);
|
25
|
+
|
26
|
+
class ICESSL_API Certificate : public virtual IceSSL::Certificate
|
27
|
+
{
|
28
|
+
public:
|
29
|
+
|
30
|
+
//
|
31
|
+
// Construct a certificate using a native certificate.
|
32
|
+
//
|
33
|
+
// The Certificate class assumes ownership of the given native
|
34
|
+
// certificate.
|
35
|
+
//
|
36
|
+
static CertificatePtr create(CERT_SIGNED_CONTENT_INFO*);
|
37
|
+
|
38
|
+
//
|
39
|
+
// Load the certificate from a file. The certificate must use the
|
40
|
+
// PEM encoding format. Raises CertificateReadException if the
|
41
|
+
// file cannot be read.
|
42
|
+
//
|
43
|
+
static CertificatePtr load(const std::string&);
|
44
|
+
|
45
|
+
//
|
46
|
+
// Decode a certificate from a string that uses the PEM encoding
|
47
|
+
// format. Raises CertificateEncodingException if an error
|
48
|
+
// occurs.
|
49
|
+
//
|
50
|
+
static CertificatePtr decode(const std::string&);
|
51
|
+
|
52
|
+
//
|
53
|
+
// Retrieve the native X509 certificate value wrapped by this
|
54
|
+
// object.
|
55
|
+
//
|
56
|
+
// The returned reference is only valid for the lifetime of this
|
57
|
+
// object. The returned reference is a pointer to a struct.
|
58
|
+
//
|
59
|
+
virtual CERT_SIGNED_CONTENT_INFO* getCert() const = 0;
|
60
|
+
};
|
61
|
+
|
62
|
+
} // SChannel namespace end
|
63
|
+
|
64
|
+
} // IceSSL namespace end
|
65
|
+
|
66
|
+
#endif
|
@@ -0,0 +1,66 @@
|
|
1
|
+
// **********************************************************************
|
2
|
+
//
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
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
|
+
// **********************************************************************
|
9
|
+
|
10
|
+
#ifndef ICESSL_SECURE_TRANSPORT_H
|
11
|
+
#define ICESSL_SECURE_TRANSPORT_H
|
12
|
+
|
13
|
+
#include <IceSSL/Plugin.h>
|
14
|
+
#include <Security/Security.h>
|
15
|
+
|
16
|
+
namespace IceSSL
|
17
|
+
{
|
18
|
+
|
19
|
+
namespace SecureTransport
|
20
|
+
{
|
21
|
+
|
22
|
+
class Certificate;
|
23
|
+
ICE_DEFINE_PTR(CertificatePtr, Certificate);
|
24
|
+
|
25
|
+
class ICESSL_API Certificate : public virtual IceSSL::Certificate
|
26
|
+
{
|
27
|
+
public:
|
28
|
+
|
29
|
+
//
|
30
|
+
// Construct a certificate using a native certificate.
|
31
|
+
//
|
32
|
+
// The Certificate class assumes ownership of the given native
|
33
|
+
// certificate.
|
34
|
+
//
|
35
|
+
static CertificatePtr create(SecCertificateRef);
|
36
|
+
|
37
|
+
//
|
38
|
+
// Load the certificate from a file. The certificate must use the
|
39
|
+
// PEM encoding format. Raises CertificateReadException if the
|
40
|
+
// file cannot be read.
|
41
|
+
//
|
42
|
+
static CertificatePtr load(const std::string&);
|
43
|
+
|
44
|
+
//
|
45
|
+
// Decode a certificate from a string that uses the PEM encoding
|
46
|
+
// format. Raises CertificateEncodingException if an error
|
47
|
+
// occurs.
|
48
|
+
//
|
49
|
+
static CertificatePtr decode(const std::string&);
|
50
|
+
|
51
|
+
//
|
52
|
+
// Retrieve the native X509 certificate value wrapped by this
|
53
|
+
// object.
|
54
|
+
//
|
55
|
+
// The returned reference is only valid for the lifetime of this
|
56
|
+
// object. You can increment the reference count of the returned
|
57
|
+
// object with CFRetain.
|
58
|
+
//
|
59
|
+
virtual SecCertificateRef getCert() const = 0;
|
60
|
+
};
|
61
|
+
|
62
|
+
} // SecureTransport namespace end
|
63
|
+
|
64
|
+
} // IceSSL namespace end
|
65
|
+
|
66
|
+
#endif
|
@@ -0,0 +1,58 @@
|
|
1
|
+
// **********************************************************************
|
2
|
+
//
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
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
|
+
// **********************************************************************
|
9
|
+
|
10
|
+
#ifndef ICESSL_UWP_H
|
11
|
+
#define ICESSL_UWP_H
|
12
|
+
|
13
|
+
#include <IceSSL/Plugin.h>
|
14
|
+
|
15
|
+
namespace IceSSL
|
16
|
+
{
|
17
|
+
|
18
|
+
namespace UWP
|
19
|
+
{
|
20
|
+
|
21
|
+
class Certificate;
|
22
|
+
ICE_DEFINE_PTR(CertificatePtr, Certificate);
|
23
|
+
|
24
|
+
class ICESSL_API Certificate : public virtual IceSSL::Certificate
|
25
|
+
{
|
26
|
+
public:
|
27
|
+
|
28
|
+
//
|
29
|
+
// Construct a certificate using a native certificate.
|
30
|
+
//
|
31
|
+
static CertificatePtr create(Windows::Security::Cryptography::Certificates::Certificate^);
|
32
|
+
|
33
|
+
//
|
34
|
+
// Load the certificate from a file. The certificate must use the
|
35
|
+
// PEM encoding format. Raises CertificateReadException if the
|
36
|
+
// file cannot be read.
|
37
|
+
//
|
38
|
+
static CertificatePtr load(const std::string&);
|
39
|
+
|
40
|
+
//
|
41
|
+
// Decode a certificate from a string that uses the PEM encoding
|
42
|
+
// format. Raises CertificateEncodingException if an error
|
43
|
+
// occurs.
|
44
|
+
//
|
45
|
+
static CertificatePtr decode(const std::string&);
|
46
|
+
|
47
|
+
//
|
48
|
+
// Retrieve the native X509 certificate value wrapped by this
|
49
|
+
// object.
|
50
|
+
//
|
51
|
+
virtual Windows::Security::Cryptography::Certificates::Certificate^ getCert() const = 0;
|
52
|
+
};
|
53
|
+
|
54
|
+
} // UWP namespace end
|
55
|
+
|
56
|
+
} // IceSSL namespace end
|
57
|
+
|
58
|
+
#endif
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -10,12 +10,12 @@
|
|
10
10
|
#ifndef ICE_UTIL_ATOMIC_H
|
11
11
|
#define ICE_UTIL_ATOMIC_H
|
12
12
|
|
13
|
-
#if ((defined(
|
14
|
-
(defined(
|
15
|
-
# define
|
13
|
+
#if ((defined(ICE_CPP11_COMPILER) && defined(_MSC_VER) && (_MSC_VER > 1600)) || \
|
14
|
+
(defined(ICE_CPP11_COMPILER) && !defined(_MSC_VER)))
|
15
|
+
# define ICE_CPP11_COMPILER_HAS_ATOMIC
|
16
16
|
#endif
|
17
17
|
|
18
|
-
#if defined(
|
18
|
+
#if defined(ICE_CPP11_COMPILER_HAS_ATOMIC)
|
19
19
|
# include <atomic>
|
20
20
|
#elif defined(ICE_USE_MUTEX_SHARED)
|
21
21
|
|
@@ -28,7 +28,7 @@
|
|
28
28
|
#elif ((defined(__GNUC__) && (((__GNUC__* 100) + __GNUC_MINOR__) >= 401)) || __clang__) && \
|
29
29
|
((defined(__sun) && (defined(__sparc) || defined(__sparcv9))) || \
|
30
30
|
defined(__APPLE__) || \
|
31
|
-
(defined(
|
31
|
+
(defined(__linux) && \
|
32
32
|
(defined(__i486) || defined(__i586) || \
|
33
33
|
defined(__i686) || defined(__x86_64))))
|
34
34
|
|
@@ -41,11 +41,10 @@
|
|
41
41
|
# include <IceUtil/Mutex.h>
|
42
42
|
#endif
|
43
43
|
|
44
|
-
|
45
44
|
namespace IceUtilInternal
|
46
45
|
{
|
47
46
|
|
48
|
-
#ifdef
|
47
|
+
#ifdef ICE_CPP11_COMPILER_HAS_ATOMIC
|
49
48
|
typedef std::atomic<int> Atomic;
|
50
49
|
#else
|
51
50
|
|
@@ -63,12 +62,11 @@ typedef unsigned int ATOMIC_T;
|
|
63
62
|
typedef int ATOMIC_T;
|
64
63
|
#endif
|
65
64
|
|
66
|
-
|
67
65
|
//
|
68
66
|
// This is temporary and very partial placeholder for std::atomic,
|
69
67
|
// which is not yet widely available.
|
70
68
|
//
|
71
|
-
class
|
69
|
+
class ICE_API Atomic : public IceUtil::noncopyable
|
72
70
|
{
|
73
71
|
public:
|
74
72
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -27,7 +27,7 @@ class Semaphore
|
|
27
27
|
public:
|
28
28
|
|
29
29
|
Semaphore(long = 0);
|
30
|
-
|
30
|
+
ICE_API ~Semaphore();
|
31
31
|
|
32
32
|
void wait() const;
|
33
33
|
bool timedWait(const IceUtil::Time&) const;
|
@@ -40,7 +40,6 @@ private:
|
|
40
40
|
}
|
41
41
|
#endif
|
42
42
|
|
43
|
-
|
44
43
|
namespace IceUtil
|
45
44
|
{
|
46
45
|
|
@@ -55,7 +54,7 @@ class Mutex;
|
|
55
54
|
// Condition variable implementation. Conforms to the same semantics
|
56
55
|
// as a POSIX threads condition variable.
|
57
56
|
//
|
58
|
-
class
|
57
|
+
class ICE_API Cond : private noncopyable
|
59
58
|
{
|
60
59
|
public:
|
61
60
|
|
@@ -167,7 +166,7 @@ private:
|
|
167
166
|
throw;
|
168
167
|
}
|
169
168
|
}
|
170
|
-
|
169
|
+
|
171
170
|
#else
|
172
171
|
|
173
172
|
template <typename M> void waitImpl(const M&) const;
|
@@ -177,7 +176,7 @@ private:
|
|
177
176
|
|
178
177
|
#ifdef _WIN32
|
179
178
|
# ifdef ICE_HAS_WIN32_CONDVAR
|
180
|
-
mutable CONDITION_VARIABLE _cond;
|
179
|
+
mutable CONDITION_VARIABLE _cond;
|
181
180
|
# else
|
182
181
|
void wake(bool);
|
183
182
|
void preWait() const;
|
@@ -212,12 +211,12 @@ template <typename M> inline void
|
|
212
211
|
Cond::waitImpl(const M& mutex) const
|
213
212
|
{
|
214
213
|
typedef typename M::LockState LockState;
|
215
|
-
|
214
|
+
|
216
215
|
LockState state;
|
217
216
|
mutex.unlock(state);
|
218
|
-
BOOL ok = SleepConditionVariableCS(&_cond, state.mutex, INFINITE);
|
217
|
+
BOOL ok = SleepConditionVariableCS(&_cond, state.mutex, INFINITE);
|
219
218
|
mutex.lock(state);
|
220
|
-
|
219
|
+
|
221
220
|
if(!ok)
|
222
221
|
{
|
223
222
|
throw ThreadSyscallException(__FILE__, __LINE__, GetLastError());
|
@@ -231,19 +230,19 @@ Cond::timedWaitImpl(const M& mutex, const Time& timeout) const
|
|
231
230
|
if(msTimeout < 0 || msTimeout > 0x7FFFFFFF)
|
232
231
|
{
|
233
232
|
throw IceUtil::InvalidTimeoutException(__FILE__, __LINE__, timeout);
|
234
|
-
}
|
233
|
+
}
|
235
234
|
|
236
235
|
typedef typename M::LockState LockState;
|
237
236
|
|
238
237
|
LockState state;
|
239
238
|
mutex.unlock(state);
|
240
|
-
BOOL ok = SleepConditionVariableCS(&_cond, state.mutex, static_cast<DWORD>(msTimeout));
|
239
|
+
BOOL ok = SleepConditionVariableCS(&_cond, state.mutex, static_cast<DWORD>(msTimeout));
|
241
240
|
mutex.lock(state);
|
242
|
-
|
241
|
+
|
243
242
|
if(!ok)
|
244
243
|
{
|
245
244
|
DWORD err = GetLastError();
|
246
|
-
|
245
|
+
|
247
246
|
if(err != ERROR_TIMEOUT)
|
248
247
|
{
|
249
248
|
throw ThreadSyscallException(__FILE__, __LINE__, err);
|
@@ -260,12 +259,12 @@ template <typename M> inline void
|
|
260
259
|
Cond::waitImpl(const M& mutex) const
|
261
260
|
{
|
262
261
|
typedef typename M::LockState LockState;
|
263
|
-
|
262
|
+
|
264
263
|
LockState state;
|
265
264
|
mutex.unlock(state);
|
266
265
|
int rc = pthread_cond_wait(&_cond, state.mutex);
|
267
266
|
mutex.lock(state);
|
268
|
-
|
267
|
+
|
269
268
|
if(rc != 0)
|
270
269
|
{
|
271
270
|
throw ThreadSyscallException(__FILE__, __LINE__, rc);
|
@@ -281,10 +280,10 @@ Cond::timedWaitImpl(const M& mutex, const Time& timeout) const
|
|
281
280
|
}
|
282
281
|
|
283
282
|
typedef typename M::LockState LockState;
|
284
|
-
|
283
|
+
|
285
284
|
LockState state;
|
286
285
|
mutex.unlock(state);
|
287
|
-
|
286
|
+
|
288
287
|
# ifdef __APPLE__
|
289
288
|
//
|
290
289
|
// The monotonic time is based on mach_absolute_time and pthread
|
@@ -300,7 +299,7 @@ Cond::timedWaitImpl(const M& mutex, const Time& timeout) const
|
|
300
299
|
ts.tv_nsec = tv.tv_usec * 1000;
|
301
300
|
int rc = pthread_cond_timedwait(&_cond, state.mutex, &ts);
|
302
301
|
mutex.lock(state);
|
303
|
-
|
302
|
+
|
304
303
|
if(rc != 0)
|
305
304
|
{
|
306
305
|
//
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -85,7 +85,7 @@
|
|
85
85
|
# elif defined(__WORDSIZE) && (__WORDSIZE == 32)
|
86
86
|
# define ICE_32
|
87
87
|
# elif defined(__sun) && (defined(__sparcv9) || defined(__x86_64)) || \
|
88
|
-
defined(
|
88
|
+
defined(__linux) && defined(__x86_64) || \
|
89
89
|
defined(__APPLE__) && defined(__x86_64) || \
|
90
90
|
defined(__hppa) && defined(__LP64__) || \
|
91
91
|
defined(_ARCH_COM) && defined(__64BIT__) || \
|
@@ -105,11 +105,18 @@
|
|
105
105
|
//
|
106
106
|
#if (__cplusplus >= 201103) || \
|
107
107
|
((defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__) && ((__GNUC__* 100) + __GNUC_MINOR__) >= 405)) || \
|
108
|
-
(defined(_MSC_VER) && (_MSC_VER >=
|
109
|
-
# define
|
108
|
+
(defined(_MSC_VER) && (_MSC_VER >= 1900))
|
109
|
+
# define ICE_CPP11_COMPILER
|
110
110
|
#endif
|
111
111
|
|
112
|
-
|
112
|
+
//
|
113
|
+
// Ensure the C++ compiler supports C++11 when using the C++11 mapping
|
114
|
+
//
|
115
|
+
#if defined(ICE_CPP11_MAPPING) && !defined(ICE_CPP11_COMPILER)
|
116
|
+
# error "you need a C++11 capable compiler to use the C++11 mapping"
|
117
|
+
#endif
|
118
|
+
|
119
|
+
#if defined(ICE_CPP11_COMPILER) && (!defined(_MSC_VER) || (_MSC_VER >= 1900))
|
113
120
|
# define ICE_NOEXCEPT noexcept
|
114
121
|
# define ICE_NOEXCEPT_FALSE noexcept(false)
|
115
122
|
#else
|
@@ -118,16 +125,26 @@
|
|
118
125
|
#endif
|
119
126
|
|
120
127
|
//
|
121
|
-
//
|
128
|
+
// Does the C++ compiler library provide std::codecvt_utf8 and
|
129
|
+
// std::codecvt_utf8_utf16?
|
130
|
+
//
|
131
|
+
#if (defined(_MSC_VER) && (_MSC_VER >= 1800)) || \
|
132
|
+
defined(__clang__) || \
|
133
|
+
(defined(ICE_CPP11_COMPILER) && defined(__GNUC__) && (__GNUC__ >= 5))
|
134
|
+
#define ICE_HAS_CODECVT_UTF8
|
135
|
+
#endif
|
136
|
+
|
137
|
+
//
|
138
|
+
// Visual Studio 2015 or later
|
122
139
|
//
|
123
|
-
#if defined(_MSC_VER) && (_MSC_VER >=
|
140
|
+
#if defined(_MSC_VER) && (_MSC_VER >= 1900)
|
124
141
|
|
125
142
|
//
|
126
|
-
// Check if building for
|
143
|
+
// Check if building for UWP
|
127
144
|
//
|
128
145
|
# include <winapifamily.h>
|
129
146
|
# if defined(WINAPI_FAMILY) && (WINAPI_FAMILY == WINAPI_FAMILY_APP)
|
130
|
-
# define
|
147
|
+
# define ICE_OS_UWP
|
131
148
|
# define ICE_STATIC_LIBS
|
132
149
|
# endif
|
133
150
|
|
@@ -137,7 +154,7 @@
|
|
137
154
|
// Support for thread-safe function local static initialization
|
138
155
|
// (a.k.a. "magic statics")
|
139
156
|
//
|
140
|
-
#if defined(__GNUC__) || defined(__clang__)
|
157
|
+
#if defined(ICE_CPP11_MAPPING) || defined(__GNUC__) || defined(__clang__) || (defined(_MSC_VER) && (_MSC_VER >= 1900))
|
141
158
|
# define ICE_HAS_THREAD_SAFE_LOCAL_STATIC
|
142
159
|
#endif
|
143
160
|
|
@@ -145,14 +162,13 @@
|
|
145
162
|
// Compiler extensions to export and import symbols: see the documentation
|
146
163
|
// for Visual Studio, Solaris Studio and GCC.
|
147
164
|
//
|
148
|
-
#if defined(
|
165
|
+
#if defined(_MSC_VER)
|
149
166
|
# define ICE_DECLSPEC_EXPORT __declspec(dllexport)
|
150
167
|
# define ICE_DECLSPEC_IMPORT __declspec(dllimport)
|
151
|
-
//
|
152
|
-
//
|
153
|
-
|
154
|
-
#
|
155
|
-
#elif defined(__GNUC__)
|
168
|
+
// With Visual Studio, we can import/export member functions without importing/
|
169
|
+
// exporting the whole class
|
170
|
+
# define ICE_MEMBER_IMPORT_EXPORT
|
171
|
+
#elif defined(__GNUC__) || defined(__clang__)
|
156
172
|
# define ICE_DECLSPEC_EXPORT __attribute__((visibility ("default")))
|
157
173
|
# define ICE_DECLSPEC_IMPORT __attribute__((visibility ("default")))
|
158
174
|
#elif defined(__SUNPRO_CC)
|
@@ -163,15 +179,25 @@
|
|
163
179
|
# define ICE_DECLSPEC_IMPORT /**/
|
164
180
|
#endif
|
165
181
|
|
182
|
+
#ifdef ICE_MEMBER_IMPORT_EXPORT
|
183
|
+
# define ICE_CLASS(API) /**/
|
184
|
+
# define ICE_MEMBER(API) API
|
185
|
+
#else
|
186
|
+
# define ICE_CLASS(API) API
|
187
|
+
# define ICE_MEMBER(API) /**/
|
188
|
+
#endif
|
189
|
+
|
166
190
|
//
|
167
|
-
// Let's use these extensions with
|
191
|
+
// Let's use these extensions with Ice:
|
168
192
|
//
|
169
|
-
#
|
170
|
-
#
|
171
|
-
#
|
172
|
-
#
|
173
|
-
#
|
174
|
-
#
|
193
|
+
#ifndef ICE_API
|
194
|
+
# if defined(ICE_STATIC_LIBS)
|
195
|
+
# define ICE_API /**/
|
196
|
+
# elif defined(ICE_API_EXPORTS)
|
197
|
+
# define ICE_API ICE_DECLSPEC_EXPORT
|
198
|
+
# else
|
199
|
+
# define ICE_API ICE_DECLSPEC_IMPORT
|
200
|
+
# endif
|
175
201
|
#endif
|
176
202
|
|
177
203
|
#if defined(_MSC_VER)
|
@@ -214,9 +240,9 @@
|
|
214
240
|
#include <sstream>
|
215
241
|
|
216
242
|
#ifndef _WIN32
|
217
|
-
# include <unistd.h>
|
218
243
|
# include <pthread.h>
|
219
244
|
# include <errno.h>
|
245
|
+
# include <unistd.h>
|
220
246
|
#endif
|
221
247
|
|
222
248
|
#ifdef __APPLE__
|
@@ -229,28 +255,62 @@
|
|
229
255
|
#endif
|
230
256
|
|
231
257
|
#ifdef __IBMCPP__
|
232
|
-
// TODO: better fix for this warning
|
258
|
+
// TODO: better fix for this warning
|
233
259
|
# pragma report(disable, "1540-0198") // private inheritance without private keyword
|
234
260
|
#endif
|
235
261
|
|
236
|
-
|
237
|
-
|
262
|
+
//
|
263
|
+
// The Ice version.
|
264
|
+
//
|
265
|
+
#define ICE_STRING_VERSION "3.7.0" // "A.B.C", with A=major, B=minor, C=patch
|
266
|
+
#define ICE_INT_VERSION 30700 // AABBCC, with AA=major, BB=minor, CC=patch
|
267
|
+
#define ICE_SO_VERSION "37" // "ABC", with A=major, B=minor, C=patch
|
268
|
+
|
269
|
+
#if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS)
|
270
|
+
# define ICE_BUILDING_ICE
|
238
271
|
#endif
|
239
272
|
|
240
273
|
#if defined(_MSC_VER)
|
241
274
|
# if !defined(ICE_STATIC_LIBS) && (!defined(_DLL) || !defined(_MT))
|
242
275
|
# error "Only multi-threaded DLL libraries can be used with Ice!"
|
243
276
|
# endif
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
#
|
248
|
-
#
|
249
|
-
#
|
277
|
+
|
278
|
+
# ifdef ICE_CPP11_MAPPING
|
279
|
+
# if defined(_DEBUG)
|
280
|
+
# if defined(ICE_OS_UWP)
|
281
|
+
# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp++11D.lib"
|
282
|
+
# else
|
283
|
+
# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11D.lib"
|
284
|
+
# endif
|
285
|
+
# else
|
286
|
+
# if defined(ICE_OS_UWP)
|
287
|
+
# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp++11.lib"
|
288
|
+
# else
|
289
|
+
# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11.lib"
|
290
|
+
# endif
|
291
|
+
# endif
|
292
|
+
# else
|
293
|
+
# if defined(_DEBUG)
|
294
|
+
# if defined(ICE_OS_UWP)
|
295
|
+
# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwpD.lib"
|
296
|
+
# else
|
297
|
+
# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "D.lib"
|
298
|
+
# endif
|
250
299
|
# else
|
251
|
-
#
|
300
|
+
# if defined(ICE_OS_UWP)
|
301
|
+
# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp.lib"
|
302
|
+
# else
|
303
|
+
# define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION ".lib"
|
304
|
+
# endif
|
252
305
|
# endif
|
253
306
|
# endif
|
307
|
+
|
308
|
+
//
|
309
|
+
// Automatically link with Ice[D|++11|++11D].lib
|
310
|
+
//
|
311
|
+
# if !defined(ICE_BUILDING_ICE) && !defined(ICE_BUILDING_SLICE_COMPILERS)
|
312
|
+
# pragma comment(lib, ICE_LIBNAME("Ice"))
|
313
|
+
# endif
|
254
314
|
#endif
|
255
315
|
|
256
316
|
namespace IceUtil
|
@@ -259,7 +319,7 @@ namespace IceUtil
|
|
259
319
|
//
|
260
320
|
// By deriving from this class, other classes are made non-copyable.
|
261
321
|
//
|
262
|
-
class
|
322
|
+
class ICE_API noncopyable
|
263
323
|
{
|
264
324
|
protected:
|
265
325
|
|
@@ -273,6 +333,8 @@ private:
|
|
273
333
|
const noncopyable& operator=(const noncopyable&);
|
274
334
|
};
|
275
335
|
|
336
|
+
typedef unsigned char Byte;
|
337
|
+
|
276
338
|
//
|
277
339
|
// Int64 typedef and ICE_INT64 macro for Int64 literal values
|
278
340
|
//
|
@@ -295,9 +357,46 @@ typedef long long Int64;
|
|
295
357
|
}
|
296
358
|
|
297
359
|
//
|
298
|
-
//
|
299
|
-
//
|
300
|
-
#
|
301
|
-
#
|
360
|
+
// Macros to facilitate C++98 -> C++11 transition
|
361
|
+
//
|
362
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
363
|
+
# include <memory>
|
364
|
+
# include <future>
|
365
|
+
# define ICE_HANDLE ::std::shared_ptr
|
366
|
+
# define ICE_INTERNAL_HANDLE ::std::shared_ptr
|
367
|
+
# define ICE_PROXY_HANDLE ::std::shared_ptr
|
368
|
+
# define ICE_MAKE_SHARED(T, ...) ::std::make_shared<T>(__VA_ARGS__)
|
369
|
+
# define ICE_DEFINE_PTR(TPtr, T) using TPtr = ::std::shared_ptr<T>
|
370
|
+
# define ICE_ENUM(CLASS,ENUMERATOR) CLASS::ENUMERATOR
|
371
|
+
# define ICE_SCOPED_ENUM(CLASS,ENUMERATOR) CLASS::ENUMERATOR
|
372
|
+
# define ICE_NULLPTR nullptr
|
373
|
+
# define ICE_DYNAMIC_CAST(T,V) ::std::dynamic_pointer_cast<T>(V)
|
374
|
+
# define ICE_SHARED_FROM_THIS shared_from_this()
|
375
|
+
# define ICE_SHARED_FROM_CONST_THIS(T) const_cast<T*>(this)->shared_from_this()
|
376
|
+
# define ICE_GET_SHARED_FROM_THIS(p) p->shared_from_this()
|
377
|
+
# define ICE_CHECKED_CAST(T, ...) Ice::checkedCast<T>(__VA_ARGS__)
|
378
|
+
# define ICE_UNCHECKED_CAST(T, ...) Ice::uncheckedCast<T>(__VA_ARGS__)
|
379
|
+
# define ICE_DELEGATE(T) T
|
380
|
+
# define ICE_IN(...) __VA_ARGS__
|
381
|
+
# define ICE_SET_EXCEPTION_FROM_CLONE(T, V) T = V
|
382
|
+
#else // C++98 mapping
|
383
|
+
# define ICE_HANDLE ::IceUtil::Handle
|
384
|
+
# define ICE_INTERNAL_HANDLE ::IceInternal::Handle
|
385
|
+
# define ICE_PROXY_HANDLE ::IceInternal::ProxyHandle
|
386
|
+
# define ICE_MAKE_SHARED(T, ...) new T(__VA_ARGS__)
|
387
|
+
# define ICE_DEFINE_PTR(TPtr, T) typedef ::IceUtil::Handle<T> TPtr
|
388
|
+
# define ICE_ENUM(CLASS,ENUMERATOR) ENUMERATOR
|
389
|
+
# define ICE_SCOPED_ENUM(CLASS,ENUMERATOR) CLASS##ENUMERATOR
|
390
|
+
# define ICE_NULLPTR 0
|
391
|
+
# define ICE_DYNAMIC_CAST(T,V) T##Ptr::dynamicCast(V)
|
392
|
+
# define ICE_SHARED_FROM_THIS this
|
393
|
+
# define ICE_SHARED_FROM_CONST_THIS(T) const_cast<T*>(this)
|
394
|
+
# define ICE_GET_SHARED_FROM_THIS(p) p
|
395
|
+
# define ICE_CHECKED_CAST(T, ...) T::checkedCast(__VA_ARGS__)
|
396
|
+
# define ICE_UNCHECKED_CAST(T, ...) T::uncheckedCast(__VA_ARGS__)
|
397
|
+
# define ICE_DELEGATE(T) T##Ptr
|
398
|
+
# define ICE_IN(...) const __VA_ARGS__&
|
399
|
+
# define ICE_SET_EXCEPTION_FROM_CLONE(T, V) T.reset(V)
|
400
|
+
#endif
|
302
401
|
|
303
402
|
#endif
|