zeroc-ice 3.6.5 → 3.7.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/BZIP2_LICENSE +42 -0
- data/ICE_LICENSE +17 -17
- data/LICENSE +12 -12
- data/bin/slice2rb +1 -1
- data/ext/Communicator.cpp +150 -53
- data/ext/Communicator.h +1 -1
- data/ext/Config.h +2 -12
- data/ext/Connection.cpp +89 -68
- data/ext/Connection.h +1 -1
- data/ext/Endpoint.cpp +16 -45
- data/ext/Endpoint.h +1 -1
- data/ext/ImplicitContext.cpp +1 -5
- data/ext/ImplicitContext.h +1 -1
- data/ext/Init.cpp +4 -1
- data/ext/Logger.cpp +1 -1
- data/ext/Logger.h +1 -1
- data/ext/Operation.cpp +33 -44
- data/ext/Operation.h +1 -1
- data/ext/Properties.cpp +1 -1
- data/ext/Properties.h +1 -1
- data/ext/Proxy.cpp +22 -57
- data/ext/Proxy.h +1 -1
- data/ext/Slice.cpp +5 -5
- data/ext/Slice.h +1 -1
- data/ext/Types.cpp +244 -171
- data/ext/Types.h +118 -66
- data/ext/Util.cpp +13 -9
- data/ext/Util.h +10 -10
- data/ext/ValueFactoryManager.cpp +445 -0
- data/ext/ValueFactoryManager.h +100 -0
- data/ext/extconf.rb +47 -45
- data/ext/ice/bzip2/blocksort.c +1094 -0
- data/ext/ice/bzip2/bzlib.c +1572 -0
- data/ext/ice/bzip2/bzlib.h +282 -0
- data/ext/ice/bzip2/bzlib_private.h +509 -0
- data/ext/ice/bzip2/compress.c +672 -0
- data/ext/ice/bzip2/crctable.c +104 -0
- data/ext/ice/bzip2/decompress.c +646 -0
- data/ext/ice/bzip2/huffman.c +205 -0
- data/ext/ice/bzip2/randtable.c +84 -0
- data/ext/ice/cpp/include/Ice/Application.h +77 -60
- data/ext/ice/cpp/include/Ice/AsyncResult.h +34 -318
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -2
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +5 -10
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -1
- data/ext/ice/cpp/include/Ice/Buffer.h +10 -10
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +14 -12
- data/ext/ice/cpp/include/Ice/Comparable.h +130 -0
- data/ext/ice/cpp/include/Ice/Config.h +7 -36
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +107 -11
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +5 -1
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +28 -0
- data/ext/ice/cpp/include/Ice/{DefaultObjectFactory.h → DefaultValueFactory.h} +28 -14
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +4 -6
- data/ext/ice/cpp/include/Ice/Dispatcher.h +14 -13
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -5
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -1
- data/ext/ice/cpp/include/Ice/Exception.h +66 -56
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +69 -0
- data/ext/ice/cpp/include/Ice/FactoryTable.h +11 -12
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +27 -25
- data/ext/ice/cpp/include/Ice/Format.h +6 -1
- data/ext/ice/cpp/include/Ice/Functional.h +33 -33
- data/ext/ice/cpp/include/Ice/GCObject.h +9 -5
- data/ext/ice/cpp/include/Ice/Handle.h +6 -11
- data/ext/ice/cpp/include/Ice/Ice.h +9 -5
- data/ext/ice/cpp/include/{IceUtil → Ice}/IconvStringConverter.h +108 -62
- data/ext/ice/cpp/include/Ice/Incoming.h +109 -33
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +63 -23
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -1
- data/ext/ice/cpp/include/Ice/Initialize.h +178 -38
- data/ext/ice/cpp/include/Ice/InputStream.h +994 -0
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -2
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +46 -0
- data/ext/ice/cpp/include/Ice/LocalObject.h +9 -9
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -1
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +20 -14
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +114 -65
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +23 -5
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +99 -26
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +17 -4
- data/ext/ice/cpp/include/Ice/Object.h +105 -56
- data/ext/ice/cpp/include/Ice/ObjectF.h +8 -3
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -8
- data/ext/ice/cpp/include/Ice/Optional.h +1084 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +655 -84
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -6
- data/ext/ice/cpp/include/Ice/OutputStream.h +753 -0
- data/ext/ice/cpp/include/Ice/Protocol.h +19 -12
- data/ext/ice/cpp/include/Ice/Proxy.h +1329 -717
- data/ext/ice/cpp/include/Ice/ProxyF.h +11 -33
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -1
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +34 -50
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -1
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +22 -3
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -4
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -1
- data/ext/ice/cpp/include/{IceUtil → Ice}/SHA1.h +16 -16
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -1
- data/ext/ice/cpp/include/Ice/Service.h +13 -18
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -1
- data/ext/ice/cpp/include/Ice/SlicedData.h +46 -20
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +14 -6
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +159 -49
- data/ext/ice/cpp/include/Ice/StringConverter.h +52 -0
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -1
- data/{slice/Ice/ObjectFactoryF.ice → ext/ice/cpp/include/Ice/UUID.h} +9 -7
- data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +21 -22
- data/ext/ice/cpp/include/Ice/UniqueRef.h +98 -0
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +40 -8
- data/ext/ice/cpp/include/Ice/Value.h +104 -0
- data/{slice/Freeze/ConnectionF.ice → ext/ice/cpp/include/Ice/ValueF.h} +11 -7
- data/ext/ice/cpp/include/IceSSL/Config.h +8 -23
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -6
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +130 -0
- data/ext/ice/cpp/include/IceSSL/Plugin.h +172 -259
- data/ext/ice/cpp/include/IceSSL/SChannel.h +66 -0
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +66 -0
- data/ext/ice/cpp/include/IceSSL/UWP.h +58 -0
- data/ext/ice/cpp/include/IceUtil/Atomic.h +8 -10
- data/ext/ice/cpp/include/IceUtil/Cond.h +17 -18
- data/ext/ice/cpp/include/IceUtil/Config.h +138 -39
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +97 -0
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -5
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +23 -17
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +1 -3
- data/ext/ice/cpp/include/IceUtil/Exception.h +157 -67
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +148 -0
- data/ext/ice/cpp/include/IceUtil/Functional.h +1 -2
- data/ext/ice/cpp/include/IceUtil/Handle.h +11 -11
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -10
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -3
- data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -2
- data/ext/ice/cpp/include/IceUtil/Lock.h +8 -10
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -2
- data/ext/ice/cpp/include/IceUtil/Mutex.h +17 -11
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -2
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -4
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -4
- data/ext/ice/cpp/include/IceUtil/Optional.h +32 -18
- data/ext/ice/cpp/include/IceUtil/Options.h +17 -18
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +55 -29
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -6
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +11 -10
- data/ext/ice/cpp/include/IceUtil/Random.h +3 -3
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -8
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +58 -0
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +1 -9
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -2
- data/ext/ice/cpp/include/IceUtil/Shared.h +5 -7
- data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -2
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +77 -72
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -21
- data/ext/ice/cpp/include/IceUtil/Thread.h +10 -12
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -42
- data/ext/ice/cpp/include/IceUtil/Time.h +3 -3
- data/ext/ice/cpp/include/IceUtil/Timer.h +14 -13
- data/ext/ice/cpp/include/IceUtil/UUID.h +2 -2
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -1
- data/ext/ice/cpp/include/{Ice → generated/Ice}/BuiltinSequences.h +41 -8
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +364 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/Connection.h +872 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ConnectionF.h +46 -8
- data/ext/ice/cpp/include/{Ice → generated/Ice}/Current.h +71 -8
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +582 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/EndpointF.h +62 -8
- data/ext/ice/cpp/include/{Ice → generated/Ice}/EndpointTypes.h +31 -16
- data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +23 -8
- data/ext/ice/cpp/include/generated/Ice/Identity.h +221 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContext.h +72 -13
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +602 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/InstrumentationF.h +54 -8
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +2802 -0
- data/ext/ice/cpp/include/generated/Ice/Locator.h +2036 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LocatorF.h +53 -12
- data/ext/ice/cpp/include/{Ice → generated/Ice}/Logger.h +71 -13
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +2649 -0
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +302 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +142 -0
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +197 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/PluginF.h +43 -8
- data/ext/ice/cpp/include/generated/Ice/Process.h +536 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ProcessF.h +45 -10
- data/ext/ice/cpp/include/{Ice → generated/Ice}/Properties.h +88 -21
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +749 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/PropertiesF.h +48 -10
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +1449 -0
- data/ext/ice/cpp/include/generated/Ice/Router.h +1032 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/RouterF.h +45 -10
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocator.h +65 -13
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +40 -8
- data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +23 -8
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +169 -0
- data/ext/ice/cpp/include/generated/Ice/Version.h +334 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +172 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +98 -0
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +156 -0
- data/ext/ice/cpp/src/Ice/ACM.cpp +18 -14
- data/ext/ice/cpp/src/Ice/ACM.h +9 -2
- data/ext/ice/cpp/{include → src}/Ice/ACMF.h +10 -5
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -1
- data/ext/ice/cpp/src/Ice/Acceptor.h +4 -3
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
- data/ext/ice/cpp/src/{IceUtil → Ice}/ArgVector.cpp +9 -9
- data/ext/ice/cpp/src/{IceUtil → Ice}/ArgVector.h +7 -7
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -538
- data/ext/ice/cpp/src/Ice/Base64.cpp +11 -11
- data/ext/ice/cpp/src/Ice/Base64.h +1 -1
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +40 -12
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -10
- data/ext/ice/cpp/src/Ice/Buffer.cpp +74 -12
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +20 -6
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +85 -190
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -18
- data/ext/ice/cpp/src/Ice/Communicator.cpp +39 -8
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +271 -104
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +84 -28
- data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +58 -125
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +11 -22
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -2
- data/ext/ice/cpp/src/Ice/Connection.cpp +88 -8
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +158 -80
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +41 -23
- data/ext/ice/cpp/{include → src}/Ice/ConnectionFactoryF.h +8 -3
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +707 -653
- data/ext/ice/cpp/src/Ice/ConnectionI.h +97 -69
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -15
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +4 -3
- data/ext/ice/cpp/src/Ice/Connector.cpp +6 -1
- data/ext/ice/cpp/src/Ice/Connector.h +4 -3
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -1
- data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -4
- data/ext/ice/cpp/src/Ice/Current.cpp +29 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +6 -5
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -1
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -1
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +5 -25
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +29 -19
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +85 -6
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -1
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +35 -19
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -4
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +17 -1
- data/ext/ice/cpp/src/Ice/EndpointI.h +35 -9
- data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -5
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +18 -6
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -4
- data/ext/ice/cpp/src/Ice/EventHandler.h +13 -8
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -2
- data/ext/ice/cpp/src/Ice/Exception.cpp +95 -86
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +20 -6
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -28
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -4
- data/ext/ice/cpp/src/Ice/GCObject.cpp +28 -25
- data/ext/ice/cpp/src/Ice/HashUtil.h +2 -3
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -2
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -1
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +92 -53
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +19 -10
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -2
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +56 -0
- data/ext/ice/cpp/src/Ice/Identity.cpp +24 -10
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +37 -6
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +14 -14
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -5
- data/ext/ice/cpp/src/Ice/Incoming.cpp +276 -245
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -209
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -4
- data/ext/ice/cpp/src/Ice/Initialize.cpp +299 -172
- data/ext/ice/cpp/src/Ice/InputStream.cpp +2773 -0
- data/ext/ice/cpp/src/Ice/Instance.cpp +191 -231
- data/ext/ice/cpp/src/Ice/Instance.h +30 -18
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +106 -7
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +117 -99
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -31
- data/ext/ice/cpp/src/Ice/LocalException.cpp +1190 -416
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -2
- data/ext/ice/cpp/src/Ice/Locator.cpp +1167 -1215
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +129 -163
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +29 -29
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -1
- data/ext/ice/cpp/src/Ice/Logger.cpp +35 -5
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +178 -73
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -4
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +14 -44
- data/ext/ice/cpp/src/Ice/LoggerI.h +7 -13
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -12
- data/ext/ice/cpp/src/Ice/Metrics.cpp +1059 -1069
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +49 -19
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -2
- data/ext/ice/cpp/src/Ice/Network.cpp +534 -170
- data/ext/ice/cpp/src/Ice/Network.h +100 -23
- data/ext/ice/cpp/src/Ice/NetworkF.h +2 -2
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +21 -14
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -2
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -1
- data/ext/ice/cpp/src/Ice/Object.cpp +217 -221
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +41 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +35 -14
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -7
- data/ext/ice/cpp/{include → src}/Ice/ObjectAdapterFactoryF.h +5 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +184 -58
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +32 -26
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +37 -6
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -32
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +40 -18
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +14 -5
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +803 -365
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1399 -0
- data/ext/ice/cpp/src/Ice/Plugin.cpp +45 -6
- data/ext/ice/cpp/src/Ice/PluginF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +13 -13
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +5 -6
- data/ext/ice/cpp/src/Ice/Process.cpp +256 -114
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/Properties.cpp +38 -8
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +340 -328
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +81 -17
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -5
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +25 -26
- data/ext/ice/cpp/src/Ice/PropertiesI.h +8 -11
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +107 -50
- data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -2
- data/ext/ice/cpp/src/Ice/Protocol.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -2
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -20
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -1
- data/ext/ice/cpp/src/Ice/Proxy.cpp +690 -964
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +23 -32
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -11
- data/ext/ice/cpp/src/Ice/Reference.cpp +75 -69
- data/ext/ice/cpp/src/Ice/Reference.h +27 -22
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +18 -21
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -12
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +18 -4
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -1
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +672 -552
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -3
- data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -13
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -6
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -2
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -6
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -7
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +6 -12
- data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -6
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -1
- data/ext/ice/cpp/src/Ice/Router.cpp +523 -474
- data/ext/ice/cpp/src/Ice/RouterF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +91 -70
- data/ext/ice/cpp/src/Ice/RouterInfo.h +43 -32
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -1
- data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +21 -21
- data/ext/ice/cpp/src/Ice/Selector.cpp +989 -923
- data/ext/ice/cpp/src/Ice/Selector.h +100 -147
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +37 -6
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +9 -9
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -1
- data/ext/ice/cpp/src/Ice/SharedContext.h +2 -2
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +20 -6
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -2
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -20
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +173 -18
- data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -4
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +48 -17
- data/ext/ice/cpp/src/Ice/StringUtil.h +35 -0
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +8 -4
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -3
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +158 -32
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -5
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -7
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -2
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +40 -32
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +11 -8
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +12 -27
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -10
- data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +24 -41
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +175 -267
- data/ext/ice/cpp/src/Ice/ThreadPool.h +38 -43
- data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +28 -21
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -2
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -2
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -31
- data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -6
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -2
- data/ext/ice/cpp/src/Ice/Transceiver.h +8 -7
- data/ext/ice/cpp/src/Ice/TransceiverF.h +1 -1
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +2 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -2
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +92 -31
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +12 -4
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +150 -179
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -17
- data/ext/ice/cpp/src/Ice/Value.cpp +81 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +84 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +70 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +42 -0
- data/ext/ice/cpp/src/Ice/Version.cpp +24 -14
- data/ext/ice/cpp/src/Ice/VirtualShared.h +43 -0
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -9
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -7
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -11
- data/ext/ice/cpp/src/Ice/WSConnector.h +3 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +185 -80
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +21 -31
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +41 -37
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -21
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +526 -264
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +341 -455
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +86 -26
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -23
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -61
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -36
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -59
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -3
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +396 -159
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +251 -355
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +52 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +526 -131
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +19 -165
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -17
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +284 -0
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +69 -0
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +39 -11
- data/ext/ice/cpp/src/{Ice/ObjectFactoryF.cpp → IceSSL/ConnectionInfoF.cpp} +31 -9
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +14 -56
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -13
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +205 -197
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +41 -33
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +39 -10
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/Instance.h +7 -7
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -7
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +588 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +117 -152
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +64 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +32 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +132 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +400 -89
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +36 -21
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +291 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +63 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -41
- data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -18
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -54
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -7
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +585 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +491 -75
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +126 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +32 -0
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +78 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +126 -169
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +19 -22
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +79 -74
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +24 -187
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -19
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +862 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +56 -214
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +60 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +31 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +80 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +137 -144
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +25 -28
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +857 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +46 -0
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +9 -13
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -4
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -3
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +271 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +343 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +46 -0
- data/ext/ice/cpp/{include/Ice/ObjectFactoryManagerF.h → src/IceSSL/UWPEngineF.h} +13 -8
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +94 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +388 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +76 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +66 -1256
- data/ext/ice/cpp/src/IceSSL/Util.h +48 -137
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +162 -0
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -22
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -26
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +20 -31
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +25 -116
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Options.cpp +23 -46
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +7 -6
- data/ext/ice/cpp/src/IceUtil/Random.cpp +13 -13
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +3 -9
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -3
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -264
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +540 -235
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -74
- data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +10 -10
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +98 -97
- data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -35
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +838 -0
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +815 -163
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +76 -0
- data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -2
- data/ext/ice/cpp/{include → src}/Slice/Checksum.h +2 -2
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -78
- data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -9
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1994 -1943
- data/ext/ice/cpp/src/Slice/Grammar.h +44 -24
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -14
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2658 -1927
- data/ext/ice/cpp/{include → src}/Slice/JavaUtil.h +178 -59
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -1
- data/ext/ice/cpp/src/Slice/MD5.h +1 -1
- data/ext/ice/cpp/src/Slice/MD5I.cpp +0 -1
- data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +12 -15
- data/ext/ice/cpp/{include → src}/Slice/PHPUtil.h +6 -15
- data/ext/ice/cpp/src/Slice/Parser.cpp +802 -307
- data/ext/ice/cpp/{include → src}/Slice/Parser.h +76 -84
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +43 -21
- data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +7 -12
- data/ext/ice/cpp/src/Slice/Python.cpp +207 -86
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +683 -679
- data/ext/ice/cpp/{include → src}/Slice/PythonUtil.h +19 -8
- data/ext/ice/cpp/src/Slice/Ruby.cpp +38 -34
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +177 -445
- data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -6
- data/ext/ice/cpp/src/Slice/Scanner.cpp +218 -306
- data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +37 -64
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +374 -0
- data/ext/ice/cpp/src/Slice/Util.h +54 -0
- data/ext/ice/mcpp/Makefile +5 -2
- data/ice.gemspec +2 -7
- data/lib/Glacier2.rb +1 -1
- data/lib/Glacier2/Metrics.rb +7 -46
- data/lib/Glacier2/PermissionsVerifier.rb +24 -95
- data/lib/Glacier2/PermissionsVerifierF.rb +3 -3
- data/lib/Glacier2/Router.rb +32 -74
- data/lib/Glacier2/RouterF.rb +3 -3
- data/lib/Glacier2/SSLInfo.rb +4 -7
- data/lib/Glacier2/Session.rb +88 -307
- data/lib/Ice.rb +83 -52
- data/lib/Ice/BuiltinSequences.rb +4 -4
- data/lib/Ice/Communicator.rb +56 -58
- data/lib/Ice/CommunicatorF.rb +3 -3
- data/lib/Ice/Connection.rb +153 -162
- data/lib/Ice/ConnectionF.rb +3 -3
- data/lib/Ice/Current.rb +4 -11
- data/lib/Ice/Endpoint.rb +57 -133
- data/lib/Ice/EndpointF.rb +3 -3
- data/lib/Ice/EndpointTypes.rb +3 -7
- data/lib/Ice/FacetMap.rb +4 -4
- data/lib/Ice/Identity.rb +5 -8
- data/lib/Ice/ImplicitContext.rb +5 -34
- data/lib/Ice/ImplicitContextF.rb +3 -3
- data/lib/Ice/Instrumentation.rb +23 -275
- data/lib/Ice/InstrumentationF.rb +3 -3
- data/lib/Ice/LocalException.rb +95 -141
- data/lib/Ice/Locator.rb +51 -165
- data/lib/Ice/LocatorF.rb +3 -3
- data/lib/Ice/Logger.rb +5 -34
- data/lib/Ice/LoggerF.rb +3 -3
- data/lib/Ice/Metrics.rb +61 -416
- data/lib/Ice/ObjectAdapter.rb +34 -0
- data/lib/Ice/ObjectAdapterF.rb +3 -3
- data/lib/Ice/ObjectFactory.rb +5 -30
- data/lib/Ice/Plugin.rb +7 -60
- data/lib/Ice/PluginF.rb +3 -3
- data/lib/Ice/Process.rb +16 -52
- data/lib/Ice/ProcessF.rb +3 -3
- data/lib/Ice/Properties.rb +5 -41
- data/lib/Ice/PropertiesAdmin.rb +19 -56
- data/lib/Ice/PropertiesF.rb +3 -3
- data/lib/Ice/RemoteLogger.rb +34 -115
- data/lib/Ice/Router.rb +29 -101
- data/lib/Ice/RouterF.rb +3 -3
- data/lib/Ice/ServantLocator.rb +31 -0
- data/lib/Ice/{ObjectFactoryF.rb → ServantLocatorF.rb} +6 -6
- data/lib/Ice/SliceChecksumDict.rb +3 -3
- data/lib/Ice/ValueFactory.rb +33 -0
- data/lib/Ice/Version.rb +5 -11
- data/lib/IceBox.rb +1 -1
- data/lib/IceBox/IceBox.rb +44 -148
- data/lib/IceGrid.rb +1 -4
- data/lib/IceGrid/Admin.rb +551 -427
- data/lib/IceGrid/Descriptor.rb +62 -529
- data/lib/IceGrid/Exception.rb +24 -45
- data/lib/IceGrid/FileParser.rb +14 -50
- data/lib/IceGrid/PluginFacade.rb +40 -0
- data/lib/IceGrid/Registry.rb +151 -58
- data/lib/IceGrid/Session.rb +25 -64
- data/lib/IceGrid/UserAccountMapper.rb +14 -50
- data/lib/IcePatch2.rb +1 -1
- data/lib/IcePatch2/FileInfo.rb +5 -11
- data/lib/IcePatch2/FileServer.rb +33 -76
- data/lib/IceStorm.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +79 -206
- data/lib/IceStorm/Metrics.rb +11 -89
- data/slice/Glacier2/Metrics.ice +8 -4
- data/slice/Glacier2/PermissionsVerifier.ice +10 -7
- data/slice/Glacier2/PermissionsVerifierF.ice +7 -4
- data/slice/Glacier2/Router.ice +10 -8
- data/slice/Glacier2/RouterF.ice +7 -4
- data/slice/Glacier2/SSLInfo.ice +8 -5
- data/slice/Glacier2/Session.ice +15 -13
- data/slice/Ice/BuiltinSequences.ice +7 -4
- data/slice/Ice/Communicator.ice +141 -66
- data/slice/Ice/CommunicatorF.ice +7 -4
- data/slice/Ice/Connection.ice +183 -86
- data/slice/Ice/ConnectionF.ice +7 -4
- data/slice/Ice/Current.ice +13 -9
- data/slice/Ice/Endpoint.ice +63 -14
- data/slice/Ice/EndpointF.ice +7 -4
- data/slice/Ice/EndpointTypes.ice +8 -6
- data/slice/Ice/FacetMap.ice +7 -4
- data/slice/Ice/Identity.ice +13 -5
- data/slice/Ice/ImplicitContext.ice +20 -18
- data/slice/Ice/ImplicitContextF.ice +7 -4
- data/slice/Ice/Instrumentation.ice +20 -19
- data/slice/Ice/InstrumentationF.ice +8 -5
- data/slice/Ice/LocalException.ice +87 -87
- data/slice/Ice/Locator.ice +19 -18
- data/slice/Ice/LocatorF.ice +7 -4
- data/slice/Ice/Logger.ice +9 -7
- data/slice/Ice/LoggerF.ice +7 -4
- data/slice/Ice/Metrics.ice +18 -14
- data/slice/Ice/ObjectAdapter.ice +30 -13
- data/slice/Ice/ObjectAdapterF.ice +7 -4
- data/slice/Ice/ObjectFactory.ice +15 -12
- data/slice/Ice/Plugin.ice +9 -6
- data/slice/Ice/PluginF.ice +8 -5
- data/slice/Ice/Process.ice +9 -6
- data/slice/Ice/ProcessF.ice +7 -4
- data/slice/Ice/Properties.ice +15 -12
- data/slice/Ice/PropertiesAdmin.ice +9 -5
- data/slice/Ice/PropertiesF.ice +7 -4
- data/slice/Ice/RemoteLogger.ice +33 -24
- data/slice/Ice/Router.ice +16 -7
- data/slice/Ice/RouterF.ice +7 -4
- data/slice/Ice/ServantLocator.ice +13 -10
- data/slice/Ice/ServantLocatorF.ice +7 -4
- data/slice/Ice/SliceChecksumDict.ice +7 -4
- data/slice/Ice/ValueFactory.ice +127 -0
- data/slice/Ice/Version.ice +9 -5
- data/slice/IceBT/ConnectionInfo.ice +53 -0
- data/slice/IceBT/EndpointInfo.ice +51 -0
- data/slice/IceBT/Types.ice +39 -0
- data/slice/IceBox/IceBox.ice +20 -21
- data/slice/IceDiscovery/IceDiscovery.ice +9 -5
- data/slice/IceGrid/Admin.ice +390 -30
- data/slice/IceGrid/Descriptor.ice +37 -29
- data/slice/IceGrid/Exception.ice +33 -27
- data/slice/IceGrid/FileParser.ice +9 -6
- data/slice/IceGrid/PluginFacade.ice +11 -9
- data/slice/IceGrid/Registry.ice +139 -16
- data/slice/IceGrid/Session.ice +10 -8
- data/slice/IceGrid/UserAccountMapper.ice +9 -6
- data/slice/IceIAP/ConnectionInfo.ice +70 -0
- data/slice/IceIAP/EndpointInfo.ice +64 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +9 -7
- data/slice/IcePatch2/FileInfo.ice +9 -8
- data/slice/IcePatch2/FileServer.ice +17 -13
- data/slice/IceSSL/ConnectionInfo.ice +14 -17
- data/slice/IceSSL/ConnectionInfoF.ice +24 -0
- data/slice/IceSSL/EndpointInfo.ice +9 -30
- data/slice/IceStorm/IceStorm.ice +22 -18
- data/slice/IceStorm/Metrics.ice +9 -5
- metadata +154 -120
- data/ext/ObjectFactory.cpp +0 -140
- data/ext/ObjectFactory.h +0 -50
- data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
- 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/DeprecatedStringConverter.h +0 -62
- data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
- data/ext/ice/cpp/include/Ice/Identity.h +0 -168
- data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
- 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/Metrics.h +0 -2974
- data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
- 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/Outgoing.h +0 -225
- data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
- data/ext/ice/cpp/include/Ice/Process.h +0 -574
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
- 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/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/Slice/CPlusPlusUtil.h +0 -65
- 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/ObjCUtil.h +0 -127
- 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/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/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/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/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/IceGrid/Locator.ice +0 -57
- data/slice/IceGrid/Observer.ice +0 -395
- data/slice/IceGrid/Query.ice +0 -131
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -15,7 +15,7 @@
|
|
15
15
|
|
16
16
|
#include <Ice/RequestHandler.h>
|
17
17
|
#include <Ice/ResponseHandler.h>
|
18
|
-
#include <Ice/
|
18
|
+
#include <Ice/OutputStream.h>
|
19
19
|
#include <Ice/ObjectAdapterF.h>
|
20
20
|
#include <Ice/LoggerF.h>
|
21
21
|
#include <Ice/TraceLevelsF.h>
|
@@ -24,19 +24,19 @@ namespace Ice
|
|
24
24
|
{
|
25
25
|
|
26
26
|
class ObjectAdapterI;
|
27
|
-
|
27
|
+
ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI);
|
28
28
|
|
29
29
|
}
|
30
30
|
|
31
31
|
namespace IceInternal
|
32
32
|
{
|
33
33
|
|
34
|
-
class OutgoingBase;
|
35
|
-
class Outgoing;
|
36
34
|
class OutgoingAsyncBase;
|
37
35
|
class OutgoingAsync;
|
38
36
|
|
39
|
-
class CollocatedRequestHandler : public RequestHandler,
|
37
|
+
class CollocatedRequestHandler : public RequestHandler,
|
38
|
+
public ResponseHandler,
|
39
|
+
private IceUtil::Monitor<IceUtil::Mutex>
|
40
40
|
{
|
41
41
|
public:
|
42
42
|
|
@@ -45,13 +45,11 @@ public:
|
|
45
45
|
|
46
46
|
virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&);
|
47
47
|
|
48
|
-
virtual bool sendRequest(ProxyOutgoingBase*);
|
49
48
|
virtual AsyncStatus sendAsyncRequest(const ProxyOutgoingAsyncBasePtr&);
|
50
49
|
|
51
|
-
virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&);
|
52
50
|
virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&);
|
53
51
|
|
54
|
-
virtual void sendResponse(Ice::Int,
|
52
|
+
virtual void sendResponse(Ice::Int, Ice::OutputStream*, Ice::Byte, bool);
|
55
53
|
virtual void sendNoResponse();
|
56
54
|
virtual bool systemException(Ice::Int, const Ice::SystemException&, bool);
|
57
55
|
virtual void invokeException(Ice::Int, const Ice::LocalException&, int, bool);
|
@@ -61,13 +59,18 @@ public:
|
|
61
59
|
virtual Ice::ConnectionIPtr getConnection();
|
62
60
|
virtual Ice::ConnectionIPtr waitForConnection();
|
63
61
|
|
64
|
-
|
65
|
-
AsyncStatus invokeAsyncRequest(OutgoingAsyncBase*, int);
|
62
|
+
AsyncStatus invokeAsyncRequest(OutgoingAsyncBase*, int, bool);
|
66
63
|
|
67
|
-
bool sent(OutgoingBase*);
|
68
64
|
bool sentAsync(OutgoingAsyncBase*);
|
69
65
|
|
70
|
-
void invokeAll(
|
66
|
+
void invokeAll(Ice::OutputStream*, Ice::Int, Ice::Int);
|
67
|
+
|
68
|
+
#ifdef ICE_CPP11_MAPPING
|
69
|
+
std::shared_ptr<CollocatedRequestHandler> shared_from_this()
|
70
|
+
{
|
71
|
+
return std::static_pointer_cast<CollocatedRequestHandler>(ResponseHandler::shared_from_this());
|
72
|
+
}
|
73
|
+
#endif
|
71
74
|
|
72
75
|
private:
|
73
76
|
|
@@ -79,14 +82,10 @@ private:
|
|
79
82
|
const TraceLevelsPtr _traceLevels;
|
80
83
|
|
81
84
|
int _requestId;
|
82
|
-
|
83
|
-
std::map<OutgoingBase*, Ice::Int> _sendRequests;
|
84
85
|
std::map<OutgoingAsyncBasePtr, Ice::Int> _sendAsyncRequests;
|
85
|
-
|
86
|
-
std::map<Ice::Int, OutgoingBase*> _requests;
|
87
86
|
std::map<Ice::Int, OutgoingAsyncBasePtr> _asyncRequests;
|
88
87
|
};
|
89
|
-
|
88
|
+
ICE_DEFINE_PTR(CollocatedRequestHandlerPtr, CollocatedRequestHandler);
|
90
89
|
|
91
90
|
}
|
92
91
|
|
@@ -1,13 +1,13 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
7
7
|
//
|
8
8
|
// **********************************************************************
|
9
9
|
//
|
10
|
-
// Ice version 3.
|
10
|
+
// Ice version 3.7.0
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -24,28 +24,59 @@
|
|
24
24
|
#include <Ice/Communicator.h>
|
25
25
|
#include <IceUtil/PushDisableWarnings.h>
|
26
26
|
#include <Ice/LocalException.h>
|
27
|
-
#include <Ice/
|
28
|
-
#include <Ice/Outgoing.h>
|
27
|
+
#include <Ice/ValueFactory.h>
|
29
28
|
#include <Ice/OutgoingAsync.h>
|
30
|
-
#include <Ice/
|
31
|
-
#include <
|
29
|
+
#include <Ice/InputStream.h>
|
30
|
+
#include <Ice/OutputStream.h>
|
31
|
+
#include <Ice/LocalException.h>
|
32
32
|
#include <IceUtil/PopDisableWarnings.h>
|
33
33
|
|
34
|
+
#if defined(_MSC_VER)
|
35
|
+
# pragma warning(disable:4458) // declaration of ... hides class member
|
36
|
+
#elif defined(__clang__)
|
37
|
+
# pragma clang diagnostic ignored "-Wshadow"
|
38
|
+
#elif defined(__GNUC__)
|
39
|
+
# pragma GCC diagnostic ignored "-Wshadow"
|
40
|
+
#endif
|
41
|
+
|
34
42
|
#ifndef ICE_IGNORE_VERSION
|
35
|
-
# if ICE_INT_VERSION / 100 !=
|
43
|
+
# if ICE_INT_VERSION / 100 != 307
|
36
44
|
# error Ice version mismatch!
|
37
45
|
# endif
|
38
46
|
# if ICE_INT_VERSION % 100 > 50
|
39
47
|
# error Beta header file detected
|
40
48
|
# endif
|
41
|
-
# if ICE_INT_VERSION % 100 <
|
49
|
+
# if ICE_INT_VERSION % 100 < 0
|
42
50
|
# error Ice patch level mismatch!
|
43
51
|
# endif
|
44
52
|
#endif
|
45
53
|
|
54
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
55
|
+
|
46
56
|
namespace
|
47
57
|
{
|
48
58
|
|
49
59
|
}
|
50
60
|
|
61
|
+
Ice::Communicator::~Communicator()
|
62
|
+
{
|
63
|
+
}
|
64
|
+
|
65
|
+
#else // C++98 mapping
|
66
|
+
|
67
|
+
namespace
|
68
|
+
{
|
69
|
+
|
70
|
+
}
|
71
|
+
|
72
|
+
Ice::Communicator::~Communicator()
|
73
|
+
{
|
74
|
+
}
|
75
|
+
|
51
76
|
ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::Communicator* p) { return p; }
|
77
|
+
|
78
|
+
namespace Ice
|
79
|
+
{
|
80
|
+
}
|
81
|
+
|
82
|
+
#endif
|
@@ -1,13 +1,13 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
7
7
|
//
|
8
8
|
// **********************************************************************
|
9
9
|
//
|
10
|
-
// Ice version 3.
|
10
|
+
// Ice version 3.7.0
|
11
11
|
//
|
12
12
|
// <auto-generated>
|
13
13
|
//
|
@@ -23,22 +23,44 @@
|
|
23
23
|
#endif
|
24
24
|
#include <Ice/CommunicatorF.h>
|
25
25
|
#include <IceUtil/PushDisableWarnings.h>
|
26
|
-
#include <IceUtil/Iterator.h>
|
27
26
|
#include <IceUtil/PopDisableWarnings.h>
|
28
27
|
|
28
|
+
#if defined(_MSC_VER)
|
29
|
+
# pragma warning(disable:4458) // declaration of ... hides class member
|
30
|
+
#elif defined(__clang__)
|
31
|
+
# pragma clang diagnostic ignored "-Wshadow"
|
32
|
+
#elif defined(__GNUC__)
|
33
|
+
# pragma GCC diagnostic ignored "-Wshadow"
|
34
|
+
#endif
|
35
|
+
|
29
36
|
#ifndef ICE_IGNORE_VERSION
|
30
|
-
# if ICE_INT_VERSION / 100 !=
|
37
|
+
# if ICE_INT_VERSION / 100 != 307
|
31
38
|
# error Ice version mismatch!
|
32
39
|
# endif
|
33
40
|
# if ICE_INT_VERSION % 100 > 50
|
34
41
|
# error Beta header file detected
|
35
42
|
# endif
|
36
|
-
# if ICE_INT_VERSION % 100 <
|
43
|
+
# if ICE_INT_VERSION % 100 < 0
|
37
44
|
# error Ice patch level mismatch!
|
38
45
|
# endif
|
39
46
|
#endif
|
40
47
|
|
48
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
49
|
+
|
50
|
+
namespace
|
51
|
+
{
|
52
|
+
|
53
|
+
}
|
54
|
+
|
55
|
+
#else // C++98 mapping
|
56
|
+
|
41
57
|
namespace
|
42
58
|
{
|
43
59
|
|
44
60
|
}
|
61
|
+
|
62
|
+
namespace Ice
|
63
|
+
{
|
64
|
+
}
|
65
|
+
|
66
|
+
#endif
|
@@ -1,19 +1,19 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
7
7
|
//
|
8
8
|
// **********************************************************************
|
9
9
|
|
10
|
+
#include <IceUtil/DisableWarnings.h>
|
10
11
|
#include <Ice/CommunicatorI.h>
|
11
12
|
#include <Ice/Instance.h>
|
12
13
|
#include <Ice/Properties.h>
|
13
14
|
#include <Ice/ConnectionFactory.h>
|
14
15
|
#include <Ice/ReferenceFactory.h>
|
15
16
|
#include <Ice/ProxyFactory.h>
|
16
|
-
#include <Ice/ObjectFactoryManager.h>
|
17
17
|
#include <Ice/ObjectAdapterFactory.h>
|
18
18
|
#include <Ice/LoggerUtil.h>
|
19
19
|
#include <Ice/LocalException.h>
|
@@ -23,14 +23,176 @@
|
|
23
23
|
#include <Ice/OutgoingAsync.h>
|
24
24
|
#include <IceUtil/Mutex.h>
|
25
25
|
#include <IceUtil/MutexPtrLock.h>
|
26
|
-
#include <
|
26
|
+
#include <Ice/UUID.h>
|
27
27
|
|
28
28
|
using namespace std;
|
29
29
|
using namespace Ice;
|
30
30
|
using namespace IceInternal;
|
31
31
|
|
32
|
+
#ifndef ICE_CPP11_MAPPING
|
33
|
+
IceUtil::Shared* IceInternal::upCast(CommunicatorFlushBatchAsync* p) { return p; }
|
34
|
+
#endif
|
35
|
+
|
36
|
+
CommunicatorFlushBatchAsync::~CommunicatorFlushBatchAsync()
|
37
|
+
{
|
38
|
+
// Out of line to avoid weak vtable
|
39
|
+
}
|
40
|
+
|
41
|
+
CommunicatorFlushBatchAsync::CommunicatorFlushBatchAsync(const InstancePtr& instance) :
|
42
|
+
OutgoingAsyncBase(instance)
|
43
|
+
{
|
44
|
+
//
|
45
|
+
// _useCount is initialized to 1 to prevent premature callbacks.
|
46
|
+
// The caller must invoke ready() after all flush requests have
|
47
|
+
// been initiated.
|
48
|
+
//
|
49
|
+
_useCount = 1;
|
50
|
+
}
|
51
|
+
|
52
|
+
void
|
53
|
+
CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con, Ice::CompressBatch compressBatch)
|
54
|
+
{
|
55
|
+
class FlushBatch : public OutgoingAsyncBase
|
56
|
+
{
|
57
|
+
public:
|
58
|
+
|
59
|
+
FlushBatch(const CommunicatorFlushBatchAsyncPtr& outAsync,
|
60
|
+
const InstancePtr& instance,
|
61
|
+
InvocationObserver& observer) :
|
62
|
+
OutgoingAsyncBase(instance), _outAsync(outAsync), _observer(observer)
|
63
|
+
{
|
64
|
+
}
|
65
|
+
|
66
|
+
virtual bool
|
67
|
+
sent()
|
68
|
+
{
|
69
|
+
_childObserver.detach();
|
70
|
+
_outAsync->check(false);
|
71
|
+
return false;
|
72
|
+
}
|
73
|
+
|
74
|
+
virtual bool
|
75
|
+
exception(const Exception& ex)
|
76
|
+
{
|
77
|
+
_childObserver.failed(ex.ice_id());
|
78
|
+
_childObserver.detach();
|
79
|
+
_outAsync->check(false);
|
80
|
+
return false;
|
81
|
+
}
|
82
|
+
|
83
|
+
virtual InvocationObserver&
|
84
|
+
getObserver()
|
85
|
+
{
|
86
|
+
return _observer;
|
87
|
+
}
|
88
|
+
|
89
|
+
virtual bool handleSent(bool, bool)
|
90
|
+
{
|
91
|
+
return false;
|
92
|
+
}
|
93
|
+
|
94
|
+
virtual bool handleException(const Ice::Exception&)
|
95
|
+
{
|
96
|
+
return false;
|
97
|
+
}
|
98
|
+
|
99
|
+
virtual bool handleResponse(bool)
|
100
|
+
{
|
101
|
+
return false;
|
102
|
+
}
|
103
|
+
|
104
|
+
virtual void handleInvokeSent(bool, OutgoingAsyncBase*) const
|
105
|
+
{
|
106
|
+
assert(false);
|
107
|
+
}
|
108
|
+
|
109
|
+
virtual void handleInvokeException(const Ice::Exception&, OutgoingAsyncBase*) const
|
110
|
+
{
|
111
|
+
assert(false);
|
112
|
+
}
|
113
|
+
|
114
|
+
virtual void handleInvokeResponse(bool, OutgoingAsyncBase*) const
|
115
|
+
{
|
116
|
+
assert(false);
|
117
|
+
}
|
118
|
+
|
119
|
+
private:
|
120
|
+
|
121
|
+
const CommunicatorFlushBatchAsyncPtr _outAsync;
|
122
|
+
InvocationObserver& _observer;
|
123
|
+
};
|
124
|
+
|
125
|
+
{
|
126
|
+
Lock sync(_m);
|
127
|
+
++_useCount;
|
128
|
+
}
|
129
|
+
|
130
|
+
try
|
131
|
+
{
|
132
|
+
OutgoingAsyncBasePtr flushBatch = ICE_MAKE_SHARED(FlushBatch, ICE_SHARED_FROM_THIS, _instance, _observer);
|
133
|
+
bool compress;
|
134
|
+
int batchRequestNum = con->getBatchRequestQueue()->swap(flushBatch->getOs(), compress);
|
135
|
+
if(batchRequestNum == 0)
|
136
|
+
{
|
137
|
+
flushBatch->sent();
|
138
|
+
}
|
139
|
+
else
|
140
|
+
{
|
141
|
+
if(compressBatch == ICE_SCOPED_ENUM(CompressBatch, Yes))
|
142
|
+
{
|
143
|
+
compress = true;
|
144
|
+
}
|
145
|
+
else if(compressBatch == ICE_SCOPED_ENUM(CompressBatch, No))
|
146
|
+
{
|
147
|
+
compress = false;
|
148
|
+
}
|
149
|
+
con->sendAsyncRequest(flushBatch, compress, false, batchRequestNum);
|
150
|
+
}
|
151
|
+
}
|
152
|
+
catch(const LocalException&)
|
153
|
+
{
|
154
|
+
check(false);
|
155
|
+
throw;
|
156
|
+
}
|
157
|
+
}
|
158
|
+
|
159
|
+
void
|
160
|
+
CommunicatorFlushBatchAsync::invoke(const string& operation, CompressBatch compressBatch)
|
161
|
+
{
|
162
|
+
_observer.attach(_instance.get(), operation);
|
163
|
+
_instance->outgoingConnectionFactory()->flushAsyncBatchRequests(ICE_SHARED_FROM_THIS, compressBatch);
|
164
|
+
_instance->objectAdapterFactory()->flushAsyncBatchRequests(ICE_SHARED_FROM_THIS, compressBatch);
|
165
|
+
check(true);
|
166
|
+
}
|
167
|
+
|
168
|
+
void
|
169
|
+
CommunicatorFlushBatchAsync::check(bool userThread)
|
170
|
+
{
|
171
|
+
{
|
172
|
+
Lock sync(_m);
|
173
|
+
assert(_useCount > 0);
|
174
|
+
if(--_useCount > 0)
|
175
|
+
{
|
176
|
+
return;
|
177
|
+
}
|
178
|
+
}
|
179
|
+
|
180
|
+
if(sentImpl(true))
|
181
|
+
{
|
182
|
+
if(userThread)
|
183
|
+
{
|
184
|
+
_sentSynchronously = true;
|
185
|
+
invokeSent();
|
186
|
+
}
|
187
|
+
else
|
188
|
+
{
|
189
|
+
invokeSentAsync();
|
190
|
+
}
|
191
|
+
}
|
192
|
+
}
|
193
|
+
|
32
194
|
void
|
33
|
-
Ice::CommunicatorI::destroy()
|
195
|
+
Ice::CommunicatorI::destroy() ICE_NOEXCEPT
|
34
196
|
{
|
35
197
|
if(_instance)
|
36
198
|
{
|
@@ -56,26 +218,26 @@ Ice::CommunicatorI::isShutdown() const
|
|
56
218
|
return _instance->objectAdapterFactory()->isShutdown();
|
57
219
|
}
|
58
220
|
|
59
|
-
|
221
|
+
ObjectPrxPtr
|
60
222
|
Ice::CommunicatorI::stringToProxy(const string& s) const
|
61
223
|
{
|
62
224
|
return _instance->proxyFactory()->stringToProxy(s);
|
63
225
|
}
|
64
226
|
|
65
227
|
string
|
66
|
-
Ice::CommunicatorI::proxyToString(const
|
228
|
+
Ice::CommunicatorI::proxyToString(const ObjectPrxPtr& proxy) const
|
67
229
|
{
|
68
230
|
return _instance->proxyFactory()->proxyToString(proxy);
|
69
231
|
}
|
70
232
|
|
71
|
-
|
233
|
+
ObjectPrxPtr
|
72
234
|
Ice::CommunicatorI::propertyToProxy(const string& p) const
|
73
235
|
{
|
74
236
|
return _instance->proxyFactory()->propertyToProxy(p);
|
75
237
|
}
|
76
238
|
|
77
239
|
PropertyDict
|
78
|
-
Ice::CommunicatorI::proxyToProperty(const
|
240
|
+
Ice::CommunicatorI::proxyToProperty(const ObjectPrxPtr& proxy, const string& property) const
|
79
241
|
{
|
80
242
|
return _instance->proxyFactory()->proxyToProperty(proxy, property);
|
81
243
|
}
|
@@ -83,19 +245,19 @@ Ice::CommunicatorI::proxyToProperty(const ObjectPrx& proxy, const string& proper
|
|
83
245
|
Identity
|
84
246
|
Ice::CommunicatorI::stringToIdentity(const string& s) const
|
85
247
|
{
|
86
|
-
return
|
248
|
+
return Ice::stringToIdentity(s);
|
87
249
|
}
|
88
250
|
|
89
251
|
string
|
90
252
|
Ice::CommunicatorI::identityToString(const Identity& ident) const
|
91
253
|
{
|
92
|
-
return _instance->
|
254
|
+
return Ice::identityToString(ident, _instance->toStringMode());
|
93
255
|
}
|
94
256
|
|
95
257
|
ObjectAdapterPtr
|
96
258
|
Ice::CommunicatorI::createObjectAdapter(const string& name)
|
97
259
|
{
|
98
|
-
return _instance->objectAdapterFactory()->createObjectAdapter(name,
|
260
|
+
return _instance->objectAdapterFactory()->createObjectAdapter(name, ICE_NULLPTR);
|
99
261
|
}
|
100
262
|
|
101
263
|
ObjectAdapterPtr
|
@@ -104,20 +266,20 @@ Ice::CommunicatorI::createObjectAdapterWithEndpoints(const string& name, const s
|
|
104
266
|
string oaName = name;
|
105
267
|
if(oaName.empty())
|
106
268
|
{
|
107
|
-
oaName =
|
269
|
+
oaName = Ice::generateUUID();
|
108
270
|
}
|
109
271
|
|
110
272
|
getProperties()->setProperty(oaName + ".Endpoints", endpoints);
|
111
|
-
return _instance->objectAdapterFactory()->createObjectAdapter(oaName,
|
273
|
+
return _instance->objectAdapterFactory()->createObjectAdapter(oaName, ICE_NULLPTR);
|
112
274
|
}
|
113
275
|
|
114
276
|
ObjectAdapterPtr
|
115
|
-
Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const
|
277
|
+
Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const RouterPrxPtr& router)
|
116
278
|
{
|
117
279
|
string oaName = name;
|
118
280
|
if(oaName.empty())
|
119
281
|
{
|
120
|
-
oaName =
|
282
|
+
oaName = Ice::generateUUID();
|
121
283
|
}
|
122
284
|
|
123
285
|
PropertyDict properties = proxyToProperty(router, oaName + ".Router");
|
@@ -130,15 +292,15 @@ Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const Rout
|
|
130
292
|
}
|
131
293
|
|
132
294
|
void
|
133
|
-
Ice::CommunicatorI::addObjectFactory(const ObjectFactoryPtr& factory, const string& id)
|
295
|
+
Ice::CommunicatorI::addObjectFactory(const ::Ice::ObjectFactoryPtr& factory, const string& id)
|
134
296
|
{
|
135
|
-
_instance->
|
297
|
+
_instance->addObjectFactory(factory, id);
|
136
298
|
}
|
137
299
|
|
138
|
-
ObjectFactoryPtr
|
300
|
+
::Ice::ObjectFactoryPtr
|
139
301
|
Ice::CommunicatorI::findObjectFactory(const string& id) const
|
140
302
|
{
|
141
|
-
return _instance->
|
303
|
+
return _instance->findObjectFactory(id);
|
142
304
|
}
|
143
305
|
|
144
306
|
PropertiesPtr
|
@@ -159,26 +321,26 @@ Ice::CommunicatorI::getObserver() const
|
|
159
321
|
return _instance->initializationData().observer;
|
160
322
|
}
|
161
323
|
|
162
|
-
|
324
|
+
RouterPrxPtr
|
163
325
|
Ice::CommunicatorI::getDefaultRouter() const
|
164
326
|
{
|
165
327
|
return _instance->referenceFactory()->getDefaultRouter();
|
166
328
|
}
|
167
329
|
|
168
330
|
void
|
169
|
-
Ice::CommunicatorI::setDefaultRouter(const
|
331
|
+
Ice::CommunicatorI::setDefaultRouter(const RouterPrxPtr& router)
|
170
332
|
{
|
171
333
|
_instance->setDefaultRouter(router);
|
172
334
|
}
|
173
335
|
|
174
|
-
|
336
|
+
LocatorPrxPtr
|
175
337
|
Ice::CommunicatorI::getDefaultLocator() const
|
176
338
|
{
|
177
339
|
return _instance->referenceFactory()->getDefaultLocator();
|
178
340
|
}
|
179
341
|
|
180
342
|
void
|
181
|
-
Ice::CommunicatorI::setDefaultLocator(const
|
343
|
+
Ice::CommunicatorI::setDefaultLocator(const LocatorPrxPtr& locator)
|
182
344
|
{
|
183
345
|
_instance->setDefaultLocator(locator);
|
184
346
|
}
|
@@ -195,120 +357,125 @@ Ice::CommunicatorI::getPluginManager() const
|
|
195
357
|
return _instance->pluginManager();
|
196
358
|
}
|
197
359
|
|
360
|
+
ValueFactoryManagerPtr
|
361
|
+
Ice::CommunicatorI::getValueFactoryManager() const
|
362
|
+
{
|
363
|
+
return _instance->initializationData().valueFactoryManager;
|
364
|
+
}
|
365
|
+
|
366
|
+
namespace
|
367
|
+
{
|
368
|
+
|
369
|
+
const ::std::string flushBatchRequests_name = "flushBatchRequests";
|
370
|
+
|
371
|
+
}
|
372
|
+
|
373
|
+
#ifdef ICE_CPP11_MAPPING
|
374
|
+
|
375
|
+
::std::function<void()>
|
376
|
+
Ice::CommunicatorI::flushBatchRequestsAsync(CompressBatch compress,
|
377
|
+
function<void(exception_ptr)> ex,
|
378
|
+
function<void(bool)> sent)
|
379
|
+
{
|
380
|
+
class CommunicatorFlushBatchLambda : public CommunicatorFlushBatchAsync, public LambdaInvoke
|
381
|
+
{
|
382
|
+
public:
|
383
|
+
|
384
|
+
CommunicatorFlushBatchLambda(const InstancePtr& instance,
|
385
|
+
std::function<void(std::exception_ptr)> ex,
|
386
|
+
std::function<void(bool)> sent) :
|
387
|
+
CommunicatorFlushBatchAsync(instance), LambdaInvoke(std::move(ex), std::move(sent))
|
388
|
+
{
|
389
|
+
}
|
390
|
+
};
|
391
|
+
auto outAsync = make_shared<CommunicatorFlushBatchLambda>(_instance, ex, sent);
|
392
|
+
outAsync->invoke(flushBatchRequests_name, compress);
|
393
|
+
return [outAsync]() { outAsync->cancel(); };
|
394
|
+
}
|
395
|
+
|
396
|
+
#else
|
397
|
+
|
198
398
|
void
|
199
|
-
Ice::CommunicatorI::flushBatchRequests()
|
399
|
+
Ice::CommunicatorI::flushBatchRequests(CompressBatch compress)
|
200
400
|
{
|
201
|
-
end_flushBatchRequests(begin_flushBatchRequests());
|
401
|
+
end_flushBatchRequests(begin_flushBatchRequests(compress));
|
202
402
|
}
|
203
403
|
|
204
404
|
AsyncResultPtr
|
205
|
-
Ice::CommunicatorI::begin_flushBatchRequests()
|
405
|
+
Ice::CommunicatorI::begin_flushBatchRequests(CompressBatch compress)
|
206
406
|
{
|
207
|
-
return
|
407
|
+
return _iceI_begin_flushBatchRequests(compress, ::IceInternal::dummyCallback, 0);
|
208
408
|
}
|
209
409
|
|
210
410
|
AsyncResultPtr
|
211
|
-
Ice::CommunicatorI::begin_flushBatchRequests(
|
411
|
+
Ice::CommunicatorI::begin_flushBatchRequests(CompressBatch compress,
|
412
|
+
const CallbackPtr& cb,
|
413
|
+
const LocalObjectPtr& cookie)
|
212
414
|
{
|
213
|
-
return
|
415
|
+
return _iceI_begin_flushBatchRequests(compress, cb, cookie);
|
214
416
|
}
|
215
417
|
|
216
418
|
AsyncResultPtr
|
217
|
-
Ice::CommunicatorI::begin_flushBatchRequests(
|
419
|
+
Ice::CommunicatorI::begin_flushBatchRequests(CompressBatch compress,
|
420
|
+
const Callback_Communicator_flushBatchRequestsPtr& cb,
|
218
421
|
const LocalObjectPtr& cookie)
|
219
422
|
{
|
220
|
-
return
|
423
|
+
return _iceI_begin_flushBatchRequests(compress, cb, cookie);
|
221
424
|
}
|
222
425
|
|
223
426
|
AsyncResultPtr
|
224
|
-
Ice::CommunicatorI::
|
225
|
-
|
427
|
+
Ice::CommunicatorI::_iceI_begin_flushBatchRequests(CompressBatch compress,
|
428
|
+
const IceInternal::CallbackBasePtr& cb,
|
429
|
+
const LocalObjectPtr& cookie)
|
226
430
|
{
|
227
|
-
|
228
|
-
class Cpp11CB : public IceInternal::Cpp11FnCallbackNC
|
431
|
+
class CommunicatorFlushBatchAsyncWithCallback : public CommunicatorFlushBatchAsync, public CallbackCompletion
|
229
432
|
{
|
230
|
-
|
231
433
|
public:
|
232
434
|
|
233
|
-
|
234
|
-
|
235
|
-
|
435
|
+
CommunicatorFlushBatchAsyncWithCallback(const Ice::CommunicatorPtr& communicator,
|
436
|
+
const InstancePtr& instance,
|
437
|
+
const CallbackBasePtr& callback,
|
438
|
+
const Ice::LocalObjectPtr& cookie) :
|
439
|
+
CommunicatorFlushBatchAsync(instance), CallbackCompletion(callback, cookie), _communicator(communicator)
|
236
440
|
{
|
237
|
-
|
441
|
+
_cookie = cookie;
|
238
442
|
}
|
239
443
|
|
240
|
-
virtual
|
241
|
-
completed(const AsyncResultPtr& __result) const
|
444
|
+
virtual Ice::CommunicatorPtr getCommunicator() const
|
242
445
|
{
|
243
|
-
|
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
|
-
}
|
446
|
+
return _communicator;
|
254
447
|
}
|
255
|
-
};
|
256
|
-
|
257
|
-
return __begin_flushBatchRequests(new Cpp11CB(exception, sent), 0);
|
258
|
-
#else
|
259
|
-
assert(false); // Ice not built with C++11 support.
|
260
|
-
return 0;
|
261
|
-
#endif
|
262
|
-
}
|
263
|
-
|
264
|
-
namespace
|
265
|
-
{
|
266
|
-
|
267
|
-
const ::std::string __flushBatchRequests_name = "flushBatchRequests";
|
268
|
-
|
269
|
-
}
|
270
448
|
|
271
|
-
|
272
|
-
|
273
|
-
{
|
274
|
-
|
275
|
-
|
276
|
-
|
277
|
-
//
|
278
|
-
// This callback object receives the results of all invocations
|
279
|
-
// of Connection::begin_flushBatchRequests.
|
280
|
-
//
|
281
|
-
CommunicatorFlushBatchAsyncPtr result = new CommunicatorFlushBatchAsync(this,
|
282
|
-
_instance,
|
283
|
-
__flushBatchRequests_name,
|
284
|
-
cb,
|
285
|
-
cookie);
|
449
|
+
virtual const std::string&
|
450
|
+
getOperation() const
|
451
|
+
{
|
452
|
+
return flushBatchRequests_name;
|
453
|
+
}
|
286
454
|
|
287
|
-
|
288
|
-
adapterFactory->flushAsyncBatchRequests(result);
|
455
|
+
private:
|
289
456
|
|
290
|
-
|
291
|
-
|
292
|
-
// flush requests.
|
293
|
-
//
|
294
|
-
result->ready();
|
457
|
+
Ice::CommunicatorPtr _communicator;
|
458
|
+
};
|
295
459
|
|
460
|
+
CommunicatorFlushBatchAsyncPtr result = new CommunicatorFlushBatchAsyncWithCallback(this, _instance, cb, cookie);
|
461
|
+
result->invoke(flushBatchRequests_name, compress);
|
296
462
|
return result;
|
297
463
|
}
|
298
464
|
|
299
465
|
void
|
300
466
|
Ice::CommunicatorI::end_flushBatchRequests(const AsyncResultPtr& r)
|
301
467
|
{
|
302
|
-
AsyncResult::
|
303
|
-
r->
|
468
|
+
AsyncResult::_check(r, this, flushBatchRequests_name);
|
469
|
+
r->_waitForResponse();
|
304
470
|
}
|
471
|
+
#endif
|
305
472
|
|
306
|
-
|
473
|
+
ObjectPrxPtr
|
307
474
|
Ice::CommunicatorI::createAdmin(const ObjectAdapterPtr& adminAdapter, const Identity& adminId)
|
308
475
|
{
|
309
476
|
return _instance->createAdmin(adminAdapter, adminId);
|
310
477
|
}
|
311
|
-
|
478
|
+
ObjectPrxPtr
|
312
479
|
Ice::CommunicatorI::getAdmin() const
|
313
480
|
{
|
314
481
|
return _instance->getAdmin();
|
@@ -338,32 +505,32 @@ Ice::CommunicatorI::findAllAdminFacets()
|
|
338
505
|
return _instance->findAllAdminFacets();
|
339
506
|
}
|
340
507
|
|
341
|
-
|
508
|
+
CommunicatorIPtr
|
509
|
+
Ice::CommunicatorI::create(const InitializationData& initData)
|
342
510
|
{
|
343
|
-
|
511
|
+
Ice::CommunicatorIPtr communicator = ICE_MAKE_SHARED(CommunicatorI);
|
344
512
|
try
|
345
513
|
{
|
346
|
-
const_cast<InstancePtr&>(_instance) = new Instance(
|
514
|
+
const_cast<InstancePtr&>(communicator->_instance) = new Instance(communicator, initData);
|
347
515
|
|
348
516
|
//
|
349
517
|
// Keep a reference to the dynamic library list to ensure
|
350
518
|
// the libraries are not unloaded until this Communicator's
|
351
519
|
// destructor is invoked.
|
352
520
|
//
|
353
|
-
const_cast<DynamicLibraryListPtr&>(_dynamicLibraryList) = _instance->dynamicLibraryList();
|
521
|
+
const_cast<DynamicLibraryListPtr&>(communicator->_dynamicLibraryList) = communicator->_instance->dynamicLibraryList();
|
354
522
|
}
|
355
523
|
catch(...)
|
356
524
|
{
|
357
|
-
destroy();
|
358
|
-
__setNoDelete(false);
|
525
|
+
communicator->destroy();
|
359
526
|
throw;
|
360
527
|
}
|
361
|
-
|
528
|
+
return communicator;
|
362
529
|
}
|
363
530
|
|
364
531
|
Ice::CommunicatorI::~CommunicatorI()
|
365
532
|
{
|
366
|
-
if(!_instance->destroyed())
|
533
|
+
if(_instance && !_instance->destroyed())
|
367
534
|
{
|
368
535
|
Warning out(_instance->initializationData().logger);
|
369
536
|
out << "Ice::Communicator::destroy() has not been called";
|
@@ -371,11 +538,11 @@ Ice::CommunicatorI::~CommunicatorI()
|
|
371
538
|
}
|
372
539
|
|
373
540
|
void
|
374
|
-
Ice::CommunicatorI::finishSetup(int& argc, char* argv[])
|
541
|
+
Ice::CommunicatorI::finishSetup(int& argc, const char* argv[])
|
375
542
|
{
|
376
543
|
try
|
377
544
|
{
|
378
|
-
_instance->finishSetup(argc, argv,
|
545
|
+
_instance->finishSetup(argc, argv, ICE_SHARED_FROM_THIS);
|
379
546
|
}
|
380
547
|
catch(...)
|
381
548
|
{
|