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_REPLY_STATUS_H
|
11
6
|
#define ICE_REPLY_STATUS_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
|
#include <Ice/RequestHandler.h>
|
11
6
|
#include <Ice/Reference.h>
|
@@ -13,17 +8,19 @@
|
|
13
8
|
using namespace std;
|
14
9
|
using namespace IceInternal;
|
15
10
|
|
11
|
+
#ifndef ICE_CPP11_MAPPING
|
16
12
|
IceUtil::Shared* IceInternal::upCast(RequestHandler* p) { return p; }
|
17
13
|
IceUtil::Shared* IceInternal::upCast(CancellationHandler* p) { return p; }
|
14
|
+
#endif
|
18
15
|
|
19
16
|
RetryException::RetryException(const Ice::LocalException& ex)
|
20
17
|
{
|
21
|
-
_ex
|
18
|
+
ICE_SET_EXCEPTION_FROM_CLONE(_ex, ex.ice_clone());
|
22
19
|
}
|
23
20
|
|
24
21
|
RetryException::RetryException(const RetryException& ex)
|
25
22
|
{
|
26
|
-
_ex
|
23
|
+
ICE_SET_EXCEPTION_FROM_CLONE(_ex, ex.get()->ice_clone());
|
27
24
|
}
|
28
25
|
|
29
26
|
const Ice::LocalException*
|
@@ -1,17 +1,12 @@
|
|
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_REQUEST_HANDLER_H
|
11
6
|
#define ICE_REQUEST_HANDLER_H
|
12
7
|
|
13
8
|
#include <IceUtil/Shared.h>
|
14
|
-
#include <
|
9
|
+
#include <Ice/UniquePtr.h>
|
15
10
|
|
16
11
|
#include <Ice/RequestHandlerF.h>
|
17
12
|
#include <Ice/ReferenceF.h>
|
@@ -24,16 +19,11 @@ namespace Ice
|
|
24
19
|
|
25
20
|
class LocalException;
|
26
21
|
|
27
|
-
}
|
22
|
+
}
|
28
23
|
|
29
24
|
namespace IceInternal
|
30
25
|
{
|
31
26
|
|
32
|
-
class BasicStream;
|
33
|
-
|
34
|
-
class OutgoingBase;
|
35
|
-
class ProxyOutgoingBase;
|
36
|
-
|
37
27
|
//
|
38
28
|
// An exception wrapper, which is used to notify that the request
|
39
29
|
// handler should be cleared and the invocation retried.
|
@@ -49,14 +39,16 @@ public:
|
|
49
39
|
|
50
40
|
private:
|
51
41
|
|
52
|
-
|
42
|
+
IceInternal::UniquePtr<Ice::LocalException> _ex;
|
53
43
|
};
|
54
44
|
|
55
|
-
class CancellationHandler
|
45
|
+
class CancellationHandler
|
46
|
+
#ifndef ICE_CPP11_MAPPING
|
47
|
+
: public virtual IceUtil::Shared
|
48
|
+
#endif
|
56
49
|
{
|
57
50
|
public:
|
58
51
|
|
59
|
-
virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&) = 0;
|
60
52
|
virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&) = 0;
|
61
53
|
};
|
62
54
|
|
@@ -64,9 +56,10 @@ class RequestHandler : public CancellationHandler
|
|
64
56
|
{
|
65
57
|
public:
|
66
58
|
|
59
|
+
RequestHandler(const ReferencePtr&);
|
60
|
+
|
67
61
|
virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&) = 0;
|
68
62
|
|
69
|
-
virtual bool sendRequest(ProxyOutgoingBase*) = 0;
|
70
63
|
virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&) = 0;
|
71
64
|
|
72
65
|
const ReferencePtr& getReference() const { return _reference; } // Inlined for performances.
|
@@ -76,7 +69,6 @@ public:
|
|
76
69
|
|
77
70
|
protected:
|
78
71
|
|
79
|
-
RequestHandler(const ReferencePtr&);
|
80
72
|
const ReferencePtr _reference;
|
81
73
|
const bool _response;
|
82
74
|
};
|
@@ -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/RequestHandlerFactory.h>
|
11
6
|
#include <Ice/CollocatedRequestHandler.h>
|
@@ -23,14 +18,14 @@ RequestHandlerFactory::RequestHandlerFactory(const InstancePtr& instance) : _ins
|
|
23
18
|
}
|
24
19
|
|
25
20
|
RequestHandlerPtr
|
26
|
-
IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr& ref, const Ice::
|
21
|
+
IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr& ref, const Ice::ObjectPrxPtr& proxy)
|
27
22
|
{
|
28
23
|
if(ref->getCollocationOptimized())
|
29
24
|
{
|
30
25
|
Ice::ObjectAdapterPtr adapter = _instance->objectAdapterFactory()->findObjectAdapter(proxy);
|
31
26
|
if(adapter)
|
32
27
|
{
|
33
|
-
return proxy->
|
28
|
+
return proxy->_setRequestHandler(ICE_MAKE_SHARED(CollocatedRequestHandler, ref, adapter));
|
34
29
|
}
|
35
30
|
}
|
36
31
|
|
@@ -42,7 +37,7 @@ IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr
|
|
42
37
|
map<ReferencePtr, ConnectRequestHandlerPtr>::iterator p = _handlers.find(ref);
|
43
38
|
if(p == _handlers.end())
|
44
39
|
{
|
45
|
-
handler =
|
40
|
+
handler = ICE_MAKE_SHARED(ConnectRequestHandler, ref, proxy);
|
46
41
|
_handlers.insert(make_pair(ref, handler));
|
47
42
|
connect = true;
|
48
43
|
}
|
@@ -53,14 +48,18 @@ IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr
|
|
53
48
|
}
|
54
49
|
else
|
55
50
|
{
|
56
|
-
handler =
|
51
|
+
handler = ICE_MAKE_SHARED(ConnectRequestHandler, ref, proxy);
|
57
52
|
connect = true;
|
58
53
|
}
|
59
54
|
if(connect)
|
60
55
|
{
|
56
|
+
#ifdef ICE_CPP11_MAPPING
|
57
|
+
ref->getConnection(handler);
|
58
|
+
#else
|
61
59
|
ref->getConnection(handler.get());
|
60
|
+
#endif
|
62
61
|
}
|
63
|
-
return proxy->
|
62
|
+
return proxy->_setRequestHandler(handler->connect(proxy));
|
64
63
|
}
|
65
64
|
|
66
65
|
void
|
@@ -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_REQUEST_HANDLER_FACTORY_H
|
11
6
|
#define ICE_REQUEST_HANDLER_FACTORY_H
|
@@ -28,7 +23,7 @@ public:
|
|
28
23
|
|
29
24
|
RequestHandlerFactory(const InstancePtr&);
|
30
25
|
|
31
|
-
RequestHandlerPtr getRequestHandler(const RoutableReferencePtr&, const Ice::
|
26
|
+
RequestHandlerPtr getRequestHandler(const RoutableReferencePtr&, const Ice::ObjectPrxPtr&);
|
32
27
|
void removeRequestHandler(const ReferencePtr&, const RequestHandlerPtr&);
|
33
28
|
|
34
29
|
private:
|
@@ -1,20 +1,12 @@
|
|
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/ResponseHandler.h>
|
11
6
|
|
12
7
|
using namespace std;
|
13
8
|
using namespace IceInternal;
|
14
9
|
|
10
|
+
#ifndef ICE_CPP11_MAPPING
|
15
11
|
IceUtil::Shared* IceInternal::upCast(ResponseHandler* obj) { return obj; }
|
16
|
-
|
17
|
-
ResponseHandler::~ResponseHandler()
|
18
|
-
{
|
19
|
-
}
|
20
|
-
|
12
|
+
#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_RESPONSE_HANDLER_H
|
11
6
|
#define ICE_RESPONSE_HANDLER_H
|
@@ -16,19 +11,28 @@
|
|
16
11
|
#include <Ice/Config.h>
|
17
12
|
#include <Ice/LocalException.h>
|
18
13
|
#include <Ice/ResponseHandlerF.h>
|
14
|
+
#include <Ice/VirtualShared.h>
|
19
15
|
|
20
|
-
namespace
|
16
|
+
namespace Ice
|
21
17
|
{
|
22
18
|
|
23
|
-
class
|
19
|
+
class OutputStream;
|
24
20
|
|
25
|
-
|
21
|
+
}
|
22
|
+
|
23
|
+
namespace IceInternal
|
26
24
|
{
|
27
|
-
public:
|
28
25
|
|
29
|
-
|
26
|
+
class ResponseHandler :
|
27
|
+
#ifdef ICE_CPP11_MAPPING
|
28
|
+
public EnableSharedFromThis<ResponseHandler>
|
29
|
+
#else
|
30
|
+
public virtual IceUtil::Shared
|
31
|
+
#endif
|
32
|
+
{
|
33
|
+
public:
|
30
34
|
|
31
|
-
virtual void sendResponse(Ice::Int,
|
35
|
+
virtual void sendResponse(Ice::Int, Ice::OutputStream*, Ice::Byte, bool) = 0;
|
32
36
|
virtual void sendNoResponse() = 0;
|
33
37
|
virtual bool systemException(Ice::Int, const Ice::SystemException&, bool) = 0;
|
34
38
|
virtual void invokeException(Ice::Int, const Ice::LocalException&, int, bool) = 0;
|
@@ -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/RetryQueue.h>
|
11
6
|
#include <Ice/OutgoingAsync.h>
|
@@ -40,28 +35,22 @@ IceInternal::RetryTask::runTimerTask()
|
|
40
35
|
// (we still need the client thread pool at this point to call
|
41
36
|
// exception callbacks with CommunicatorDestroyedException).
|
42
37
|
//
|
43
|
-
_queue->remove(
|
38
|
+
_queue->remove(ICE_SHARED_FROM_THIS);
|
44
39
|
}
|
45
40
|
|
46
41
|
void
|
47
|
-
IceInternal::RetryTask::
|
42
|
+
IceInternal::RetryTask::asyncRequestCanceled(const OutgoingAsyncBasePtr& /*outAsync*/, const Ice::LocalException& ex)
|
48
43
|
{
|
49
|
-
|
50
|
-
}
|
51
|
-
|
52
|
-
void
|
53
|
-
IceInternal::RetryTask::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, const Ice::LocalException& ex)
|
54
|
-
{
|
55
|
-
if(_queue->cancel(this))
|
44
|
+
if(_queue->cancel(ICE_SHARED_FROM_THIS))
|
56
45
|
{
|
57
46
|
if(_instance->traceLevels()->retry >= 1)
|
58
47
|
{
|
59
48
|
Trace out(_instance->initializationData().logger, _instance->traceLevels()->retryCat);
|
60
49
|
out << "operation retry canceled\n" << ex;
|
61
50
|
}
|
62
|
-
if(_outAsync->
|
51
|
+
if(_outAsync->exception(ex))
|
63
52
|
{
|
64
|
-
_outAsync->
|
53
|
+
_outAsync->invokeExceptionAsync();
|
65
54
|
}
|
66
55
|
}
|
67
56
|
}
|
@@ -97,7 +86,7 @@ IceInternal::RetryQueue::add(const ProxyOutgoingAsyncBasePtr& out, int interval)
|
|
97
86
|
{
|
98
87
|
throw CommunicatorDestroyedException(__FILE__, __LINE__);
|
99
88
|
}
|
100
|
-
RetryTaskPtr task =
|
89
|
+
RetryTaskPtr task = ICE_MAKE_SHARED(RetryTask, _instance, this, out);
|
101
90
|
out->cancelable(task); // This will throw if the request is canceled.
|
102
91
|
try
|
103
92
|
{
|
@@ -155,11 +144,14 @@ IceInternal::RetryQueue::cancel(const RetryTaskPtr& task)
|
|
155
144
|
Lock sync(*this);
|
156
145
|
if(_requests.erase(task) > 0)
|
157
146
|
{
|
158
|
-
if(
|
147
|
+
if(_instance)
|
148
|
+
{
|
149
|
+
return _instance->timer()->cancel(task);
|
150
|
+
}
|
151
|
+
else if(_requests.empty())
|
159
152
|
{
|
160
153
|
notify(); // If we are destroying the queue, destroy is probably waiting on the queue to be empty.
|
161
154
|
}
|
162
|
-
return _instance->timer()->cancel(task);
|
163
155
|
}
|
164
156
|
return false;
|
165
157
|
}
|
@@ -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_RETRY_QUEUE_H
|
11
6
|
#define ICE_RETRY_QUEUE_H
|
@@ -21,7 +16,11 @@
|
|
21
16
|
namespace IceInternal
|
22
17
|
{
|
23
18
|
|
24
|
-
class RetryTask : public IceUtil::TimerTask,
|
19
|
+
class RetryTask : public IceUtil::TimerTask,
|
20
|
+
public CancellationHandler
|
21
|
+
#ifdef ICE_CPP11_MAPPING
|
22
|
+
, public std::enable_shared_from_this<RetryTask>
|
23
|
+
#endif
|
25
24
|
{
|
26
25
|
public:
|
27
26
|
|
@@ -29,21 +28,19 @@ public:
|
|
29
28
|
|
30
29
|
virtual void runTimerTask();
|
31
30
|
|
32
|
-
virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&);
|
33
31
|
virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&);
|
34
32
|
|
35
33
|
void destroy();
|
36
34
|
|
37
35
|
bool operator<(const RetryTask&) const;
|
38
36
|
|
39
|
-
|
40
37
|
private:
|
41
38
|
|
42
39
|
const InstancePtr _instance;
|
43
40
|
const RetryQueuePtr _queue;
|
44
41
|
const ProxyOutgoingAsyncBasePtr _outAsync;
|
45
42
|
};
|
46
|
-
|
43
|
+
ICE_DEFINE_PTR(RetryTaskPtr, RetryTask);
|
47
44
|
|
48
45
|
class RetryQueue : public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
|
49
46
|
{
|
@@ -67,4 +64,3 @@ private:
|
|
67
64
|
}
|
68
65
|
|
69
66
|
#endif
|
70
|
-
|
@@ -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_RETRY_QUEUE_F_H
|
11
6
|
#define ICE_RETRY_QUEUE_F_H
|
@@ -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
|
//
|
@@ -24,550 +19,634 @@
|
|
24
19
|
#include <Ice/Router.h>
|
25
20
|
#include <IceUtil/PushDisableWarnings.h>
|
26
21
|
#include <Ice/LocalException.h>
|
27
|
-
#include <Ice/
|
28
|
-
#include <Ice/Outgoing.h>
|
22
|
+
#include <Ice/ValueFactory.h>
|
29
23
|
#include <Ice/OutgoingAsync.h>
|
30
|
-
#include <Ice/
|
31
|
-
#include <
|
24
|
+
#include <Ice/InputStream.h>
|
25
|
+
#include <Ice/OutputStream.h>
|
32
26
|
#include <IceUtil/PopDisableWarnings.h>
|
33
27
|
|
28
|
+
#if defined(_MSC_VER)
|
29
|
+
# pragma warning(disable:4458) // declaration of ... hides class member
|
30
|
+
#elif defined(__clang__)
|
31
|
+
# pragma clang diagnostic ignored "-Wshadow"
|
32
|
+
#elif defined(__GNUC__)
|
33
|
+
# pragma GCC diagnostic ignored "-Wshadow"
|
34
|
+
#endif
|
35
|
+
|
34
36
|
#ifndef ICE_IGNORE_VERSION
|
35
|
-
# if ICE_INT_VERSION / 100 !=
|
37
|
+
# if ICE_INT_VERSION / 100 != 307
|
36
38
|
# error Ice version mismatch!
|
37
39
|
# endif
|
38
|
-
# if ICE_INT_VERSION % 100
|
40
|
+
# if ICE_INT_VERSION % 100 >= 50
|
39
41
|
# error Beta header file detected
|
40
42
|
# endif
|
41
|
-
# if ICE_INT_VERSION % 100 <
|
43
|
+
# if ICE_INT_VERSION % 100 < 4
|
42
44
|
# error Ice patch level mismatch!
|
43
45
|
# endif
|
44
46
|
#endif
|
45
47
|
|
48
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
49
|
+
|
46
50
|
namespace
|
47
51
|
{
|
48
52
|
|
49
|
-
const ::std::string
|
53
|
+
const ::std::string iceC_Ice_Router_ids[2] =
|
54
|
+
{
|
55
|
+
"::Ice::Object",
|
56
|
+
"::Ice::Router"
|
57
|
+
};
|
58
|
+
const ::std::string iceC_Ice_Router_ops[] =
|
59
|
+
{
|
60
|
+
"addProxies",
|
61
|
+
"getClientProxy",
|
62
|
+
"getServerProxy",
|
63
|
+
"ice_id",
|
64
|
+
"ice_ids",
|
65
|
+
"ice_isA",
|
66
|
+
"ice_ping"
|
67
|
+
};
|
68
|
+
const ::std::string iceC_Ice_Router_getClientProxy_name = "getClientProxy";
|
69
|
+
const ::std::string iceC_Ice_Router_getServerProxy_name = "getServerProxy";
|
70
|
+
const ::std::string iceC_Ice_Router_addProxies_name = "addProxies";
|
50
71
|
|
51
|
-
const ::std::string
|
72
|
+
const ::std::string iceC_Ice_RouterFinder_ids[2] =
|
73
|
+
{
|
74
|
+
"::Ice::Object",
|
75
|
+
"::Ice::RouterFinder"
|
76
|
+
};
|
77
|
+
const ::std::string iceC_Ice_RouterFinder_ops[] =
|
78
|
+
{
|
79
|
+
"getRouter",
|
80
|
+
"ice_id",
|
81
|
+
"ice_ids",
|
82
|
+
"ice_isA",
|
83
|
+
"ice_ping"
|
84
|
+
};
|
85
|
+
const ::std::string iceC_Ice_RouterFinder_getRouter_name = "getRouter";
|
52
86
|
|
53
|
-
|
87
|
+
}
|
54
88
|
|
55
|
-
|
89
|
+
bool
|
90
|
+
Ice::Router::ice_isA(::std::string s, const Current&) const
|
91
|
+
{
|
92
|
+
return ::std::binary_search(iceC_Ice_Router_ids, iceC_Ice_Router_ids + 2, s);
|
93
|
+
}
|
56
94
|
|
95
|
+
::std::vector<::std::string>
|
96
|
+
Ice::Router::ice_ids(const Current&) const
|
97
|
+
{
|
98
|
+
return ::std::vector<::std::string>(&iceC_Ice_Router_ids[0], &iceC_Ice_Router_ids[2]);
|
57
99
|
}
|
58
|
-
#ifdef __SUNPRO_CC
|
59
|
-
class ICE_API IceProxy::Ice::Router;
|
60
|
-
#endif
|
61
|
-
ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::Router* p) { return p; }
|
62
100
|
|
63
|
-
|
64
|
-
::
|
101
|
+
::std::string
|
102
|
+
Ice::Router::ice_id(const Current&) const
|
65
103
|
{
|
66
|
-
|
67
|
-
__is->read(proxy);
|
68
|
-
if(!proxy)
|
69
|
-
{
|
70
|
-
v = 0;
|
71
|
-
}
|
72
|
-
else
|
73
|
-
{
|
74
|
-
v = new ::IceProxy::Ice::Router;
|
75
|
-
v->__copyFrom(proxy);
|
76
|
-
}
|
104
|
+
return ice_staticId();
|
77
105
|
}
|
78
106
|
|
79
|
-
::
|
80
|
-
|
107
|
+
const ::std::string&
|
108
|
+
Ice::Router::ice_staticId()
|
81
109
|
{
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
110
|
+
static const ::std::string typeId = "::Ice::Router";
|
111
|
+
return typeId;
|
112
|
+
}
|
113
|
+
|
114
|
+
/// \cond INTERNAL
|
115
|
+
bool
|
116
|
+
Ice::Router::_iceD_getClientProxy(::IceInternal::Incoming& inS, const Current& current) const
|
117
|
+
{
|
118
|
+
_iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
|
119
|
+
inS.readEmptyParams();
|
120
|
+
Ice::optional<bool> iceP_hasRoutingTable;
|
121
|
+
::std::shared_ptr<ObjectPrx> ret = this->getClientProxy(iceP_hasRoutingTable, current);
|
122
|
+
auto ostr = inS.startWriteParams();
|
123
|
+
ostr->writeAll(ret);
|
124
|
+
ostr->writeAll({1}, iceP_hasRoutingTable);
|
125
|
+
inS.endWriteParams();
|
126
|
+
return true;
|
127
|
+
}
|
128
|
+
/// \endcond
|
129
|
+
|
130
|
+
/// \cond INTERNAL
|
131
|
+
bool
|
132
|
+
Ice::Router::_iceD_getServerProxy(::IceInternal::Incoming& inS, const Current& current) const
|
133
|
+
{
|
134
|
+
_iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
|
135
|
+
inS.readEmptyParams();
|
136
|
+
::std::shared_ptr<ObjectPrx> ret = this->getServerProxy(current);
|
137
|
+
auto ostr = inS.startWriteParams();
|
138
|
+
ostr->writeAll(ret);
|
139
|
+
inS.endWriteParams();
|
140
|
+
return true;
|
141
|
+
}
|
142
|
+
/// \endcond
|
143
|
+
|
144
|
+
/// \cond INTERNAL
|
145
|
+
bool
|
146
|
+
Ice::Router::_iceD_addProxies(::IceInternal::Incoming& inS, const Current& current)
|
147
|
+
{
|
148
|
+
_iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
|
149
|
+
auto istr = inS.startReadParams();
|
150
|
+
ObjectProxySeq iceP_proxies;
|
151
|
+
istr->readAll(iceP_proxies);
|
152
|
+
inS.endReadParams();
|
153
|
+
ObjectProxySeq ret = this->addProxies(::std::move(iceP_proxies), current);
|
154
|
+
auto ostr = inS.startWriteParams();
|
155
|
+
ostr->writeAll(ret);
|
156
|
+
inS.endWriteParams();
|
157
|
+
return true;
|
158
|
+
}
|
159
|
+
/// \endcond
|
160
|
+
|
161
|
+
/// \cond INTERNAL
|
162
|
+
bool
|
163
|
+
Ice::Router::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
|
164
|
+
{
|
165
|
+
::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_Router_ops, iceC_Ice_Router_ops + 7, current.operation);
|
166
|
+
if(r.first == r.second)
|
86
167
|
{
|
87
|
-
|
168
|
+
throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
169
|
+
}
|
170
|
+
|
171
|
+
switch(r.first - iceC_Ice_Router_ops)
|
172
|
+
{
|
173
|
+
case 0:
|
88
174
|
{
|
89
|
-
|
175
|
+
return _iceD_addProxies(in, current);
|
90
176
|
}
|
91
|
-
|
177
|
+
case 1:
|
92
178
|
{
|
93
|
-
|
94
|
-
|
179
|
+
return _iceD_getClientProxy(in, current);
|
180
|
+
}
|
181
|
+
case 2:
|
182
|
+
{
|
183
|
+
return _iceD_getServerProxy(in, current);
|
184
|
+
}
|
185
|
+
case 3:
|
186
|
+
{
|
187
|
+
return _iceD_ice_id(in, current);
|
188
|
+
}
|
189
|
+
case 4:
|
190
|
+
{
|
191
|
+
return _iceD_ice_ids(in, current);
|
192
|
+
}
|
193
|
+
case 5:
|
194
|
+
{
|
195
|
+
return _iceD_ice_isA(in, current);
|
196
|
+
}
|
197
|
+
case 6:
|
198
|
+
{
|
199
|
+
return _iceD_ice_ping(in, current);
|
200
|
+
}
|
201
|
+
default:
|
202
|
+
{
|
203
|
+
assert(false);
|
204
|
+
throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
95
205
|
}
|
96
206
|
}
|
97
|
-
::Ice::ObjectPrx __ret;
|
98
|
-
::IceInternal::BasicStream* __is = __og.startReadParams();
|
99
|
-
__is->read(__ret);
|
100
|
-
__og.endReadParams();
|
101
|
-
return __ret;
|
102
207
|
}
|
208
|
+
/// \endcond
|
103
209
|
|
104
|
-
|
105
|
-
|
210
|
+
bool
|
211
|
+
Ice::RouterFinder::ice_isA(::std::string s, const Current&) const
|
106
212
|
{
|
107
|
-
|
108
|
-
::IceInternal::OutgoingAsyncPtr __result = new ::IceInternal::OutgoingAsync(this, __Ice__Router__getClientProxy_name, __del, __cookie);
|
109
|
-
try
|
110
|
-
{
|
111
|
-
__result->prepare(__Ice__Router__getClientProxy_name, ::Ice::Nonmutating, __ctx);
|
112
|
-
__result->writeEmptyParams();
|
113
|
-
__result->invoke();
|
114
|
-
}
|
115
|
-
catch(const ::Ice::Exception& __ex)
|
116
|
-
{
|
117
|
-
__result->abort(__ex);
|
118
|
-
}
|
119
|
-
return __result;
|
213
|
+
return ::std::binary_search(iceC_Ice_RouterFinder_ids, iceC_Ice_RouterFinder_ids + 2, s);
|
120
214
|
}
|
121
215
|
|
122
|
-
|
216
|
+
::std::vector<::std::string>
|
217
|
+
Ice::RouterFinder::ice_ids(const Current&) const
|
218
|
+
{
|
219
|
+
return ::std::vector<::std::string>(&iceC_Ice_RouterFinder_ids[0], &iceC_Ice_RouterFinder_ids[2]);
|
220
|
+
}
|
123
221
|
|
124
|
-
::
|
125
|
-
|
222
|
+
::std::string
|
223
|
+
Ice::RouterFinder::ice_id(const Current&) const
|
126
224
|
{
|
127
|
-
|
128
|
-
{
|
129
|
-
public:
|
130
|
-
|
131
|
-
Cpp11CB(const ::std::function<void (const ::Ice::ObjectPrx&)>& responseFunc, const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, const ::std::function<void (bool)>& sentFunc) :
|
132
|
-
::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
|
133
|
-
_response(responseFunc)
|
134
|
-
{
|
135
|
-
CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
|
136
|
-
}
|
137
|
-
|
138
|
-
virtual void completed(const ::Ice::AsyncResultPtr& __result) const
|
139
|
-
{
|
140
|
-
::Ice::RouterPrx __proxy = ::Ice::RouterPrx::uncheckedCast(__result->getProxy());
|
141
|
-
::Ice::ObjectPrx __ret;
|
142
|
-
try
|
143
|
-
{
|
144
|
-
__ret = __proxy->end_getClientProxy(__result);
|
145
|
-
}
|
146
|
-
catch(const ::Ice::Exception& ex)
|
147
|
-
{
|
148
|
-
Cpp11FnCallbackNC::exception(__result, ex);
|
149
|
-
return;
|
150
|
-
}
|
151
|
-
if(_response != nullptr)
|
152
|
-
{
|
153
|
-
_response(__ret);
|
154
|
-
}
|
155
|
-
}
|
156
|
-
|
157
|
-
private:
|
158
|
-
|
159
|
-
::std::function<void (const ::Ice::ObjectPrx&)> _response;
|
160
|
-
};
|
161
|
-
return begin_getClientProxy(__ctx, new Cpp11CB(__response, __exception, __sent));
|
225
|
+
return ice_staticId();
|
162
226
|
}
|
163
|
-
#endif
|
164
227
|
|
165
|
-
::
|
166
|
-
|
228
|
+
const ::std::string&
|
229
|
+
Ice::RouterFinder::ice_staticId()
|
167
230
|
{
|
168
|
-
::
|
169
|
-
|
170
|
-
|
231
|
+
static const ::std::string typeId = "::Ice::RouterFinder";
|
232
|
+
return typeId;
|
233
|
+
}
|
234
|
+
|
235
|
+
/// \cond INTERNAL
|
236
|
+
bool
|
237
|
+
Ice::RouterFinder::_iceD_getRouter(::IceInternal::Incoming& inS, const Current& current)
|
238
|
+
{
|
239
|
+
_iceCheckMode(::Ice::OperationMode::Normal, current.mode);
|
240
|
+
inS.readEmptyParams();
|
241
|
+
::std::shared_ptr<RouterPrx> ret = this->getRouter(current);
|
242
|
+
auto ostr = inS.startWriteParams();
|
243
|
+
ostr->writeAll(ret);
|
244
|
+
inS.endWriteParams();
|
245
|
+
return true;
|
246
|
+
}
|
247
|
+
/// \endcond
|
248
|
+
|
249
|
+
/// \cond INTERNAL
|
250
|
+
bool
|
251
|
+
Ice::RouterFinder::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
|
252
|
+
{
|
253
|
+
::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_RouterFinder_ops, iceC_Ice_RouterFinder_ops + 5, current.operation);
|
254
|
+
if(r.first == r.second)
|
171
255
|
{
|
172
|
-
|
256
|
+
throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
257
|
+
}
|
258
|
+
|
259
|
+
switch(r.first - iceC_Ice_RouterFinder_ops)
|
260
|
+
{
|
261
|
+
case 0:
|
173
262
|
{
|
174
|
-
|
263
|
+
return _iceD_getRouter(in, current);
|
175
264
|
}
|
176
|
-
|
265
|
+
case 1:
|
177
266
|
{
|
178
|
-
|
267
|
+
return _iceD_ice_id(in, current);
|
268
|
+
}
|
269
|
+
case 2:
|
270
|
+
{
|
271
|
+
return _iceD_ice_ids(in, current);
|
272
|
+
}
|
273
|
+
case 3:
|
274
|
+
{
|
275
|
+
return _iceD_ice_isA(in, current);
|
276
|
+
}
|
277
|
+
case 4:
|
278
|
+
{
|
279
|
+
return _iceD_ice_ping(in, current);
|
280
|
+
}
|
281
|
+
default:
|
282
|
+
{
|
283
|
+
assert(false);
|
284
|
+
throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
179
285
|
}
|
180
286
|
}
|
181
|
-
::IceInternal::BasicStream* __is = __result->__startReadParams();
|
182
|
-
__is->read(__ret);
|
183
|
-
__result->__endReadParams();
|
184
|
-
return __ret;
|
185
287
|
}
|
288
|
+
/// \endcond
|
186
289
|
|
187
|
-
|
188
|
-
|
290
|
+
/// \cond INTERNAL
|
291
|
+
void
|
292
|
+
Ice::RouterPrx::_iceI_getClientProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<Router::GetClientProxyResult>>& outAsync, const Context& context)
|
189
293
|
{
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
try
|
294
|
+
_checkTwowayOnly(iceC_Ice_Router_getClientProxy_name);
|
295
|
+
outAsync->invoke(iceC_Ice_Router_getClientProxy_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context,
|
296
|
+
nullptr,
|
297
|
+
nullptr,
|
298
|
+
[](InputStream* istr)
|
196
299
|
{
|
197
|
-
|
198
|
-
|
199
|
-
|
300
|
+
Router::GetClientProxyResult v;
|
301
|
+
istr->readAll(v.returnValue);
|
302
|
+
istr->readAll({1}, v.hasRoutingTable);
|
303
|
+
return v;
|
304
|
+
});
|
305
|
+
}
|
306
|
+
/// \endcond
|
307
|
+
|
308
|
+
/// \cond INTERNAL
|
309
|
+
void
|
310
|
+
Ice::RouterPrx::_iceI_getServerProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::ObjectPrx>>>& outAsync, const Context& context)
|
311
|
+
{
|
312
|
+
_checkTwowayOnly(iceC_Ice_Router_getServerProxy_name);
|
313
|
+
outAsync->invoke(iceC_Ice_Router_getServerProxy_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context,
|
314
|
+
nullptr,
|
315
|
+
nullptr);
|
316
|
+
}
|
317
|
+
/// \endcond
|
318
|
+
|
319
|
+
/// \cond INTERNAL
|
320
|
+
void
|
321
|
+
Ice::RouterPrx::_iceI_addProxies(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::Ice::ObjectProxySeq>>& outAsync, const ObjectProxySeq& iceP_proxies, const Context& context)
|
322
|
+
{
|
323
|
+
_checkTwowayOnly(iceC_Ice_Router_addProxies_name);
|
324
|
+
outAsync->invoke(iceC_Ice_Router_addProxies_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
|
325
|
+
[&](OutputStream* ostr)
|
200
326
|
{
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
}
|
205
|
-
::Ice::ObjectPrx __ret;
|
206
|
-
::IceInternal::BasicStream* __is = __og.startReadParams();
|
207
|
-
__is->read(__ret);
|
208
|
-
__og.endReadParams();
|
209
|
-
return __ret;
|
327
|
+
ostr->writeAll(iceP_proxies);
|
328
|
+
},
|
329
|
+
nullptr);
|
210
330
|
}
|
331
|
+
/// \endcond
|
211
332
|
|
212
|
-
|
213
|
-
|
333
|
+
/// \cond INTERNAL
|
334
|
+
::std::shared_ptr<::Ice::ObjectPrx>
|
335
|
+
Ice::RouterPrx::_newInstance() const
|
214
336
|
{
|
215
|
-
|
216
|
-
|
217
|
-
|
337
|
+
return ::IceInternal::createProxy<RouterPrx>();
|
338
|
+
}
|
339
|
+
/// \endcond
|
340
|
+
|
341
|
+
const ::std::string&
|
342
|
+
Ice::RouterPrx::ice_staticId()
|
343
|
+
{
|
344
|
+
return Router::ice_staticId();
|
345
|
+
}
|
346
|
+
|
347
|
+
/// \cond INTERNAL
|
348
|
+
void
|
349
|
+
Ice::RouterFinderPrx::_iceI_getRouter(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<::Ice::RouterPrx>>>& outAsync, const Context& context)
|
350
|
+
{
|
351
|
+
_checkTwowayOnly(iceC_Ice_RouterFinder_getRouter_name);
|
352
|
+
outAsync->invoke(iceC_Ice_RouterFinder_getRouter_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
|
353
|
+
nullptr,
|
354
|
+
nullptr);
|
355
|
+
}
|
356
|
+
/// \endcond
|
357
|
+
|
358
|
+
/// \cond INTERNAL
|
359
|
+
::std::shared_ptr<::Ice::ObjectPrx>
|
360
|
+
Ice::RouterFinderPrx::_newInstance() const
|
361
|
+
{
|
362
|
+
return ::IceInternal::createProxy<RouterFinderPrx>();
|
363
|
+
}
|
364
|
+
/// \endcond
|
365
|
+
|
366
|
+
const ::std::string&
|
367
|
+
Ice::RouterFinderPrx::ice_staticId()
|
368
|
+
{
|
369
|
+
return RouterFinder::ice_staticId();
|
370
|
+
}
|
371
|
+
|
372
|
+
#else // C++98 mapping
|
373
|
+
|
374
|
+
namespace
|
375
|
+
{
|
376
|
+
|
377
|
+
const ::std::string iceC_Ice_Router_getClientProxy_name = "getClientProxy";
|
378
|
+
|
379
|
+
const ::std::string iceC_Ice_Router_getServerProxy_name = "getServerProxy";
|
380
|
+
|
381
|
+
const ::std::string iceC_Ice_Router_addProxies_name = "addProxies";
|
382
|
+
|
383
|
+
const ::std::string iceC_Ice_RouterFinder_getRouter_name = "getRouter";
|
384
|
+
|
385
|
+
}
|
386
|
+
|
387
|
+
/// \cond INTERNAL
|
388
|
+
ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(Router* p) { return p; }
|
389
|
+
|
390
|
+
void
|
391
|
+
::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< Router>& v)
|
392
|
+
{
|
393
|
+
::Ice::ObjectPrx proxy;
|
394
|
+
istr->read(proxy);
|
395
|
+
if(!proxy)
|
218
396
|
{
|
219
|
-
|
220
|
-
__result->writeEmptyParams();
|
221
|
-
__result->invoke();
|
397
|
+
v = 0;
|
222
398
|
}
|
223
|
-
|
399
|
+
else
|
224
400
|
{
|
225
|
-
|
401
|
+
v = new Router;
|
402
|
+
v->_copyFrom(proxy);
|
226
403
|
}
|
227
|
-
return __result;
|
228
404
|
}
|
229
|
-
|
230
|
-
#ifdef ICE_CPP11
|
405
|
+
/// \endcond
|
231
406
|
|
232
407
|
::Ice::AsyncResultPtr
|
233
|
-
IceProxy::Ice::Router::
|
408
|
+
IceProxy::Ice::Router::_iceI_begin_getClientProxy(const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
|
234
409
|
{
|
235
|
-
|
410
|
+
_checkTwowayOnly(iceC_Ice_Router_getClientProxy_name, sync);
|
411
|
+
::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_Router_getClientProxy_name, del, cookie, sync);
|
412
|
+
try
|
413
|
+
{
|
414
|
+
result->prepare(iceC_Ice_Router_getClientProxy_name, ::Ice::Nonmutating, context);
|
415
|
+
result->writeEmptyParams();
|
416
|
+
result->invoke(iceC_Ice_Router_getClientProxy_name);
|
417
|
+
}
|
418
|
+
catch(const ::Ice::Exception& ex)
|
236
419
|
{
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
|
241
|
-
_response(responseFunc)
|
242
|
-
{
|
243
|
-
CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
|
244
|
-
}
|
245
|
-
|
246
|
-
virtual void completed(const ::Ice::AsyncResultPtr& __result) const
|
247
|
-
{
|
248
|
-
::Ice::RouterPrx __proxy = ::Ice::RouterPrx::uncheckedCast(__result->getProxy());
|
249
|
-
::Ice::ObjectPrx __ret;
|
250
|
-
try
|
251
|
-
{
|
252
|
-
__ret = __proxy->end_getServerProxy(__result);
|
253
|
-
}
|
254
|
-
catch(const ::Ice::Exception& ex)
|
255
|
-
{
|
256
|
-
Cpp11FnCallbackNC::exception(__result, ex);
|
257
|
-
return;
|
258
|
-
}
|
259
|
-
if(_response != nullptr)
|
260
|
-
{
|
261
|
-
_response(__ret);
|
262
|
-
}
|
263
|
-
}
|
264
|
-
|
265
|
-
private:
|
266
|
-
|
267
|
-
::std::function<void (const ::Ice::ObjectPrx&)> _response;
|
268
|
-
};
|
269
|
-
return begin_getServerProxy(__ctx, new Cpp11CB(__response, __exception, __sent));
|
420
|
+
result->abort(ex);
|
421
|
+
}
|
422
|
+
return result;
|
270
423
|
}
|
271
|
-
#endif
|
272
424
|
|
273
425
|
::Ice::ObjectPrx
|
274
|
-
IceProxy::Ice::Router::
|
426
|
+
IceProxy::Ice::Router::end_getClientProxy(IceUtil::Optional<bool>& iceP_hasRoutingTable, const ::Ice::AsyncResultPtr& result)
|
275
427
|
{
|
276
|
-
::Ice::AsyncResult::
|
277
|
-
::Ice::ObjectPrx
|
278
|
-
if(!
|
428
|
+
::Ice::AsyncResult::_check(result, this, iceC_Ice_Router_getClientProxy_name);
|
429
|
+
::Ice::ObjectPrx ret;
|
430
|
+
if(!result->_waitForResponse())
|
279
431
|
{
|
280
432
|
try
|
281
433
|
{
|
282
|
-
|
434
|
+
result->_throwUserException();
|
283
435
|
}
|
284
|
-
catch(const ::Ice::UserException&
|
436
|
+
catch(const ::Ice::UserException& ex)
|
285
437
|
{
|
286
|
-
throw ::Ice::UnknownUserException(__FILE__, __LINE__,
|
438
|
+
throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
|
287
439
|
}
|
288
440
|
}
|
289
|
-
::
|
290
|
-
|
291
|
-
|
292
|
-
|
441
|
+
::Ice::InputStream* istr = result->_startReadParams();
|
442
|
+
istr->read(ret);
|
443
|
+
istr->read(1, iceP_hasRoutingTable);
|
444
|
+
result->_endReadParams();
|
445
|
+
return ret;
|
293
446
|
}
|
294
447
|
|
295
|
-
::Ice::
|
296
|
-
IceProxy::Ice::Router::addProxies(const ::Ice::ObjectProxySeq& __p_proxies, const ::Ice::Context* __ctx)
|
448
|
+
void IceProxy::Ice::Router::_iceI_end_getClientProxy(IceUtil::Optional<bool>& iceP_hasRoutingTable, ::Ice::ObjectPrxPtr& ret, const ::Ice::AsyncResultPtr& result)
|
297
449
|
{
|
298
|
-
|
299
|
-
|
300
|
-
try
|
301
|
-
{
|
302
|
-
::IceInternal::BasicStream* __os = __og.startWriteParams(::Ice::DefaultFormat);
|
303
|
-
__os->write(__p_proxies);
|
304
|
-
__og.endWriteParams();
|
305
|
-
}
|
306
|
-
catch(const ::Ice::LocalException& __ex)
|
307
|
-
{
|
308
|
-
__og.abort(__ex);
|
309
|
-
}
|
310
|
-
if(!__og.invoke())
|
450
|
+
::Ice::AsyncResult::_check(result, this, iceC_Ice_Router_getClientProxy_name);
|
451
|
+
if(!result->_waitForResponse())
|
311
452
|
{
|
312
453
|
try
|
313
454
|
{
|
314
|
-
|
455
|
+
result->_throwUserException();
|
315
456
|
}
|
316
|
-
catch(const ::Ice::UserException&
|
457
|
+
catch(const ::Ice::UserException& ex)
|
317
458
|
{
|
318
|
-
::Ice::UnknownUserException
|
319
|
-
throw __uue;
|
459
|
+
throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
|
320
460
|
}
|
321
461
|
}
|
322
|
-
::Ice::
|
323
|
-
|
324
|
-
|
325
|
-
|
326
|
-
return __ret;
|
462
|
+
::Ice::InputStream* istr = result->_startReadParams();
|
463
|
+
istr->read(ret);
|
464
|
+
istr->read(1, iceP_hasRoutingTable);
|
465
|
+
result->_endReadParams();
|
327
466
|
}
|
328
467
|
|
329
468
|
::Ice::AsyncResultPtr
|
330
|
-
IceProxy::Ice::Router::
|
469
|
+
IceProxy::Ice::Router::_iceI_begin_getServerProxy(const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
|
331
470
|
{
|
332
|
-
|
333
|
-
::IceInternal::OutgoingAsyncPtr
|
471
|
+
_checkTwowayOnly(iceC_Ice_Router_getServerProxy_name, sync);
|
472
|
+
::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_Router_getServerProxy_name, del, cookie, sync);
|
334
473
|
try
|
335
474
|
{
|
336
|
-
|
337
|
-
|
338
|
-
|
339
|
-
__result->endWriteParams();
|
340
|
-
__result->invoke();
|
475
|
+
result->prepare(iceC_Ice_Router_getServerProxy_name, ::Ice::Nonmutating, context);
|
476
|
+
result->writeEmptyParams();
|
477
|
+
result->invoke(iceC_Ice_Router_getServerProxy_name);
|
341
478
|
}
|
342
|
-
catch(const ::Ice::Exception&
|
479
|
+
catch(const ::Ice::Exception& ex)
|
343
480
|
{
|
344
|
-
|
481
|
+
result->abort(ex);
|
345
482
|
}
|
346
|
-
return
|
483
|
+
return result;
|
347
484
|
}
|
348
485
|
|
349
|
-
|
486
|
+
::Ice::ObjectPrx
|
487
|
+
IceProxy::Ice::Router::end_getServerProxy(const ::Ice::AsyncResultPtr& result)
|
488
|
+
{
|
489
|
+
::Ice::AsyncResult::_check(result, this, iceC_Ice_Router_getServerProxy_name);
|
490
|
+
::Ice::ObjectPrx ret;
|
491
|
+
if(!result->_waitForResponse())
|
492
|
+
{
|
493
|
+
try
|
494
|
+
{
|
495
|
+
result->_throwUserException();
|
496
|
+
}
|
497
|
+
catch(const ::Ice::UserException& ex)
|
498
|
+
{
|
499
|
+
throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
|
500
|
+
}
|
501
|
+
}
|
502
|
+
::Ice::InputStream* istr = result->_startReadParams();
|
503
|
+
istr->read(ret);
|
504
|
+
result->_endReadParams();
|
505
|
+
return ret;
|
506
|
+
}
|
350
507
|
|
351
508
|
::Ice::AsyncResultPtr
|
352
|
-
IceProxy::Ice::Router::
|
509
|
+
IceProxy::Ice::Router::_iceI_begin_addProxies(const ::Ice::ObjectProxySeq& iceP_proxies, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
|
353
510
|
{
|
354
|
-
|
511
|
+
_checkTwowayOnly(iceC_Ice_Router_addProxies_name, sync);
|
512
|
+
::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_Router_addProxies_name, del, cookie, sync);
|
513
|
+
try
|
514
|
+
{
|
515
|
+
result->prepare(iceC_Ice_Router_addProxies_name, ::Ice::Idempotent, context);
|
516
|
+
::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
|
517
|
+
ostr->write(iceP_proxies);
|
518
|
+
result->endWriteParams();
|
519
|
+
result->invoke(iceC_Ice_Router_addProxies_name);
|
520
|
+
}
|
521
|
+
catch(const ::Ice::Exception& ex)
|
355
522
|
{
|
356
|
-
|
357
|
-
|
358
|
-
|
359
|
-
::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
|
360
|
-
_response(responseFunc)
|
361
|
-
{
|
362
|
-
CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
|
363
|
-
}
|
364
|
-
|
365
|
-
virtual void completed(const ::Ice::AsyncResultPtr& __result) const
|
366
|
-
{
|
367
|
-
::Ice::RouterPrx __proxy = ::Ice::RouterPrx::uncheckedCast(__result->getProxy());
|
368
|
-
::Ice::ObjectProxySeq __ret;
|
369
|
-
try
|
370
|
-
{
|
371
|
-
__ret = __proxy->end_addProxies(__result);
|
372
|
-
}
|
373
|
-
catch(const ::Ice::Exception& ex)
|
374
|
-
{
|
375
|
-
Cpp11FnCallbackNC::exception(__result, ex);
|
376
|
-
return;
|
377
|
-
}
|
378
|
-
if(_response != nullptr)
|
379
|
-
{
|
380
|
-
_response(__ret);
|
381
|
-
}
|
382
|
-
}
|
383
|
-
|
384
|
-
private:
|
385
|
-
|
386
|
-
::std::function<void (const ::Ice::ObjectProxySeq&)> _response;
|
387
|
-
};
|
388
|
-
return begin_addProxies(__p_proxies, __ctx, new Cpp11CB(__response, __exception, __sent));
|
523
|
+
result->abort(ex);
|
524
|
+
}
|
525
|
+
return result;
|
389
526
|
}
|
390
|
-
#endif
|
391
527
|
|
392
528
|
::Ice::ObjectProxySeq
|
393
|
-
IceProxy::Ice::Router::end_addProxies(const ::Ice::AsyncResultPtr&
|
529
|
+
IceProxy::Ice::Router::end_addProxies(const ::Ice::AsyncResultPtr& result)
|
394
530
|
{
|
395
|
-
::Ice::AsyncResult::
|
396
|
-
::Ice::ObjectProxySeq
|
397
|
-
if(!
|
531
|
+
::Ice::AsyncResult::_check(result, this, iceC_Ice_Router_addProxies_name);
|
532
|
+
::Ice::ObjectProxySeq ret;
|
533
|
+
if(!result->_waitForResponse())
|
398
534
|
{
|
399
535
|
try
|
400
536
|
{
|
401
|
-
|
537
|
+
result->_throwUserException();
|
402
538
|
}
|
403
|
-
catch(const ::Ice::UserException&
|
539
|
+
catch(const ::Ice::UserException& ex)
|
404
540
|
{
|
405
|
-
throw ::Ice::UnknownUserException(__FILE__, __LINE__,
|
541
|
+
throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
|
406
542
|
}
|
407
543
|
}
|
408
|
-
::
|
409
|
-
|
410
|
-
|
411
|
-
return
|
544
|
+
::Ice::InputStream* istr = result->_startReadParams();
|
545
|
+
istr->read(ret);
|
546
|
+
result->_endReadParams();
|
547
|
+
return ret;
|
412
548
|
}
|
413
549
|
|
550
|
+
/// \cond INTERNAL
|
551
|
+
::IceProxy::Ice::Object*
|
552
|
+
IceProxy::Ice::Router::_newInstance() const
|
553
|
+
{
|
554
|
+
return new Router;
|
555
|
+
}
|
556
|
+
/// \endcond
|
557
|
+
|
414
558
|
const ::std::string&
|
415
559
|
IceProxy::Ice::Router::ice_staticId()
|
416
560
|
{
|
417
561
|
return ::Ice::Router::ice_staticId();
|
418
562
|
}
|
419
563
|
|
420
|
-
|
421
|
-
IceProxy::Ice::
|
422
|
-
{
|
423
|
-
return new Router;
|
424
|
-
}
|
425
|
-
#ifdef __SUNPRO_CC
|
426
|
-
class ICE_API IceProxy::Ice::RouterFinder;
|
427
|
-
#endif
|
428
|
-
ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::RouterFinder* p) { return p; }
|
564
|
+
/// \cond INTERNAL
|
565
|
+
ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(RouterFinder* p) { return p; }
|
429
566
|
|
430
567
|
void
|
431
|
-
::IceProxy::Ice::
|
568
|
+
::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< RouterFinder>& v)
|
432
569
|
{
|
433
570
|
::Ice::ObjectPrx proxy;
|
434
|
-
|
571
|
+
istr->read(proxy);
|
435
572
|
if(!proxy)
|
436
573
|
{
|
437
574
|
v = 0;
|
438
575
|
}
|
439
576
|
else
|
440
577
|
{
|
441
|
-
v = new
|
442
|
-
v->
|
578
|
+
v = new RouterFinder;
|
579
|
+
v->_copyFrom(proxy);
|
443
580
|
}
|
444
581
|
}
|
445
|
-
|
446
|
-
::Ice::RouterPrx
|
447
|
-
IceProxy::Ice::RouterFinder::getRouter(const ::Ice::Context* __ctx)
|
448
|
-
{
|
449
|
-
__checkTwowayOnly(__Ice__RouterFinder__getRouter_name);
|
450
|
-
::IceInternal::Outgoing __og(this, __Ice__RouterFinder__getRouter_name, ::Ice::Normal, __ctx);
|
451
|
-
__og.writeEmptyParams();
|
452
|
-
if(!__og.invoke())
|
453
|
-
{
|
454
|
-
try
|
455
|
-
{
|
456
|
-
__og.throwUserException();
|
457
|
-
}
|
458
|
-
catch(const ::Ice::UserException& __ex)
|
459
|
-
{
|
460
|
-
::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
|
461
|
-
throw __uue;
|
462
|
-
}
|
463
|
-
}
|
464
|
-
::Ice::RouterPrx __ret;
|
465
|
-
::IceInternal::BasicStream* __is = __og.startReadParams();
|
466
|
-
__is->read(__ret);
|
467
|
-
__og.endReadParams();
|
468
|
-
return __ret;
|
469
|
-
}
|
582
|
+
/// \endcond
|
470
583
|
|
471
584
|
::Ice::AsyncResultPtr
|
472
|
-
IceProxy::Ice::RouterFinder::
|
585
|
+
IceProxy::Ice::RouterFinder::_iceI_begin_getRouter(const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
|
473
586
|
{
|
474
|
-
|
475
|
-
::IceInternal::OutgoingAsyncPtr
|
587
|
+
_checkTwowayOnly(iceC_Ice_RouterFinder_getRouter_name, sync);
|
588
|
+
::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_RouterFinder_getRouter_name, del, cookie, sync);
|
476
589
|
try
|
477
590
|
{
|
478
|
-
|
479
|
-
|
480
|
-
|
591
|
+
result->prepare(iceC_Ice_RouterFinder_getRouter_name, ::Ice::Normal, context);
|
592
|
+
result->writeEmptyParams();
|
593
|
+
result->invoke(iceC_Ice_RouterFinder_getRouter_name);
|
481
594
|
}
|
482
|
-
catch(const ::Ice::Exception&
|
595
|
+
catch(const ::Ice::Exception& ex)
|
483
596
|
{
|
484
|
-
|
597
|
+
result->abort(ex);
|
485
598
|
}
|
486
|
-
return
|
487
|
-
}
|
488
|
-
|
489
|
-
#ifdef ICE_CPP11
|
490
|
-
|
491
|
-
::Ice::AsyncResultPtr
|
492
|
-
IceProxy::Ice::RouterFinder::__begin_getRouter(const ::Ice::Context* __ctx, const ::IceInternal::Function<void (const ::Ice::RouterPrx&)>& __response, const ::IceInternal::Function<void (const ::Ice::Exception&)>& __exception, const ::IceInternal::Function<void (bool)>& __sent)
|
493
|
-
{
|
494
|
-
class Cpp11CB : public ::IceInternal::Cpp11FnCallbackNC
|
495
|
-
{
|
496
|
-
public:
|
497
|
-
|
498
|
-
Cpp11CB(const ::std::function<void (const ::Ice::RouterPrx&)>& responseFunc, const ::std::function<void (const ::Ice::Exception&)>& exceptionFunc, const ::std::function<void (bool)>& sentFunc) :
|
499
|
-
::IceInternal::Cpp11FnCallbackNC(exceptionFunc, sentFunc),
|
500
|
-
_response(responseFunc)
|
501
|
-
{
|
502
|
-
CallbackBase::checkCallback(true, responseFunc || exceptionFunc != nullptr);
|
503
|
-
}
|
504
|
-
|
505
|
-
virtual void completed(const ::Ice::AsyncResultPtr& __result) const
|
506
|
-
{
|
507
|
-
::Ice::RouterFinderPrx __proxy = ::Ice::RouterFinderPrx::uncheckedCast(__result->getProxy());
|
508
|
-
::Ice::RouterPrx __ret;
|
509
|
-
try
|
510
|
-
{
|
511
|
-
__ret = __proxy->end_getRouter(__result);
|
512
|
-
}
|
513
|
-
catch(const ::Ice::Exception& ex)
|
514
|
-
{
|
515
|
-
Cpp11FnCallbackNC::exception(__result, ex);
|
516
|
-
return;
|
517
|
-
}
|
518
|
-
if(_response != nullptr)
|
519
|
-
{
|
520
|
-
_response(__ret);
|
521
|
-
}
|
522
|
-
}
|
523
|
-
|
524
|
-
private:
|
525
|
-
|
526
|
-
::std::function<void (const ::Ice::RouterPrx&)> _response;
|
527
|
-
};
|
528
|
-
return begin_getRouter(__ctx, new Cpp11CB(__response, __exception, __sent));
|
599
|
+
return result;
|
529
600
|
}
|
530
|
-
#endif
|
531
601
|
|
532
602
|
::Ice::RouterPrx
|
533
|
-
IceProxy::Ice::RouterFinder::end_getRouter(const ::Ice::AsyncResultPtr&
|
603
|
+
IceProxy::Ice::RouterFinder::end_getRouter(const ::Ice::AsyncResultPtr& result)
|
534
604
|
{
|
535
|
-
::Ice::AsyncResult::
|
536
|
-
::Ice::RouterPrx
|
537
|
-
if(!
|
605
|
+
::Ice::AsyncResult::_check(result, this, iceC_Ice_RouterFinder_getRouter_name);
|
606
|
+
::Ice::RouterPrx ret;
|
607
|
+
if(!result->_waitForResponse())
|
538
608
|
{
|
539
609
|
try
|
540
610
|
{
|
541
|
-
|
611
|
+
result->_throwUserException();
|
542
612
|
}
|
543
|
-
catch(const ::Ice::UserException&
|
613
|
+
catch(const ::Ice::UserException& ex)
|
544
614
|
{
|
545
|
-
throw ::Ice::UnknownUserException(__FILE__, __LINE__,
|
615
|
+
throw ::Ice::UnknownUserException(__FILE__, __LINE__, ex.ice_id());
|
546
616
|
}
|
547
617
|
}
|
548
|
-
::
|
549
|
-
|
550
|
-
|
551
|
-
return
|
618
|
+
::Ice::InputStream* istr = result->_startReadParams();
|
619
|
+
istr->read(ret);
|
620
|
+
result->_endReadParams();
|
621
|
+
return ret;
|
552
622
|
}
|
553
623
|
|
624
|
+
/// \cond INTERNAL
|
625
|
+
::IceProxy::Ice::Object*
|
626
|
+
IceProxy::Ice::RouterFinder::_newInstance() const
|
627
|
+
{
|
628
|
+
return new RouterFinder;
|
629
|
+
}
|
630
|
+
/// \endcond
|
631
|
+
|
554
632
|
const ::std::string&
|
555
633
|
IceProxy::Ice::RouterFinder::ice_staticId()
|
556
634
|
{
|
557
635
|
return ::Ice::RouterFinder::ice_staticId();
|
558
636
|
}
|
559
637
|
|
560
|
-
|
561
|
-
IceProxy::Ice::RouterFinder::__newInstance() const
|
638
|
+
Ice::Router::~Router()
|
562
639
|
{
|
563
|
-
return new RouterFinder;
|
564
640
|
}
|
565
641
|
|
566
|
-
|
642
|
+
/// \cond INTERNAL
|
643
|
+
ICE_API ::Ice::Object* Ice::upCast(Router* p) { return p; }
|
644
|
+
|
645
|
+
/// \endcond
|
567
646
|
|
568
647
|
namespace
|
569
648
|
{
|
570
|
-
const ::std::string
|
649
|
+
const ::std::string iceC_Ice_Router_ids[2] =
|
571
650
|
{
|
572
651
|
"::Ice::Object",
|
573
652
|
"::Ice::Router"
|
@@ -576,21 +655,21 @@ const ::std::string __Ice__Router_ids[2] =
|
|
576
655
|
}
|
577
656
|
|
578
657
|
bool
|
579
|
-
Ice::Router::ice_isA(const ::std::string&
|
658
|
+
Ice::Router::ice_isA(const ::std::string& s, const Current&) const
|
580
659
|
{
|
581
|
-
return ::std::binary_search(
|
660
|
+
return ::std::binary_search(iceC_Ice_Router_ids, iceC_Ice_Router_ids + 2, s);
|
582
661
|
}
|
583
662
|
|
584
663
|
::std::vector< ::std::string>
|
585
|
-
Ice::Router::ice_ids(const
|
664
|
+
Ice::Router::ice_ids(const Current&) const
|
586
665
|
{
|
587
|
-
return ::std::vector< ::std::string>(&
|
666
|
+
return ::std::vector< ::std::string>(&iceC_Ice_Router_ids[0], &iceC_Ice_Router_ids[2]);
|
588
667
|
}
|
589
668
|
|
590
669
|
const ::std::string&
|
591
|
-
Ice::Router::ice_id(const
|
670
|
+
Ice::Router::ice_id(const Current&) const
|
592
671
|
{
|
593
|
-
return
|
672
|
+
return ice_staticId();
|
594
673
|
}
|
595
674
|
|
596
675
|
const ::std::string&
|
@@ -600,52 +679,60 @@ Ice::Router::ice_staticId()
|
|
600
679
|
static const ::std::string typeId = "::Ice::Router";
|
601
680
|
return typeId;
|
602
681
|
#else
|
603
|
-
return
|
682
|
+
return iceC_Ice_Router_ids[1];
|
604
683
|
#endif
|
605
684
|
}
|
606
685
|
|
607
|
-
|
608
|
-
|
686
|
+
/// \cond INTERNAL
|
687
|
+
bool
|
688
|
+
Ice::Router::_iceD_getClientProxy(::IceInternal::Incoming& inS, const Current& current) const
|
609
689
|
{
|
610
|
-
|
611
|
-
|
612
|
-
::
|
613
|
-
|
614
|
-
|
615
|
-
|
616
|
-
|
690
|
+
_iceCheckMode(::Ice::Idempotent, current.mode);
|
691
|
+
inS.readEmptyParams();
|
692
|
+
IceUtil::Optional<bool> iceP_hasRoutingTable;
|
693
|
+
ObjectPrx ret = this->getClientProxy(iceP_hasRoutingTable, current);
|
694
|
+
OutputStream* ostr = inS.startWriteParams();
|
695
|
+
ostr->write(ret);
|
696
|
+
ostr->write(1, iceP_hasRoutingTable);
|
697
|
+
inS.endWriteParams();
|
698
|
+
return true;
|
617
699
|
}
|
700
|
+
/// \endcond
|
618
701
|
|
619
|
-
|
620
|
-
|
702
|
+
/// \cond INTERNAL
|
703
|
+
bool
|
704
|
+
Ice::Router::_iceD_getServerProxy(::IceInternal::Incoming& inS, const Current& current) const
|
621
705
|
{
|
622
|
-
|
623
|
-
|
624
|
-
|
625
|
-
|
626
|
-
|
627
|
-
|
628
|
-
return
|
706
|
+
_iceCheckMode(::Ice::Idempotent, current.mode);
|
707
|
+
inS.readEmptyParams();
|
708
|
+
ObjectPrx ret = this->getServerProxy(current);
|
709
|
+
OutputStream* ostr = inS.startWriteParams();
|
710
|
+
ostr->write(ret);
|
711
|
+
inS.endWriteParams();
|
712
|
+
return true;
|
629
713
|
}
|
714
|
+
/// \endcond
|
630
715
|
|
631
|
-
|
632
|
-
|
716
|
+
/// \cond INTERNAL
|
717
|
+
bool
|
718
|
+
Ice::Router::_iceD_addProxies(::IceInternal::Incoming& inS, const Current& current)
|
633
719
|
{
|
634
|
-
|
635
|
-
|
636
|
-
|
637
|
-
|
638
|
-
|
639
|
-
|
640
|
-
|
641
|
-
|
642
|
-
|
643
|
-
return
|
720
|
+
_iceCheckMode(::Ice::Idempotent, current.mode);
|
721
|
+
InputStream* istr = inS.startReadParams();
|
722
|
+
ObjectProxySeq iceP_proxies;
|
723
|
+
istr->read(iceP_proxies);
|
724
|
+
inS.endReadParams();
|
725
|
+
ObjectProxySeq ret = this->addProxies(iceP_proxies, current);
|
726
|
+
OutputStream* ostr = inS.startWriteParams();
|
727
|
+
ostr->write(ret);
|
728
|
+
inS.endWriteParams();
|
729
|
+
return true;
|
644
730
|
}
|
731
|
+
/// \endcond
|
645
732
|
|
646
733
|
namespace
|
647
734
|
{
|
648
|
-
const ::std::string
|
735
|
+
const ::std::string iceC_Ice_Router_all[] =
|
649
736
|
{
|
650
737
|
"addProxies",
|
651
738
|
"getClientProxy",
|
@@ -658,80 +745,97 @@ const ::std::string __Ice__Router_all[] =
|
|
658
745
|
|
659
746
|
}
|
660
747
|
|
661
|
-
|
662
|
-
|
748
|
+
/// \cond INTERNAL
|
749
|
+
bool
|
750
|
+
Ice::Router::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
|
663
751
|
{
|
664
|
-
::std::pair<
|
752
|
+
::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_Router_all, iceC_Ice_Router_all + 7, current.operation);
|
665
753
|
if(r.first == r.second)
|
666
754
|
{
|
667
|
-
throw
|
755
|
+
throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
668
756
|
}
|
669
757
|
|
670
|
-
switch(r.first -
|
758
|
+
switch(r.first - iceC_Ice_Router_all)
|
671
759
|
{
|
672
760
|
case 0:
|
673
761
|
{
|
674
|
-
return
|
762
|
+
return _iceD_addProxies(in, current);
|
675
763
|
}
|
676
764
|
case 1:
|
677
765
|
{
|
678
|
-
return
|
766
|
+
return _iceD_getClientProxy(in, current);
|
679
767
|
}
|
680
768
|
case 2:
|
681
769
|
{
|
682
|
-
return
|
770
|
+
return _iceD_getServerProxy(in, current);
|
683
771
|
}
|
684
772
|
case 3:
|
685
773
|
{
|
686
|
-
return
|
774
|
+
return _iceD_ice_id(in, current);
|
687
775
|
}
|
688
776
|
case 4:
|
689
777
|
{
|
690
|
-
return
|
778
|
+
return _iceD_ice_ids(in, current);
|
691
779
|
}
|
692
780
|
case 5:
|
693
781
|
{
|
694
|
-
return
|
782
|
+
return _iceD_ice_isA(in, current);
|
695
783
|
}
|
696
784
|
case 6:
|
697
785
|
{
|
698
|
-
return
|
786
|
+
return _iceD_ice_ping(in, current);
|
787
|
+
}
|
788
|
+
default:
|
789
|
+
{
|
790
|
+
assert(false);
|
791
|
+
throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
699
792
|
}
|
700
793
|
}
|
701
|
-
|
702
|
-
assert(false);
|
703
|
-
throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
704
794
|
}
|
795
|
+
/// \endcond
|
705
796
|
|
797
|
+
/// \cond STREAM
|
706
798
|
void
|
707
|
-
Ice::Router::
|
799
|
+
Ice::Router::_iceWriteImpl(OutputStream* ostr) const
|
708
800
|
{
|
709
|
-
|
710
|
-
|
801
|
+
ostr->startSlice(ice_staticId(), -1, true);
|
802
|
+
StreamWriter< Router, OutputStream>::write(ostr, *this);
|
803
|
+
ostr->endSlice();
|
711
804
|
}
|
712
805
|
|
713
806
|
void
|
714
|
-
Ice::Router::
|
807
|
+
Ice::Router::_iceReadImpl(InputStream* istr)
|
715
808
|
{
|
716
|
-
|
717
|
-
|
809
|
+
istr->startSlice();
|
810
|
+
StreamReader< Router, InputStream>::read(istr, *this);
|
811
|
+
istr->endSlice();
|
718
812
|
}
|
813
|
+
/// \endcond
|
719
814
|
|
720
|
-
|
721
|
-
|
815
|
+
/// \cond INTERNAL
|
816
|
+
void
|
817
|
+
Ice::_icePatchObjectPtr(RouterPtr& handle, const ObjectPtr& v)
|
722
818
|
{
|
723
|
-
handle =
|
819
|
+
handle = RouterPtr::dynamicCast(v);
|
724
820
|
if(v && !handle)
|
725
821
|
{
|
726
|
-
IceInternal::Ex::throwUOE(
|
822
|
+
IceInternal::Ex::throwUOE(Router::ice_staticId(), v);
|
727
823
|
}
|
728
824
|
}
|
825
|
+
/// \endcond
|
826
|
+
|
827
|
+
Ice::RouterFinder::~RouterFinder()
|
828
|
+
{
|
829
|
+
}
|
729
830
|
|
730
|
-
|
831
|
+
/// \cond INTERNAL
|
832
|
+
ICE_API ::Ice::Object* Ice::upCast(RouterFinder* p) { return p; }
|
833
|
+
|
834
|
+
/// \endcond
|
731
835
|
|
732
836
|
namespace
|
733
837
|
{
|
734
|
-
const ::std::string
|
838
|
+
const ::std::string iceC_Ice_RouterFinder_ids[2] =
|
735
839
|
{
|
736
840
|
"::Ice::Object",
|
737
841
|
"::Ice::RouterFinder"
|
@@ -740,21 +844,21 @@ const ::std::string __Ice__RouterFinder_ids[2] =
|
|
740
844
|
}
|
741
845
|
|
742
846
|
bool
|
743
|
-
Ice::RouterFinder::ice_isA(const ::std::string&
|
847
|
+
Ice::RouterFinder::ice_isA(const ::std::string& s, const Current&) const
|
744
848
|
{
|
745
|
-
return ::std::binary_search(
|
849
|
+
return ::std::binary_search(iceC_Ice_RouterFinder_ids, iceC_Ice_RouterFinder_ids + 2, s);
|
746
850
|
}
|
747
851
|
|
748
852
|
::std::vector< ::std::string>
|
749
|
-
Ice::RouterFinder::ice_ids(const
|
853
|
+
Ice::RouterFinder::ice_ids(const Current&) const
|
750
854
|
{
|
751
|
-
return ::std::vector< ::std::string>(&
|
855
|
+
return ::std::vector< ::std::string>(&iceC_Ice_RouterFinder_ids[0], &iceC_Ice_RouterFinder_ids[2]);
|
752
856
|
}
|
753
857
|
|
754
858
|
const ::std::string&
|
755
|
-
Ice::RouterFinder::ice_id(const
|
859
|
+
Ice::RouterFinder::ice_id(const Current&) const
|
756
860
|
{
|
757
|
-
return
|
861
|
+
return ice_staticId();
|
758
862
|
}
|
759
863
|
|
760
864
|
const ::std::string&
|
@@ -764,25 +868,27 @@ Ice::RouterFinder::ice_staticId()
|
|
764
868
|
static const ::std::string typeId = "::Ice::RouterFinder";
|
765
869
|
return typeId;
|
766
870
|
#else
|
767
|
-
return
|
871
|
+
return iceC_Ice_RouterFinder_ids[1];
|
768
872
|
#endif
|
769
873
|
}
|
770
874
|
|
771
|
-
|
772
|
-
|
875
|
+
/// \cond INTERNAL
|
876
|
+
bool
|
877
|
+
Ice::RouterFinder::_iceD_getRouter(::IceInternal::Incoming& inS, const Current& current)
|
773
878
|
{
|
774
|
-
|
775
|
-
|
776
|
-
|
777
|
-
|
778
|
-
|
779
|
-
|
780
|
-
return
|
879
|
+
_iceCheckMode(::Ice::Normal, current.mode);
|
880
|
+
inS.readEmptyParams();
|
881
|
+
RouterPrx ret = this->getRouter(current);
|
882
|
+
OutputStream* ostr = inS.startWriteParams();
|
883
|
+
ostr->write(ret);
|
884
|
+
inS.endWriteParams();
|
885
|
+
return true;
|
781
886
|
}
|
887
|
+
/// \endcond
|
782
888
|
|
783
889
|
namespace
|
784
890
|
{
|
785
|
-
const ::std::string
|
891
|
+
const ::std::string iceC_Ice_RouterFinder_all[] =
|
786
892
|
{
|
787
893
|
"getRouter",
|
788
894
|
"ice_id",
|
@@ -793,63 +899,79 @@ const ::std::string __Ice__RouterFinder_all[] =
|
|
793
899
|
|
794
900
|
}
|
795
901
|
|
796
|
-
|
797
|
-
|
902
|
+
/// \cond INTERNAL
|
903
|
+
bool
|
904
|
+
Ice::RouterFinder::_iceDispatch(::IceInternal::Incoming& in, const Current& current)
|
798
905
|
{
|
799
|
-
::std::pair<
|
906
|
+
::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_RouterFinder_all, iceC_Ice_RouterFinder_all + 5, current.operation);
|
800
907
|
if(r.first == r.second)
|
801
908
|
{
|
802
|
-
throw
|
909
|
+
throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
803
910
|
}
|
804
911
|
|
805
|
-
switch(r.first -
|
912
|
+
switch(r.first - iceC_Ice_RouterFinder_all)
|
806
913
|
{
|
807
914
|
case 0:
|
808
915
|
{
|
809
|
-
return
|
916
|
+
return _iceD_getRouter(in, current);
|
810
917
|
}
|
811
918
|
case 1:
|
812
919
|
{
|
813
|
-
return
|
920
|
+
return _iceD_ice_id(in, current);
|
814
921
|
}
|
815
922
|
case 2:
|
816
923
|
{
|
817
|
-
return
|
924
|
+
return _iceD_ice_ids(in, current);
|
818
925
|
}
|
819
926
|
case 3:
|
820
927
|
{
|
821
|
-
return
|
928
|
+
return _iceD_ice_isA(in, current);
|
822
929
|
}
|
823
930
|
case 4:
|
824
931
|
{
|
825
|
-
return
|
932
|
+
return _iceD_ice_ping(in, current);
|
933
|
+
}
|
934
|
+
default:
|
935
|
+
{
|
936
|
+
assert(false);
|
937
|
+
throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
826
938
|
}
|
827
939
|
}
|
828
|
-
|
829
|
-
assert(false);
|
830
|
-
throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
831
940
|
}
|
941
|
+
/// \endcond
|
832
942
|
|
943
|
+
/// \cond STREAM
|
833
944
|
void
|
834
|
-
Ice::RouterFinder::
|
945
|
+
Ice::RouterFinder::_iceWriteImpl(OutputStream* ostr) const
|
835
946
|
{
|
836
|
-
|
837
|
-
|
947
|
+
ostr->startSlice(ice_staticId(), -1, true);
|
948
|
+
StreamWriter< RouterFinder, OutputStream>::write(ostr, *this);
|
949
|
+
ostr->endSlice();
|
838
950
|
}
|
839
951
|
|
840
952
|
void
|
841
|
-
Ice::RouterFinder::
|
953
|
+
Ice::RouterFinder::_iceReadImpl(InputStream* istr)
|
842
954
|
{
|
843
|
-
|
844
|
-
|
955
|
+
istr->startSlice();
|
956
|
+
StreamReader< RouterFinder, InputStream>::read(istr, *this);
|
957
|
+
istr->endSlice();
|
845
958
|
}
|
959
|
+
/// \endcond
|
846
960
|
|
847
|
-
|
848
|
-
|
961
|
+
/// \cond INTERNAL
|
962
|
+
void
|
963
|
+
Ice::_icePatchObjectPtr(RouterFinderPtr& handle, const ObjectPtr& v)
|
849
964
|
{
|
850
|
-
handle =
|
965
|
+
handle = RouterFinderPtr::dynamicCast(v);
|
851
966
|
if(v && !handle)
|
852
967
|
{
|
853
|
-
IceInternal::Ex::throwUOE(
|
968
|
+
IceInternal::Ex::throwUOE(RouterFinder::ice_staticId(), v);
|
854
969
|
}
|
855
970
|
}
|
971
|
+
/// \endcond
|
972
|
+
|
973
|
+
namespace Ice
|
974
|
+
{
|
975
|
+
}
|
976
|
+
|
977
|
+
#endif
|