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_H
|
11
6
|
#define ICE_INSTANCE_H
|
@@ -15,7 +10,7 @@
|
|
15
10
|
#include <IceUtil/Mutex.h>
|
16
11
|
#include <IceUtil/RecMutex.h>
|
17
12
|
#include <IceUtil/Timer.h>
|
18
|
-
#include <
|
13
|
+
#include <Ice/StringConverter.h>
|
19
14
|
#include <Ice/InstanceF.h>
|
20
15
|
#include <Ice/CommunicatorF.h>
|
21
16
|
#include <Ice/InstrumentationF.h>
|
@@ -28,7 +23,7 @@
|
|
28
23
|
#include <Ice/ThreadPoolF.h>
|
29
24
|
#include <Ice/ConnectionFactoryF.h>
|
30
25
|
#include <Ice/ACM.h>
|
31
|
-
#include <Ice/
|
26
|
+
#include <Ice/ObjectFactory.h>
|
32
27
|
#include <Ice/ObjectAdapterFactoryF.h>
|
33
28
|
#include <Ice/EndpointFactoryManagerF.h>
|
34
29
|
#include <Ice/IPEndpointIF.h>
|
@@ -42,7 +37,6 @@
|
|
42
37
|
#include <Ice/FacetMap.h>
|
43
38
|
#include <Ice/Process.h>
|
44
39
|
#include <list>
|
45
|
-
#include <IceUtil/UniquePtr.h>
|
46
40
|
|
47
41
|
namespace Ice
|
48
42
|
{
|
@@ -58,7 +52,7 @@ class Timer;
|
|
58
52
|
typedef IceUtil::Handle<Timer> TimerPtr;
|
59
53
|
|
60
54
|
class MetricsAdminI;
|
61
|
-
|
55
|
+
ICE_DEFINE_PTR(MetricsAdminIPtr, MetricsAdminI);
|
62
56
|
|
63
57
|
class RequestHandlerFactory;
|
64
58
|
typedef IceUtil::Handle<RequestHandlerFactory> RequestHandlerFactoryPtr;
|
@@ -95,7 +89,6 @@ public:
|
|
95
89
|
RequestHandlerFactoryPtr requestHandlerFactory() const;
|
96
90
|
ProxyFactoryPtr proxyFactory() const;
|
97
91
|
OutgoingConnectionFactoryPtr outgoingConnectionFactory() const;
|
98
|
-
ObjectFactoryManagerPtr servantFactoryManager() const;
|
99
92
|
ObjectAdapterFactoryPtr objectAdapterFactory() const;
|
100
93
|
ProtocolSupport protocolSupport() const;
|
101
94
|
bool preferIPv6() const;
|
@@ -112,13 +105,12 @@ public:
|
|
112
105
|
size_t batchAutoFlushSize() const { return _batchAutoFlushSize; }
|
113
106
|
size_t classGraphDepthMax() const { return _classGraphDepthMax; }
|
114
107
|
bool collectObjects() const { return _collectObjects; }
|
108
|
+
Ice::ToStringMode toStringMode() const { return _toStringMode; }
|
115
109
|
const ACMConfig& clientACM() const;
|
116
110
|
const ACMConfig& serverACM() const;
|
117
|
-
Ice::Identity stringToIdentity(const std::string&) const;
|
118
|
-
std::string identityToString(const Ice::Identity&) const;
|
119
111
|
|
120
|
-
Ice::
|
121
|
-
Ice::
|
112
|
+
Ice::ObjectPrxPtr createAdmin(const Ice::ObjectAdapterPtr&, const Ice::Identity&);
|
113
|
+
Ice::ObjectPrxPtr getAdmin();
|
122
114
|
void addAdminFacet(const Ice::ObjectPtr&, const std::string&);
|
123
115
|
Ice::ObjectPtr removeAdminFacet(const std::string&);
|
124
116
|
Ice::ObjectPtr findAdminFacet(const std::string&);
|
@@ -129,24 +121,33 @@ public:
|
|
129
121
|
return _implicitContext;
|
130
122
|
}
|
131
123
|
|
132
|
-
void setDefaultLocator(const Ice::
|
133
|
-
void setDefaultRouter(const Ice::
|
124
|
+
void setDefaultLocator(const Ice::LocatorPrxPtr&);
|
125
|
+
void setDefaultRouter(const Ice::RouterPrxPtr&);
|
134
126
|
|
135
127
|
void setLogger(const Ice::LoggerPtr&);
|
128
|
+
#ifdef ICE_CPP11_MAPPING
|
129
|
+
void setThreadHook(std::function<void()>, std::function<void()>);
|
130
|
+
#else
|
136
131
|
void setThreadHook(const Ice::ThreadNotificationPtr&);
|
132
|
+
#endif
|
137
133
|
|
138
|
-
|
139
|
-
|
134
|
+
const Ice::StringConverterPtr& getStringConverter() const { return _stringConverter; }
|
135
|
+
const Ice::WstringConverterPtr& getWstringConverter() const { return _wstringConverter; }
|
140
136
|
|
141
137
|
BufSizeWarnInfo getBufSizeWarn(Ice::Short type);
|
142
138
|
void setSndBufSizeWarn(Ice::Short type, int size);
|
143
139
|
void setRcvBufSizeWarn(Ice::Short type, int size);
|
144
140
|
|
141
|
+
void addObjectFactory(const Ice::ObjectFactoryPtr&, const std::string&);
|
142
|
+
Ice::ObjectFactoryPtr findObjectFactory(const std::string&) const;
|
143
|
+
|
144
|
+
typedef std::map<std::string, Ice::ObjectFactoryPtr> ObjectFactoryMap;
|
145
|
+
|
145
146
|
private:
|
146
147
|
|
147
148
|
Instance(const Ice::CommunicatorPtr&, const Ice::InitializationData&);
|
148
149
|
virtual ~Instance();
|
149
|
-
void finishSetup(int&, char*[], const Ice::CommunicatorPtr&);
|
150
|
+
void finishSetup(int&, const char*[], const Ice::CommunicatorPtr&);
|
150
151
|
void destroy();
|
151
152
|
friend class Ice::CommunicatorI;
|
152
153
|
|
@@ -173,6 +174,7 @@ private:
|
|
173
174
|
const size_t _batchAutoFlushSize; // Immutable, not reset by destroy().
|
174
175
|
const size_t _classGraphDepthMax; // Immutable, not reset by destroy().
|
175
176
|
const bool _collectObjects; // Immutable, not reset by destroy().
|
177
|
+
const Ice::ToStringMode _toStringMode; // Immutable, not reset by destroy()
|
176
178
|
ACMConfig _clientACM;
|
177
179
|
ACMConfig _serverACM;
|
178
180
|
RouterManagerPtr _routerManager;
|
@@ -181,7 +183,6 @@ private:
|
|
181
183
|
RequestHandlerFactoryPtr _requestHandlerFactory;
|
182
184
|
ProxyFactoryPtr _proxyFactory;
|
183
185
|
OutgoingConnectionFactoryPtr _outgoingConnectionFactory;
|
184
|
-
ObjectFactoryManagerPtr _servantFactoryManager;
|
185
186
|
ObjectAdapterFactoryPtr _objectAdapterFactory;
|
186
187
|
ProtocolSupport _protocolSupport;
|
187
188
|
bool _preferIPv6;
|
@@ -195,8 +196,8 @@ private:
|
|
195
196
|
DynamicLibraryListPtr _dynamicLibraryList;
|
196
197
|
Ice::PluginManagerPtr _pluginManager;
|
197
198
|
const Ice::ImplicitContextIPtr _implicitContext;
|
198
|
-
|
199
|
-
|
199
|
+
Ice::StringConverterPtr _stringConverter;
|
200
|
+
Ice::WstringConverterPtr _wstringConverter;
|
200
201
|
bool _adminEnabled;
|
201
202
|
Ice::ObjectAdapterPtr _adminAdapter;
|
202
203
|
Ice::FacetMap _adminFacets;
|
@@ -205,6 +206,8 @@ private:
|
|
205
206
|
IceInternal::MetricsAdminIPtr _metricsAdmin;
|
206
207
|
std::map<Ice::Short, BufSizeWarnInfo> _setBufSizeWarn;
|
207
208
|
IceUtil::Mutex _setBufSizeWarnMutex;
|
209
|
+
ObjectFactoryMap _objectFactoryMap;
|
210
|
+
mutable ObjectFactoryMap::iterator _objectFactoryMapHint;
|
208
211
|
};
|
209
212
|
|
210
213
|
class ProcessI : public Ice::Process
|
@@ -214,7 +217,11 @@ public:
|
|
214
217
|
ProcessI(const Ice::CommunicatorPtr&);
|
215
218
|
|
216
219
|
virtual void shutdown(const Ice::Current&);
|
220
|
+
#ifdef ICE_CPP11_MAPPING
|
221
|
+
virtual void writeMessage(std::string, Ice::Int, const Ice::Current&);
|
222
|
+
#else
|
217
223
|
virtual void writeMessage(const std::string&, Ice::Int, const Ice::Current&);
|
224
|
+
#endif
|
218
225
|
|
219
226
|
private:
|
220
227
|
|
@@ -1,13 +1,8 @@
|
|
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
4
|
//
|
8
|
-
//
|
9
|
-
//
|
10
|
-
// Ice version 3.6.5
|
5
|
+
// Ice version 3.7.4
|
11
6
|
//
|
12
7
|
// <auto-generated>
|
13
8
|
//
|
@@ -23,22 +18,79 @@
|
|
23
18
|
#endif
|
24
19
|
#include <Ice/Instrumentation.h>
|
25
20
|
#include <IceUtil/PushDisableWarnings.h>
|
26
|
-
#include <Ice/
|
27
|
-
#include <
|
21
|
+
#include <Ice/InputStream.h>
|
22
|
+
#include <Ice/OutputStream.h>
|
28
23
|
#include <IceUtil/PopDisableWarnings.h>
|
29
24
|
|
25
|
+
#if defined(_MSC_VER)
|
26
|
+
# pragma warning(disable:4458) // declaration of ... hides class member
|
27
|
+
#elif defined(__clang__)
|
28
|
+
# pragma clang diagnostic ignored "-Wshadow"
|
29
|
+
#elif defined(__GNUC__)
|
30
|
+
# pragma GCC diagnostic ignored "-Wshadow"
|
31
|
+
#endif
|
32
|
+
|
30
33
|
#ifndef ICE_IGNORE_VERSION
|
31
|
-
# if ICE_INT_VERSION / 100 !=
|
34
|
+
# if ICE_INT_VERSION / 100 != 307
|
32
35
|
# error Ice version mismatch!
|
33
36
|
# endif
|
34
|
-
# if ICE_INT_VERSION % 100
|
37
|
+
# if ICE_INT_VERSION % 100 >= 50
|
35
38
|
# error Beta header file detected
|
36
39
|
# endif
|
37
|
-
# if ICE_INT_VERSION % 100 <
|
40
|
+
# if ICE_INT_VERSION % 100 < 4
|
38
41
|
# error Ice patch level mismatch!
|
39
42
|
# endif
|
40
43
|
#endif
|
41
44
|
|
45
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
46
|
+
|
47
|
+
namespace
|
48
|
+
{
|
49
|
+
|
50
|
+
}
|
51
|
+
|
52
|
+
Ice::Instrumentation::Observer::~Observer()
|
53
|
+
{
|
54
|
+
}
|
55
|
+
|
56
|
+
Ice::Instrumentation::ThreadObserver::~ThreadObserver()
|
57
|
+
{
|
58
|
+
}
|
59
|
+
|
60
|
+
Ice::Instrumentation::ConnectionObserver::~ConnectionObserver()
|
61
|
+
{
|
62
|
+
}
|
63
|
+
|
64
|
+
Ice::Instrumentation::DispatchObserver::~DispatchObserver()
|
65
|
+
{
|
66
|
+
}
|
67
|
+
|
68
|
+
Ice::Instrumentation::ChildInvocationObserver::~ChildInvocationObserver()
|
69
|
+
{
|
70
|
+
}
|
71
|
+
|
72
|
+
Ice::Instrumentation::RemoteObserver::~RemoteObserver()
|
73
|
+
{
|
74
|
+
}
|
75
|
+
|
76
|
+
Ice::Instrumentation::CollocatedObserver::~CollocatedObserver()
|
77
|
+
{
|
78
|
+
}
|
79
|
+
|
80
|
+
Ice::Instrumentation::InvocationObserver::~InvocationObserver()
|
81
|
+
{
|
82
|
+
}
|
83
|
+
|
84
|
+
Ice::Instrumentation::ObserverUpdater::~ObserverUpdater()
|
85
|
+
{
|
86
|
+
}
|
87
|
+
|
88
|
+
Ice::Instrumentation::CommunicatorObserver::~CommunicatorObserver()
|
89
|
+
{
|
90
|
+
}
|
91
|
+
|
92
|
+
#else // C++98 mapping
|
93
|
+
|
42
94
|
namespace
|
43
95
|
{
|
44
96
|
|
@@ -49,26 +101,88 @@ namespace
|
|
49
101
|
|
50
102
|
}
|
51
103
|
|
52
|
-
|
104
|
+
Ice::Instrumentation::Observer::~Observer()
|
53
105
|
{
|
54
106
|
}
|
55
107
|
|
56
|
-
|
108
|
+
/// \cond INTERNAL
|
109
|
+
ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(Observer* p) { return p; }
|
110
|
+
/// \endcond
|
57
111
|
|
58
|
-
|
112
|
+
Ice::Instrumentation::ThreadObserver::~ThreadObserver()
|
113
|
+
{
|
114
|
+
}
|
59
115
|
|
60
|
-
|
116
|
+
/// \cond INTERNAL
|
117
|
+
ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(ThreadObserver* p) { return p; }
|
118
|
+
/// \endcond
|
61
119
|
|
62
|
-
|
120
|
+
Ice::Instrumentation::ConnectionObserver::~ConnectionObserver()
|
121
|
+
{
|
122
|
+
}
|
63
123
|
|
64
|
-
|
124
|
+
/// \cond INTERNAL
|
125
|
+
ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(ConnectionObserver* p) { return p; }
|
126
|
+
/// \endcond
|
65
127
|
|
66
|
-
|
128
|
+
Ice::Instrumentation::DispatchObserver::~DispatchObserver()
|
129
|
+
{
|
130
|
+
}
|
67
131
|
|
68
|
-
|
132
|
+
/// \cond INTERNAL
|
133
|
+
ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(DispatchObserver* p) { return p; }
|
134
|
+
/// \endcond
|
69
135
|
|
70
|
-
|
136
|
+
Ice::Instrumentation::ChildInvocationObserver::~ChildInvocationObserver()
|
137
|
+
{
|
138
|
+
}
|
139
|
+
|
140
|
+
/// \cond INTERNAL
|
141
|
+
ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(ChildInvocationObserver* p) { return p; }
|
142
|
+
/// \endcond
|
71
143
|
|
72
|
-
|
144
|
+
Ice::Instrumentation::RemoteObserver::~RemoteObserver()
|
145
|
+
{
|
146
|
+
}
|
147
|
+
|
148
|
+
/// \cond INTERNAL
|
149
|
+
ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(RemoteObserver* p) { return p; }
|
150
|
+
/// \endcond
|
151
|
+
|
152
|
+
Ice::Instrumentation::CollocatedObserver::~CollocatedObserver()
|
153
|
+
{
|
154
|
+
}
|
73
155
|
|
74
|
-
|
156
|
+
/// \cond INTERNAL
|
157
|
+
ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(CollocatedObserver* p) { return p; }
|
158
|
+
/// \endcond
|
159
|
+
|
160
|
+
Ice::Instrumentation::InvocationObserver::~InvocationObserver()
|
161
|
+
{
|
162
|
+
}
|
163
|
+
|
164
|
+
/// \cond INTERNAL
|
165
|
+
ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(InvocationObserver* p) { return p; }
|
166
|
+
/// \endcond
|
167
|
+
|
168
|
+
Ice::Instrumentation::ObserverUpdater::~ObserverUpdater()
|
169
|
+
{
|
170
|
+
}
|
171
|
+
|
172
|
+
/// \cond INTERNAL
|
173
|
+
ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(ObserverUpdater* p) { return p; }
|
174
|
+
/// \endcond
|
175
|
+
|
176
|
+
Ice::Instrumentation::CommunicatorObserver::~CommunicatorObserver()
|
177
|
+
{
|
178
|
+
}
|
179
|
+
|
180
|
+
/// \cond INTERNAL
|
181
|
+
ICE_API ::Ice::LocalObject* Ice::Instrumentation::upCast(CommunicatorObserver* p) { return p; }
|
182
|
+
/// \endcond
|
183
|
+
|
184
|
+
namespace Ice
|
185
|
+
{
|
186
|
+
}
|
187
|
+
|
188
|
+
#endif
|
@@ -1,13 +1,8 @@
|
|
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
4
|
//
|
8
|
-
//
|
9
|
-
//
|
10
|
-
// Ice version 3.6.5
|
5
|
+
// Ice version 3.7.4
|
11
6
|
//
|
12
7
|
// <auto-generated>
|
13
8
|
//
|
@@ -23,21 +18,37 @@
|
|
23
18
|
#endif
|
24
19
|
#include <Ice/InstrumentationF.h>
|
25
20
|
#include <IceUtil/PushDisableWarnings.h>
|
26
|
-
#include <IceUtil/Iterator.h>
|
27
21
|
#include <IceUtil/PopDisableWarnings.h>
|
28
22
|
|
23
|
+
#if defined(_MSC_VER)
|
24
|
+
# pragma warning(disable:4458) // declaration of ... hides class member
|
25
|
+
#elif defined(__clang__)
|
26
|
+
# pragma clang diagnostic ignored "-Wshadow"
|
27
|
+
#elif defined(__GNUC__)
|
28
|
+
# pragma GCC diagnostic ignored "-Wshadow"
|
29
|
+
#endif
|
30
|
+
|
29
31
|
#ifndef ICE_IGNORE_VERSION
|
30
|
-
# if ICE_INT_VERSION / 100 !=
|
32
|
+
# if ICE_INT_VERSION / 100 != 307
|
31
33
|
# error Ice version mismatch!
|
32
34
|
# endif
|
33
|
-
# if ICE_INT_VERSION % 100
|
35
|
+
# if ICE_INT_VERSION % 100 >= 50
|
34
36
|
# error Beta header file detected
|
35
37
|
# endif
|
36
|
-
# if ICE_INT_VERSION % 100 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 4
|
37
39
|
# error Ice patch level mismatch!
|
38
40
|
# endif
|
39
41
|
#endif
|
40
42
|
|
43
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
44
|
+
|
45
|
+
namespace
|
46
|
+
{
|
47
|
+
|
48
|
+
}
|
49
|
+
|
50
|
+
#else // C++98 mapping
|
51
|
+
|
41
52
|
namespace
|
42
53
|
{
|
43
54
|
|
@@ -47,3 +58,9 @@ namespace
|
|
47
58
|
}
|
48
59
|
|
49
60
|
}
|
61
|
+
|
62
|
+
namespace Ice
|
63
|
+
{
|
64
|
+
}
|
65
|
+
|
66
|
+
#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
|
#include <Ice/InstrumentationI.h>
|
11
6
|
|
@@ -22,7 +17,13 @@ using namespace IceInternal;
|
|
22
17
|
using namespace Ice::Instrumentation;
|
23
18
|
using namespace IceMX;
|
24
19
|
|
25
|
-
|
20
|
+
#ifdef ICE_CPP11_MAPPING
|
21
|
+
# define ICE_OBJECT_PRX Ice::ObjectPrx
|
22
|
+
#else
|
23
|
+
# define ICE_OBJECT_PRX IceProxy::Ice::Object
|
24
|
+
#endif
|
25
|
+
|
26
|
+
namespace
|
26
27
|
{
|
27
28
|
|
28
29
|
int ThreadMetrics::*
|
@@ -30,33 +31,33 @@ getThreadStateMetric(ThreadState s)
|
|
30
31
|
{
|
31
32
|
switch(s)
|
32
33
|
{
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
34
|
+
case ICE_ENUM(ThreadState, ThreadStateIdle):
|
35
|
+
return 0;
|
36
|
+
case ICE_ENUM(ThreadState, ThreadStateInUseForIO):
|
37
|
+
return &ThreadMetrics::inUseForIO;
|
38
|
+
case ICE_ENUM(ThreadState, ThreadStateInUseForUser):
|
39
|
+
return &ThreadMetrics::inUseForUser;
|
40
|
+
case ICE_ENUM(ThreadState, ThreadStateInUseForOther):
|
41
|
+
return &ThreadMetrics::inUseForOther;
|
42
|
+
default:
|
43
|
+
assert(false);
|
44
|
+
return 0;
|
44
45
|
}
|
45
|
-
}
|
46
|
+
}
|
46
47
|
|
47
|
-
struct ThreadStateChanged
|
48
|
+
struct ThreadStateChanged
|
48
49
|
{
|
49
|
-
ThreadStateChanged(ThreadState
|
50
|
+
ThreadStateChanged(ThreadState oldStateP, ThreadState newStateP) : oldState(oldStateP), newState(newStateP)
|
50
51
|
{
|
51
52
|
}
|
52
|
-
|
53
|
+
|
53
54
|
void operator()(const ThreadMetricsPtr& v)
|
54
55
|
{
|
55
|
-
if(oldState != ThreadStateIdle)
|
56
|
+
if(oldState != ICE_ENUM(ThreadState, ThreadStateIdle))
|
56
57
|
{
|
57
58
|
--(v.get()->*getThreadStateMetric(oldState));
|
58
59
|
}
|
59
|
-
if(newState != ThreadStateIdle)
|
60
|
+
if(newState != ICE_ENUM(ThreadState, ThreadStateIdle))
|
60
61
|
{
|
61
62
|
++(v.get()->*getThreadStateMetric(newState));
|
62
63
|
}
|
@@ -66,6 +67,20 @@ struct ThreadStateChanged
|
|
66
67
|
ThreadState newState;
|
67
68
|
};
|
68
69
|
|
70
|
+
IPConnectionInfo*
|
71
|
+
getIPConnectionInfo(const ConnectionInfoPtr& info)
|
72
|
+
{
|
73
|
+
for(ConnectionInfoPtr p = info; p; p = p->underlying)
|
74
|
+
{
|
75
|
+
IPConnectionInfo* ipInfo = dynamic_cast<IPConnectionInfo*>(p.get());
|
76
|
+
if(ipInfo)
|
77
|
+
{
|
78
|
+
return ipInfo;
|
79
|
+
}
|
80
|
+
}
|
81
|
+
return ICE_NULLPTR;
|
82
|
+
}
|
83
|
+
|
69
84
|
class ConnectionHelper : public MetricsHelperT<ConnectionMetrics>
|
70
85
|
{
|
71
86
|
public:
|
@@ -73,7 +88,7 @@ public:
|
|
73
88
|
class Attributes : public AttributeResolverT<ConnectionHelper>
|
74
89
|
{
|
75
90
|
public:
|
76
|
-
|
91
|
+
|
77
92
|
Attributes()
|
78
93
|
{
|
79
94
|
add("parent", &ConnectionHelper::getParent);
|
@@ -83,8 +98,8 @@ public:
|
|
83
98
|
}
|
84
99
|
};
|
85
100
|
static Attributes attributes;
|
86
|
-
|
87
|
-
ConnectionHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, ConnectionState state) :
|
101
|
+
|
102
|
+
ConnectionHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, ConnectionState state) :
|
88
103
|
_connectionInfo(con), _endpoint(endpt), _state(state)
|
89
104
|
{
|
90
105
|
}
|
@@ -100,7 +115,7 @@ public:
|
|
100
115
|
if(_id.empty())
|
101
116
|
{
|
102
117
|
ostringstream os;
|
103
|
-
|
118
|
+
IPConnectionInfo* info = getIPConnectionInfo(_connectionInfo);
|
104
119
|
if(info)
|
105
120
|
{
|
106
121
|
os << info->localAddress << ':' << info->localPort;
|
@@ -125,23 +140,23 @@ public:
|
|
125
140
|
{
|
126
141
|
switch(_state)
|
127
142
|
{
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
143
|
+
case ICE_ENUM(ConnectionState, ConnectionStateValidating):
|
144
|
+
return "validating";
|
145
|
+
case ICE_ENUM(ConnectionState, ConnectionStateHolding):
|
146
|
+
return "holding";
|
147
|
+
case ICE_ENUM(ConnectionState, ConnectionStateActive):
|
148
|
+
return "active";
|
149
|
+
case ICE_ENUM(ConnectionState, ConnectionStateClosing):
|
150
|
+
return "closing";
|
151
|
+
case ICE_ENUM(ConnectionState, ConnectionStateClosed):
|
152
|
+
return "closed";
|
153
|
+
default:
|
154
|
+
assert(false);
|
155
|
+
return "";
|
141
156
|
}
|
142
157
|
}
|
143
|
-
|
144
|
-
string
|
158
|
+
|
159
|
+
string
|
145
160
|
getParent() const
|
146
161
|
{
|
147
162
|
if(!_connectionInfo->adapterName.empty())
|
@@ -153,7 +168,7 @@ public:
|
|
153
168
|
return "Communicator";
|
154
169
|
}
|
155
170
|
}
|
156
|
-
|
171
|
+
|
157
172
|
const ConnectionInfoPtr&
|
158
173
|
getConnectionInfo() const
|
159
174
|
{
|
@@ -175,7 +190,7 @@ public:
|
|
175
190
|
}
|
176
191
|
return _endpointInfo;
|
177
192
|
}
|
178
|
-
|
193
|
+
|
179
194
|
private:
|
180
195
|
|
181
196
|
const ConnectionInfoPtr& _connectionInfo;
|
@@ -194,7 +209,7 @@ public:
|
|
194
209
|
class Attributes : public AttributeResolverT<DispatchHelper>
|
195
210
|
{
|
196
211
|
public:
|
197
|
-
|
212
|
+
|
198
213
|
Attributes()
|
199
214
|
{
|
200
215
|
add("parent", &DispatchHelper::getParent);
|
@@ -213,7 +228,7 @@ public:
|
|
213
228
|
}
|
214
229
|
};
|
215
230
|
static Attributes attributes;
|
216
|
-
|
231
|
+
|
217
232
|
DispatchHelper(const Current& current, int size) : _current(current), _size(size)
|
218
233
|
{
|
219
234
|
}
|
@@ -263,7 +278,7 @@ public:
|
|
263
278
|
return _id;
|
264
279
|
}
|
265
280
|
|
266
|
-
string
|
281
|
+
string
|
267
282
|
getParent() const
|
268
283
|
{
|
269
284
|
return _current.adapter->getName();
|
@@ -334,7 +349,7 @@ public:
|
|
334
349
|
class Attributes : public AttributeResolverT<InvocationHelper>
|
335
350
|
{
|
336
351
|
public:
|
337
|
-
|
352
|
+
|
338
353
|
Attributes()
|
339
354
|
{
|
340
355
|
add("parent", &InvocationHelper::getParent);
|
@@ -342,8 +357,8 @@ public:
|
|
342
357
|
|
343
358
|
add("operation", &InvocationHelper::getOperation);
|
344
359
|
add("identity", &InvocationHelper::getIdentity);
|
345
|
-
add("facet", &InvocationHelper::getProxy, &
|
346
|
-
add("encoding", &InvocationHelper::getProxy, &
|
360
|
+
add("facet", &InvocationHelper::getProxy, &ICE_OBJECT_PRX::ice_getFacet);
|
361
|
+
add("encoding", &InvocationHelper::getProxy, &ICE_OBJECT_PRX::ice_getEncodingVersion);
|
347
362
|
add("mode", &InvocationHelper::getMode);
|
348
363
|
add("proxy", &InvocationHelper::getProxy);
|
349
364
|
|
@@ -351,8 +366,7 @@ public:
|
|
351
366
|
}
|
352
367
|
};
|
353
368
|
static Attributes attributes;
|
354
|
-
|
355
|
-
InvocationHelper(const ObjectPrx& proxy, const string& op, const Context& ctx) :
|
369
|
+
InvocationHelper(const ObjectPrxPtr& proxy, const string& op, const Context& ctx) :
|
356
370
|
_proxy(proxy), _operation(op), _context(ctx)
|
357
371
|
{
|
358
372
|
}
|
@@ -386,23 +400,23 @@ public:
|
|
386
400
|
if(_proxy->ice_isTwoway())
|
387
401
|
{
|
388
402
|
return "twoway";
|
389
|
-
}
|
403
|
+
}
|
390
404
|
else if(_proxy->ice_isOneway())
|
391
405
|
{
|
392
406
|
return "oneway";
|
393
|
-
}
|
407
|
+
}
|
394
408
|
else if(_proxy->ice_isBatchOneway())
|
395
409
|
{
|
396
410
|
return "batch-oneway";
|
397
|
-
}
|
411
|
+
}
|
398
412
|
else if(_proxy->ice_isDatagram())
|
399
413
|
{
|
400
414
|
return "datagram";
|
401
|
-
}
|
415
|
+
}
|
402
416
|
else if(_proxy->ice_isBatchDatagram())
|
403
417
|
{
|
404
418
|
return "batch-datagram";
|
405
|
-
}
|
419
|
+
}
|
406
420
|
else
|
407
421
|
{
|
408
422
|
throw invalid_argument("mode");
|
@@ -419,7 +433,7 @@ public:
|
|
419
433
|
{
|
420
434
|
try
|
421
435
|
{
|
422
|
-
os << _proxy->ice_endpoints(Ice::EndpointSeq()) << " [" << _operation << ']';
|
436
|
+
os << _proxy->ice_endpoints(Ice::EndpointSeq())->ice_toString() << " [" << _operation << ']';
|
423
437
|
}
|
424
438
|
catch(const Exception&)
|
425
439
|
{
|
@@ -437,19 +451,18 @@ public:
|
|
437
451
|
return _id;
|
438
452
|
}
|
439
453
|
|
440
|
-
string
|
454
|
+
string
|
441
455
|
getParent() const
|
442
456
|
{
|
443
457
|
return "Communicator";
|
444
458
|
}
|
445
459
|
|
446
|
-
const
|
460
|
+
const ObjectPrxPtr&
|
447
461
|
getProxy() const
|
448
462
|
{
|
449
463
|
return _proxy;
|
450
464
|
}
|
451
465
|
|
452
|
-
|
453
466
|
string
|
454
467
|
getIdentity() const
|
455
468
|
{
|
@@ -471,7 +484,7 @@ public:
|
|
471
484
|
|
472
485
|
private:
|
473
486
|
|
474
|
-
const
|
487
|
+
const ObjectPrxPtr& _proxy;
|
475
488
|
const string& _operation;
|
476
489
|
const Context& _context;
|
477
490
|
mutable string _id;
|
@@ -486,7 +499,7 @@ public:
|
|
486
499
|
class Attributes : public AttributeResolverT<RemoteInvocationHelper>
|
487
500
|
{
|
488
501
|
public:
|
489
|
-
|
502
|
+
|
490
503
|
Attributes()
|
491
504
|
{
|
492
505
|
add("parent", &RemoteInvocationHelper::getParent);
|
@@ -496,8 +509,8 @@ public:
|
|
496
509
|
}
|
497
510
|
};
|
498
511
|
static Attributes attributes;
|
499
|
-
|
500
|
-
RemoteInvocationHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, int requestId, int size) :
|
512
|
+
|
513
|
+
RemoteInvocationHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, int requestId, int size) :
|
501
514
|
_connectionInfo(con), _endpoint(endpt), _requestId(requestId), _size(size)
|
502
515
|
{
|
503
516
|
}
|
@@ -525,8 +538,8 @@ public:
|
|
525
538
|
}
|
526
539
|
return _id;
|
527
540
|
}
|
528
|
-
|
529
|
-
string
|
541
|
+
|
542
|
+
string
|
530
543
|
getParent() const
|
531
544
|
{
|
532
545
|
if(!_connectionInfo->adapterName.empty())
|
@@ -538,7 +551,7 @@ public:
|
|
538
551
|
return "Communicator";
|
539
552
|
}
|
540
553
|
}
|
541
|
-
|
554
|
+
|
542
555
|
const ConnectionInfoPtr&
|
543
556
|
getConnectionInfo() const
|
544
557
|
{
|
@@ -560,7 +573,7 @@ public:
|
|
560
573
|
}
|
561
574
|
return _endpointInfo;
|
562
575
|
}
|
563
|
-
|
576
|
+
|
564
577
|
private:
|
565
578
|
|
566
579
|
const ConnectionInfoPtr& _connectionInfo;
|
@@ -588,7 +601,7 @@ public:
|
|
588
601
|
class Attributes : public AttributeResolverT<CollocatedInvocationHelper>
|
589
602
|
{
|
590
603
|
public:
|
591
|
-
|
604
|
+
|
592
605
|
Attributes()
|
593
606
|
{
|
594
607
|
add("parent", &CollocatedInvocationHelper::getParent);
|
@@ -597,8 +610,8 @@ public:
|
|
597
610
|
}
|
598
611
|
};
|
599
612
|
static Attributes attributes;
|
600
|
-
|
601
|
-
CollocatedInvocationHelper(const Ice::ObjectAdapterPtr& adapter, int requestId, int size) :
|
613
|
+
|
614
|
+
CollocatedInvocationHelper(const Ice::ObjectAdapterPtr& adapter, int requestId, int size) :
|
602
615
|
_requestId(requestId), _size(size), _id(adapter->getName())
|
603
616
|
{
|
604
617
|
}
|
@@ -618,8 +631,8 @@ public:
|
|
618
631
|
{
|
619
632
|
return _id;
|
620
633
|
}
|
621
|
-
|
622
|
-
string
|
634
|
+
|
635
|
+
string
|
623
636
|
getParent() const
|
624
637
|
{
|
625
638
|
return "Communicator";
|
@@ -647,7 +660,7 @@ public:
|
|
647
660
|
class Attributes : public AttributeResolverT<ThreadHelper>
|
648
661
|
{
|
649
662
|
public:
|
650
|
-
|
663
|
+
|
651
664
|
Attributes()
|
652
665
|
{
|
653
666
|
add("parent", &ThreadHelper::_parent);
|
@@ -655,7 +668,7 @@ public:
|
|
655
668
|
}
|
656
669
|
};
|
657
670
|
static Attributes attributes;
|
658
|
-
|
671
|
+
|
659
672
|
ThreadHelper(const string& parent, const string& id, ThreadState state) : _parent(parent), _id(id), _state(state)
|
660
673
|
{
|
661
674
|
}
|
@@ -667,14 +680,14 @@ public:
|
|
667
680
|
|
668
681
|
virtual void initMetrics(const ThreadMetricsPtr& v) const
|
669
682
|
{
|
670
|
-
if(_state != ThreadStateIdle)
|
683
|
+
if(_state != ICE_ENUM(ThreadState, ThreadStateIdle))
|
671
684
|
{
|
672
685
|
++(v.get()->*getThreadStateMetric(_state));
|
673
686
|
}
|
674
687
|
}
|
675
688
|
|
676
689
|
private:
|
677
|
-
|
690
|
+
|
678
691
|
const string _parent;
|
679
692
|
const string _id;
|
680
693
|
const ThreadState _state;
|
@@ -689,7 +702,7 @@ public:
|
|
689
702
|
class Attributes : public AttributeResolverT<EndpointHelper>
|
690
703
|
{
|
691
704
|
public:
|
692
|
-
|
705
|
+
|
693
706
|
Attributes()
|
694
707
|
{
|
695
708
|
add("parent", &EndpointHelper::getParent);
|
@@ -698,7 +711,7 @@ public:
|
|
698
711
|
}
|
699
712
|
};
|
700
713
|
static Attributes attributes;
|
701
|
-
|
714
|
+
|
702
715
|
EndpointHelper(const EndpointPtr& endpt, const string& id) : _endpoint(endpt), _id(id)
|
703
716
|
{
|
704
717
|
}
|
@@ -745,7 +758,7 @@ public:
|
|
745
758
|
}
|
746
759
|
|
747
760
|
private:
|
748
|
-
|
761
|
+
|
749
762
|
const EndpointPtr _endpoint;
|
750
763
|
mutable string _id;
|
751
764
|
mutable EndpointInfoPtr _endpointInfo;
|
@@ -755,7 +768,7 @@ EndpointHelper::Attributes EndpointHelper::attributes;
|
|
755
768
|
|
756
769
|
}
|
757
770
|
|
758
|
-
void
|
771
|
+
void
|
759
772
|
ConnectionObserverI::sentBytes(Int num)
|
760
773
|
{
|
761
774
|
forEach(add(&ConnectionMetrics::sentBytes, num));
|
@@ -765,7 +778,7 @@ ConnectionObserverI::sentBytes(Int num)
|
|
765
778
|
}
|
766
779
|
}
|
767
780
|
|
768
|
-
void
|
781
|
+
void
|
769
782
|
ConnectionObserverI::receivedBytes(Int num)
|
770
783
|
{
|
771
784
|
forEach(add(&ConnectionMetrics::receivedBytes, num));
|
@@ -847,8 +860,8 @@ InvocationObserverI::userException()
|
|
847
860
|
}
|
848
861
|
|
849
862
|
RemoteObserverPtr
|
850
|
-
InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection,
|
851
|
-
const EndpointPtr& endpoint,
|
863
|
+
InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection,
|
864
|
+
const EndpointPtr& endpoint,
|
852
865
|
int requestId,
|
853
866
|
int size)
|
854
867
|
{
|
@@ -859,14 +872,14 @@ InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection,
|
|
859
872
|
{
|
860
873
|
delegate = _delegate->getRemoteObserver(connection, endpoint, requestId, size);
|
861
874
|
}
|
862
|
-
return getObserverWithDelegate<RemoteObserverI>("Remote",
|
875
|
+
return getObserverWithDelegate<RemoteObserverI>("Remote",
|
863
876
|
RemoteInvocationHelper(connection, endpoint, requestId, size),
|
864
877
|
delegate);
|
865
878
|
}
|
866
879
|
catch(const exception&)
|
867
880
|
{
|
868
881
|
}
|
869
|
-
return
|
882
|
+
return ICE_NULLPTR;
|
870
883
|
}
|
871
884
|
|
872
885
|
CollocatedObserverPtr
|
@@ -886,10 +899,10 @@ InvocationObserverI::getCollocatedObserver(const Ice::ObjectAdapterPtr& adapter,
|
|
886
899
|
catch(const exception&)
|
887
900
|
{
|
888
901
|
}
|
889
|
-
return
|
902
|
+
return ICE_NULLPTR;
|
890
903
|
}
|
891
904
|
|
892
|
-
CommunicatorObserverI::CommunicatorObserverI(const InitializationData& initData) :
|
905
|
+
CommunicatorObserverI::CommunicatorObserverI(const InitializationData& initData) :
|
893
906
|
_metrics(new MetricsAdminI(initData.properties, initData.logger)),
|
894
907
|
_delegate(initData.observer),
|
895
908
|
_connections(_metrics, "Connection"),
|
@@ -934,7 +947,7 @@ CommunicatorObserverI::getConnectionEstablishmentObserver(const EndpointPtr& end
|
|
934
947
|
error << "unexpected exception trying to obtain observer:\n" << ex;
|
935
948
|
}
|
936
949
|
}
|
937
|
-
return
|
950
|
+
return ICE_NULLPTR;
|
938
951
|
}
|
939
952
|
|
940
953
|
ObserverPtr
|
@@ -957,13 +970,13 @@ CommunicatorObserverI::getEndpointLookupObserver(const EndpointPtr& endpt)
|
|
957
970
|
error << "unexpected exception trying to obtain observer:\n" << ex;
|
958
971
|
}
|
959
972
|
}
|
960
|
-
return
|
973
|
+
return ICE_NULLPTR;
|
961
974
|
}
|
962
975
|
|
963
|
-
ConnectionObserverPtr
|
964
|
-
CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con,
|
976
|
+
ConnectionObserverPtr
|
977
|
+
CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con,
|
965
978
|
const EndpointPtr& endpt,
|
966
|
-
ConnectionState state,
|
979
|
+
ConnectionState state,
|
967
980
|
const ConnectionObserverPtr& observer)
|
968
981
|
{
|
969
982
|
if(_connections.isEnabled())
|
@@ -984,11 +997,11 @@ CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con,
|
|
984
997
|
error << "unexpected exception trying to obtain observer:\n" << ex;
|
985
998
|
}
|
986
999
|
}
|
987
|
-
return
|
1000
|
+
return ICE_NULLPTR;
|
988
1001
|
}
|
989
1002
|
|
990
|
-
ThreadObserverPtr
|
991
|
-
CommunicatorObserverI::getThreadObserver(const string& parent,
|
1003
|
+
ThreadObserverPtr
|
1004
|
+
CommunicatorObserverI::getThreadObserver(const string& parent,
|
992
1005
|
const string& id,
|
993
1006
|
ThreadState state,
|
994
1007
|
const ThreadObserverPtr& observer)
|
@@ -1011,11 +1024,11 @@ CommunicatorObserverI::getThreadObserver(const string& parent,
|
|
1011
1024
|
error << "unexpected exception trying to obtain observer:\n" << ex;
|
1012
1025
|
}
|
1013
1026
|
}
|
1014
|
-
return
|
1027
|
+
return ICE_NULLPTR;
|
1015
1028
|
}
|
1016
1029
|
|
1017
|
-
InvocationObserverPtr
|
1018
|
-
CommunicatorObserverI::getInvocationObserver(const
|
1030
|
+
InvocationObserverPtr
|
1031
|
+
CommunicatorObserverI::getInvocationObserver(const ObjectPrxPtr& proxy, const string& op, const Context& ctx)
|
1019
1032
|
{
|
1020
1033
|
if(_invocations.isEnabled())
|
1021
1034
|
{
|
@@ -1034,10 +1047,10 @@ CommunicatorObserverI::getInvocationObserver(const ObjectPrx& proxy, const strin
|
|
1034
1047
|
error << "unexpected exception trying to obtain observer:\n" << ex;
|
1035
1048
|
}
|
1036
1049
|
}
|
1037
|
-
return
|
1050
|
+
return ICE_NULLPTR;
|
1038
1051
|
}
|
1039
1052
|
|
1040
|
-
DispatchObserverPtr
|
1053
|
+
DispatchObserverPtr
|
1041
1054
|
CommunicatorObserverI::getDispatchObserver(const Current& current, int size)
|
1042
1055
|
{
|
1043
1056
|
if(_dispatch.isEnabled())
|
@@ -1057,10 +1070,10 @@ CommunicatorObserverI::getDispatchObserver(const Current& current, int size)
|
|
1057
1070
|
error << "unexpected exception trying to obtain observer:\n" << ex;
|
1058
1071
|
}
|
1059
1072
|
}
|
1060
|
-
return
|
1073
|
+
return ICE_NULLPTR;
|
1061
1074
|
}
|
1062
1075
|
|
1063
|
-
const IceInternal::MetricsAdminIPtr&
|
1076
|
+
const IceInternal::MetricsAdminIPtr&
|
1064
1077
|
CommunicatorObserverI::getFacet() const
|
1065
1078
|
{
|
1066
1079
|
assert(_metrics);
|