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_COLLOCATED_REQUEST_HANDLER_H
|
11
6
|
#define ICE_COLLOCATED_REQUEST_HANDLER_H
|
@@ -15,7 +10,7 @@
|
|
15
10
|
|
16
11
|
#include <Ice/RequestHandler.h>
|
17
12
|
#include <Ice/ResponseHandler.h>
|
18
|
-
#include <Ice/
|
13
|
+
#include <Ice/OutputStream.h>
|
19
14
|
#include <Ice/ObjectAdapterF.h>
|
20
15
|
#include <Ice/LoggerF.h>
|
21
16
|
#include <Ice/TraceLevelsF.h>
|
@@ -24,19 +19,19 @@ namespace Ice
|
|
24
19
|
{
|
25
20
|
|
26
21
|
class ObjectAdapterI;
|
27
|
-
|
22
|
+
ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI);
|
28
23
|
|
29
24
|
}
|
30
25
|
|
31
26
|
namespace IceInternal
|
32
27
|
{
|
33
28
|
|
34
|
-
class OutgoingBase;
|
35
|
-
class Outgoing;
|
36
29
|
class OutgoingAsyncBase;
|
37
30
|
class OutgoingAsync;
|
38
31
|
|
39
|
-
class CollocatedRequestHandler : public RequestHandler,
|
32
|
+
class CollocatedRequestHandler : public RequestHandler,
|
33
|
+
public ResponseHandler,
|
34
|
+
private IceUtil::Monitor<IceUtil::Mutex>
|
40
35
|
{
|
41
36
|
public:
|
42
37
|
|
@@ -45,13 +40,11 @@ public:
|
|
45
40
|
|
46
41
|
virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&);
|
47
42
|
|
48
|
-
virtual bool sendRequest(ProxyOutgoingBase*);
|
49
43
|
virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&);
|
50
44
|
|
51
|
-
virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&);
|
52
45
|
virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&);
|
53
46
|
|
54
|
-
virtual void sendResponse(Ice::Int,
|
47
|
+
virtual void sendResponse(Ice::Int, Ice::OutputStream*, Ice::Byte, bool);
|
55
48
|
virtual void sendNoResponse();
|
56
49
|
virtual bool systemException(Ice::Int, const Ice::SystemException&, bool);
|
57
50
|
virtual void invokeException(Ice::Int, const Ice::LocalException&, int, bool);
|
@@ -61,13 +54,18 @@ public:
|
|
61
54
|
virtual Ice::ConnectionIPtr getConnection();
|
62
55
|
virtual Ice::ConnectionIPtr waitForConnection();
|
63
56
|
|
64
|
-
|
65
|
-
AsyncStatus invokeAsyncRequest(OutgoingAsyncBase*, int);
|
57
|
+
AsyncStatus invokeAsyncRequest(OutgoingAsyncBase*, int, bool);
|
66
58
|
|
67
|
-
bool sent(OutgoingBase*);
|
68
59
|
bool sentAsync(OutgoingAsyncBase*);
|
69
60
|
|
70
|
-
void invokeAll(
|
61
|
+
void invokeAll(Ice::OutputStream*, Ice::Int, Ice::Int);
|
62
|
+
|
63
|
+
#ifdef ICE_CPP11_MAPPING
|
64
|
+
std::shared_ptr<CollocatedRequestHandler> shared_from_this()
|
65
|
+
{
|
66
|
+
return std::static_pointer_cast<CollocatedRequestHandler>(ResponseHandler::shared_from_this());
|
67
|
+
}
|
68
|
+
#endif
|
71
69
|
|
72
70
|
private:
|
73
71
|
|
@@ -79,14 +77,10 @@ private:
|
|
79
77
|
const TraceLevelsPtr _traceLevels;
|
80
78
|
|
81
79
|
int _requestId;
|
82
|
-
|
83
|
-
std::map<OutgoingBase*, Ice::Int> _sendRequests;
|
84
80
|
std::map<OutgoingAsyncBasePtr, Ice::Int> _sendAsyncRequests;
|
85
|
-
|
86
|
-
std::map<Ice::Int, OutgoingBase*> _requests;
|
87
81
|
std::map<Ice::Int, OutgoingAsyncBasePtr> _asyncRequests;
|
88
82
|
};
|
89
|
-
|
83
|
+
ICE_DEFINE_PTR(CollocatedRequestHandlerPtr, CollocatedRequestHandler);
|
90
84
|
|
91
85
|
}
|
92
86
|
|
@@ -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,28 +19,61 @@
|
|
24
19
|
#include <Ice/Communicator.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>
|
26
|
+
#include <Ice/LocalException.h>
|
32
27
|
#include <IceUtil/PopDisableWarnings.h>
|
33
28
|
|
29
|
+
#if defined(_MSC_VER)
|
30
|
+
# pragma warning(disable:4458) // declaration of ... hides class member
|
31
|
+
#elif defined(__clang__)
|
32
|
+
# pragma clang diagnostic ignored "-Wshadow"
|
33
|
+
#elif defined(__GNUC__)
|
34
|
+
# pragma GCC diagnostic ignored "-Wshadow"
|
35
|
+
#endif
|
36
|
+
|
34
37
|
#ifndef ICE_IGNORE_VERSION
|
35
|
-
# if ICE_INT_VERSION / 100 !=
|
38
|
+
# if ICE_INT_VERSION / 100 != 307
|
36
39
|
# error Ice version mismatch!
|
37
40
|
# endif
|
38
|
-
# if ICE_INT_VERSION % 100
|
41
|
+
# if ICE_INT_VERSION % 100 >= 50
|
39
42
|
# error Beta header file detected
|
40
43
|
# endif
|
41
|
-
# if ICE_INT_VERSION % 100 <
|
44
|
+
# if ICE_INT_VERSION % 100 < 4
|
42
45
|
# error Ice patch level mismatch!
|
43
46
|
# endif
|
44
47
|
#endif
|
45
48
|
|
49
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
50
|
+
|
51
|
+
namespace
|
52
|
+
{
|
53
|
+
|
54
|
+
}
|
55
|
+
|
56
|
+
Ice::Communicator::~Communicator()
|
57
|
+
{
|
58
|
+
}
|
59
|
+
|
60
|
+
#else // C++98 mapping
|
61
|
+
|
46
62
|
namespace
|
47
63
|
{
|
48
64
|
|
49
65
|
}
|
50
66
|
|
51
|
-
|
67
|
+
Ice::Communicator::~Communicator()
|
68
|
+
{
|
69
|
+
}
|
70
|
+
|
71
|
+
/// \cond INTERNAL
|
72
|
+
ICE_API ::Ice::LocalObject* Ice::upCast(Communicator* p) { return p; }
|
73
|
+
/// \endcond
|
74
|
+
|
75
|
+
namespace Ice
|
76
|
+
{
|
77
|
+
}
|
78
|
+
|
79
|
+
#endif
|
@@ -1,13 +1,8 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
4
|
//
|
8
|
-
//
|
9
|
-
//
|
10
|
-
// Ice version 3.6.5
|
5
|
+
// Ice version 3.7.4
|
11
6
|
//
|
12
7
|
// <auto-generated>
|
13
8
|
//
|
@@ -23,22 +18,44 @@
|
|
23
18
|
#endif
|
24
19
|
#include <Ice/CommunicatorF.h>
|
25
20
|
#include <IceUtil/PushDisableWarnings.h>
|
26
|
-
#include <IceUtil/Iterator.h>
|
27
21
|
#include <IceUtil/PopDisableWarnings.h>
|
28
22
|
|
23
|
+
#if defined(_MSC_VER)
|
24
|
+
# pragma warning(disable:4458) // declaration of ... hides class member
|
25
|
+
#elif defined(__clang__)
|
26
|
+
# pragma clang diagnostic ignored "-Wshadow"
|
27
|
+
#elif defined(__GNUC__)
|
28
|
+
# pragma GCC diagnostic ignored "-Wshadow"
|
29
|
+
#endif
|
30
|
+
|
29
31
|
#ifndef ICE_IGNORE_VERSION
|
30
|
-
# if ICE_INT_VERSION / 100 !=
|
32
|
+
# if ICE_INT_VERSION / 100 != 307
|
31
33
|
# error Ice version mismatch!
|
32
34
|
# endif
|
33
|
-
# if ICE_INT_VERSION % 100
|
35
|
+
# if ICE_INT_VERSION % 100 >= 50
|
34
36
|
# error Beta header file detected
|
35
37
|
# endif
|
36
|
-
# if ICE_INT_VERSION % 100 <
|
38
|
+
# if ICE_INT_VERSION % 100 < 4
|
37
39
|
# error Ice patch level mismatch!
|
38
40
|
# endif
|
39
41
|
#endif
|
40
42
|
|
43
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
44
|
+
|
41
45
|
namespace
|
42
46
|
{
|
43
47
|
|
44
48
|
}
|
49
|
+
|
50
|
+
#else // C++98 mapping
|
51
|
+
|
52
|
+
namespace
|
53
|
+
{
|
54
|
+
|
55
|
+
}
|
56
|
+
|
57
|
+
namespace Ice
|
58
|
+
{
|
59
|
+
}
|
60
|
+
|
61
|
+
#endif
|
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Ice/CommunicatorI.h>
|
11
6
|
#include <Ice/Instance.h>
|
@@ -13,7 +8,6 @@
|
|
13
8
|
#include <Ice/ConnectionFactory.h>
|
14
9
|
#include <Ice/ReferenceFactory.h>
|
15
10
|
#include <Ice/ProxyFactory.h>
|
16
|
-
#include <Ice/ObjectFactoryManager.h>
|
17
11
|
#include <Ice/ObjectAdapterFactory.h>
|
18
12
|
#include <Ice/LoggerUtil.h>
|
19
13
|
#include <Ice/LocalException.h>
|
@@ -23,14 +17,179 @@
|
|
23
17
|
#include <Ice/OutgoingAsync.h>
|
24
18
|
#include <IceUtil/Mutex.h>
|
25
19
|
#include <IceUtil/MutexPtrLock.h>
|
26
|
-
#include <
|
20
|
+
#include <Ice/UUID.h>
|
21
|
+
#ifdef ICE_SWIFT
|
22
|
+
# include <Ice/ThreadPool.h>
|
23
|
+
#endif
|
27
24
|
|
28
25
|
using namespace std;
|
29
26
|
using namespace Ice;
|
30
27
|
using namespace IceInternal;
|
31
28
|
|
29
|
+
#ifndef ICE_CPP11_MAPPING
|
30
|
+
IceUtil::Shared* IceInternal::upCast(CommunicatorFlushBatchAsync* p) { return p; }
|
31
|
+
#endif
|
32
|
+
|
33
|
+
CommunicatorFlushBatchAsync::~CommunicatorFlushBatchAsync()
|
34
|
+
{
|
35
|
+
// Out of line to avoid weak vtable
|
36
|
+
}
|
37
|
+
|
38
|
+
CommunicatorFlushBatchAsync::CommunicatorFlushBatchAsync(const InstancePtr& instance) :
|
39
|
+
OutgoingAsyncBase(instance)
|
40
|
+
{
|
41
|
+
//
|
42
|
+
// _useCount is initialized to 1 to prevent premature callbacks.
|
43
|
+
// The caller must invoke ready() after all flush requests have
|
44
|
+
// been initiated.
|
45
|
+
//
|
46
|
+
_useCount = 1;
|
47
|
+
}
|
48
|
+
|
49
|
+
void
|
50
|
+
CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con, Ice::CompressBatch compressBatch)
|
51
|
+
{
|
52
|
+
class FlushBatch : public OutgoingAsyncBase
|
53
|
+
{
|
54
|
+
public:
|
55
|
+
|
56
|
+
FlushBatch(const CommunicatorFlushBatchAsyncPtr& outAsync,
|
57
|
+
const InstancePtr& instance,
|
58
|
+
InvocationObserver& observer) :
|
59
|
+
OutgoingAsyncBase(instance), _outAsync(outAsync), _parentObserver(observer)
|
60
|
+
{
|
61
|
+
}
|
62
|
+
|
63
|
+
virtual bool
|
64
|
+
sent()
|
65
|
+
{
|
66
|
+
_childObserver.detach();
|
67
|
+
_outAsync->check(false);
|
68
|
+
return false;
|
69
|
+
}
|
70
|
+
|
71
|
+
virtual bool
|
72
|
+
exception(const Exception& ex)
|
73
|
+
{
|
74
|
+
_childObserver.failed(ex.ice_id());
|
75
|
+
_childObserver.detach();
|
76
|
+
_outAsync->check(false);
|
77
|
+
return false;
|
78
|
+
}
|
79
|
+
|
80
|
+
virtual InvocationObserver&
|
81
|
+
getObserver()
|
82
|
+
{
|
83
|
+
return _parentObserver;
|
84
|
+
}
|
85
|
+
|
86
|
+
virtual bool handleSent(bool, bool)
|
87
|
+
{
|
88
|
+
return false;
|
89
|
+
}
|
90
|
+
|
91
|
+
virtual bool handleException(const Ice::Exception&)
|
92
|
+
{
|
93
|
+
return false;
|
94
|
+
}
|
95
|
+
|
96
|
+
virtual bool handleResponse(bool)
|
97
|
+
{
|
98
|
+
return false;
|
99
|
+
}
|
100
|
+
|
101
|
+
virtual void handleInvokeSent(bool, OutgoingAsyncBase*) const
|
102
|
+
{
|
103
|
+
assert(false);
|
104
|
+
}
|
105
|
+
|
106
|
+
virtual void handleInvokeException(const Ice::Exception&, OutgoingAsyncBase*) const
|
107
|
+
{
|
108
|
+
assert(false);
|
109
|
+
}
|
110
|
+
|
111
|
+
virtual void handleInvokeResponse(bool, OutgoingAsyncBase*) const
|
112
|
+
{
|
113
|
+
assert(false);
|
114
|
+
}
|
115
|
+
|
116
|
+
private:
|
117
|
+
|
118
|
+
const CommunicatorFlushBatchAsyncPtr _outAsync;
|
119
|
+
InvocationObserver& _parentObserver;
|
120
|
+
};
|
121
|
+
|
122
|
+
{
|
123
|
+
Lock sync(_m);
|
124
|
+
++_useCount;
|
125
|
+
}
|
126
|
+
|
127
|
+
try
|
128
|
+
{
|
129
|
+
OutgoingAsyncBasePtr flushBatch = ICE_MAKE_SHARED(FlushBatch, ICE_SHARED_FROM_THIS, _instance, _observer);
|
130
|
+
bool compress;
|
131
|
+
int batchRequestNum = con->getBatchRequestQueue()->swap(flushBatch->getOs(), compress);
|
132
|
+
if(batchRequestNum == 0)
|
133
|
+
{
|
134
|
+
flushBatch->sent();
|
135
|
+
}
|
136
|
+
else
|
137
|
+
{
|
138
|
+
if(compressBatch == ICE_SCOPED_ENUM(CompressBatch, Yes))
|
139
|
+
{
|
140
|
+
compress = true;
|
141
|
+
}
|
142
|
+
else if(compressBatch == ICE_SCOPED_ENUM(CompressBatch, No))
|
143
|
+
{
|
144
|
+
compress = false;
|
145
|
+
}
|
146
|
+
con->sendAsyncRequest(flushBatch, compress, false, batchRequestNum);
|
147
|
+
}
|
148
|
+
}
|
149
|
+
catch(const LocalException&)
|
150
|
+
{
|
151
|
+
check(false);
|
152
|
+
throw;
|
153
|
+
}
|
154
|
+
}
|
155
|
+
|
156
|
+
void
|
157
|
+
CommunicatorFlushBatchAsync::invoke(const string& operation, CompressBatch compressBatch)
|
158
|
+
{
|
159
|
+
_observer.attach(_instance.get(), operation);
|
160
|
+
_instance->outgoingConnectionFactory()->flushAsyncBatchRequests(ICE_SHARED_FROM_THIS, compressBatch);
|
161
|
+
_instance->objectAdapterFactory()->flushAsyncBatchRequests(ICE_SHARED_FROM_THIS, compressBatch);
|
162
|
+
check(true);
|
163
|
+
}
|
164
|
+
|
165
|
+
void
|
166
|
+
CommunicatorFlushBatchAsync::check(bool userThread)
|
167
|
+
{
|
168
|
+
{
|
169
|
+
Lock sync(_m);
|
170
|
+
assert(_useCount > 0);
|
171
|
+
if(--_useCount > 0)
|
172
|
+
{
|
173
|
+
return;
|
174
|
+
}
|
175
|
+
}
|
176
|
+
|
177
|
+
if(sentImpl(true))
|
178
|
+
{
|
179
|
+
if(userThread)
|
180
|
+
{
|
181
|
+
_sentSynchronously = true;
|
182
|
+
invokeSent();
|
183
|
+
}
|
184
|
+
else
|
185
|
+
{
|
186
|
+
invokeSentAsync();
|
187
|
+
}
|
188
|
+
}
|
189
|
+
}
|
190
|
+
|
32
191
|
void
|
33
|
-
Ice::CommunicatorI::destroy()
|
192
|
+
Ice::CommunicatorI::destroy() ICE_NOEXCEPT
|
34
193
|
{
|
35
194
|
if(_instance)
|
36
195
|
{
|
@@ -39,43 +198,64 @@ Ice::CommunicatorI::destroy()
|
|
39
198
|
}
|
40
199
|
|
41
200
|
void
|
42
|
-
Ice::CommunicatorI::shutdown()
|
201
|
+
Ice::CommunicatorI::shutdown() ICE_NOEXCEPT
|
43
202
|
{
|
44
|
-
|
203
|
+
try
|
204
|
+
{
|
205
|
+
_instance->objectAdapterFactory()->shutdown();
|
206
|
+
}
|
207
|
+
catch(const Ice::CommunicatorDestroyedException&)
|
208
|
+
{
|
209
|
+
// Ignore
|
210
|
+
}
|
45
211
|
}
|
46
212
|
|
47
213
|
void
|
48
|
-
Ice::CommunicatorI::waitForShutdown()
|
214
|
+
Ice::CommunicatorI::waitForShutdown() ICE_NOEXCEPT
|
49
215
|
{
|
50
|
-
|
216
|
+
try
|
217
|
+
{
|
218
|
+
_instance->objectAdapterFactory()->waitForShutdown();
|
219
|
+
}
|
220
|
+
catch(const Ice::CommunicatorDestroyedException&)
|
221
|
+
{
|
222
|
+
// Ignore
|
223
|
+
}
|
51
224
|
}
|
52
225
|
|
53
226
|
bool
|
54
|
-
Ice::CommunicatorI::isShutdown() const
|
227
|
+
Ice::CommunicatorI::isShutdown() const ICE_NOEXCEPT
|
55
228
|
{
|
56
|
-
|
229
|
+
try
|
230
|
+
{
|
231
|
+
return _instance->objectAdapterFactory()->isShutdown();
|
232
|
+
}
|
233
|
+
catch(const Ice::CommunicatorDestroyedException&)
|
234
|
+
{
|
235
|
+
return true;
|
236
|
+
}
|
57
237
|
}
|
58
238
|
|
59
|
-
|
239
|
+
ObjectPrxPtr
|
60
240
|
Ice::CommunicatorI::stringToProxy(const string& s) const
|
61
241
|
{
|
62
242
|
return _instance->proxyFactory()->stringToProxy(s);
|
63
243
|
}
|
64
244
|
|
65
245
|
string
|
66
|
-
Ice::CommunicatorI::proxyToString(const
|
246
|
+
Ice::CommunicatorI::proxyToString(const ObjectPrxPtr& proxy) const
|
67
247
|
{
|
68
248
|
return _instance->proxyFactory()->proxyToString(proxy);
|
69
249
|
}
|
70
250
|
|
71
|
-
|
251
|
+
ObjectPrxPtr
|
72
252
|
Ice::CommunicatorI::propertyToProxy(const string& p) const
|
73
253
|
{
|
74
254
|
return _instance->proxyFactory()->propertyToProxy(p);
|
75
255
|
}
|
76
256
|
|
77
257
|
PropertyDict
|
78
|
-
Ice::CommunicatorI::proxyToProperty(const
|
258
|
+
Ice::CommunicatorI::proxyToProperty(const ObjectPrxPtr& proxy, const string& property) const
|
79
259
|
{
|
80
260
|
return _instance->proxyFactory()->proxyToProperty(proxy, property);
|
81
261
|
}
|
@@ -83,19 +263,19 @@ Ice::CommunicatorI::proxyToProperty(const ObjectPrx& proxy, const string& proper
|
|
83
263
|
Identity
|
84
264
|
Ice::CommunicatorI::stringToIdentity(const string& s) const
|
85
265
|
{
|
86
|
-
return
|
266
|
+
return Ice::stringToIdentity(s);
|
87
267
|
}
|
88
268
|
|
89
269
|
string
|
90
270
|
Ice::CommunicatorI::identityToString(const Identity& ident) const
|
91
271
|
{
|
92
|
-
return _instance->
|
272
|
+
return Ice::identityToString(ident, _instance->toStringMode());
|
93
273
|
}
|
94
274
|
|
95
275
|
ObjectAdapterPtr
|
96
276
|
Ice::CommunicatorI::createObjectAdapter(const string& name)
|
97
277
|
{
|
98
|
-
return _instance->objectAdapterFactory()->createObjectAdapter(name,
|
278
|
+
return _instance->objectAdapterFactory()->createObjectAdapter(name, ICE_NULLPTR);
|
99
279
|
}
|
100
280
|
|
101
281
|
ObjectAdapterPtr
|
@@ -104,20 +284,20 @@ Ice::CommunicatorI::createObjectAdapterWithEndpoints(const string& name, const s
|
|
104
284
|
string oaName = name;
|
105
285
|
if(oaName.empty())
|
106
286
|
{
|
107
|
-
oaName =
|
287
|
+
oaName = Ice::generateUUID();
|
108
288
|
}
|
109
289
|
|
110
290
|
getProperties()->setProperty(oaName + ".Endpoints", endpoints);
|
111
|
-
return _instance->objectAdapterFactory()->createObjectAdapter(oaName,
|
291
|
+
return _instance->objectAdapterFactory()->createObjectAdapter(oaName, ICE_NULLPTR);
|
112
292
|
}
|
113
293
|
|
114
294
|
ObjectAdapterPtr
|
115
|
-
Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const
|
295
|
+
Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const RouterPrxPtr& router)
|
116
296
|
{
|
117
297
|
string oaName = name;
|
118
298
|
if(oaName.empty())
|
119
299
|
{
|
120
|
-
oaName =
|
300
|
+
oaName = Ice::generateUUID();
|
121
301
|
}
|
122
302
|
|
123
303
|
PropertyDict properties = proxyToProperty(router, oaName + ".Router");
|
@@ -130,61 +310,61 @@ Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const Rout
|
|
130
310
|
}
|
131
311
|
|
132
312
|
void
|
133
|
-
Ice::CommunicatorI::addObjectFactory(const ObjectFactoryPtr& factory, const string& id)
|
313
|
+
Ice::CommunicatorI::addObjectFactory(const ::Ice::ObjectFactoryPtr& factory, const string& id)
|
134
314
|
{
|
135
|
-
_instance->
|
315
|
+
_instance->addObjectFactory(factory, id);
|
136
316
|
}
|
137
317
|
|
138
|
-
ObjectFactoryPtr
|
139
|
-
Ice::CommunicatorI::findObjectFactory(const string& id) const
|
318
|
+
::Ice::ObjectFactoryPtr
|
319
|
+
Ice::CommunicatorI::findObjectFactory(const string& id) const ICE_NOEXCEPT
|
140
320
|
{
|
141
|
-
return _instance->
|
321
|
+
return _instance->findObjectFactory(id);
|
142
322
|
}
|
143
323
|
|
144
324
|
PropertiesPtr
|
145
|
-
Ice::CommunicatorI::getProperties() const
|
325
|
+
Ice::CommunicatorI::getProperties() const ICE_NOEXCEPT
|
146
326
|
{
|
147
327
|
return _instance->initializationData().properties;
|
148
328
|
}
|
149
329
|
|
150
330
|
LoggerPtr
|
151
|
-
Ice::CommunicatorI::getLogger() const
|
331
|
+
Ice::CommunicatorI::getLogger() const ICE_NOEXCEPT
|
152
332
|
{
|
153
333
|
return _instance->initializationData().logger;
|
154
334
|
}
|
155
335
|
|
156
336
|
Ice::Instrumentation::CommunicatorObserverPtr
|
157
|
-
Ice::CommunicatorI::getObserver() const
|
337
|
+
Ice::CommunicatorI::getObserver() const ICE_NOEXCEPT
|
158
338
|
{
|
159
339
|
return _instance->initializationData().observer;
|
160
340
|
}
|
161
341
|
|
162
|
-
|
342
|
+
RouterPrxPtr
|
163
343
|
Ice::CommunicatorI::getDefaultRouter() const
|
164
344
|
{
|
165
345
|
return _instance->referenceFactory()->getDefaultRouter();
|
166
346
|
}
|
167
347
|
|
168
348
|
void
|
169
|
-
Ice::CommunicatorI::setDefaultRouter(const
|
349
|
+
Ice::CommunicatorI::setDefaultRouter(const RouterPrxPtr& router)
|
170
350
|
{
|
171
351
|
_instance->setDefaultRouter(router);
|
172
352
|
}
|
173
353
|
|
174
|
-
|
354
|
+
LocatorPrxPtr
|
175
355
|
Ice::CommunicatorI::getDefaultLocator() const
|
176
356
|
{
|
177
357
|
return _instance->referenceFactory()->getDefaultLocator();
|
178
358
|
}
|
179
359
|
|
180
360
|
void
|
181
|
-
Ice::CommunicatorI::setDefaultLocator(const
|
361
|
+
Ice::CommunicatorI::setDefaultLocator(const LocatorPrxPtr& locator)
|
182
362
|
{
|
183
363
|
_instance->setDefaultLocator(locator);
|
184
364
|
}
|
185
365
|
|
186
366
|
Ice::ImplicitContextPtr
|
187
|
-
Ice::CommunicatorI::getImplicitContext() const
|
367
|
+
Ice::CommunicatorI::getImplicitContext() const ICE_NOEXCEPT
|
188
368
|
{
|
189
369
|
return _instance->getImplicitContext();
|
190
370
|
}
|
@@ -195,120 +375,141 @@ Ice::CommunicatorI::getPluginManager() const
|
|
195
375
|
return _instance->pluginManager();
|
196
376
|
}
|
197
377
|
|
198
|
-
|
199
|
-
Ice::CommunicatorI::
|
378
|
+
ValueFactoryManagerPtr
|
379
|
+
Ice::CommunicatorI::getValueFactoryManager() const ICE_NOEXCEPT
|
200
380
|
{
|
201
|
-
|
381
|
+
return _instance->initializationData().valueFactoryManager;
|
202
382
|
}
|
203
383
|
|
204
|
-
|
205
|
-
|
384
|
+
#ifdef ICE_SWIFT
|
385
|
+
|
386
|
+
dispatch_queue_t
|
387
|
+
Ice::CommunicatorI::getClientDispatchQueue() const
|
206
388
|
{
|
207
|
-
return
|
389
|
+
return _instance->clientThreadPool()->getDispatchQueue();
|
208
390
|
}
|
209
391
|
|
210
|
-
|
211
|
-
Ice::CommunicatorI::
|
392
|
+
dispatch_queue_t
|
393
|
+
Ice::CommunicatorI::getServerDispatchQueue() const
|
212
394
|
{
|
213
|
-
return
|
395
|
+
return _instance->serverThreadPool()->getDispatchQueue();
|
214
396
|
}
|
215
397
|
|
216
|
-
|
217
|
-
|
218
|
-
|
398
|
+
#endif
|
399
|
+
|
400
|
+
namespace
|
219
401
|
{
|
220
|
-
|
402
|
+
|
403
|
+
const ::std::string flushBatchRequests_name = "flushBatchRequests";
|
404
|
+
|
221
405
|
}
|
222
406
|
|
223
|
-
|
224
|
-
|
225
|
-
|
407
|
+
#ifdef ICE_CPP11_MAPPING
|
408
|
+
|
409
|
+
::std::function<void()>
|
410
|
+
Ice::CommunicatorI::flushBatchRequestsAsync(CompressBatch compress,
|
411
|
+
function<void(exception_ptr)> ex,
|
412
|
+
function<void(bool)> sent)
|
226
413
|
{
|
227
|
-
|
228
|
-
class Cpp11CB : public IceInternal::Cpp11FnCallbackNC
|
414
|
+
class CommunicatorFlushBatchLambda : public CommunicatorFlushBatchAsync, public LambdaInvoke
|
229
415
|
{
|
230
|
-
|
231
416
|
public:
|
232
417
|
|
233
|
-
|
234
|
-
|
235
|
-
|
418
|
+
CommunicatorFlushBatchLambda(const InstancePtr& instance,
|
419
|
+
std::function<void(std::exception_ptr)> ex,
|
420
|
+
std::function<void(bool)> sent) :
|
421
|
+
CommunicatorFlushBatchAsync(instance), LambdaInvoke(std::move(ex), std::move(sent))
|
236
422
|
{
|
237
|
-
CallbackBase::checkCallback(true, excb != nullptr);
|
238
|
-
}
|
239
|
-
|
240
|
-
virtual void
|
241
|
-
completed(const AsyncResultPtr& __result) const
|
242
|
-
{
|
243
|
-
CommunicatorPtr __com = __result->getCommunicator();
|
244
|
-
assert(__com);
|
245
|
-
try
|
246
|
-
{
|
247
|
-
__com->end_flushBatchRequests(__result);
|
248
|
-
assert(false);
|
249
|
-
}
|
250
|
-
catch(const Exception& ex)
|
251
|
-
{
|
252
|
-
IceInternal::Cpp11FnCallbackNC::exception(__result, ex);
|
253
|
-
}
|
254
423
|
}
|
255
424
|
};
|
425
|
+
auto outAsync = make_shared<CommunicatorFlushBatchLambda>(_instance, ex, sent);
|
426
|
+
outAsync->invoke(flushBatchRequests_name, compress);
|
427
|
+
return [outAsync]() { outAsync->cancel(); };
|
428
|
+
}
|
256
429
|
|
257
|
-
return __begin_flushBatchRequests(new Cpp11CB(exception, sent), 0);
|
258
430
|
#else
|
259
|
-
|
260
|
-
|
261
|
-
|
431
|
+
|
432
|
+
void
|
433
|
+
Ice::CommunicatorI::flushBatchRequests(CompressBatch compress)
|
434
|
+
{
|
435
|
+
end_flushBatchRequests(begin_flushBatchRequests(compress));
|
262
436
|
}
|
263
437
|
|
264
|
-
|
438
|
+
AsyncResultPtr
|
439
|
+
Ice::CommunicatorI::begin_flushBatchRequests(CompressBatch compress)
|
265
440
|
{
|
441
|
+
return _iceI_begin_flushBatchRequests(compress, ::IceInternal::dummyCallback, 0);
|
442
|
+
}
|
266
443
|
|
267
|
-
|
444
|
+
AsyncResultPtr
|
445
|
+
Ice::CommunicatorI::begin_flushBatchRequests(CompressBatch compress,
|
446
|
+
const CallbackPtr& cb,
|
447
|
+
const LocalObjectPtr& cookie)
|
448
|
+
{
|
449
|
+
return _iceI_begin_flushBatchRequests(compress, cb, cookie);
|
450
|
+
}
|
268
451
|
|
452
|
+
AsyncResultPtr
|
453
|
+
Ice::CommunicatorI::begin_flushBatchRequests(CompressBatch compress,
|
454
|
+
const Callback_Communicator_flushBatchRequestsPtr& cb,
|
455
|
+
const LocalObjectPtr& cookie)
|
456
|
+
{
|
457
|
+
return _iceI_begin_flushBatchRequests(compress, cb, cookie);
|
269
458
|
}
|
270
459
|
|
271
460
|
AsyncResultPtr
|
272
|
-
Ice::CommunicatorI::
|
461
|
+
Ice::CommunicatorI::_iceI_begin_flushBatchRequests(CompressBatch compress,
|
462
|
+
const IceInternal::CallbackBasePtr& cb,
|
463
|
+
const LocalObjectPtr& cookie)
|
273
464
|
{
|
274
|
-
|
275
|
-
|
465
|
+
class CommunicatorFlushBatchAsyncWithCallback : public CommunicatorFlushBatchAsync, public CallbackCompletion
|
466
|
+
{
|
467
|
+
public:
|
276
468
|
|
277
|
-
|
278
|
-
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
|
284
|
-
|
285
|
-
cookie);
|
469
|
+
CommunicatorFlushBatchAsyncWithCallback(const Ice::CommunicatorPtr& communicator,
|
470
|
+
const InstancePtr& instance,
|
471
|
+
const CallbackBasePtr& callback,
|
472
|
+
const Ice::LocalObjectPtr& cookie) :
|
473
|
+
CommunicatorFlushBatchAsync(instance), CallbackCompletion(callback, cookie), _communicator(communicator)
|
474
|
+
{
|
475
|
+
_cookie = cookie;
|
476
|
+
}
|
286
477
|
|
287
|
-
|
288
|
-
|
478
|
+
virtual Ice::CommunicatorPtr getCommunicator() const
|
479
|
+
{
|
480
|
+
return _communicator;
|
481
|
+
}
|
289
482
|
|
290
|
-
|
291
|
-
|
292
|
-
|
293
|
-
|
294
|
-
|
483
|
+
virtual const std::string&
|
484
|
+
getOperation() const
|
485
|
+
{
|
486
|
+
return flushBatchRequests_name;
|
487
|
+
}
|
488
|
+
|
489
|
+
private:
|
295
490
|
|
491
|
+
Ice::CommunicatorPtr _communicator;
|
492
|
+
};
|
493
|
+
|
494
|
+
CommunicatorFlushBatchAsyncPtr result = new CommunicatorFlushBatchAsyncWithCallback(this, _instance, cb, cookie);
|
495
|
+
result->invoke(flushBatchRequests_name, compress);
|
296
496
|
return result;
|
297
497
|
}
|
298
498
|
|
299
499
|
void
|
300
500
|
Ice::CommunicatorI::end_flushBatchRequests(const AsyncResultPtr& r)
|
301
501
|
{
|
302
|
-
AsyncResult::
|
303
|
-
r->
|
502
|
+
AsyncResult::_check(r, this, flushBatchRequests_name);
|
503
|
+
r->_waitForResponse();
|
304
504
|
}
|
505
|
+
#endif
|
305
506
|
|
306
|
-
|
507
|
+
ObjectPrxPtr
|
307
508
|
Ice::CommunicatorI::createAdmin(const ObjectAdapterPtr& adminAdapter, const Identity& adminId)
|
308
509
|
{
|
309
510
|
return _instance->createAdmin(adminAdapter, adminId);
|
310
511
|
}
|
311
|
-
|
512
|
+
ObjectPrxPtr
|
312
513
|
Ice::CommunicatorI::getAdmin() const
|
313
514
|
{
|
314
515
|
return _instance->getAdmin();
|
@@ -338,32 +539,32 @@ Ice::CommunicatorI::findAllAdminFacets()
|
|
338
539
|
return _instance->findAllAdminFacets();
|
339
540
|
}
|
340
541
|
|
341
|
-
|
542
|
+
CommunicatorIPtr
|
543
|
+
Ice::CommunicatorI::create(const InitializationData& initData)
|
342
544
|
{
|
343
|
-
|
545
|
+
Ice::CommunicatorIPtr communicator = ICE_MAKE_SHARED(CommunicatorI);
|
344
546
|
try
|
345
547
|
{
|
346
|
-
const_cast<InstancePtr&>(_instance) = new Instance(
|
548
|
+
const_cast<InstancePtr&>(communicator->_instance) = new Instance(communicator, initData);
|
347
549
|
|
348
550
|
//
|
349
551
|
// Keep a reference to the dynamic library list to ensure
|
350
552
|
// the libraries are not unloaded until this Communicator's
|
351
553
|
// destructor is invoked.
|
352
554
|
//
|
353
|
-
const_cast<DynamicLibraryListPtr&>(_dynamicLibraryList) = _instance->dynamicLibraryList();
|
555
|
+
const_cast<DynamicLibraryListPtr&>(communicator->_dynamicLibraryList) = communicator->_instance->dynamicLibraryList();
|
354
556
|
}
|
355
557
|
catch(...)
|
356
558
|
{
|
357
|
-
destroy();
|
358
|
-
__setNoDelete(false);
|
559
|
+
communicator->destroy();
|
359
560
|
throw;
|
360
561
|
}
|
361
|
-
|
562
|
+
return communicator;
|
362
563
|
}
|
363
564
|
|
364
565
|
Ice::CommunicatorI::~CommunicatorI()
|
365
566
|
{
|
366
|
-
if(!_instance->destroyed())
|
567
|
+
if(_instance && !_instance->destroyed())
|
367
568
|
{
|
368
569
|
Warning out(_instance->initializationData().logger);
|
369
570
|
out << "Ice::Communicator::destroy() has not been called";
|
@@ -371,11 +572,11 @@ Ice::CommunicatorI::~CommunicatorI()
|
|
371
572
|
}
|
372
573
|
|
373
574
|
void
|
374
|
-
Ice::CommunicatorI::finishSetup(int& argc, char* argv[])
|
575
|
+
Ice::CommunicatorI::finishSetup(int& argc, const char* argv[])
|
375
576
|
{
|
376
577
|
try
|
377
578
|
{
|
378
|
-
_instance->finishSetup(argc, argv,
|
579
|
+
_instance->finishSetup(argc, argv, ICE_SHARED_FROM_THIS);
|
379
580
|
}
|
380
581
|
catch(...)
|
381
582
|
{
|