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
|
#include <Ice/IncomingAsync.h>
|
11
6
|
#include <Ice/ServantLocator.h>
|
@@ -23,9 +18,21 @@ using namespace std;
|
|
23
18
|
using namespace Ice;
|
24
19
|
using namespace IceInternal;
|
25
20
|
|
21
|
+
#ifndef ICE_CPP11_MAPPING
|
26
22
|
IceUtil::Shared* IceInternal::upCast(IncomingAsync* p) { return p; }
|
27
23
|
IceUtil::Shared* Ice::upCast(AMD_Object_ice_invoke* p) { return p; }
|
28
24
|
|
25
|
+
Ice::AMDCallback::~AMDCallback()
|
26
|
+
{
|
27
|
+
// Out of line to avoid weak vtable
|
28
|
+
}
|
29
|
+
|
30
|
+
Ice::AMD_Object_ice_invoke::~AMD_Object_ice_invoke()
|
31
|
+
{
|
32
|
+
// Out of line to avoid weak vtable
|
33
|
+
}
|
34
|
+
#endif
|
35
|
+
|
29
36
|
namespace
|
30
37
|
{
|
31
38
|
|
@@ -53,288 +60,171 @@ Init init;
|
|
53
60
|
|
54
61
|
IceInternal::IncomingAsync::IncomingAsync(Incoming& in) :
|
55
62
|
IncomingBase(in),
|
56
|
-
|
57
|
-
_responseHandlerCopy(_responseHandler)
|
58
|
-
_retriable(in.isRetriable()),
|
59
|
-
_active(true)
|
63
|
+
_responseSent(false),
|
64
|
+
_responseHandlerCopy(ICE_GET_SHARED_FROM_THIS(_responseHandler))
|
60
65
|
{
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
}
|
66
|
+
#ifndef ICE_CPP11_MAPPING
|
67
|
+
in.setAsync(this);
|
68
|
+
#endif
|
65
69
|
}
|
66
70
|
|
71
|
+
#ifdef ICE_CPP11_MAPPING
|
72
|
+
shared_ptr<IncomingAsync>
|
73
|
+
IceInternal::IncomingAsync::create(Incoming& in)
|
74
|
+
{
|
75
|
+
auto async = make_shared<IncomingAsync>(in);
|
76
|
+
in.setAsync(async);
|
77
|
+
return async;
|
78
|
+
}
|
79
|
+
#endif
|
80
|
+
|
81
|
+
#ifndef ICE_CPP11_MAPPING
|
67
82
|
void
|
68
|
-
IceInternal::IncomingAsync::
|
83
|
+
IceInternal::IncomingAsync::ice_exception(const ::std::exception& exc)
|
69
84
|
{
|
70
|
-
|
85
|
+
try
|
71
86
|
{
|
72
|
-
|
73
|
-
if(!_active)
|
87
|
+
for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p)
|
74
88
|
{
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
throw ResponseSentException(__FILE__, __LINE__);
|
89
|
+
if(!(*p)->exception(exc))
|
90
|
+
{
|
91
|
+
return;
|
92
|
+
}
|
80
93
|
}
|
81
|
-
|
94
|
+
}
|
95
|
+
catch(...)
|
96
|
+
{
|
97
|
+
return;
|
82
98
|
}
|
83
99
|
|
84
|
-
|
100
|
+
checkResponseSent();
|
101
|
+
IncomingBase::exception(exc, true); // User thread
|
85
102
|
}
|
86
103
|
|
87
104
|
void
|
88
|
-
IceInternal::IncomingAsync::ice_exception(
|
105
|
+
IceInternal::IncomingAsync::ice_exception()
|
89
106
|
{
|
90
|
-
|
91
|
-
// Only call __exception if this incoming is not retriable or if
|
92
|
-
// all the interceptors return true and no response has been sent
|
93
|
-
// yet.
|
94
|
-
//
|
95
|
-
|
96
|
-
if(_retriable)
|
107
|
+
try
|
97
108
|
{
|
98
|
-
|
109
|
+
for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p)
|
99
110
|
{
|
100
|
-
|
101
|
-
p != _interceptorAsyncCallbackQueue.end(); ++p)
|
111
|
+
if(!(*p)->exception())
|
102
112
|
{
|
103
|
-
|
104
|
-
{
|
105
|
-
return;
|
106
|
-
}
|
113
|
+
return;
|
107
114
|
}
|
108
115
|
}
|
109
|
-
catch(...)
|
110
|
-
{
|
111
|
-
return;
|
112
|
-
}
|
113
|
-
|
114
|
-
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
|
115
|
-
if(!_active)
|
116
|
-
{
|
117
|
-
return;
|
118
|
-
}
|
119
|
-
_active = false;
|
120
116
|
}
|
121
|
-
|
122
|
-
if(_responseHandler)
|
117
|
+
catch(...)
|
123
118
|
{
|
124
|
-
|
125
|
-
}
|
126
|
-
else
|
127
|
-
{
|
128
|
-
//
|
129
|
-
// Response has already been sent.
|
130
|
-
//
|
131
|
-
if(_os.instance()->initializationData().properties->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
|
132
|
-
{
|
133
|
-
__warning(ex.what());
|
134
|
-
}
|
119
|
+
return;
|
135
120
|
}
|
121
|
+
|
122
|
+
checkResponseSent();
|
123
|
+
IncomingBase::exception("unknown c++ exception", true); // User thread
|
136
124
|
}
|
137
125
|
|
126
|
+
#endif
|
127
|
+
|
138
128
|
void
|
139
|
-
IceInternal::IncomingAsync::
|
129
|
+
IceInternal::IncomingAsync::kill(Incoming& in)
|
140
130
|
{
|
141
|
-
|
142
|
-
//
|
143
|
-
|
144
|
-
// yet.
|
145
|
-
//
|
131
|
+
checkResponseSent();
|
132
|
+
in._observer.adopt(_observer); // Give back the observer to incoming.
|
133
|
+
}
|
146
134
|
|
147
|
-
|
135
|
+
void
|
136
|
+
IceInternal::IncomingAsync::completed()
|
137
|
+
{
|
138
|
+
for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p)
|
148
139
|
{
|
149
140
|
try
|
150
141
|
{
|
151
|
-
|
152
|
-
|
142
|
+
#ifdef ICE_CPP11_MAPPING
|
143
|
+
if(p->first && !p->first())
|
144
|
+
#else
|
145
|
+
if(!(*p)->response())
|
146
|
+
#endif
|
153
147
|
{
|
154
|
-
|
155
|
-
{
|
156
|
-
return;
|
157
|
-
}
|
148
|
+
return;
|
158
149
|
}
|
159
150
|
}
|
160
151
|
catch(...)
|
161
152
|
{
|
162
|
-
return;
|
163
|
-
}
|
164
|
-
|
165
|
-
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
|
166
|
-
if(!_active)
|
167
|
-
{
|
168
|
-
return;
|
169
153
|
}
|
170
|
-
_active = false;
|
171
154
|
}
|
172
155
|
|
173
|
-
|
174
|
-
|
175
|
-
__exception();
|
176
|
-
}
|
177
|
-
else
|
178
|
-
{
|
179
|
-
//
|
180
|
-
// Response has already been sent.
|
181
|
-
//
|
182
|
-
if(_os.instance()->initializationData().properties->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0)
|
183
|
-
{
|
184
|
-
__warning("unknown exception");
|
185
|
-
}
|
186
|
-
}
|
156
|
+
checkResponseSent();
|
157
|
+
IncomingBase::response(true); // User thread
|
187
158
|
}
|
188
159
|
|
160
|
+
#ifdef ICE_CPP11_MAPPING
|
189
161
|
void
|
190
|
-
IceInternal::IncomingAsync::
|
162
|
+
IceInternal::IncomingAsync::completed(exception_ptr ex)
|
191
163
|
{
|
192
|
-
|
164
|
+
for(DispatchInterceptorCallbacks::iterator p = _interceptorCBs.begin(); p != _interceptorCBs.end(); ++p)
|
193
165
|
{
|
194
|
-
|
195
|
-
{
|
196
|
-
return;
|
197
|
-
}
|
198
|
-
|
199
|
-
assert(_responseHandler);
|
200
|
-
|
201
|
-
if(_response)
|
166
|
+
try
|
202
167
|
{
|
203
|
-
|
204
|
-
|
168
|
+
if(p->second && !p->second(ex))
|
169
|
+
{
|
170
|
+
return;
|
171
|
+
}
|
205
172
|
}
|
206
|
-
|
173
|
+
catch(...)
|
207
174
|
{
|
208
|
-
_responseHandler->sendNoResponse();
|
209
175
|
}
|
210
|
-
|
211
|
-
_observer.detach();
|
212
|
-
_responseHandler = 0;
|
213
176
|
}
|
214
|
-
catch(const LocalException& ex)
|
215
|
-
{
|
216
|
-
_responseHandler->invokeException(_current.requestId, ex, 1, true); // Fatal invocation exception
|
217
|
-
}
|
218
|
-
}
|
219
177
|
|
220
|
-
|
221
|
-
IceInternal::IncomingAsync::__exception(const std::exception& exc)
|
222
|
-
{
|
178
|
+
checkResponseSent();
|
223
179
|
try
|
224
180
|
{
|
225
|
-
|
226
|
-
{
|
227
|
-
return;
|
228
|
-
}
|
229
|
-
|
230
|
-
__handleException(exc, true);
|
181
|
+
rethrow_exception(ex);
|
231
182
|
}
|
232
|
-
catch(const
|
183
|
+
catch(const std::exception& exc)
|
233
184
|
{
|
234
|
-
|
185
|
+
IncomingBase::exception(exc, true); // User thread
|
235
186
|
}
|
236
|
-
|
237
|
-
|
238
|
-
void
|
239
|
-
IceInternal::IncomingAsync::__exception()
|
240
|
-
{
|
241
|
-
try
|
187
|
+
catch(...)
|
242
188
|
{
|
243
|
-
|
244
|
-
{
|
245
|
-
return;
|
246
|
-
}
|
247
|
-
|
248
|
-
__handleException(true);
|
249
|
-
}
|
250
|
-
catch(const LocalException& ex)
|
251
|
-
{
|
252
|
-
_responseHandler->invokeException(_current.requestId, ex, 1, true); // Fatal invocation exception
|
189
|
+
IncomingBase::exception("unknown c++ exception", true); // User thread
|
253
190
|
}
|
254
191
|
}
|
192
|
+
#endif
|
255
193
|
|
256
|
-
|
257
|
-
IceInternal::IncomingAsync::
|
194
|
+
void
|
195
|
+
IceInternal::IncomingAsync::checkResponseSent()
|
258
196
|
{
|
259
|
-
|
260
|
-
|
261
|
-
// the interceptors return true and no response has been sent
|
262
|
-
// yet. Upon getting a true return value, the caller should send
|
263
|
-
// the response.
|
264
|
-
//
|
265
|
-
|
266
|
-
if(_retriable)
|
197
|
+
IceUtil::Mutex::Lock sync(*globalMutex);
|
198
|
+
if(_responseSent)
|
267
199
|
{
|
268
|
-
|
269
|
-
{
|
270
|
-
for(deque<DispatchInterceptorAsyncCallbackPtr>::iterator p = _interceptorAsyncCallbackQueue.begin();
|
271
|
-
p != _interceptorAsyncCallbackQueue.end(); ++p)
|
272
|
-
{
|
273
|
-
if((*p)->response(ok) == false)
|
274
|
-
{
|
275
|
-
return false;
|
276
|
-
}
|
277
|
-
}
|
278
|
-
}
|
279
|
-
catch(...)
|
280
|
-
{
|
281
|
-
return false;
|
282
|
-
}
|
283
|
-
|
284
|
-
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
|
285
|
-
if(!_active)
|
286
|
-
{
|
287
|
-
return false;
|
288
|
-
}
|
289
|
-
_active = false;
|
200
|
+
throw ResponseSentException(__FILE__, __LINE__);
|
290
201
|
}
|
291
|
-
|
202
|
+
_responseSent = true;
|
292
203
|
}
|
293
204
|
|
294
|
-
|
295
|
-
|
205
|
+
#ifndef ICE_CPP11_MAPPING
|
206
|
+
IceAsync::Ice::AMD_Object_ice_invoke::AMD_Object_ice_invoke(Incoming& in) : IncomingAsync(in)
|
296
207
|
{
|
297
208
|
}
|
298
209
|
|
299
210
|
void
|
300
211
|
IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const vector<Byte>& outEncaps)
|
301
212
|
{
|
302
|
-
if(
|
213
|
+
if(outEncaps.empty())
|
303
214
|
{
|
304
|
-
|
305
|
-
{
|
306
|
-
if(outEncaps.empty())
|
307
|
-
{
|
308
|
-
__writeParamEncaps(0, 0, ok);
|
309
|
-
}
|
310
|
-
else
|
311
|
-
{
|
312
|
-
__writeParamEncaps(&outEncaps[0], static_cast< ::Ice::Int>(outEncaps.size()), ok);
|
313
|
-
}
|
314
|
-
}
|
315
|
-
catch(const LocalException& ex)
|
316
|
-
{
|
317
|
-
__exception(ex);
|
318
|
-
return;
|
319
|
-
}
|
320
|
-
__response();
|
215
|
+
writeParamEncaps(0, 0, ok);
|
321
216
|
}
|
217
|
+
else
|
218
|
+
{
|
219
|
+
writeParamEncaps(&outEncaps[0], static_cast<Int>(outEncaps.size()), ok);
|
220
|
+
}
|
221
|
+
completed();
|
322
222
|
}
|
323
223
|
|
324
224
|
void
|
325
225
|
IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const pair<const Byte*, const Byte*>& outEncaps)
|
326
226
|
{
|
327
|
-
|
328
|
-
|
329
|
-
try
|
330
|
-
{
|
331
|
-
__writeParamEncaps(outEncaps.first, static_cast<Int>(outEncaps.second - outEncaps.first), ok);
|
332
|
-
}
|
333
|
-
catch(const LocalException& ex)
|
334
|
-
{
|
335
|
-
__exception(ex);
|
336
|
-
return;
|
337
|
-
}
|
338
|
-
__response();
|
339
|
-
}
|
227
|
+
writeParamEncaps(outEncaps.first, static_cast<Int>(outEncaps.second - outEncaps.first), ok);
|
228
|
+
completed();
|
340
229
|
}
|
230
|
+
#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_INCOMING_REQUEST_H
|
11
6
|
#define ICE_INCOMING_REQUEST_H
|
@@ -23,15 +18,16 @@ namespace IceInternal
|
|
23
18
|
class ICE_API IncomingRequest : public Ice::Request
|
24
19
|
{
|
25
20
|
public:
|
26
|
-
|
27
|
-
|
21
|
+
|
22
|
+
IncomingRequest(Incoming& in) : _in(in)
|
28
23
|
{
|
29
24
|
}
|
30
25
|
|
31
26
|
virtual const Ice::Current& getCurrent();
|
32
|
-
|
27
|
+
|
33
28
|
Incoming& _in;
|
34
29
|
};
|
30
|
+
|
35
31
|
}
|
36
32
|
|
37
33
|
#endif
|
@@ -1,25 +1,19 @@
|
|
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
|
-
#include <
|
5
|
+
#include <Ice/ArgVector.h>
|
11
6
|
#include <Ice/CommunicatorI.h>
|
12
7
|
#include <Ice/PropertiesI.h>
|
13
8
|
#include <Ice/Initialize.h>
|
14
9
|
#include <Ice/LocalException.h>
|
15
|
-
#include <Ice/StreamI.h>
|
16
10
|
#include <Ice/LoggerI.h>
|
17
11
|
#include <Ice/Instance.h>
|
18
12
|
#include <Ice/PluginManagerI.h>
|
19
|
-
#include <
|
13
|
+
#include <Ice/StringUtil.h>
|
20
14
|
#include <IceUtil/Mutex.h>
|
21
15
|
#include <IceUtil/MutexPtrLock.h>
|
22
|
-
#include <
|
16
|
+
#include <Ice/StringConverter.h>
|
23
17
|
|
24
18
|
using namespace std;
|
25
19
|
using namespace Ice;
|
@@ -28,19 +22,6 @@ using namespace IceInternal;
|
|
28
22
|
namespace
|
29
23
|
{
|
30
24
|
|
31
|
-
pair<const Byte*, const Byte*>
|
32
|
-
makePair(const vector<Byte>& v)
|
33
|
-
{
|
34
|
-
if(v.empty())
|
35
|
-
{
|
36
|
-
return pair<const Byte*, const Byte*>(static_cast<Byte*>(0), static_cast<Byte*>(0));
|
37
|
-
}
|
38
|
-
else
|
39
|
-
{
|
40
|
-
return pair<const Byte*, const Byte*>(&v[0], &v[0] + v.size());
|
41
|
-
}
|
42
|
-
}
|
43
|
-
|
44
25
|
IceUtil::Mutex* globalMutex = 0;
|
45
26
|
Ice::LoggerPtr processLogger;
|
46
27
|
|
@@ -65,7 +46,7 @@ Init init;
|
|
65
46
|
}
|
66
47
|
|
67
48
|
StringSeq
|
68
|
-
Ice::argsToStringSeq(int argc, char* argv[])
|
49
|
+
Ice::argsToStringSeq(int argc, const char* const argv[])
|
69
50
|
{
|
70
51
|
StringSeq result;
|
71
52
|
for(int i = 0; i < argc; i++)
|
@@ -78,17 +59,17 @@ Ice::argsToStringSeq(int argc, char* argv[])
|
|
78
59
|
#ifdef _WIN32
|
79
60
|
|
80
61
|
StringSeq
|
81
|
-
Ice::argsToStringSeq(int /*argc*/, wchar_t* argv[])
|
62
|
+
Ice::argsToStringSeq(int /*argc*/, const wchar_t* const argv[])
|
82
63
|
{
|
83
64
|
//
|
84
65
|
// Don't need to use a wide string converter argv is expected to
|
85
66
|
// come from Windows API.
|
86
67
|
//
|
87
|
-
const
|
68
|
+
const StringConverterPtr converter = getProcessStringConverter();
|
88
69
|
StringSeq args;
|
89
|
-
for(int i=0; argv[i] != 0; i++)
|
70
|
+
for(int i = 0; argv[i] != 0; i++)
|
90
71
|
{
|
91
|
-
args.push_back(
|
72
|
+
args.push_back(wstringToString(argv[i], converter));
|
92
73
|
}
|
93
74
|
return args;
|
94
75
|
}
|
@@ -96,7 +77,7 @@ Ice::argsToStringSeq(int /*argc*/, wchar_t* argv[])
|
|
96
77
|
#endif
|
97
78
|
|
98
79
|
void
|
99
|
-
Ice::stringSeqToArgs(const StringSeq& args, int& argc, char* argv[])
|
80
|
+
Ice::stringSeqToArgs(const StringSeq& args, int& argc, const char* argv[])
|
100
81
|
{
|
101
82
|
//
|
102
83
|
// Shift all elements in argv which are present in args to the
|
@@ -132,20 +113,65 @@ Ice::stringSeqToArgs(const StringSeq& args, int& argc, char* argv[])
|
|
132
113
|
}
|
133
114
|
}
|
134
115
|
|
116
|
+
#ifdef _WIN32
|
117
|
+
void
|
118
|
+
Ice::stringSeqToArgs(const StringSeq& args, int& argc, const wchar_t* argv[])
|
119
|
+
{
|
120
|
+
//
|
121
|
+
// Don't need to use a wide string converter argv is expected to
|
122
|
+
// come from Windows API.
|
123
|
+
//
|
124
|
+
const StringConverterPtr converter = getProcessStringConverter();
|
125
|
+
|
126
|
+
//
|
127
|
+
// Shift all elements in argv which are present in args to the
|
128
|
+
// beginning of argv. We record the original value of argc so
|
129
|
+
// that we can know later if we've shifted the array.
|
130
|
+
//
|
131
|
+
const int argcOrig = argc;
|
132
|
+
int i = 0;
|
133
|
+
while(i < argc)
|
134
|
+
{
|
135
|
+
if(find(args.begin(), args.end(), wstringToString(argv[i], converter)) == args.end())
|
136
|
+
{
|
137
|
+
for(int j = i; j < argc - 1; j++)
|
138
|
+
{
|
139
|
+
argv[j] = argv[j + 1];
|
140
|
+
}
|
141
|
+
--argc;
|
142
|
+
}
|
143
|
+
else
|
144
|
+
{
|
145
|
+
++i;
|
146
|
+
}
|
147
|
+
}
|
148
|
+
|
149
|
+
//
|
150
|
+
// Make sure that argv[argc] == 0, the ISO C++ standard requires this.
|
151
|
+
// We can only do this if we've shifted the array, otherwise argv[argc]
|
152
|
+
// may point to an invalid address.
|
153
|
+
//
|
154
|
+
if(argv && argcOrig != argc)
|
155
|
+
{
|
156
|
+
argv[argc] = 0;
|
157
|
+
}
|
158
|
+
}
|
159
|
+
#endif
|
160
|
+
|
135
161
|
PropertiesPtr
|
136
162
|
Ice::createProperties()
|
137
163
|
{
|
138
|
-
return
|
164
|
+
return ICE_MAKE_SHARED(PropertiesI);
|
139
165
|
}
|
140
166
|
|
141
167
|
PropertiesPtr
|
142
168
|
Ice::createProperties(StringSeq& args, const PropertiesPtr& defaults)
|
143
169
|
{
|
144
|
-
return
|
170
|
+
return ICE_MAKE_SHARED(PropertiesI, args, defaults);
|
145
171
|
}
|
146
172
|
|
147
173
|
PropertiesPtr
|
148
|
-
Ice::createProperties(int& argc, char* argv[], const PropertiesPtr& defaults)
|
174
|
+
Ice::createProperties(int& argc, const char* argv[], const PropertiesPtr& defaults)
|
149
175
|
{
|
150
176
|
StringSeq args = argsToStringSeq(argc, argv);
|
151
177
|
PropertiesPtr properties = createProperties(args, defaults);
|
@@ -153,6 +179,31 @@ Ice::createProperties(int& argc, char* argv[], const PropertiesPtr& defaults)
|
|
153
179
|
return properties;
|
154
180
|
}
|
155
181
|
|
182
|
+
#ifdef _WIN32
|
183
|
+
PropertiesPtr
|
184
|
+
Ice::createProperties(int& argc, const wchar_t* argv[], const PropertiesPtr& defaults)
|
185
|
+
{
|
186
|
+
StringSeq args = argsToStringSeq(argc, argv);
|
187
|
+
PropertiesPtr properties = createProperties(args, defaults);
|
188
|
+
stringSeqToArgs(args, argc, argv);
|
189
|
+
return properties;
|
190
|
+
}
|
191
|
+
#endif
|
192
|
+
|
193
|
+
#ifdef ICE_CPP11_MAPPING
|
194
|
+
Ice::ThreadHookPlugin::ThreadHookPlugin(const CommunicatorPtr& communicator,
|
195
|
+
function<void()> threadStart,
|
196
|
+
function<void()> threadStop)
|
197
|
+
{
|
198
|
+
if(communicator == nullptr)
|
199
|
+
{
|
200
|
+
throw PluginInitializationException(__FILE__, __LINE__, "Communicator cannot be null");
|
201
|
+
}
|
202
|
+
|
203
|
+
IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);
|
204
|
+
instance->setThreadHook(move(threadStart), move(threadStop));
|
205
|
+
}
|
206
|
+
#else
|
156
207
|
Ice::ThreadHookPlugin::ThreadHookPlugin(const CommunicatorPtr& communicator, const ThreadNotificationPtr& threadHook)
|
157
208
|
{
|
158
209
|
if(communicator == 0)
|
@@ -163,7 +214,7 @@ Ice::ThreadHookPlugin::ThreadHookPlugin(const CommunicatorPtr& communicator, con
|
|
163
214
|
IceInternal::InstancePtr instance = IceInternal::getInstance(communicator);
|
164
215
|
instance->setThreadHook(threadHook);
|
165
216
|
}
|
166
|
-
|
217
|
+
#endif
|
167
218
|
void
|
168
219
|
Ice::ThreadHookPlugin::initialize()
|
169
220
|
{
|
@@ -177,7 +228,7 @@ Ice::ThreadHookPlugin::destroy()
|
|
177
228
|
namespace
|
178
229
|
{
|
179
230
|
|
180
|
-
inline void checkIceVersion(
|
231
|
+
inline void checkIceVersion(int version)
|
181
232
|
{
|
182
233
|
#ifndef ICE_IGNORE_VERSION
|
183
234
|
|
@@ -222,32 +273,68 @@ inline void checkIceVersion(Int version)
|
|
222
273
|
|
223
274
|
}
|
224
275
|
|
225
|
-
CommunicatorPtr
|
226
|
-
Ice::initialize(int& argc, char* argv[], const InitializationData& initializationData,
|
276
|
+
Ice::CommunicatorPtr
|
277
|
+
Ice::initialize(int& argc, const char* argv[], const InitializationData& initializationData, int version)
|
227
278
|
{
|
228
279
|
checkIceVersion(version);
|
229
280
|
|
230
281
|
InitializationData initData = initializationData;
|
231
282
|
initData.properties = createProperties(argc, argv, initData.properties);
|
232
283
|
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
284
|
+
CommunicatorIPtr communicator = CommunicatorI::create(initData);
|
285
|
+
communicator->finishSetup(argc, argv);
|
286
|
+
return communicator;
|
287
|
+
}
|
288
|
+
|
289
|
+
Ice::CommunicatorPtr
|
290
|
+
Ice::initialize(int& argc, const char* argv[], ICE_CONFIG_FILE_STRING configFile, int version)
|
291
|
+
{
|
292
|
+
InitializationData initData;
|
293
|
+
initData.properties = createProperties();
|
294
|
+
initData.properties->load(configFile);
|
295
|
+
return initialize(argc, argv, initData, version);
|
237
296
|
}
|
238
297
|
|
239
|
-
|
240
|
-
Ice::
|
298
|
+
#ifdef _WIN32
|
299
|
+
Ice::CommunicatorPtr
|
300
|
+
Ice::initialize(int& argc, const wchar_t* argv[], const InitializationData& initializationData, int version)
|
241
301
|
{
|
242
|
-
|
243
|
-
|
244
|
-
|
302
|
+
Ice::StringSeq args = argsToStringSeq(argc, argv);
|
303
|
+
CommunicatorPtr communicator = initialize(args, initializationData, version);
|
304
|
+
stringSeqToArgs(args, argc, argv);
|
305
|
+
return communicator;
|
306
|
+
}
|
307
|
+
|
308
|
+
Ice::CommunicatorPtr
|
309
|
+
Ice::initialize(int& argc, const wchar_t* argv[], ICE_CONFIG_FILE_STRING configFile, int version)
|
310
|
+
{
|
311
|
+
InitializationData initData;
|
312
|
+
initData.properties = createProperties();
|
313
|
+
initData.properties->load(configFile);
|
314
|
+
return initialize(argc, argv, initData, version);
|
315
|
+
}
|
316
|
+
#endif
|
317
|
+
|
318
|
+
Ice::CommunicatorPtr
|
319
|
+
Ice::initialize(StringSeq& args, const InitializationData& initializationData, int version)
|
320
|
+
{
|
321
|
+
IceInternal::ArgVector av(args);
|
322
|
+
CommunicatorPtr communicator = initialize(av.argc, av.argv, initializationData, version);
|
245
323
|
args = argsToStringSeq(av.argc, av.argv);
|
246
324
|
return communicator;
|
247
325
|
}
|
248
326
|
|
249
|
-
CommunicatorPtr
|
250
|
-
Ice::initialize(
|
327
|
+
Ice::CommunicatorPtr
|
328
|
+
Ice::initialize(StringSeq& args, ICE_CONFIG_FILE_STRING configFile, int version)
|
329
|
+
{
|
330
|
+
InitializationData initData;
|
331
|
+
initData.properties = createProperties();
|
332
|
+
initData.properties->load(configFile);
|
333
|
+
return initialize(args, initData, version);
|
334
|
+
}
|
335
|
+
|
336
|
+
Ice::CommunicatorPtr
|
337
|
+
Ice::initialize(const InitializationData& initData, int version)
|
251
338
|
{
|
252
339
|
//
|
253
340
|
// We can't simply call the other initialize() because this one does NOT read
|
@@ -255,196 +342,240 @@ Ice::initialize(const InitializationData& initData, Int version)
|
|
255
342
|
//
|
256
343
|
checkIceVersion(version);
|
257
344
|
|
258
|
-
|
259
|
-
CommunicatorPtr result = communicatorI; // For exception safety.
|
345
|
+
CommunicatorIPtr communicator = CommunicatorI::create(initData);
|
260
346
|
int argc = 0;
|
261
|
-
char* argv[] = { 0 };
|
262
|
-
|
263
|
-
return
|
347
|
+
const char* argv[] = { 0 };
|
348
|
+
communicator->finishSetup(argc, argv);
|
349
|
+
return communicator;
|
264
350
|
}
|
265
351
|
|
266
|
-
|
267
|
-
Ice::
|
352
|
+
Ice::CommunicatorPtr
|
353
|
+
Ice::initialize(ICE_CONFIG_FILE_STRING configFile, int version)
|
268
354
|
{
|
269
|
-
|
355
|
+
InitializationData initData;
|
356
|
+
initData.properties = createProperties();
|
357
|
+
initData.properties->load(configFile);
|
358
|
+
return initialize(initData, version);
|
270
359
|
}
|
271
360
|
|
272
|
-
|
273
|
-
Ice::
|
361
|
+
LoggerPtr
|
362
|
+
Ice::getProcessLogger()
|
274
363
|
{
|
275
|
-
|
364
|
+
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
|
365
|
+
|
366
|
+
if(processLogger == ICE_NULLPTR)
|
367
|
+
{
|
368
|
+
//
|
369
|
+
// TODO: Would be nice to be able to use process name as prefix by default.
|
370
|
+
//
|
371
|
+
processLogger = ICE_MAKE_SHARED(LoggerI, "", "", true);
|
372
|
+
}
|
373
|
+
return processLogger;
|
276
374
|
}
|
277
375
|
|
278
|
-
|
279
|
-
Ice::
|
376
|
+
void
|
377
|
+
Ice::setProcessLogger(const LoggerPtr& logger)
|
280
378
|
{
|
281
|
-
|
379
|
+
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
|
380
|
+
processLogger = logger;
|
282
381
|
}
|
283
382
|
|
284
|
-
|
285
|
-
Ice::
|
383
|
+
void
|
384
|
+
Ice::registerPluginFactory(const std::string& name, PluginFactory factory, bool loadOnInitialize)
|
286
385
|
{
|
287
|
-
|
386
|
+
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
|
387
|
+
PluginManagerI::registerPluginFactory(name, factory, loadOnInitialize);
|
288
388
|
}
|
289
389
|
|
290
|
-
|
291
|
-
|
390
|
+
//
|
391
|
+
// CommunicatorHolder
|
392
|
+
//
|
393
|
+
|
394
|
+
Ice::CommunicatorHolder::CommunicatorHolder()
|
292
395
|
{
|
293
|
-
return new InputStreamI(communicator, bytes, true);
|
294
396
|
}
|
295
397
|
|
296
|
-
|
297
|
-
Ice::
|
298
|
-
|
398
|
+
#ifdef ICE_CPP11_MAPPING
|
399
|
+
Ice::CommunicatorHolder::CommunicatorHolder(shared_ptr<Communicator> communicator) :
|
400
|
+
_communicator(std::move(communicator))
|
299
401
|
{
|
300
|
-
return new InputStreamI(communicator, bytes, v, true);
|
301
402
|
}
|
302
403
|
|
303
|
-
|
304
|
-
Ice::
|
404
|
+
Ice::CommunicatorHolder&
|
405
|
+
Ice::CommunicatorHolder::operator=(shared_ptr<Communicator> communicator)
|
305
406
|
{
|
306
|
-
|
407
|
+
if(_communicator)
|
408
|
+
{
|
409
|
+
_communicator->destroy();
|
410
|
+
}
|
411
|
+
_communicator = std::move(communicator);
|
412
|
+
return *this;
|
307
413
|
}
|
308
414
|
|
309
|
-
|
310
|
-
Ice::
|
311
|
-
const EncodingVersion& v)
|
415
|
+
Ice::CommunicatorHolder&
|
416
|
+
Ice::CommunicatorHolder::operator=(CommunicatorHolder&& other) noexcept
|
312
417
|
{
|
313
|
-
|
418
|
+
if(_communicator)
|
419
|
+
{
|
420
|
+
_communicator->destroy();
|
421
|
+
}
|
422
|
+
_communicator = std::move(other._communicator);
|
423
|
+
return *this;
|
314
424
|
}
|
315
425
|
|
316
|
-
|
317
|
-
|
426
|
+
#else // C++98 mapping
|
427
|
+
|
428
|
+
Ice::CommunicatorHolder::CommunicatorHolder(int& argc, const char* argv[], const InitializationData& initData,
|
429
|
+
int version) :
|
430
|
+
_communicator(initialize(argc, argv, initData, version))
|
318
431
|
{
|
319
|
-
return new OutputStreamI(communicator);
|
320
432
|
}
|
321
433
|
|
322
|
-
|
323
|
-
|
434
|
+
Ice::CommunicatorHolder::CommunicatorHolder(int& argc, char* argv[], const InitializationData& initData, int version) :
|
435
|
+
_communicator(initialize(argc, argv, initData, version))
|
324
436
|
{
|
325
|
-
return new OutputStreamI(communicator, v);
|
326
437
|
}
|
327
438
|
|
328
|
-
|
329
|
-
|
439
|
+
Ice::CommunicatorHolder::CommunicatorHolder(int& argc, const char* argv[], const char* configFile, int version) :
|
440
|
+
_communicator(initialize(argc, argv, configFile, version))
|
330
441
|
{
|
331
|
-
|
442
|
+
}
|
332
443
|
|
333
|
-
|
334
|
-
|
335
|
-
|
336
|
-
// TODO: Would be nice to be able to use process name as prefix by default.
|
337
|
-
//
|
338
|
-
processLogger = new Ice::LoggerI("", "", true, IceUtil::getProcessStringConverter());
|
339
|
-
}
|
340
|
-
return processLogger;
|
444
|
+
Ice::CommunicatorHolder::CommunicatorHolder(int& argc, char* argv[], const char* configFile, int version) :
|
445
|
+
_communicator(initialize(argc, argv, configFile, version))
|
446
|
+
{
|
341
447
|
}
|
342
448
|
|
343
|
-
|
344
|
-
Ice::
|
449
|
+
# ifdef _WIN32
|
450
|
+
Ice::CommunicatorHolder::CommunicatorHolder(int& argc, const wchar_t* argv[], const InitializationData& initData,
|
451
|
+
int version) :
|
452
|
+
_communicator(initialize(argc, argv, initData, version))
|
345
453
|
{
|
346
|
-
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
|
347
|
-
processLogger = logger;
|
348
454
|
}
|
349
455
|
|
350
|
-
|
351
|
-
|
456
|
+
Ice::CommunicatorHolder::CommunicatorHolder(int& argc, wchar_t* argv[], const InitializationData& initData,
|
457
|
+
int version) :
|
458
|
+
_communicator(initialize(argc, argv, initData, version))
|
352
459
|
{
|
353
|
-
IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
|
354
|
-
PluginManagerI::registerPluginFactory(name, factory, loadOnInitialize);
|
355
460
|
}
|
356
461
|
|
357
|
-
|
358
|
-
|
462
|
+
Ice::CommunicatorHolder::CommunicatorHolder(int& argc, const wchar_t* argv[], const char* configFile, int version) :
|
463
|
+
_communicator(initialize(argc, argv, configFile, version))
|
359
464
|
{
|
360
|
-
CommunicatorI* p = dynamic_cast<CommunicatorI*>(communicator.get());
|
361
|
-
assert(p);
|
362
|
-
return p->_instance;
|
363
465
|
}
|
364
466
|
|
365
|
-
|
366
|
-
|
467
|
+
Ice::CommunicatorHolder::CommunicatorHolder(int& argc, wchar_t* argv[], const char* configFile, int version) :
|
468
|
+
_communicator(initialize(argc, argv, configFile, version))
|
367
469
|
{
|
368
|
-
CommunicatorI* p = dynamic_cast<CommunicatorI*>(communicator.get());
|
369
|
-
assert(p);
|
370
|
-
return p->_instance->timer();
|
371
470
|
}
|
471
|
+
# endif
|
372
472
|
|
373
|
-
|
374
|
-
|
375
|
-
Ice::newDispatcher(const ::std::function<void (const DispatcherCallPtr&, const ConnectionPtr)>& cb)
|
473
|
+
Ice::CommunicatorHolder::CommunicatorHolder(StringSeq& args, const InitializationData& initData, int version) :
|
474
|
+
_communicator(initialize(args, initData, version))
|
376
475
|
{
|
377
|
-
|
378
|
-
{
|
379
|
-
public:
|
476
|
+
}
|
380
477
|
|
381
|
-
|
382
|
-
|
383
|
-
|
384
|
-
|
478
|
+
Ice::CommunicatorHolder::CommunicatorHolder(StringSeq& args, const char* configFile, int version) :
|
479
|
+
_communicator(initialize(args, configFile, version))
|
480
|
+
{
|
481
|
+
}
|
385
482
|
|
386
|
-
|
387
|
-
|
388
|
-
|
389
|
-
|
483
|
+
Ice::CommunicatorHolder::CommunicatorHolder(const InitializationData& initData, int version) :
|
484
|
+
_communicator(initialize(initData, version))
|
485
|
+
{
|
486
|
+
}
|
390
487
|
|
391
|
-
|
392
|
-
|
393
|
-
|
488
|
+
Ice::CommunicatorHolder::CommunicatorHolder(const char* configFile, int version) :
|
489
|
+
_communicator(initialize(configFile, version))
|
490
|
+
{
|
491
|
+
}
|
394
492
|
|
395
|
-
|
493
|
+
Ice::CommunicatorHolder::CommunicatorHolder(const CommunicatorPtr& communicator) :
|
494
|
+
_communicator(communicator)
|
495
|
+
{
|
396
496
|
}
|
397
|
-
#endif
|
398
497
|
|
399
|
-
|
400
|
-
Ice::
|
401
|
-
Ice::newBatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>& cb)
|
498
|
+
Ice::CommunicatorHolder&
|
499
|
+
Ice::CommunicatorHolder::operator=(const CommunicatorPtr& communicator)
|
402
500
|
{
|
403
|
-
|
501
|
+
if(_communicator)
|
404
502
|
{
|
405
|
-
|
503
|
+
_communicator->destroy();
|
504
|
+
}
|
505
|
+
_communicator = communicator;
|
506
|
+
return *this;
|
507
|
+
}
|
406
508
|
|
407
|
-
|
408
|
-
_cb(cb)
|
409
|
-
{
|
410
|
-
}
|
509
|
+
#endif
|
411
510
|
|
412
|
-
|
413
|
-
|
414
|
-
|
415
|
-
|
511
|
+
Ice::CommunicatorHolder::~CommunicatorHolder()
|
512
|
+
{
|
513
|
+
if(_communicator)
|
514
|
+
{
|
515
|
+
_communicator->destroy();
|
516
|
+
}
|
517
|
+
}
|
518
|
+
|
519
|
+
Ice::CommunicatorHolder::operator bool() const
|
520
|
+
{
|
521
|
+
return _communicator != ICE_NULLPTR;
|
522
|
+
}
|
416
523
|
|
417
|
-
|
418
|
-
|
419
|
-
|
524
|
+
const Ice::CommunicatorPtr&
|
525
|
+
Ice::CommunicatorHolder::communicator() const
|
526
|
+
{
|
527
|
+
return _communicator;
|
528
|
+
}
|
420
529
|
|
421
|
-
|
530
|
+
const Ice::CommunicatorPtr&
|
531
|
+
Ice::CommunicatorHolder::operator->() const
|
532
|
+
{
|
533
|
+
return _communicator;
|
422
534
|
}
|
535
|
+
|
536
|
+
Ice::CommunicatorPtr
|
537
|
+
Ice::CommunicatorHolder::release()
|
538
|
+
{
|
539
|
+
#ifdef ICE_CPP11_MAPPING
|
540
|
+
return std::move(_communicator);
|
541
|
+
#else
|
542
|
+
CommunicatorPtr result;
|
543
|
+
result.swap(_communicator);
|
544
|
+
return result;
|
423
545
|
#endif
|
546
|
+
}
|
547
|
+
|
548
|
+
InstancePtr
|
549
|
+
IceInternal::getInstance(const CommunicatorPtr& communicator)
|
550
|
+
{
|
551
|
+
CommunicatorIPtr p = ICE_DYNAMIC_CAST(::Ice::CommunicatorI, communicator);
|
552
|
+
assert(p);
|
553
|
+
return p->_instance;
|
554
|
+
}
|
555
|
+
|
556
|
+
IceUtil::TimerPtr
|
557
|
+
IceInternal::getInstanceTimer(const CommunicatorPtr& communicator)
|
558
|
+
{
|
559
|
+
CommunicatorIPtr p = ICE_DYNAMIC_CAST(::Ice::CommunicatorI, communicator);
|
560
|
+
assert(p);
|
561
|
+
return p->_instance->timer();
|
562
|
+
}
|
424
563
|
|
425
564
|
Identity
|
426
565
|
Ice::stringToIdentity(const string& s)
|
427
566
|
{
|
428
|
-
//
|
429
|
-
// This method only accepts printable ascii. Since printable ascii is a subset
|
430
|
-
// of all narrow string encodings, it is not necessary to convert the string
|
431
|
-
// from the native string encoding. Any characters other than printable-ASCII
|
432
|
-
// will cause an IllegalArgumentException. Note that it can contain Unicode
|
433
|
-
// encoded in the escaped form which is the reason why we call fromUTF8 after
|
434
|
-
// unespcaping the printable ASCII string.
|
435
|
-
//
|
436
|
-
|
437
567
|
Identity ident;
|
438
568
|
|
439
569
|
//
|
440
570
|
// Find unescaped separator; note that the string may contain an escaped
|
441
571
|
// backslash before the separator.
|
442
572
|
//
|
443
|
-
string::size_type slash = string::npos
|
573
|
+
string::size_type slash = string::npos;
|
574
|
+
string::size_type pos = 0;
|
444
575
|
while((pos = s.find('/', pos)) != string::npos)
|
445
576
|
{
|
446
|
-
|
447
|
-
while(static_cast<int>(pos
|
577
|
+
string::size_type escapes = 0;
|
578
|
+
while(static_cast<int>(pos - escapes) > 0 && s[pos - escapes - 1] == '\\')
|
448
579
|
{
|
449
580
|
escapes++;
|
450
581
|
}
|
@@ -463,9 +594,7 @@ Ice::stringToIdentity(const string& s)
|
|
463
594
|
//
|
464
595
|
// Extra unescaped slash found.
|
465
596
|
//
|
466
|
-
IdentityParseException
|
467
|
-
ex.str = "unescaped backslash in identity `" + s + "'";
|
468
|
-
throw ex;
|
597
|
+
throw IdentityParseException(__FILE__, __LINE__, "unescaped '/' in identity `" + s + "'");
|
469
598
|
}
|
470
599
|
}
|
471
600
|
pos++;
|
@@ -475,64 +604,51 @@ Ice::stringToIdentity(const string& s)
|
|
475
604
|
{
|
476
605
|
try
|
477
606
|
{
|
478
|
-
ident.name =
|
607
|
+
ident.name = unescapeString(s, 0, s.size(), "/");
|
479
608
|
}
|
480
|
-
catch(const IceUtil::IllegalArgumentException&
|
609
|
+
catch(const IceUtil::IllegalArgumentException& ex)
|
481
610
|
{
|
482
|
-
IdentityParseException
|
483
|
-
ex.str = "invalid identity name `" + s + "': " + e.reason();
|
484
|
-
throw ex;
|
611
|
+
throw IdentityParseException(__FILE__, __LINE__, "invalid identity name `" + s + "': " + ex.reason());
|
485
612
|
}
|
486
613
|
}
|
487
614
|
else
|
488
615
|
{
|
489
616
|
try
|
490
617
|
{
|
491
|
-
ident.category =
|
618
|
+
ident.category = unescapeString(s, 0, slash, "/");
|
492
619
|
}
|
493
|
-
catch(const IceUtil::IllegalArgumentException&
|
620
|
+
catch(const IceUtil::IllegalArgumentException& ex)
|
494
621
|
{
|
495
|
-
IdentityParseException
|
496
|
-
|
497
|
-
throw ex;
|
622
|
+
throw IdentityParseException(__FILE__, __LINE__, "invalid category in identity `" + s + "': " +
|
623
|
+
ex.reason());
|
498
624
|
}
|
625
|
+
|
499
626
|
if(slash + 1 < s.size())
|
500
627
|
{
|
501
628
|
try
|
502
629
|
{
|
503
|
-
ident.name =
|
630
|
+
ident.name = unescapeString(s, slash + 1, s.size(), "/");
|
504
631
|
}
|
505
|
-
catch(const IceUtil::IllegalArgumentException&
|
632
|
+
catch(const IceUtil::IllegalArgumentException& ex)
|
506
633
|
{
|
507
|
-
IdentityParseException
|
508
|
-
|
509
|
-
throw ex;
|
634
|
+
throw IdentityParseException(__FILE__, __LINE__, "invalid name in identity `" + s + "': " +
|
635
|
+
ex.reason());
|
510
636
|
}
|
511
637
|
}
|
512
638
|
}
|
513
639
|
|
514
|
-
ident.name = UTF8ToNative(ident.name, IceUtil::getProcessStringConverter());
|
515
|
-
ident.category = UTF8ToNative(ident.category, IceUtil::getProcessStringConverter());
|
516
|
-
|
517
640
|
return ident;
|
518
641
|
}
|
519
642
|
|
520
643
|
string
|
521
|
-
Ice::identityToString(const Identity& ident)
|
644
|
+
Ice::identityToString(const Identity& ident, ToStringMode toStringMode)
|
522
645
|
{
|
523
|
-
|
524
|
-
// This method returns the stringified identity. The returned string only
|
525
|
-
// contains printable ascii. It can contain UTF8 in the escaped form.
|
526
|
-
//
|
527
|
-
string name = nativeToUTF8(ident.name, IceUtil::getProcessStringConverter());
|
528
|
-
string category = nativeToUTF8(ident.category, IceUtil::getProcessStringConverter());
|
529
|
-
|
530
|
-
if(category.empty())
|
646
|
+
if(ident.category.empty())
|
531
647
|
{
|
532
|
-
return
|
648
|
+
return escapeString(ident.name, "/", toStringMode);
|
533
649
|
}
|
534
650
|
else
|
535
651
|
{
|
536
|
-
return
|
652
|
+
return escapeString(ident.category, "/", toStringMode) + '/' + escapeString(ident.name, "/", toStringMode);
|
537
653
|
}
|
538
654
|
}
|