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
@@ -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.
|
@@ -20,7 +20,6 @@ namespace IceInternal
|
|
20
20
|
class Instance;
|
21
21
|
ICE_API IceUtil::Shared* upCast(Instance*);
|
22
22
|
typedef IceInternal::Handle<Instance> InstancePtr;
|
23
|
-
|
24
23
|
}
|
25
24
|
|
26
25
|
#endif
|
@@ -0,0 +1,46 @@
|
|
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 ICE_INTERFACE_BY_VALUE_H
|
11
|
+
#define ICE_INTERFACE_BY_VALUE_H
|
12
|
+
|
13
|
+
#include <Ice/Value.h>
|
14
|
+
#include <Ice/OutputStream.h>
|
15
|
+
#include <Ice/InputStream.h>
|
16
|
+
|
17
|
+
#ifdef ICE_CPP11_MAPPING
|
18
|
+
|
19
|
+
namespace Ice
|
20
|
+
{
|
21
|
+
|
22
|
+
template<typename T>
|
23
|
+
class InterfaceByValue : public ValueHelper<InterfaceByValue<T>, Value>
|
24
|
+
{
|
25
|
+
public:
|
26
|
+
virtual std::string ice_id() const
|
27
|
+
{
|
28
|
+
return T::ice_staticId();
|
29
|
+
}
|
30
|
+
|
31
|
+
static const std::string& ice_staticId()
|
32
|
+
{
|
33
|
+
return T::ice_staticId();
|
34
|
+
}
|
35
|
+
|
36
|
+
std::tuple<> ice_tuple() const
|
37
|
+
{
|
38
|
+
return std::tie();
|
39
|
+
}
|
40
|
+
};
|
41
|
+
|
42
|
+
}
|
43
|
+
|
44
|
+
#endif
|
45
|
+
|
46
|
+
#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,20 +10,19 @@
|
|
10
10
|
#ifndef ICE_LOCAL_OBJECT_H
|
11
11
|
#define ICE_LOCAL_OBJECT_H
|
12
12
|
|
13
|
+
#if !defined(ICE_CPP11_MAPPING) || defined(ICE_BUILDING_SRC)
|
14
|
+
//
|
15
|
+
// Part of the C++98 mapping, and "internal" definitions when building Ice
|
16
|
+
// with the C++11 mapping
|
17
|
+
//
|
18
|
+
|
13
19
|
#include <IceUtil/Shared.h>
|
14
20
|
#include <Ice/LocalObjectF.h>
|
15
21
|
|
16
|
-
namespace IceInternal
|
17
|
-
{
|
18
|
-
|
19
|
-
class BasicStream;
|
20
|
-
|
21
|
-
}
|
22
|
-
|
23
22
|
namespace Ice
|
24
23
|
{
|
25
24
|
|
26
|
-
class ICE_API LocalObject : virtual
|
25
|
+
class ICE_API LocalObject : public virtual ::IceUtil::Shared
|
27
26
|
{
|
28
27
|
public:
|
29
28
|
|
@@ -34,3 +33,4 @@ public:
|
|
34
33
|
}
|
35
34
|
|
36
35
|
#endif
|
36
|
+
#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.
|
@@ -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.
|
@@ -23,12 +23,12 @@ class ICE_API LoggerOutputBase : private IceUtil::noncopyable
|
|
23
23
|
public:
|
24
24
|
|
25
25
|
std::string str() const;
|
26
|
-
|
27
|
-
std::ostringstream&
|
26
|
+
|
27
|
+
std::ostringstream& _stream(); // For internal use only. Don't use in your code.
|
28
28
|
|
29
29
|
private:
|
30
30
|
|
31
|
-
std::ostringstream
|
31
|
+
std::ostringstream _os;
|
32
32
|
};
|
33
33
|
|
34
34
|
ICE_API LoggerOutputBase& loggerInsert(LoggerOutputBase& out, const IceUtil::Exception& ex);
|
@@ -48,7 +48,7 @@ struct LoggerOutputInserter
|
|
48
48
|
static inline LoggerOutputBase&
|
49
49
|
insert(LoggerOutputBase& out, const T& val)
|
50
50
|
{
|
51
|
-
out.
|
51
|
+
out._stream() << val;
|
52
52
|
return out;
|
53
53
|
}
|
54
54
|
};
|
@@ -68,12 +68,18 @@ template<typename T>
|
|
68
68
|
inline LoggerOutputBase&
|
69
69
|
operator<<(LoggerOutputBase& out, const T& val)
|
70
70
|
{
|
71
|
-
return LoggerOutputInserter<T, IsException<T>::value>::insert(out, val);
|
71
|
+
return LoggerOutputInserter<T, IsException<T>::value>::insert(out, val);
|
72
72
|
}
|
73
73
|
|
74
|
+
#ifdef ICE_CPP11_MAPPING
|
75
|
+
template<typename T, typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type* = nullptr>
|
76
|
+
inline LoggerOutputBase&
|
77
|
+
operator<<(LoggerOutputBase& os, const ::std::shared_ptr<T>& p)
|
78
|
+
#else
|
74
79
|
template<typename T>
|
75
|
-
inline LoggerOutputBase&
|
80
|
+
inline LoggerOutputBase&
|
76
81
|
operator<<(LoggerOutputBase& os, const ::IceInternal::ProxyHandle<T>& p)
|
82
|
+
#endif
|
77
83
|
{
|
78
84
|
return os << (p ? p->ice_toString() : "");
|
79
85
|
}
|
@@ -81,7 +87,7 @@ operator<<(LoggerOutputBase& os, const ::IceInternal::ProxyHandle<T>& p)
|
|
81
87
|
inline LoggerOutputBase&
|
82
88
|
operator<<(LoggerOutputBase& out, const ::std::exception& ex)
|
83
89
|
{
|
84
|
-
out.
|
90
|
+
out._stream() << ex.what();
|
85
91
|
return out;
|
86
92
|
}
|
87
93
|
|
@@ -94,7 +100,7 @@ public:
|
|
94
100
|
inline LoggerOutput(const LPtr& lptr) :
|
95
101
|
_logger(lptr)
|
96
102
|
{}
|
97
|
-
|
103
|
+
|
98
104
|
inline ~LoggerOutput()
|
99
105
|
{
|
100
106
|
flush();
|
@@ -102,17 +108,17 @@ public:
|
|
102
108
|
|
103
109
|
inline void flush()
|
104
110
|
{
|
105
|
-
std::string s =
|
111
|
+
std::string s = _stream().str();
|
106
112
|
if(!s.empty())
|
107
113
|
{
|
108
114
|
L& ref = *_logger;
|
109
115
|
(ref.*output)(s);
|
110
116
|
}
|
111
|
-
|
117
|
+
_stream().str("");
|
112
118
|
}
|
113
119
|
|
114
120
|
private:
|
115
|
-
|
121
|
+
|
116
122
|
LPtr _logger;
|
117
123
|
};
|
118
124
|
|
@@ -126,9 +132,9 @@ public:
|
|
126
132
|
Trace(const LoggerPtr&, const std::string&);
|
127
133
|
~Trace();
|
128
134
|
void flush();
|
129
|
-
|
135
|
+
|
130
136
|
private:
|
131
|
-
|
137
|
+
|
132
138
|
LoggerPtr _logger;
|
133
139
|
std::string _category;
|
134
140
|
};
|
@@ -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.
|
@@ -17,7 +17,7 @@
|
|
17
17
|
#include <Ice/Metrics.h>
|
18
18
|
|
19
19
|
#ifdef _MSC_VER
|
20
|
-
# define
|
20
|
+
# define ICE_CPP11_COMPILER_REGEXP
|
21
21
|
#endif
|
22
22
|
|
23
23
|
#ifdef __MINGW32__
|
@@ -25,7 +25,7 @@
|
|
25
25
|
// No regexp support with MinGW, when MinGW C++11 mode is not experimental
|
26
26
|
// we can use std::regex.
|
27
27
|
//
|
28
|
-
#elif defined(
|
28
|
+
#elif defined(ICE_CPP11_COMPILER_REGEXP)
|
29
29
|
# include <regex>
|
30
30
|
#else
|
31
31
|
# include <regex.h>
|
@@ -44,14 +44,22 @@ template<typename T> class MetricsHelperT;
|
|
44
44
|
namespace IceInternal
|
45
45
|
{
|
46
46
|
|
47
|
-
class ICE_API MetricsMapI
|
47
|
+
class ICE_API MetricsMapI;
|
48
|
+
ICE_DEFINE_PTR(MetricsMapIPtr, MetricsMapI);
|
49
|
+
|
50
|
+
class ICE_API MetricsMapI :
|
51
|
+
#ifdef ICE_CPP11_MAPPING
|
52
|
+
public std::enable_shared_from_this<MetricsMapI>
|
53
|
+
#else
|
54
|
+
public virtual IceUtil::Shared
|
55
|
+
#endif
|
48
56
|
{
|
49
57
|
public:
|
50
58
|
|
51
59
|
class ICE_API RegExp : public IceUtil::Shared
|
52
60
|
{
|
53
61
|
public:
|
54
|
-
|
62
|
+
|
55
63
|
RegExp(const std::string&, const std::string&);
|
56
64
|
~RegExp();
|
57
65
|
|
@@ -73,7 +81,7 @@ public:
|
|
73
81
|
private:
|
74
82
|
|
75
83
|
bool match(const std::string&);
|
76
|
-
|
84
|
+
|
77
85
|
const std::string _attribute;
|
78
86
|
|
79
87
|
#ifdef __MINGW32__
|
@@ -81,7 +89,7 @@ public:
|
|
81
89
|
// No regexp support with MinGW, when MinGW C++11 mode is not experimental
|
82
90
|
// we can use std::regex.
|
83
91
|
//
|
84
|
-
#elif defined(
|
92
|
+
#elif defined(ICE_CPP11_COMPILER_REGEXP)
|
85
93
|
# if _MSC_VER < 1600
|
86
94
|
std::tr1::regex _regex;
|
87
95
|
# else
|
@@ -89,9 +97,11 @@ public:
|
|
89
97
|
# endif
|
90
98
|
#else
|
91
99
|
regex_t _preg;
|
92
|
-
#endif
|
100
|
+
#endif
|
93
101
|
};
|
94
|
-
|
102
|
+
ICE_DEFINE_PTR(RegExpPtr, RegExp);
|
103
|
+
|
104
|
+
virtual ~MetricsMapI();
|
95
105
|
|
96
106
|
MetricsMapI(const std::string&, const Ice::PropertiesPtr&);
|
97
107
|
MetricsMapI(const MetricsMapI&);
|
@@ -102,7 +112,7 @@ public:
|
|
102
112
|
virtual IceMX::MetricsFailures getFailures(const std::string&) = 0;
|
103
113
|
virtual IceMX::MetricsMap getMetrics() const = 0;
|
104
114
|
|
105
|
-
virtual
|
115
|
+
virtual MetricsMapIPtr clone() const = 0;
|
106
116
|
|
107
117
|
const Ice::PropertyDict& getProperties() const;
|
108
118
|
|
@@ -115,43 +125,52 @@ protected:
|
|
115
125
|
const std::vector<RegExpPtr> _accept;
|
116
126
|
const std::vector<RegExpPtr> _reject;
|
117
127
|
};
|
118
|
-
typedef IceUtil::Handle<MetricsMapI> MetricsMapIPtr;
|
119
128
|
|
120
|
-
class ICE_API MetricsMapFactory
|
129
|
+
class ICE_API MetricsMapFactory
|
130
|
+
#ifndef ICE_CPP11_MAPPING
|
131
|
+
: public Ice::LocalObject
|
132
|
+
#endif
|
121
133
|
{
|
122
134
|
public:
|
123
135
|
|
136
|
+
virtual ~MetricsMapFactory();
|
137
|
+
|
124
138
|
MetricsMapFactory(IceMX::Updater*);
|
125
139
|
|
126
140
|
virtual MetricsMapIPtr create(const std::string&, const Ice::PropertiesPtr&) = 0;
|
127
|
-
|
141
|
+
|
128
142
|
void update();
|
129
143
|
|
130
144
|
private:
|
131
|
-
|
145
|
+
|
132
146
|
IceMX::Updater* _updater;
|
133
147
|
};
|
134
|
-
|
148
|
+
ICE_DEFINE_PTR(MetricsMapFactoryPtr, MetricsMapFactory);
|
135
149
|
|
136
150
|
template<class MetricsType> class MetricsMapT : public MetricsMapI, private IceUtil::Mutex
|
137
151
|
{
|
138
152
|
public:
|
139
153
|
|
140
154
|
typedef MetricsType T;
|
141
|
-
typedef
|
155
|
+
typedef ICE_INTERNAL_HANDLE<MetricsType> TPtr;
|
142
156
|
|
143
|
-
|
157
|
+
ICE_DEFINE_PTR(MetricsMapTPtr, MetricsMapT);
|
144
158
|
|
145
159
|
typedef IceMX::MetricsMap MetricsType::* SubMapMember;
|
146
160
|
|
147
161
|
class EntryT;
|
148
|
-
|
162
|
+
ICE_DEFINE_PTR(EntryTPtr, EntryT);
|
149
163
|
|
150
|
-
class EntryT :
|
164
|
+
class EntryT :
|
165
|
+
#ifdef ICE_CPP11_MAPPING
|
166
|
+
public std::enable_shared_from_this<EntryT>
|
167
|
+
#else
|
168
|
+
public Ice::LocalObject
|
169
|
+
#endif
|
151
170
|
{
|
152
171
|
public:
|
153
172
|
|
154
|
-
EntryT(
|
173
|
+
EntryT(MetricsMapTPtr map, const TPtr& object, const typename std::list<EntryTPtr>::iterator& p) :
|
155
174
|
_map(map), _object(object), _detachedPos(p)
|
156
175
|
{
|
157
176
|
}
|
@@ -166,7 +185,7 @@ public:
|
|
166
185
|
}
|
167
186
|
}
|
168
187
|
|
169
|
-
void
|
188
|
+
void
|
170
189
|
failed(const std::string& exceptionName)
|
171
190
|
{
|
172
191
|
IceUtil::Mutex::Lock sync(*_map);
|
@@ -180,7 +199,7 @@ public:
|
|
180
199
|
MetricsMapIPtr m;
|
181
200
|
{
|
182
201
|
IceUtil::Mutex::Lock sync(*_map);
|
183
|
-
typename std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> >::iterator p =
|
202
|
+
typename std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> >::iterator p =
|
184
203
|
_subMaps.find(mapName);
|
185
204
|
if(p == _subMaps.end())
|
186
205
|
{
|
@@ -196,7 +215,7 @@ public:
|
|
196
215
|
}
|
197
216
|
m = p->second.first;
|
198
217
|
}
|
199
|
-
|
218
|
+
|
200
219
|
MetricsMapT<MemberMetricsType>* map = dynamic_cast<MetricsMapT<MemberMetricsType>*>(m.get());
|
201
220
|
assert(map);
|
202
221
|
return map->getMatching(helper);
|
@@ -209,7 +228,11 @@ public:
|
|
209
228
|
_object->totalLifetime += lifetime;
|
210
229
|
if(--_object->current == 0)
|
211
230
|
{
|
231
|
+
#ifdef ICE_CPP11_MAPPING
|
232
|
+
_map->detached(this->shared_from_this());
|
233
|
+
#else
|
212
234
|
_map->detached(this);
|
235
|
+
#endif
|
213
236
|
}
|
214
237
|
}
|
215
238
|
|
@@ -228,7 +251,6 @@ public:
|
|
228
251
|
|
229
252
|
private:
|
230
253
|
|
231
|
-
|
232
254
|
IceMX::MetricsFailures
|
233
255
|
getFailures() const
|
234
256
|
{
|
@@ -241,7 +263,7 @@ public:
|
|
241
263
|
IceMX::MetricsPtr
|
242
264
|
clone() const
|
243
265
|
{
|
244
|
-
TPtr metrics =
|
266
|
+
TPtr metrics = ICE_DYNAMIC_CAST(T, _object->ice_clone());
|
245
267
|
for(typename std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> >::const_iterator p =
|
246
268
|
_subMaps.begin(); p != _subMaps.end(); ++p)
|
247
269
|
{
|
@@ -250,7 +272,7 @@ public:
|
|
250
272
|
return metrics;
|
251
273
|
}
|
252
274
|
|
253
|
-
bool
|
275
|
+
bool
|
254
276
|
isDetached() const
|
255
277
|
{
|
256
278
|
return _object->current == 0;
|
@@ -274,7 +296,7 @@ public:
|
|
274
296
|
|
275
297
|
MetricsMapT(const std::string& mapPrefix,
|
276
298
|
const Ice::PropertiesPtr& properties,
|
277
|
-
const std::map<std::string, std::pair<SubMapMember, MetricsMapFactoryPtr> >& subMaps) :
|
299
|
+
const std::map<std::string, std::pair<SubMapMember, MetricsMapFactoryPtr> >& subMaps) :
|
278
300
|
MetricsMapI(mapPrefix, properties), _destroyed(false)
|
279
301
|
{
|
280
302
|
std::vector<std::string> subMapNames;
|
@@ -295,8 +317,8 @@ public:
|
|
295
317
|
continue; // This sub-map isn't configured.
|
296
318
|
}
|
297
319
|
}
|
298
|
-
_subMaps.insert(std::make_pair(p->first,
|
299
|
-
std::make_pair(p->second.first,
|
320
|
+
_subMaps.insert(std::make_pair(p->first,
|
321
|
+
std::make_pair(p->second.first,
|
300
322
|
p->second.second->create(subMapPrefix, properties))));
|
301
323
|
}
|
302
324
|
}
|
@@ -305,7 +327,14 @@ public:
|
|
305
327
|
{
|
306
328
|
}
|
307
329
|
|
308
|
-
|
330
|
+
#ifdef ICE_CPP11_MAPPING
|
331
|
+
std::shared_ptr<MetricsMapT> shared_from_this()
|
332
|
+
{
|
333
|
+
return std::static_pointer_cast<MetricsMapT>(MetricsMapI::shared_from_this());
|
334
|
+
}
|
335
|
+
#endif
|
336
|
+
|
337
|
+
virtual void
|
309
338
|
destroy()
|
310
339
|
{
|
311
340
|
Lock sync(*this);
|
@@ -318,7 +347,7 @@ public:
|
|
318
347
|
getMetrics() const
|
319
348
|
{
|
320
349
|
IceMX::MetricsMap objects;
|
321
|
-
|
350
|
+
|
322
351
|
Lock sync(*this);
|
323
352
|
for(typename std::map<std::string, EntryTPtr>::const_iterator p = _objects.begin(); p != _objects.end(); ++p)
|
324
353
|
{
|
@@ -326,12 +355,12 @@ public:
|
|
326
355
|
}
|
327
356
|
return objects;
|
328
357
|
}
|
329
|
-
|
358
|
+
|
330
359
|
virtual IceMX::MetricsFailuresSeq
|
331
360
|
getFailures()
|
332
361
|
{
|
333
362
|
IceMX::MetricsFailuresSeq failures;
|
334
|
-
|
363
|
+
|
335
364
|
Lock sync(*this);
|
336
365
|
for(typename std::map<std::string, EntryTPtr>::const_iterator p = _objects.begin(); p != _objects.end(); ++p)
|
337
366
|
{
|
@@ -343,7 +372,7 @@ public:
|
|
343
372
|
}
|
344
373
|
return failures;
|
345
374
|
}
|
346
|
-
|
375
|
+
|
347
376
|
virtual IceMX::MetricsFailures
|
348
377
|
getFailures(const std::string& id)
|
349
378
|
{
|
@@ -356,7 +385,6 @@ public:
|
|
356
385
|
return IceMX::MetricsFailures();
|
357
386
|
}
|
358
387
|
|
359
|
-
|
360
388
|
std::pair<MetricsMapIPtr, SubMapMember>
|
361
389
|
createSubMap(const std::string& subMapName)
|
362
390
|
{
|
@@ -364,9 +392,9 @@ public:
|
|
364
392
|
_subMaps.find(subMapName);
|
365
393
|
if(p != _subMaps.end())
|
366
394
|
{
|
367
|
-
return std::pair<MetricsMapIPtr, SubMapMember>(p->second.second->clone(), p->second.first);
|
395
|
+
return std::pair<MetricsMapIPtr, SubMapMember>(ICE_GET_SHARED_FROM_THIS(p->second.second->clone()), p->second.first);
|
368
396
|
}
|
369
|
-
return std::pair<MetricsMapIPtr, SubMapMember>(MetricsMapIPtr(), static_cast<SubMapMember>(0));
|
397
|
+
return std::pair<MetricsMapIPtr, SubMapMember>(MetricsMapIPtr(ICE_NULLPTR), static_cast<SubMapMember>(0));
|
370
398
|
}
|
371
399
|
|
372
400
|
EntryTPtr
|
@@ -379,15 +407,15 @@ public:
|
|
379
407
|
{
|
380
408
|
if(!(*p)->match(helper, false))
|
381
409
|
{
|
382
|
-
return
|
410
|
+
return ICE_NULLPTR;
|
383
411
|
}
|
384
412
|
}
|
385
|
-
|
413
|
+
|
386
414
|
for(std::vector<RegExpPtr>::const_iterator p = _reject.begin(); p != _reject.end(); ++p)
|
387
415
|
{
|
388
416
|
if((*p)->match(helper, true))
|
389
417
|
{
|
390
|
-
return
|
418
|
+
return ICE_NULLPTR;
|
391
419
|
}
|
392
420
|
}
|
393
421
|
|
@@ -419,16 +447,16 @@ public:
|
|
419
447
|
}
|
420
448
|
catch(const std::exception&)
|
421
449
|
{
|
422
|
-
return
|
450
|
+
return ICE_NULLPTR;
|
423
451
|
}
|
424
452
|
|
425
453
|
//
|
426
454
|
// Lookup the metrics object.
|
427
|
-
//
|
455
|
+
//
|
428
456
|
Lock sync(*this);
|
429
457
|
if(_destroyed)
|
430
458
|
{
|
431
|
-
return
|
459
|
+
return ICE_NULLPTR;
|
432
460
|
}
|
433
461
|
|
434
462
|
if(previous && previous->_object->id == key)
|
@@ -440,23 +468,30 @@ public:
|
|
440
468
|
typename std::map<std::string, EntryTPtr>::const_iterator p = _objects.find(key);
|
441
469
|
if(p == _objects.end())
|
442
470
|
{
|
443
|
-
TPtr t =
|
471
|
+
TPtr t = ICE_MAKE_SHARED(T);
|
444
472
|
t->id = key;
|
473
|
+
|
474
|
+
#ifdef ICE_CPP11_MAPPING
|
445
475
|
p = _objects.insert(typename std::map<std::string, EntryTPtr>::value_type(
|
446
|
-
|
476
|
+
key, std::make_shared<EntryT>(shared_from_this(), t, _detachedQueue.end()))).first;
|
477
|
+
#else
|
478
|
+
p = _objects.insert(typename std::map<std::string, EntryTPtr>::value_type(
|
479
|
+
key, new EntryT(this, t, _detachedQueue.end()))).first;
|
480
|
+
#endif
|
481
|
+
|
447
482
|
}
|
448
483
|
p->second->attach(helper);
|
449
484
|
return p->second;
|
450
485
|
}
|
451
|
-
|
486
|
+
|
452
487
|
private:
|
453
488
|
|
454
|
-
virtual
|
489
|
+
virtual MetricsMapIPtr clone() const
|
455
490
|
{
|
456
|
-
return
|
491
|
+
return ICE_MAKE_SHARED(MetricsMapT<MetricsType>, *this);
|
457
492
|
}
|
458
493
|
|
459
|
-
void detached(
|
494
|
+
void detached(EntryTPtr entry)
|
460
495
|
{
|
461
496
|
// This is called with the map mutex locked.
|
462
497
|
|
@@ -529,14 +564,14 @@ public:
|
|
529
564
|
virtual MetricsMapIPtr
|
530
565
|
create(const std::string& mapPrefix, const Ice::PropertiesPtr& properties)
|
531
566
|
{
|
532
|
-
return
|
567
|
+
return ICE_MAKE_SHARED(MetricsMapT<MetricsType>, mapPrefix, properties, _subMaps);
|
533
568
|
}
|
534
569
|
|
535
570
|
template<class SubMapMetricsType> void
|
536
571
|
registerSubMap(const std::string& subMap, IceMX::MetricsMap MetricsType::* member)
|
537
572
|
{
|
538
|
-
_subMaps[subMap] = std::pair<IceMX::MetricsMap MetricsType::*,
|
539
|
-
MetricsMapFactoryPtr>(member,
|
573
|
+
_subMaps[subMap] = std::pair<IceMX::MetricsMap MetricsType::*,
|
574
|
+
MetricsMapFactoryPtr>(member, ICE_MAKE_SHARED(MetricsMapFactoryT<SubMapMetricsType>, ICE_NULLPTR));
|
540
575
|
}
|
541
576
|
|
542
577
|
private:
|
@@ -547,12 +582,12 @@ private:
|
|
547
582
|
class MetricsViewI : public IceUtil::Shared
|
548
583
|
{
|
549
584
|
public:
|
550
|
-
|
585
|
+
|
551
586
|
MetricsViewI(const std::string&);
|
552
587
|
|
553
588
|
void destroy();
|
554
589
|
|
555
|
-
bool addOrUpdateMap(const Ice::PropertiesPtr&, const std::string&, const MetricsMapFactoryPtr&,
|
590
|
+
bool addOrUpdateMap(const Ice::PropertiesPtr&, const std::string&, const MetricsMapFactoryPtr&,
|
556
591
|
const Ice::LoggerPtr&);
|
557
592
|
bool removeMap(const std::string&);
|
558
593
|
|
@@ -569,9 +604,12 @@ private:
|
|
569
604
|
const std::string _name;
|
570
605
|
std::map<std::string, MetricsMapIPtr> _maps;
|
571
606
|
};
|
572
|
-
|
607
|
+
ICE_DEFINE_PTR(MetricsViewIPtr, MetricsViewI);
|
573
608
|
|
574
|
-
class ICE_API MetricsAdminI : public IceMX::MetricsAdmin,
|
609
|
+
class ICE_API MetricsAdminI : public IceMX::MetricsAdmin,
|
610
|
+
#ifndef ICE_CPP11_MAPPING
|
611
|
+
public Ice::PropertiesAdminUpdateCallback,
|
612
|
+
#endif
|
575
613
|
private IceUtil::Mutex
|
576
614
|
{
|
577
615
|
public:
|
@@ -583,14 +621,14 @@ public:
|
|
583
621
|
|
584
622
|
void updateViews();
|
585
623
|
|
586
|
-
template<class MetricsType> void
|
624
|
+
template<class MetricsType> void
|
587
625
|
registerMap(const std::string& map, IceMX::Updater* updater)
|
588
626
|
{
|
589
627
|
bool updated;
|
590
628
|
MetricsMapFactoryPtr factory;
|
591
629
|
{
|
592
630
|
Lock sync(*this);
|
593
|
-
factory =
|
631
|
+
factory = ICE_MAKE_SHARED(MetricsMapFactoryT<MetricsType>, updater);
|
594
632
|
_factories[map] = factory;
|
595
633
|
updated = addOrUpdateMap(map, factory);
|
596
634
|
}
|
@@ -604,16 +642,19 @@ public:
|
|
604
642
|
registerSubMap(const std::string& map, const std::string& subMap, IceMX::MetricsMap MetricsType::* member)
|
605
643
|
{
|
606
644
|
bool updated;
|
607
|
-
|
645
|
+
ICE_HANDLE<MetricsMapFactoryT<MetricsType> > factory;
|
608
646
|
{
|
609
647
|
Lock sync(*this);
|
610
|
-
|
611
648
|
std::map<std::string, MetricsMapFactoryPtr>::const_iterator p = _factories.find(map);
|
612
649
|
if(p == _factories.end())
|
613
650
|
{
|
614
651
|
return;
|
615
652
|
}
|
653
|
+
#ifdef ICE_CPP11_MAPPING
|
654
|
+
factory = ::std::dynamic_pointer_cast<MetricsMapFactoryT<MetricsType>>(p->second);
|
655
|
+
#else
|
616
656
|
factory = dynamic_cast<MetricsMapFactoryT<MetricsType>*>(p->second.get());
|
657
|
+
#endif
|
617
658
|
factory->template registerSubMap<MemberMetricsType>(subMap, member);
|
618
659
|
removeMap(map);
|
619
660
|
updated = addOrUpdateMap(map, factory);
|
@@ -627,14 +668,24 @@ public:
|
|
627
668
|
void unregisterMap(const std::string&);
|
628
669
|
|
629
670
|
virtual Ice::StringSeq getMetricsViewNames(Ice::StringSeq&, const ::Ice::Current&);
|
671
|
+
|
672
|
+
void updated(const Ice::PropertyDict&);
|
673
|
+
|
674
|
+
#ifdef ICE_CPP11_MAPPING
|
675
|
+
virtual void enableMetricsView(std::string, const ::Ice::Current&);
|
676
|
+
virtual void disableMetricsView(std::string, const ::Ice::Current&);
|
677
|
+
virtual IceMX::MetricsView getMetricsView(std::string, Ice::Long&, const ::Ice::Current&);
|
678
|
+
virtual IceMX::MetricsFailuresSeq getMapMetricsFailures(std::string, std::string, const ::Ice::Current&);
|
679
|
+
virtual IceMX::MetricsFailures getMetricsFailures(std::string, std::string, std::string, const ::Ice::Current&);
|
680
|
+
#else
|
630
681
|
virtual void enableMetricsView(const std::string&, const ::Ice::Current&);
|
631
682
|
virtual void disableMetricsView(const std::string&, const ::Ice::Current&);
|
632
683
|
virtual IceMX::MetricsView getMetricsView(const std::string&, Ice::Long&, const ::Ice::Current&);
|
633
|
-
virtual IceMX::MetricsFailuresSeq getMapMetricsFailures(const std::string&, const std::string&,
|
684
|
+
virtual IceMX::MetricsFailuresSeq getMapMetricsFailures(const std::string&, const std::string&,
|
634
685
|
const ::Ice::Current&);
|
635
686
|
virtual IceMX::MetricsFailures getMetricsFailures(const std::string&, const std::string&, const std::string&,
|
636
687
|
const ::Ice::Current&);
|
637
|
-
|
688
|
+
#endif
|
638
689
|
std::vector<MetricsMapIPtr> getMaps(const std::string&) const;
|
639
690
|
|
640
691
|
const Ice::LoggerPtr& getLogger() const;
|
@@ -643,8 +694,6 @@ private:
|
|
643
694
|
|
644
695
|
MetricsViewIPtr getMetricsView(const std::string&);
|
645
696
|
|
646
|
-
void updated(const Ice::PropertyDict&);
|
647
|
-
|
648
697
|
bool addOrUpdateMap(const std::string&, const MetricsMapFactoryPtr&);
|
649
698
|
bool removeMap(const std::string&);
|
650
699
|
|
@@ -655,7 +704,7 @@ private:
|
|
655
704
|
const Ice::LoggerPtr _logger;
|
656
705
|
Ice::PropertiesPtr _properties;
|
657
706
|
};
|
658
|
-
|
707
|
+
ICE_DEFINE_PTR(MetricsAdminIPtr, MetricsAdminI);
|
659
708
|
|
660
709
|
};
|
661
710
|
|