zeroc-ice 3.6.5 → 3.7.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ICE_LICENSE +17 -17
- data/LICENSE +12 -12
- data/bin/slice2rb +1 -6
- data/ext/Communicator.cpp +223 -61
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +23 -7
- data/ext/Connection.cpp +108 -76
- data/ext/Connection.h +4 -6
- data/ext/Endpoint.cpp +16 -54
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -10
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +4 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +38 -54
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +3 -8
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +111 -70
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +5 -20
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +313 -224
- data/ext/Types.h +118 -71
- data/ext/Util.cpp +69 -36
- data/ext/Util.h +117 -42
- data/ext/ValueFactoryManager.cpp +440 -0
- data/ext/ValueFactoryManager.h +95 -0
- data/ext/extconf.rb +52 -48
- data/ext/ice/cpp/include/Ice/Application.h +275 -105
- data/ext/ice/cpp/include/Ice/AsyncResult.h +124 -337
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -7
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +39 -16
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +10 -15
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +56 -17
- data/ext/ice/cpp/include/Ice/Comparable.h +205 -0
- data/ext/ice/cpp/include/Ice/Config.h +16 -39
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +203 -16
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +7 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +23 -0
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +57 -0
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +20 -12
- data/ext/ice/cpp/include/Ice/Dispatcher.h +35 -19
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -10
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +110 -63
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +74 -0
- data/ext/ice/cpp/include/Ice/FactoryTable.h +22 -18
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +28 -31
- data/ext/ice/cpp/include/Ice/Format.h +17 -18
- data/ext/ice/cpp/include/Ice/Functional.h +38 -38
- data/ext/ice/cpp/include/Ice/GCObject.h +9 -10
- data/ext/ice/cpp/include/Ice/Handle.h +6 -16
- data/ext/ice/cpp/include/Ice/Ice.h +9 -10
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +377 -0
- data/ext/ice/cpp/include/Ice/Incoming.h +132 -38
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +109 -31
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +872 -60
- data/ext/ice/cpp/include/Ice/InputStream.h +1514 -0
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -7
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +57 -0
- data/ext/ice/cpp/include/Ice/LocalObject.h +13 -14
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +56 -24
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +124 -71
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +25 -10
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +116 -32
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +61 -30
- data/ext/ice/cpp/include/Ice/Object.h +413 -78
- data/ext/ice/cpp/include/Ice/ObjectF.h +12 -8
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -13
- data/ext/ice/cpp/include/Ice/Optional.h +1114 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +684 -89
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -11
- data/ext/ice/cpp/include/Ice/OutputStream.h +1092 -0
- data/ext/ice/cpp/include/Ice/Protocol.h +49 -17
- data/ext/ice/cpp/include/Ice/Proxy.h +3438 -745
- data/ext/ice/cpp/include/Ice/ProxyF.h +13 -38
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +43 -55
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +84 -12
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -9
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +42 -0
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +273 -154
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +121 -53
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +17 -11
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +453 -140
- data/ext/ice/cpp/include/Ice/StringConverter.h +78 -0
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +19 -0
- data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +22 -28
- data/ext/ice/cpp/include/Ice/UniqueRef.h +97 -0
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +45 -13
- data/ext/ice/cpp/include/Ice/Value.h +139 -0
- data/ext/ice/cpp/include/Ice/ValueF.h +21 -0
- data/ext/ice/cpp/include/IceSSL/Config.h +8 -28
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -11
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +147 -0
- data/ext/ice/cpp/include/IceSSL/Plugin.h +461 -448
- data/ext/ice/cpp/include/IceSSL/SChannel.h +72 -0
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +72 -0
- data/ext/ice/cpp/include/IceSSL/UWP.h +62 -0
- data/ext/ice/cpp/include/IceUtil/Atomic.h +7 -14
- data/ext/ice/cpp/include/IceUtil/Cond.h +17 -23
- data/ext/ice/cpp/include/IceUtil/Config.h +166 -46
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +92 -0
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -10
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +63 -41
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -13
- data/ext/ice/cpp/include/IceUtil/Exception.h +284 -75
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +143 -0
- data/ext/ice/cpp/include/IceUtil/Functional.h +4 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +11 -16
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -15
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -7
- data/ext/ice/cpp/include/IceUtil/Lock.h +8 -15
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -7
- data/ext/ice/cpp/include/IceUtil/Mutex.h +19 -23
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -7
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/Optional.h +134 -23
- data/ext/ice/cpp/include/IceUtil/Options.h +17 -23
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +61 -37
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -11
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +18 -15
- data/ext/ice/cpp/include/IceUtil/Random.h +39 -8
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -13
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +53 -0
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +10 -15
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -7
- data/ext/ice/cpp/include/IceUtil/Shared.h +5 -12
- data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -7
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +146 -126
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -26
- data/ext/ice/cpp/include/IceUtil/Thread.h +10 -17
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -47
- data/ext/ice/cpp/include/IceUtil/Time.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Timer.h +18 -18
- data/ext/ice/cpp/include/IceUtil/UUID.h +6 -7
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +170 -0
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +1156 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Connection.h +1660 -0
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +119 -0
- data/ext/ice/cpp/include/generated/Ice/Current.h +322 -0
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +943 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +166 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +118 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +31 -15
- data/ext/ice/cpp/include/generated/Ice/Identity.h +264 -0
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +278 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +1143 -0
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +128 -0
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +7041 -0
- data/ext/ice/cpp/include/generated/Ice/Locator.h +3850 -0
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +147 -0
- data/ext/ice/cpp/include/generated/Ice/Logger.h +231 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +4717 -0
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1175 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +197 -0
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +306 -0
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +110 -0
- data/ext/ice/cpp/include/generated/Ice/Process.h +971 -0
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/Properties.h +446 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +1360 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +134 -0
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2689 -0
- data/ext/ice/cpp/include/generated/Ice/Router.h +1838 -0
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +299 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +51 -16
- data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +34 -14
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +318 -0
- data/ext/ice/cpp/include/generated/Ice/Version.h +357 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +223 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +101 -0
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +181 -0
- data/ext/ice/cpp/src/Ice/ACM.cpp +38 -27
- data/ext/ice/cpp/src/Ice/ACM.h +9 -7
- data/ext/ice/cpp/src/Ice/ACMF.h +30 -0
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +4 -8
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +59 -0
- data/ext/ice/cpp/src/Ice/ArgVector.h +36 -0
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -544
- data/ext/ice/cpp/src/Ice/Base64.cpp +22 -28
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +41 -18
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -15
- data/ext/ice/cpp/src/Ice/Buffer.cpp +75 -18
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +21 -12
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +86 -197
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -23
- data/ext/ice/cpp/src/Ice/Communicator.cpp +43 -15
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +318 -117
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +95 -40
- data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +55 -122
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +15 -31
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -7
- data/ext/ice/cpp/src/Ice/Connection.cpp +111 -20
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +300 -107
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +44 -28
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +30 -0
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +785 -713
- data/ext/ice/cpp/src/Ice/ConnectionI.h +105 -80
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -20
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +5 -9
- data/ext/ice/cpp/src/Ice/Connector.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Connector.h +4 -8
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -9
- data/ext/ice/cpp/src/Ice/Current.cpp +30 -12
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +10 -16
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +13 -25
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +34 -28
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +107 -19
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -11
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +41 -36
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -9
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +18 -7
- data/ext/ice/cpp/src/Ice/EndpointI.h +39 -18
- data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -10
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +19 -12
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -9
- data/ext/ice/cpp/src/Ice/EventHandler.h +13 -13
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -7
- data/ext/ice/cpp/src/Ice/Exception.cpp +102 -98
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +21 -12
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -33
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -9
- data/ext/ice/cpp/src/Ice/GCObject.cpp +29 -31
- data/ext/ice/cpp/src/Ice/HashUtil.h +3 -9
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -7
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +128 -111
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +23 -19
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -7
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +51 -0
- data/ext/ice/cpp/src/Ice/Identity.cpp +25 -16
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +11 -28
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -10
- data/ext/ice/cpp/src/Ice/Incoming.cpp +284 -255
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -214
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -9
- data/ext/ice/cpp/src/Ice/Initialize.cpp +309 -193
- data/ext/ice/cpp/src/Ice/InputStream.cpp +2726 -0
- data/ext/ice/cpp/src/Ice/Instance.cpp +243 -262
- data/ext/ice/cpp/src/Ice/Instance.h +30 -23
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +137 -23
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +118 -105
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -36
- data/ext/ice/cpp/src/Ice/LocalException.cpp +1191 -422
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Locator.cpp +1282 -1222
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +150 -186
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +31 -36
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +39 -12
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +182 -88
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -9
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +26 -55
- data/ext/ice/cpp/src/Ice/LoggerI.h +7 -18
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -17
- data/ext/ice/cpp/src/Ice/Metrics.cpp +1280 -1107
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +58 -33
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Network.cpp +753 -408
- data/ext/ice/cpp/src/Ice/Network.h +99 -36
- data/ext/ice/cpp/src/Ice/NetworkF.h +2 -7
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +20 -19
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -7
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
- data/ext/ice/cpp/src/Ice/Object.cpp +227 -232
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +45 -13
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +83 -33
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -12
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +25 -0
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +298 -191
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +44 -39
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -37
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +67 -67
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +15 -11
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +801 -366
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1367 -0
- data/ext/ice/cpp/src/Ice/Plugin.cpp +52 -14
- data/ext/ice/cpp/src/Ice/PluginF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +27 -51
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +7 -13
- data/ext/ice/cpp/src/Ice/Process.cpp +294 -128
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/Properties.cpp +42 -15
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +382 -340
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +83 -24
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -10
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +46 -57
- data/ext/ice/cpp/src/Ice/PropertiesI.h +18 -26
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +112 -19
- data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +6 -19
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -7
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -25
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +729 -957
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +33 -38
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -16
- data/ext/ice/cpp/src/Ice/Reference.cpp +190 -106
- data/ext/ice/cpp/src/Ice/Reference.h +39 -28
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +69 -118
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -17
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +19 -9
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +766 -565
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -8
- data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -18
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -11
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -7
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -11
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -12
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +12 -20
- data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -11
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
- data/ext/ice/cpp/src/Ice/Router.cpp +614 -492
- data/ext/ice/cpp/src/Ice/RouterF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +93 -99
- data/ext/ice/cpp/src/Ice/RouterInfo.h +42 -38
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +23 -28
- data/ext/ice/cpp/src/Ice/Selector.cpp +948 -855
- data/ext/ice/cpp/src/Ice/Selector.h +100 -152
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +24 -45
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +2 -7
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +21 -12
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -7
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -25
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +208 -76
- data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -9
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +57 -22
- data/ext/ice/cpp/src/Ice/StringUtil.h +30 -0
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +6 -7
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -8
- data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
- data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +169 -49
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -10
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -12
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +51 -46
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +12 -14
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +17 -32
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -15
- data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +41 -54
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +242 -274
- data/ext/ice/cpp/src/Ice/ThreadPool.h +46 -48
- data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +38 -26
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -7
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -7
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -36
- data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -11
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Transceiver.h +8 -12
- data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +5 -13
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +118 -60
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +13 -10
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +177 -236
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -22
- data/ext/ice/cpp/src/Ice/Value.cpp +76 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +83 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +61 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +37 -0
- data/ext/ice/cpp/src/Ice/Version.cpp +25 -20
- data/ext/ice/cpp/src/Ice/VirtualShared.h +38 -0
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -14
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -12
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -16
- data/ext/ice/cpp/src/Ice/WSConnector.h +3 -11
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +188 -89
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +22 -37
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +65 -66
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -27
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +596 -281
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1383 -543
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +89 -32
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -28
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -66
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -41
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -64
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -8
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +450 -172
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +863 -406
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +47 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +636 -144
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +20 -173
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -22
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +279 -0
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +64 -0
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +42 -17
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +61 -0
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +15 -64
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -18
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +207 -204
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +43 -40
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +42 -16
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -11
- data/ext/ice/cpp/src/IceSSL/Instance.h +7 -12
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -12
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +583 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +134 -115
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +27 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +127 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +477 -182
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +32 -26
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +286 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +58 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -46
- data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -23
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -60
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -12
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +580 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +523 -74
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +123 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +31 -0
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +73 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +187 -221
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +24 -26
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +97 -94
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +26 -192
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -24
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +868 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +69 -201
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +29 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +75 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +174 -161
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +29 -33
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +864 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +45 -0
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +12 -22
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -9
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -8
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +266 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +338 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +41 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +26 -0
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +89 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +383 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +71 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +71 -1260
- data/ext/ice/cpp/src/IceSSL/Util.h +48 -142
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +157 -0
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -27
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -31
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +22 -36
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +30 -126
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Options.cpp +20 -33
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +47 -21
- data/ext/ice/cpp/src/IceUtil/Random.cpp +15 -20
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +4 -19
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -8
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -269
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +582 -244
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -79
- data/ext/ice/cpp/src/IceUtil/Time.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +17 -22
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +97 -101
- data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -40
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +839 -0
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +894 -234
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +72 -0
- data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -7
- data/ext/ice/cpp/src/Slice/Checksum.h +21 -0
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -83
- data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -14
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1981 -1944
- data/ext/ice/cpp/src/Slice/Grammar.h +39 -19
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -20
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2752 -1948
- data/ext/ice/cpp/src/Slice/JavaUtil.h +398 -0
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
- data/ext/ice/cpp/src/Slice/MD5.h +1 -6
- data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -1
- data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +17 -20
- data/ext/ice/cpp/src/Slice/PHPUtil.h +36 -0
- data/ext/ice/cpp/src/Slice/Parser.cpp +1190 -426
- data/ext/ice/cpp/{include → src}/Slice/Parser.h +143 -91
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +67 -36
- data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +8 -18
- data/ext/ice/cpp/src/Slice/Python.cpp +218 -111
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +787 -699
- data/ext/ice/cpp/src/Slice/PythonUtil.h +70 -0
- data/ext/ice/cpp/src/Slice/Ruby.cpp +42 -43
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +175 -445
- data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -11
- data/ext/ice/cpp/src/Slice/Scanner.cpp +390 -399
- data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +36 -69
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +456 -0
- data/ext/ice/cpp/src/Slice/Util.h +50 -0
- data/ice.gemspec +2 -9
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +6 -50
- data/lib/Glacier2/PermissionsVerifier.rb +23 -99
- data/lib/Glacier2/PermissionsVerifierF.rb +2 -7
- data/lib/Glacier2/Router.rb +31 -78
- data/lib/Glacier2/RouterF.rb +2 -7
- data/lib/Glacier2/SSLInfo.rb +3 -11
- data/lib/Glacier2/Session.rb +87 -311
- data/lib/Ice.rb +84 -58
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +54 -61
- data/lib/Ice/CommunicatorF.rb +2 -7
- data/lib/Ice/Connection.rb +152 -166
- data/lib/Ice/ConnectionF.rb +2 -7
- data/lib/Ice/Current.rb +3 -15
- data/lib/Ice/Endpoint.rb +56 -137
- data/lib/Ice/EndpointF.rb +2 -7
- data/lib/Ice/EndpointTypes.rb +2 -11
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +4 -12
- data/lib/Ice/ImplicitContext.rb +4 -38
- data/lib/Ice/ImplicitContextF.rb +2 -7
- data/lib/Ice/Instrumentation.rb +22 -279
- data/lib/Ice/InstrumentationF.rb +2 -7
- data/lib/Ice/LocalException.rb +94 -145
- data/lib/Ice/Locator.rb +50 -169
- data/lib/Ice/LocatorF.rb +2 -7
- data/lib/Ice/Logger.rb +4 -38
- data/lib/Ice/LoggerF.rb +2 -7
- data/lib/Ice/Metrics.rb +60 -420
- data/lib/Ice/ObjectAdapter.rb +29 -0
- data/lib/Ice/ObjectAdapterF.rb +2 -7
- data/lib/Ice/ObjectFactory.rb +4 -34
- data/lib/Ice/Plugin.rb +6 -64
- data/lib/Ice/PluginF.rb +2 -7
- data/lib/Ice/Process.rb +15 -56
- data/lib/Ice/ProcessF.rb +2 -7
- data/lib/Ice/Properties.rb +4 -45
- data/lib/Ice/PropertiesAdmin.rb +18 -60
- data/lib/Ice/PropertiesF.rb +2 -7
- data/lib/Ice/RemoteLogger.rb +33 -119
- data/lib/Ice/Router.rb +28 -105
- data/lib/Ice/RouterF.rb +2 -7
- data/lib/Ice/ServantLocator.rb +26 -0
- data/lib/Ice/ServantLocatorF.rb +24 -0
- data/lib/Ice/SliceChecksumDict.rb +2 -7
- data/lib/Ice/ValueFactory.rb +28 -0
- data/lib/Ice/Version.rb +4 -15
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +43 -152
- data/lib/IceGrid.rb +1 -9
- data/lib/IceGrid/Admin.rb +550 -431
- data/lib/IceGrid/Descriptor.rb +61 -533
- data/lib/IceGrid/Exception.rb +23 -49
- data/lib/IceGrid/FileParser.rb +13 -54
- data/lib/IceGrid/PluginFacade.rb +35 -0
- data/lib/IceGrid/Registry.rb +150 -62
- data/lib/IceGrid/Session.rb +24 -68
- data/lib/IceGrid/UserAccountMapper.rb +13 -54
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +4 -15
- data/lib/IcePatch2/FileServer.rb +32 -80
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +78 -210
- data/lib/IceStorm/Metrics.rb +10 -93
- data/slice/Glacier2/Metrics.ice +20 -10
- data/slice/Glacier2/PermissionsVerifier.ice +19 -12
- data/slice/Glacier2/PermissionsVerifierF.ice +16 -9
- data/slice/Glacier2/Router.ice +19 -13
- data/slice/Glacier2/RouterF.ice +16 -9
- data/slice/Glacier2/SSLInfo.ice +17 -10
- data/slice/Glacier2/Session.ice +24 -18
- data/slice/Ice/BuiltinSequences.ice +18 -9
- data/slice/Ice/Communicator.ice +180 -64
- data/slice/Ice/CommunicatorF.ice +18 -9
- data/slice/Ice/Connection.ice +208 -75
- data/slice/Ice/ConnectionF.ice +18 -9
- data/slice/Ice/Current.ice +37 -28
- data/slice/Ice/Endpoint.ice +73 -21
- data/slice/Ice/EndpointF.ice +19 -10
- data/slice/Ice/EndpointTypes.ice +21 -13
- data/slice/Ice/FacetMap.ice +19 -10
- data/slice/Ice/Identity.ice +24 -10
- data/slice/Ice/ImplicitContext.ice +41 -33
- data/slice/Ice/ImplicitContextF.ice +17 -9
- data/slice/Ice/Instrumentation.ice +37 -30
- data/slice/Ice/InstrumentationF.ice +19 -10
- data/slice/Ice/LocalException.ice +118 -112
- data/slice/Ice/Locator.ice +28 -21
- data/slice/Ice/LocatorF.ice +18 -9
- data/slice/Ice/Logger.ice +26 -18
- data/slice/Ice/LoggerF.ice +18 -9
- data/slice/Ice/Metrics.ice +42 -30
- data/slice/Ice/ObjectAdapter.ice +88 -53
- data/slice/Ice/ObjectAdapterF.ice +18 -9
- data/slice/Ice/ObjectFactory.ice +28 -17
- data/slice/Ice/Plugin.ice +25 -13
- data/slice/Ice/PluginF.ice +22 -9
- data/slice/Ice/Process.ice +20 -11
- data/slice/Ice/ProcessF.ice +18 -9
- data/slice/Ice/Properties.ice +42 -28
- data/slice/Ice/PropertiesAdmin.ice +20 -10
- data/slice/Ice/PropertiesF.ice +18 -9
- data/slice/Ice/RemoteLogger.ice +23 -19
- data/slice/Ice/Router.ice +28 -13
- data/slice/Ice/RouterF.ice +18 -9
- data/slice/Ice/ServantLocator.ice +40 -29
- data/slice/Ice/ServantLocatorF.ice +18 -9
- data/slice/Ice/SliceChecksumDict.ice +18 -9
- data/slice/Ice/ValueFactory.ice +132 -0
- data/slice/Ice/Version.ice +20 -10
- data/slice/IceBT/ConnectionInfo.ice +58 -0
- data/slice/IceBT/EndpointInfo.ice +56 -0
- data/slice/IceBT/Types.ice +44 -0
- data/slice/IceBox/IceBox.ice +45 -27
- data/slice/IceDiscovery/IceDiscovery.ice +75 -10
- data/slice/IceGrid/Admin.ice +410 -44
- data/slice/IceGrid/Descriptor.ice +47 -34
- data/slice/IceGrid/Exception.ice +43 -32
- data/slice/IceGrid/FileParser.ice +21 -12
- data/slice/IceGrid/PluginFacade.ice +26 -18
- data/slice/IceGrid/Registry.ice +150 -21
- data/slice/IceGrid/Session.ice +25 -17
- data/slice/IceGrid/UserAccountMapper.ice +23 -14
- data/slice/IceIAP/ConnectionInfo.ice +73 -0
- data/slice/IceIAP/EndpointInfo.ice +67 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +19 -12
- data/slice/IcePatch2/FileInfo.ice +19 -13
- data/slice/IcePatch2/FileServer.ice +27 -18
- data/slice/IceSSL/ConnectionInfo.ice +27 -23
- data/slice/IceSSL/ConnectionInfoF.ice +30 -0
- data/slice/IceSSL/EndpointInfo.ice +21 -36
- data/slice/IceStorm/IceStorm.ice +33 -24
- data/slice/IceStorm/Metrics.ice +19 -11
- metadata +148 -120
- data/ext/ObjectFactory.cpp +0 -140
- data/ext/ObjectFactory.h +0 -50
- data/ext/ice/cpp/include/Ice/ACMF.h +0 -30
- data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
- data/ext/ice/cpp/include/Ice/BuiltinSequences.h +0 -82
- 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/ConnectionF.h +0 -74
- data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +0 -30
- data/ext/ice/cpp/include/Ice/Current.h +0 -102
- data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +0 -48
- 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/EndpointF.h +0 -93
- data/ext/ice/cpp/include/Ice/EndpointTypes.h +0 -82
- data/ext/ice/cpp/include/Ice/Identity.h +0 -168
- data/ext/ice/cpp/include/Ice/ImplicitContext.h +0 -102
- data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
- data/ext/ice/cpp/include/Ice/InstrumentationF.h +0 -75
- 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/LocatorF.h +0 -93
- data/ext/ice/cpp/include/Ice/Logger.h +0 -100
- 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/ObjectAdapterFactoryF.h +0 -26
- 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/ObjectFactoryManagerF.h +0 -26
- 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/PluginF.h +0 -70
- data/ext/ice/cpp/include/Ice/Process.h +0 -574
- data/ext/ice/cpp/include/Ice/ProcessF.h +0 -83
- data/ext/ice/cpp/include/Ice/Properties.h +0 -136
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
- data/ext/ice/cpp/include/Ice/PropertiesF.h +0 -87
- 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/RouterF.h +0 -83
- data/ext/ice/cpp/include/Ice/ServantLocator.h +0 -96
- 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/IceUtil/IconvStringConverter.h +0 -302
- data/ext/ice/cpp/include/IceUtil/SHA1.h +0 -47
- data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +0 -65
- data/ext/ice/cpp/include/Slice/Checksum.h +0 -26
- 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/JavaUtil.h +0 -279
- data/ext/ice/cpp/include/Slice/ObjCUtil.h +0 -127
- data/ext/ice/cpp/include/Slice/PHPUtil.h +0 -50
- data/ext/ice/cpp/include/Slice/PythonUtil.h +0 -64
- 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/ObjectFactoryF.cpp +0 -44
- 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/ArgVector.cpp +0 -64
- data/ext/ice/cpp/src/IceUtil/ArgVector.h +0 -41
- 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/Ice/ObjectFactoryF.rb +0 -29
- 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/ConnectionF.ice +0 -20
- 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/Ice/ObjectFactoryF.ice +0 -21
- data/slice/IceGrid/Locator.ice +0 -57
- data/slice/IceGrid/Observer.ice +0 -395
- data/slice/IceGrid/Query.ice +0 -131
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
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
4
|
|
10
5
|
#ifndef ICE_INSTANCE_F_H
|
11
6
|
#define ICE_INSTANCE_F_H
|
@@ -20,7 +15,6 @@ namespace IceInternal
|
|
20
15
|
class Instance;
|
21
16
|
ICE_API IceUtil::Shared* upCast(Instance*);
|
22
17
|
typedef IceInternal::Handle<Instance> InstancePtr;
|
23
|
-
|
24
18
|
}
|
25
19
|
|
26
20
|
#endif
|
@@ -0,0 +1,57 @@
|
|
1
|
+
//
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
|
+
//
|
4
|
+
|
5
|
+
#ifndef ICE_INTERFACE_BY_VALUE_H
|
6
|
+
#define ICE_INTERFACE_BY_VALUE_H
|
7
|
+
|
8
|
+
#include <Ice/Value.h>
|
9
|
+
#include <Ice/OutputStream.h>
|
10
|
+
#include <Ice/InputStream.h>
|
11
|
+
|
12
|
+
#ifdef ICE_CPP11_MAPPING
|
13
|
+
|
14
|
+
namespace Ice
|
15
|
+
{
|
16
|
+
|
17
|
+
/**
|
18
|
+
* Represents an instance of a Slice interface that was marshaled by value.
|
19
|
+
* \headerfile Ice/Ice.h
|
20
|
+
*/
|
21
|
+
template<typename T>
|
22
|
+
class InterfaceByValue : public ValueHelper<InterfaceByValue<T>, Value>
|
23
|
+
{
|
24
|
+
public:
|
25
|
+
/**
|
26
|
+
* Obtains the Slice type ID of this exception.
|
27
|
+
* @return The fully-scoped type ID.
|
28
|
+
*/
|
29
|
+
virtual std::string ice_id() const
|
30
|
+
{
|
31
|
+
return T::ice_staticId();
|
32
|
+
}
|
33
|
+
|
34
|
+
/**
|
35
|
+
* Obtains the Slice type ID of this exception.
|
36
|
+
* @return The fully-scoped type ID.
|
37
|
+
*/
|
38
|
+
static const std::string& ice_staticId()
|
39
|
+
{
|
40
|
+
return T::ice_staticId();
|
41
|
+
}
|
42
|
+
|
43
|
+
/**
|
44
|
+
* Returns an empty tuple.
|
45
|
+
* @return The empty tuple.
|
46
|
+
*/
|
47
|
+
std::tuple<> ice_tuple() const
|
48
|
+
{
|
49
|
+
return std::tie();
|
50
|
+
}
|
51
|
+
};
|
52
|
+
|
53
|
+
}
|
54
|
+
|
55
|
+
#endif
|
56
|
+
|
57
|
+
#endif
|
@@ -1,29 +1,27 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
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
4
|
|
10
5
|
#ifndef ICE_LOCAL_OBJECT_H
|
11
6
|
#define ICE_LOCAL_OBJECT_H
|
12
7
|
|
8
|
+
#if !defined(ICE_CPP11_MAPPING) || defined(ICE_BUILDING_SRC)
|
9
|
+
//
|
10
|
+
// Part of the C++98 mapping, and "internal" definitions when building Ice
|
11
|
+
// with the C++11 mapping
|
12
|
+
//
|
13
|
+
|
13
14
|
#include <IceUtil/Shared.h>
|
14
15
|
#include <Ice/LocalObjectF.h>
|
15
16
|
|
16
|
-
namespace IceInternal
|
17
|
-
{
|
18
|
-
|
19
|
-
class BasicStream;
|
20
|
-
|
21
|
-
}
|
22
|
-
|
23
17
|
namespace Ice
|
24
18
|
{
|
25
19
|
|
26
|
-
|
20
|
+
/**
|
21
|
+
* Base class for local Slice classes and interfaces.
|
22
|
+
* \headerfile Ice/Ice.h
|
23
|
+
*/
|
24
|
+
class ICE_API LocalObject : public virtual ::IceUtil::Shared
|
27
25
|
{
|
28
26
|
public:
|
29
27
|
|
@@ -34,3 +32,4 @@ public:
|
|
34
32
|
}
|
35
33
|
|
36
34
|
#endif
|
35
|
+
#endif
|
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
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
4
|
|
10
5
|
#ifndef ICE_LOCAL_OBJECT_F_H
|
11
6
|
#define ICE_LOCAL_OBJECT_F_H
|
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
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
4
|
|
10
5
|
#ifndef ICE_LOGGER_UTIL_H
|
11
6
|
#define ICE_LOGGER_UTIL_H
|
@@ -18,19 +13,27 @@
|
|
18
13
|
namespace Ice
|
19
14
|
{
|
20
15
|
|
16
|
+
/**
|
17
|
+
* Base class for logger output utility classes.
|
18
|
+
* \headerfile Ice/Ice.h
|
19
|
+
*/
|
21
20
|
class ICE_API LoggerOutputBase : private IceUtil::noncopyable
|
22
21
|
{
|
23
22
|
public:
|
24
23
|
|
24
|
+
/** Obtains the collected output. */
|
25
25
|
std::string str() const;
|
26
|
-
|
27
|
-
|
26
|
+
|
27
|
+
/// \cond INTERNAL
|
28
|
+
std::ostringstream& _stream(); // For internal use only. Don't use in your code.
|
29
|
+
/// \endcond
|
28
30
|
|
29
31
|
private:
|
30
32
|
|
31
|
-
std::ostringstream
|
33
|
+
std::ostringstream _os;
|
32
34
|
};
|
33
35
|
|
36
|
+
/// \cond INTERNAL
|
34
37
|
ICE_API LoggerOutputBase& loggerInsert(LoggerOutputBase& out, const IceUtil::Exception& ex);
|
35
38
|
|
36
39
|
template<typename T>
|
@@ -48,7 +51,7 @@ struct LoggerOutputInserter
|
|
48
51
|
static inline LoggerOutputBase&
|
49
52
|
insert(LoggerOutputBase& out, const T& val)
|
50
53
|
{
|
51
|
-
out.
|
54
|
+
out._stream() << val;
|
52
55
|
return out;
|
53
56
|
}
|
54
57
|
};
|
@@ -68,12 +71,18 @@ template
|
|
68
71
|
inline LoggerOutputBase&
|
69
72
|
operator<<(LoggerOutputBase& out, const T& val)
|
70
73
|
{
|
71
|
-
return LoggerOutputInserter<T, IsException<T>::value>::insert(out, val);
|
74
|
+
return LoggerOutputInserter<T, IsException<T>::value>::insert(out, val);
|
72
75
|
}
|
73
76
|
|
77
|
+
#ifdef ICE_CPP11_MAPPING
|
78
|
+
template<typename T, typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type* = nullptr>
|
79
|
+
inline LoggerOutputBase&
|
80
|
+
operator<<(LoggerOutputBase& os, const ::std::shared_ptr<T>& p)
|
81
|
+
#else
|
74
82
|
template<typename T>
|
75
|
-
inline LoggerOutputBase&
|
83
|
+
inline LoggerOutputBase&
|
76
84
|
operator<<(LoggerOutputBase& os, const ::IceInternal::ProxyHandle<T>& p)
|
85
|
+
#endif
|
77
86
|
{
|
78
87
|
return os << (p ? p->ice_toString() : "");
|
79
88
|
}
|
@@ -81,12 +90,17 @@ operator<<(LoggerOutputBase& os, const ::IceInternal::ProxyHandle
|
|
81
90
|
inline LoggerOutputBase&
|
82
91
|
operator<<(LoggerOutputBase& out, const ::std::exception& ex)
|
83
92
|
{
|
84
|
-
out.
|
93
|
+
out._stream() << ex.what();
|
85
94
|
return out;
|
86
95
|
}
|
87
96
|
|
88
97
|
ICE_API LoggerOutputBase& operator<<(LoggerOutputBase&, std::ios_base& (*)(std::ios_base&));
|
98
|
+
/// \endcond
|
89
99
|
|
100
|
+
/**
|
101
|
+
* Collects output and flushes it via a logger method.
|
102
|
+
* \headerfile Ice/Ice.h
|
103
|
+
*/
|
90
104
|
template<class L, class LPtr, void (L::*output)(const std::string&)>
|
91
105
|
class LoggerOutput : public LoggerOutputBase
|
92
106
|
{
|
@@ -94,57 +108,75 @@ public:
|
|
94
108
|
inline LoggerOutput(const LPtr& lptr) :
|
95
109
|
_logger(lptr)
|
96
110
|
{}
|
97
|
-
|
111
|
+
|
98
112
|
inline ~LoggerOutput()
|
99
113
|
{
|
100
114
|
flush();
|
101
115
|
}
|
102
116
|
|
117
|
+
/** Flushes the colleted output to the logger method. */
|
103
118
|
inline void flush()
|
104
119
|
{
|
105
|
-
std::string s =
|
120
|
+
std::string s = _stream().str();
|
106
121
|
if(!s.empty())
|
107
122
|
{
|
108
123
|
L& ref = *_logger;
|
109
124
|
(ref.*output)(s);
|
110
125
|
}
|
111
|
-
|
126
|
+
_stream().str("");
|
112
127
|
}
|
113
128
|
|
114
129
|
private:
|
115
|
-
|
130
|
+
|
116
131
|
LPtr _logger;
|
117
132
|
};
|
118
133
|
|
134
|
+
/** Flushes output to Logger::print. */
|
119
135
|
typedef LoggerOutput<Logger, LoggerPtr, &Logger::print> Print;
|
136
|
+
|
137
|
+
/** Flushes output to Logger::warning. */
|
120
138
|
typedef LoggerOutput<Logger, LoggerPtr, &Logger::warning> Warning;
|
139
|
+
|
140
|
+
/** Flushes output to Logger::error. */
|
121
141
|
typedef LoggerOutput<Logger, LoggerPtr, &Logger::error> Error;
|
122
142
|
|
143
|
+
/**
|
144
|
+
* Flushes output to Logger::trace.
|
145
|
+
* \headerfile Ice/Ice.h
|
146
|
+
*/
|
123
147
|
class ICE_API Trace : public LoggerOutputBase
|
124
148
|
{
|
125
149
|
public:
|
126
150
|
Trace(const LoggerPtr&, const std::string&);
|
127
151
|
~Trace();
|
128
152
|
void flush();
|
129
|
-
|
153
|
+
|
130
154
|
private:
|
131
|
-
|
155
|
+
|
132
156
|
LoggerPtr _logger;
|
133
157
|
std::string _category;
|
134
158
|
};
|
135
159
|
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
160
|
+
/**
|
161
|
+
* A special plug-in that installs a logger during a communicator's initialization.
|
162
|
+
* Both initialize and destroy are no-op. See Ice::InitializationData.
|
163
|
+
* \headerfile Ice/Ice.h
|
164
|
+
*/
|
140
165
|
class ICE_API LoggerPlugin : public Ice::Plugin
|
141
166
|
{
|
142
167
|
public:
|
143
168
|
|
144
|
-
|
169
|
+
/**
|
170
|
+
* Constructs the plug-in with a target communicator and a logger.
|
171
|
+
* @param communicator The communicator in which to install the logger.
|
172
|
+
* @param logger The logger to be installed.
|
173
|
+
*/
|
174
|
+
LoggerPlugin(const CommunicatorPtr& communicator, const LoggerPtr& logger);
|
145
175
|
|
176
|
+
/** This method is a no-op. */
|
146
177
|
virtual void initialize();
|
147
178
|
|
179
|
+
/** This method is a no-op. */
|
148
180
|
virtual void destroy();
|
149
181
|
};
|
150
182
|
|
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
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
4
|
|
10
5
|
#ifndef ICE_METRICSADMIN_I_H
|
11
6
|
#define ICE_METRICSADMIN_I_H
|
@@ -17,7 +12,7 @@
|
|
17
12
|
#include <Ice/Metrics.h>
|
18
13
|
|
19
14
|
#ifdef _MSC_VER
|
20
|
-
# define
|
15
|
+
# define ICE_CPP11_COMPILER_REGEXP
|
21
16
|
#endif
|
22
17
|
|
23
18
|
#ifdef __MINGW32__
|
@@ -25,7 +20,7 @@
|
|
25
20
|
// No regexp support with MinGW, when MinGW C++11 mode is not experimental
|
26
21
|
// we can use std::regex.
|
27
22
|
//
|
28
|
-
#elif defined(
|
23
|
+
#elif defined(ICE_CPP11_COMPILER_REGEXP)
|
29
24
|
# include <regex>
|
30
25
|
#else
|
31
26
|
# include <regex.h>
|
@@ -36,22 +31,32 @@
|
|
36
31
|
namespace IceMX
|
37
32
|
{
|
38
33
|
|
34
|
+
/// \cond INTERNAL
|
39
35
|
class Updater;
|
40
36
|
template<typename T> class MetricsHelperT;
|
37
|
+
/// \endcond
|
41
38
|
|
42
39
|
}
|
43
40
|
|
44
41
|
namespace IceInternal
|
45
42
|
{
|
46
43
|
|
47
|
-
class ICE_API MetricsMapI
|
44
|
+
class ICE_API MetricsMapI;
|
45
|
+
ICE_DEFINE_PTR(MetricsMapIPtr, MetricsMapI);
|
46
|
+
|
47
|
+
class ICE_API MetricsMapI :
|
48
|
+
#ifdef ICE_CPP11_MAPPING
|
49
|
+
public std::enable_shared_from_this<MetricsMapI>
|
50
|
+
#else
|
51
|
+
public virtual IceUtil::Shared
|
52
|
+
#endif
|
48
53
|
{
|
49
54
|
public:
|
50
55
|
|
51
56
|
class ICE_API RegExp : public IceUtil::Shared
|
52
57
|
{
|
53
58
|
public:
|
54
|
-
|
59
|
+
|
55
60
|
RegExp(const std::string&, const std::string&);
|
56
61
|
~RegExp();
|
57
62
|
|
@@ -73,7 +78,7 @@ public:
|
|
73
78
|
private:
|
74
79
|
|
75
80
|
bool match(const std::string&);
|
76
|
-
|
81
|
+
|
77
82
|
const std::string _attribute;
|
78
83
|
|
79
84
|
#ifdef __MINGW32__
|
@@ -81,7 +86,7 @@ public:
|
|
81
86
|
// No regexp support with MinGW, when MinGW C++11 mode is not experimental
|
82
87
|
// we can use std::regex.
|
83
88
|
//
|
84
|
-
#elif defined(
|
89
|
+
#elif defined(ICE_CPP11_COMPILER_REGEXP)
|
85
90
|
# if _MSC_VER < 1600
|
86
91
|
std::tr1::regex _regex;
|
87
92
|
# else
|
@@ -89,9 +94,11 @@ public:
|
|
89
94
|
# endif
|
90
95
|
#else
|
91
96
|
regex_t _preg;
|
92
|
-
#endif
|
97
|
+
#endif
|
93
98
|
};
|
94
|
-
|
99
|
+
ICE_DEFINE_PTR(RegExpPtr, RegExp);
|
100
|
+
|
101
|
+
virtual ~MetricsMapI();
|
95
102
|
|
96
103
|
MetricsMapI(const std::string&, const Ice::PropertiesPtr&);
|
97
104
|
MetricsMapI(const MetricsMapI&);
|
@@ -102,7 +109,7 @@ public:
|
|
102
109
|
virtual IceMX::MetricsFailures getFailures(const std::string&) = 0;
|
103
110
|
virtual IceMX::MetricsMap getMetrics() const = 0;
|
104
111
|
|
105
|
-
virtual
|
112
|
+
virtual MetricsMapIPtr clone() const = 0;
|
106
113
|
|
107
114
|
const Ice::PropertyDict& getProperties() const;
|
108
115
|
|
@@ -115,43 +122,52 @@ protected:
|
|
115
122
|
const std::vector<RegExpPtr> _accept;
|
116
123
|
const std::vector<RegExpPtr> _reject;
|
117
124
|
};
|
118
|
-
typedef IceUtil::Handle<MetricsMapI> MetricsMapIPtr;
|
119
125
|
|
120
|
-
class ICE_API MetricsMapFactory
|
126
|
+
class ICE_API MetricsMapFactory
|
127
|
+
#ifndef ICE_CPP11_MAPPING
|
128
|
+
: public Ice::LocalObject
|
129
|
+
#endif
|
121
130
|
{
|
122
131
|
public:
|
123
132
|
|
133
|
+
virtual ~MetricsMapFactory();
|
134
|
+
|
124
135
|
MetricsMapFactory(IceMX::Updater*);
|
125
136
|
|
126
137
|
virtual MetricsMapIPtr create(const std::string&, const Ice::PropertiesPtr&) = 0;
|
127
|
-
|
138
|
+
|
128
139
|
void update();
|
129
140
|
|
130
141
|
private:
|
131
|
-
|
142
|
+
|
132
143
|
IceMX::Updater* _updater;
|
133
144
|
};
|
134
|
-
|
145
|
+
ICE_DEFINE_PTR(MetricsMapFactoryPtr, MetricsMapFactory);
|
135
146
|
|
136
147
|
template<class MetricsType> class MetricsMapT : public MetricsMapI, private IceUtil::Mutex
|
137
148
|
{
|
138
149
|
public:
|
139
150
|
|
140
151
|
typedef MetricsType T;
|
141
|
-
typedef
|
152
|
+
typedef ICE_INTERNAL_HANDLE<MetricsType> TPtr;
|
142
153
|
|
143
|
-
|
154
|
+
ICE_DEFINE_PTR(MetricsMapTPtr, MetricsMapT);
|
144
155
|
|
145
156
|
typedef IceMX::MetricsMap MetricsType::* SubMapMember;
|
146
157
|
|
147
158
|
class EntryT;
|
148
|
-
|
159
|
+
ICE_DEFINE_PTR(EntryTPtr, EntryT);
|
149
160
|
|
150
|
-
class EntryT :
|
161
|
+
class EntryT :
|
162
|
+
#ifdef ICE_CPP11_MAPPING
|
163
|
+
public std::enable_shared_from_this<EntryT>
|
164
|
+
#else
|
165
|
+
public Ice::LocalObject
|
166
|
+
#endif
|
151
167
|
{
|
152
168
|
public:
|
153
169
|
|
154
|
-
EntryT(
|
170
|
+
EntryT(MetricsMapTPtr map, const TPtr& object, const typename std::list<EntryTPtr>::iterator& p) :
|
155
171
|
_map(map), _object(object), _detachedPos(p)
|
156
172
|
{
|
157
173
|
}
|
@@ -166,7 +182,7 @@ public:
|
|
166
182
|
}
|
167
183
|
}
|
168
184
|
|
169
|
-
void
|
185
|
+
void
|
170
186
|
failed(const std::string& exceptionName)
|
171
187
|
{
|
172
188
|
IceUtil::Mutex::Lock sync(*_map);
|
@@ -180,7 +196,7 @@ public:
|
|
180
196
|
MetricsMapIPtr m;
|
181
197
|
{
|
182
198
|
IceUtil::Mutex::Lock sync(*_map);
|
183
|
-
typename std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> >::iterator p =
|
199
|
+
typename std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> >::iterator p =
|
184
200
|
_subMaps.find(mapName);
|
185
201
|
if(p == _subMaps.end())
|
186
202
|
{
|
@@ -196,7 +212,7 @@ public:
|
|
196
212
|
}
|
197
213
|
m = p->second.first;
|
198
214
|
}
|
199
|
-
|
215
|
+
|
200
216
|
MetricsMapT<MemberMetricsType>* map = dynamic_cast<MetricsMapT<MemberMetricsType>*>(m.get());
|
201
217
|
assert(map);
|
202
218
|
return map->getMatching(helper);
|
@@ -209,7 +225,11 @@ public:
|
|
209
225
|
_object->totalLifetime += lifetime;
|
210
226
|
if(--_object->current == 0)
|
211
227
|
{
|
228
|
+
#ifdef ICE_CPP11_MAPPING
|
229
|
+
_map->detached(this->shared_from_this());
|
230
|
+
#else
|
212
231
|
_map->detached(this);
|
232
|
+
#endif
|
213
233
|
}
|
214
234
|
}
|
215
235
|
|
@@ -228,7 +248,6 @@ public:
|
|
228
248
|
|
229
249
|
private:
|
230
250
|
|
231
|
-
|
232
251
|
IceMX::MetricsFailures
|
233
252
|
getFailures() const
|
234
253
|
{
|
@@ -241,7 +260,7 @@ public:
|
|
241
260
|
IceMX::MetricsPtr
|
242
261
|
clone() const
|
243
262
|
{
|
244
|
-
TPtr metrics =
|
263
|
+
TPtr metrics = ICE_DYNAMIC_CAST(T, _object->ice_clone());
|
245
264
|
for(typename std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> >::const_iterator p =
|
246
265
|
_subMaps.begin(); p != _subMaps.end(); ++p)
|
247
266
|
{
|
@@ -250,7 +269,7 @@ public:
|
|
250
269
|
return metrics;
|
251
270
|
}
|
252
271
|
|
253
|
-
bool
|
272
|
+
bool
|
254
273
|
isDetached() const
|
255
274
|
{
|
256
275
|
return _object->current == 0;
|
@@ -274,7 +293,7 @@ public:
|
|
274
293
|
|
275
294
|
MetricsMapT(const std::string& mapPrefix,
|
276
295
|
const Ice::PropertiesPtr& properties,
|
277
|
-
const std::map<std::string, std::pair<SubMapMember, MetricsMapFactoryPtr> >& subMaps) :
|
296
|
+
const std::map<std::string, std::pair<SubMapMember, MetricsMapFactoryPtr> >& subMaps) :
|
278
297
|
MetricsMapI(mapPrefix, properties), _destroyed(false)
|
279
298
|
{
|
280
299
|
std::vector<std::string> subMapNames;
|
@@ -295,17 +314,31 @@ public:
|
|
295
314
|
continue; // This sub-map isn't configured.
|
296
315
|
}
|
297
316
|
}
|
298
|
-
_subMaps.insert(std::make_pair(p->first,
|
299
|
-
std::make_pair(p->second.first,
|
317
|
+
_subMaps.insert(std::make_pair(p->first,
|
318
|
+
std::make_pair(p->second.first,
|
300
319
|
p->second.second->create(subMapPrefix, properties))));
|
301
320
|
}
|
302
321
|
}
|
303
322
|
|
304
|
-
MetricsMapT(const MetricsMapT& other)
|
323
|
+
MetricsMapT(const MetricsMapT& other)
|
324
|
+
:
|
325
|
+
#ifndef ICE_CPP11_MAPPING
|
326
|
+
IceUtil::Shared(),
|
327
|
+
#endif
|
328
|
+
MetricsMapI(other),
|
329
|
+
IceUtil::Mutex(),
|
330
|
+
_destroyed(false)
|
331
|
+
{
|
332
|
+
}
|
333
|
+
|
334
|
+
#ifdef ICE_CPP11_MAPPING
|
335
|
+
std::shared_ptr<MetricsMapT> shared_from_this()
|
305
336
|
{
|
337
|
+
return std::static_pointer_cast<MetricsMapT>(MetricsMapI::shared_from_this());
|
306
338
|
}
|
339
|
+
#endif
|
307
340
|
|
308
|
-
virtual void
|
341
|
+
virtual void
|
309
342
|
destroy()
|
310
343
|
{
|
311
344
|
Lock sync(*this);
|
@@ -318,7 +351,7 @@ public:
|
|
318
351
|
getMetrics() const
|
319
352
|
{
|
320
353
|
IceMX::MetricsMap objects;
|
321
|
-
|
354
|
+
|
322
355
|
Lock sync(*this);
|
323
356
|
for(typename std::map<std::string, EntryTPtr>::const_iterator p = _objects.begin(); p != _objects.end(); ++p)
|
324
357
|
{
|
@@ -326,12 +359,12 @@ public:
|
|
326
359
|
}
|
327
360
|
return objects;
|
328
361
|
}
|
329
|
-
|
362
|
+
|
330
363
|
virtual IceMX::MetricsFailuresSeq
|
331
364
|
getFailures()
|
332
365
|
{
|
333
366
|
IceMX::MetricsFailuresSeq failures;
|
334
|
-
|
367
|
+
|
335
368
|
Lock sync(*this);
|
336
369
|
for(typename std::map<std::string, EntryTPtr>::const_iterator p = _objects.begin(); p != _objects.end(); ++p)
|
337
370
|
{
|
@@ -343,7 +376,7 @@ public:
|
|
343
376
|
}
|
344
377
|
return failures;
|
345
378
|
}
|
346
|
-
|
379
|
+
|
347
380
|
virtual IceMX::MetricsFailures
|
348
381
|
getFailures(const std::string& id)
|
349
382
|
{
|
@@ -356,7 +389,6 @@ public:
|
|
356
389
|
return IceMX::MetricsFailures();
|
357
390
|
}
|
358
391
|
|
359
|
-
|
360
392
|
std::pair<MetricsMapIPtr, SubMapMember>
|
361
393
|
createSubMap(const std::string& subMapName)
|
362
394
|
{
|
@@ -364,9 +396,9 @@ public:
|
|
364
396
|
_subMaps.find(subMapName);
|
365
397
|
if(p != _subMaps.end())
|
366
398
|
{
|
367
|
-
return std::pair<MetricsMapIPtr, SubMapMember>(p->second.second->clone(), p->second.first);
|
399
|
+
return std::pair<MetricsMapIPtr, SubMapMember>(ICE_GET_SHARED_FROM_THIS(p->second.second->clone()), p->second.first);
|
368
400
|
}
|
369
|
-
return std::pair<MetricsMapIPtr, SubMapMember>(MetricsMapIPtr(), static_cast<SubMapMember>(0));
|
401
|
+
return std::pair<MetricsMapIPtr, SubMapMember>(MetricsMapIPtr(ICE_NULLPTR), static_cast<SubMapMember>(0));
|
370
402
|
}
|
371
403
|
|
372
404
|
EntryTPtr
|
@@ -379,15 +411,15 @@ public:
|
|
379
411
|
{
|
380
412
|
if(!(*p)->match(helper, false))
|
381
413
|
{
|
382
|
-
return
|
414
|
+
return ICE_NULLPTR;
|
383
415
|
}
|
384
416
|
}
|
385
|
-
|
417
|
+
|
386
418
|
for(std::vector<RegExpPtr>::const_iterator p = _reject.begin(); p != _reject.end(); ++p)
|
387
419
|
{
|
388
420
|
if((*p)->match(helper, true))
|
389
421
|
{
|
390
|
-
return
|
422
|
+
return ICE_NULLPTR;
|
391
423
|
}
|
392
424
|
}
|
393
425
|
|
@@ -419,16 +451,16 @@ public:
|
|
419
451
|
}
|
420
452
|
catch(const std::exception&)
|
421
453
|
{
|
422
|
-
return
|
454
|
+
return ICE_NULLPTR;
|
423
455
|
}
|
424
456
|
|
425
457
|
//
|
426
458
|
// Lookup the metrics object.
|
427
|
-
//
|
459
|
+
//
|
428
460
|
Lock sync(*this);
|
429
461
|
if(_destroyed)
|
430
462
|
{
|
431
|
-
return
|
463
|
+
return ICE_NULLPTR;
|
432
464
|
}
|
433
465
|
|
434
466
|
if(previous && previous->_object->id == key)
|
@@ -440,23 +472,30 @@ public:
|
|
440
472
|
typename std::map<std::string, EntryTPtr>::const_iterator p = _objects.find(key);
|
441
473
|
if(p == _objects.end())
|
442
474
|
{
|
443
|
-
TPtr t =
|
475
|
+
TPtr t = ICE_MAKE_SHARED(T);
|
444
476
|
t->id = key;
|
477
|
+
|
478
|
+
#ifdef ICE_CPP11_MAPPING
|
479
|
+
p = _objects.insert(typename std::map<std::string, EntryTPtr>::value_type(
|
480
|
+
key, std::make_shared<EntryT>(shared_from_this(), t, _detachedQueue.end()))).first;
|
481
|
+
#else
|
445
482
|
p = _objects.insert(typename std::map<std::string, EntryTPtr>::value_type(
|
446
|
-
|
483
|
+
key, new EntryT(this, t, _detachedQueue.end()))).first;
|
484
|
+
#endif
|
485
|
+
|
447
486
|
}
|
448
487
|
p->second->attach(helper);
|
449
488
|
return p->second;
|
450
489
|
}
|
451
|
-
|
490
|
+
|
452
491
|
private:
|
453
492
|
|
454
|
-
virtual
|
493
|
+
virtual MetricsMapIPtr clone() const
|
455
494
|
{
|
456
|
-
return
|
495
|
+
return ICE_MAKE_SHARED(MetricsMapT<MetricsType>, *this);
|
457
496
|
}
|
458
497
|
|
459
|
-
void detached(
|
498
|
+
void detached(EntryTPtr entry)
|
460
499
|
{
|
461
500
|
// This is called with the map mutex locked.
|
462
501
|
|
@@ -529,14 +568,14 @@ public:
|
|
529
568
|
virtual MetricsMapIPtr
|
530
569
|
create(const std::string& mapPrefix, const Ice::PropertiesPtr& properties)
|
531
570
|
{
|
532
|
-
return
|
571
|
+
return ICE_MAKE_SHARED(MetricsMapT<MetricsType>, mapPrefix, properties, _subMaps);
|
533
572
|
}
|
534
573
|
|
535
574
|
template<class SubMapMetricsType> void
|
536
575
|
registerSubMap(const std::string& subMap, IceMX::MetricsMap MetricsType::* member)
|
537
576
|
{
|
538
|
-
_subMaps[subMap] = std::pair<IceMX::MetricsMap MetricsType::*,
|
539
|
-
MetricsMapFactoryPtr>(member,
|
577
|
+
_subMaps[subMap] = std::pair<IceMX::MetricsMap MetricsType::*,
|
578
|
+
MetricsMapFactoryPtr>(member, ICE_MAKE_SHARED(MetricsMapFactoryT<SubMapMetricsType>, ICE_NULLPTR));
|
540
579
|
}
|
541
580
|
|
542
581
|
private:
|
@@ -547,12 +586,12 @@ private:
|
|
547
586
|
class MetricsViewI : public IceUtil::Shared
|
548
587
|
{
|
549
588
|
public:
|
550
|
-
|
589
|
+
|
551
590
|
MetricsViewI(const std::string&);
|
552
591
|
|
553
592
|
void destroy();
|
554
593
|
|
555
|
-
bool addOrUpdateMap(const Ice::PropertiesPtr&, const std::string&, const MetricsMapFactoryPtr&,
|
594
|
+
bool addOrUpdateMap(const Ice::PropertiesPtr&, const std::string&, const MetricsMapFactoryPtr&,
|
556
595
|
const Ice::LoggerPtr&);
|
557
596
|
bool removeMap(const std::string&);
|
558
597
|
|
@@ -569,9 +608,12 @@ private:
|
|
569
608
|
const std::string _name;
|
570
609
|
std::map<std::string, MetricsMapIPtr> _maps;
|
571
610
|
};
|
572
|
-
|
611
|
+
ICE_DEFINE_PTR(MetricsViewIPtr, MetricsViewI);
|
573
612
|
|
574
|
-
class ICE_API MetricsAdminI : public IceMX::MetricsAdmin,
|
613
|
+
class ICE_API MetricsAdminI : public IceMX::MetricsAdmin,
|
614
|
+
#ifndef ICE_CPP11_MAPPING
|
615
|
+
public Ice::PropertiesAdminUpdateCallback,
|
616
|
+
#endif
|
575
617
|
private IceUtil::Mutex
|
576
618
|
{
|
577
619
|
public:
|
@@ -583,14 +625,14 @@ public:
|
|
583
625
|
|
584
626
|
void updateViews();
|
585
627
|
|
586
|
-
template<class MetricsType> void
|
628
|
+
template<class MetricsType> void
|
587
629
|
registerMap(const std::string& map, IceMX::Updater* updater)
|
588
630
|
{
|
589
631
|
bool updated;
|
590
632
|
MetricsMapFactoryPtr factory;
|
591
633
|
{
|
592
634
|
Lock sync(*this);
|
593
|
-
factory =
|
635
|
+
factory = ICE_MAKE_SHARED(MetricsMapFactoryT<MetricsType>, updater);
|
594
636
|
_factories[map] = factory;
|
595
637
|
updated = addOrUpdateMap(map, factory);
|
596
638
|
}
|
@@ -604,16 +646,19 @@ public:
|
|
604
646
|
registerSubMap(const std::string& map, const std::string& subMap, IceMX::MetricsMap MetricsType::* member)
|
605
647
|
{
|
606
648
|
bool updated;
|
607
|
-
|
649
|
+
ICE_HANDLE<MetricsMapFactoryT<MetricsType> > factory;
|
608
650
|
{
|
609
651
|
Lock sync(*this);
|
610
|
-
|
611
652
|
std::map<std::string, MetricsMapFactoryPtr>::const_iterator p = _factories.find(map);
|
612
653
|
if(p == _factories.end())
|
613
654
|
{
|
614
655
|
return;
|
615
656
|
}
|
657
|
+
#ifdef ICE_CPP11_MAPPING
|
658
|
+
factory = ::std::dynamic_pointer_cast<MetricsMapFactoryT<MetricsType>>(p->second);
|
659
|
+
#else
|
616
660
|
factory = dynamic_cast<MetricsMapFactoryT<MetricsType>*>(p->second.get());
|
661
|
+
#endif
|
617
662
|
factory->template registerSubMap<MemberMetricsType>(subMap, member);
|
618
663
|
removeMap(map);
|
619
664
|
updated = addOrUpdateMap(map, factory);
|
@@ -627,14 +672,24 @@ public:
|
|
627
672
|
void unregisterMap(const std::string&);
|
628
673
|
|
629
674
|
virtual Ice::StringSeq getMetricsViewNames(Ice::StringSeq&, const ::Ice::Current&);
|
675
|
+
|
676
|
+
void updated(const Ice::PropertyDict&);
|
677
|
+
|
678
|
+
#ifdef ICE_CPP11_MAPPING
|
679
|
+
virtual void enableMetricsView(std::string, const ::Ice::Current&);
|
680
|
+
virtual void disableMetricsView(std::string, const ::Ice::Current&);
|
681
|
+
virtual IceMX::MetricsView getMetricsView(std::string, Ice::Long&, const ::Ice::Current&);
|
682
|
+
virtual IceMX::MetricsFailuresSeq getMapMetricsFailures(std::string, std::string, const ::Ice::Current&);
|
683
|
+
virtual IceMX::MetricsFailures getMetricsFailures(std::string, std::string, std::string, const ::Ice::Current&);
|
684
|
+
#else
|
630
685
|
virtual void enableMetricsView(const std::string&, const ::Ice::Current&);
|
631
686
|
virtual void disableMetricsView(const std::string&, const ::Ice::Current&);
|
632
687
|
virtual IceMX::MetricsView getMetricsView(const std::string&, Ice::Long&, const ::Ice::Current&);
|
633
|
-
virtual IceMX::MetricsFailuresSeq getMapMetricsFailures(const std::string&, const std::string&,
|
688
|
+
virtual IceMX::MetricsFailuresSeq getMapMetricsFailures(const std::string&, const std::string&,
|
634
689
|
const ::Ice::Current&);
|
635
690
|
virtual IceMX::MetricsFailures getMetricsFailures(const std::string&, const std::string&, const std::string&,
|
636
691
|
const ::Ice::Current&);
|
637
|
-
|
692
|
+
#endif
|
638
693
|
std::vector<MetricsMapIPtr> getMaps(const std::string&) const;
|
639
694
|
|
640
695
|
const Ice::LoggerPtr& getLogger() const;
|
@@ -643,8 +698,6 @@ private:
|
|
643
698
|
|
644
699
|
MetricsViewIPtr getMetricsView(const std::string&);
|
645
700
|
|
646
|
-
void updated(const Ice::PropertyDict&);
|
647
|
-
|
648
701
|
bool addOrUpdateMap(const std::string&, const MetricsMapFactoryPtr&);
|
649
702
|
bool removeMap(const std::string&);
|
650
703
|
|
@@ -655,7 +708,7 @@ private:
|
|
655
708
|
const Ice::LoggerPtr _logger;
|
656
709
|
Ice::PropertiesPtr _properties;
|
657
710
|
};
|
658
|
-
|
711
|
+
ICE_DEFINE_PTR(MetricsAdminIPtr, MetricsAdminI);
|
659
712
|
|
660
713
|
};
|
661
714
|
|