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,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,27 +23,66 @@
|
|
23
23
|
#endif
|
24
24
|
#include <Ice/Plugin.h>
|
25
25
|
#include <IceUtil/PushDisableWarnings.h>
|
26
|
-
#include <Ice/
|
27
|
-
#include <
|
26
|
+
#include <Ice/InputStream.h>
|
27
|
+
#include <Ice/OutputStream.h>
|
28
28
|
#include <IceUtil/PopDisableWarnings.h>
|
29
29
|
|
30
|
+
#if defined(_MSC_VER)
|
31
|
+
# pragma warning(disable:4458) // declaration of ... hides class member
|
32
|
+
#elif defined(__clang__)
|
33
|
+
# pragma clang diagnostic ignored "-Wshadow"
|
34
|
+
#elif defined(__GNUC__)
|
35
|
+
# pragma GCC diagnostic ignored "-Wshadow"
|
36
|
+
#endif
|
37
|
+
|
30
38
|
#ifndef ICE_IGNORE_VERSION
|
31
|
-
# if ICE_INT_VERSION / 100 !=
|
39
|
+
# if ICE_INT_VERSION / 100 != 307
|
32
40
|
# error Ice version mismatch!
|
33
41
|
# endif
|
34
42
|
# if ICE_INT_VERSION % 100 > 50
|
35
43
|
# error Beta header file detected
|
36
44
|
# endif
|
37
|
-
# if ICE_INT_VERSION % 100 <
|
45
|
+
# if ICE_INT_VERSION % 100 < 0
|
38
46
|
# error Ice patch level mismatch!
|
39
47
|
# endif
|
40
48
|
#endif
|
41
49
|
|
50
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
51
|
+
|
52
|
+
namespace
|
53
|
+
{
|
54
|
+
|
55
|
+
}
|
56
|
+
|
57
|
+
Ice::Plugin::~Plugin()
|
58
|
+
{
|
59
|
+
}
|
60
|
+
|
61
|
+
Ice::PluginManager::~PluginManager()
|
62
|
+
{
|
63
|
+
}
|
64
|
+
|
65
|
+
#else // C++98 mapping
|
66
|
+
|
42
67
|
namespace
|
43
68
|
{
|
44
69
|
|
45
70
|
}
|
46
71
|
|
72
|
+
Ice::Plugin::~Plugin()
|
73
|
+
{
|
74
|
+
}
|
75
|
+
|
47
76
|
ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::Plugin* p) { return p; }
|
48
77
|
|
78
|
+
Ice::PluginManager::~PluginManager()
|
79
|
+
{
|
80
|
+
}
|
81
|
+
|
49
82
|
ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::PluginManager* p) { return p; }
|
83
|
+
|
84
|
+
namespace Ice
|
85
|
+
{
|
86
|
+
}
|
87
|
+
|
88
|
+
#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/PluginF.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,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.
|
@@ -25,7 +25,7 @@ const char * const Ice::PluginManagerI::_kindOfObject = "plugin";
|
|
25
25
|
namespace
|
26
26
|
{
|
27
27
|
|
28
|
-
map<string,
|
28
|
+
map<string, PluginFactory>* factories = 0;
|
29
29
|
vector<string>* loadOnInitialization = 0;
|
30
30
|
|
31
31
|
class PluginFactoryDestroy
|
@@ -46,14 +46,14 @@ PluginFactoryDestroy destroy;
|
|
46
46
|
}
|
47
47
|
|
48
48
|
void
|
49
|
-
Ice::PluginManagerI::registerPluginFactory(const std::string& name,
|
49
|
+
Ice::PluginManagerI::registerPluginFactory(const std::string& name, PluginFactory factory, bool loadOnInit)
|
50
50
|
{
|
51
51
|
if(factories == 0)
|
52
52
|
{
|
53
|
-
factories = new map<string,
|
53
|
+
factories = new map<string, PluginFactory>();
|
54
54
|
}
|
55
55
|
|
56
|
-
map<string,
|
56
|
+
map<string, PluginFactory>::const_iterator p = factories->find(name);
|
57
57
|
if(p == factories->end())
|
58
58
|
{
|
59
59
|
factories->insert(make_pair(name, factory));
|
@@ -249,7 +249,7 @@ Ice::PluginManagerI::PluginManagerI(const CommunicatorPtr& communicator, const D
|
|
249
249
|
}
|
250
250
|
|
251
251
|
void
|
252
|
-
Ice::PluginManagerI::loadPlugins(int& argc, char* argv[])
|
252
|
+
Ice::PluginManagerI::loadPlugins(int& argc, const char* argv[])
|
253
253
|
{
|
254
254
|
assert(_communicator);
|
255
255
|
|
@@ -440,8 +440,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
|
|
440
440
|
cmdArgs = properties->parseCommandLineOptions(name, cmdArgs);
|
441
441
|
}
|
442
442
|
|
443
|
-
|
444
|
-
PLUGIN_FACTORY factory = 0;
|
443
|
+
PluginFactory factory = 0;
|
445
444
|
DynamicLibraryPtr library;
|
446
445
|
|
447
446
|
//
|
@@ -451,7 +450,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
|
|
451
450
|
//
|
452
451
|
if(factories)
|
453
452
|
{
|
454
|
-
map<string,
|
453
|
+
map<string, PluginFactory>::const_iterator p = factories->find(name);
|
455
454
|
if(p != factories->end())
|
456
455
|
{
|
457
456
|
factory = p->second;
|
@@ -480,19 +479,20 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
|
|
480
479
|
ex.reason = out.str();
|
481
480
|
throw ex;
|
482
481
|
}
|
482
|
+
|
483
483
|
#ifdef __IBMCPP__
|
484
|
-
|
485
|
-
#pragma report(disable, "1540-0216")
|
484
|
+
// xlC warns when casting a void* to function pointer
|
485
|
+
# pragma report(disable, "1540-0216")
|
486
486
|
#endif
|
487
487
|
|
488
|
-
factory = reinterpret_cast<
|
488
|
+
factory = reinterpret_cast<PluginFactory>(sym);
|
489
489
|
}
|
490
490
|
|
491
491
|
//
|
492
492
|
// Invoke the factory function. No exceptions can be raised
|
493
493
|
// by the factory function because it's declared extern "C".
|
494
494
|
//
|
495
|
-
plugin
|
495
|
+
PluginPtr plugin(factory(_communicator, name, args));
|
496
496
|
if(!plugin)
|
497
497
|
{
|
498
498
|
PluginInitializationException e(__FILE__, __LINE__);
|
@@ -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.
|
@@ -21,26 +21,26 @@
|
|
21
21
|
namespace Ice
|
22
22
|
{
|
23
23
|
|
24
|
-
typedef Ice::Plugin* (*
|
24
|
+
typedef Ice::Plugin* (*PluginFactory)(const ::Ice::CommunicatorPtr&, const std::string&, const ::Ice::StringSeq&);
|
25
25
|
|
26
26
|
class PluginManagerI : public PluginManager, public IceUtil::Mutex
|
27
27
|
{
|
28
28
|
public:
|
29
29
|
|
30
|
-
static void registerPluginFactory(const std::string&,
|
30
|
+
static void registerPluginFactory(const std::string&, PluginFactory, bool);
|
31
31
|
|
32
32
|
virtual void initializePlugins();
|
33
33
|
virtual StringSeq getPlugins();
|
34
34
|
virtual PluginPtr getPlugin(const std::string&);
|
35
35
|
virtual void addPlugin(const std::string&, const PluginPtr&);
|
36
36
|
virtual void destroy();
|
37
|
+
PluginManagerI(const CommunicatorPtr&, const IceInternal::DynamicLibraryListPtr&);
|
37
38
|
|
38
39
|
private:
|
39
40
|
|
40
|
-
PluginManagerI(const CommunicatorPtr&, const IceInternal::DynamicLibraryListPtr&);
|
41
41
|
friend class IceInternal::Instance;
|
42
42
|
|
43
|
-
void loadPlugins(int&, char*[]);
|
43
|
+
void loadPlugins(int&, const char*[]);
|
44
44
|
void loadPlugin(const std::string&, const std::string&, StringSeq&);
|
45
45
|
|
46
46
|
PluginPtr findPlugin(const std::string&) const;
|
@@ -63,5 +63,4 @@ typedef IceUtil::Handle<PluginManagerI> PluginManagerIPtr;
|
|
63
63
|
|
64
64
|
}
|
65
65
|
|
66
|
-
|
67
66
|
#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
|
//
|
@@ -24,43 +24,196 @@
|
|
24
24
|
#include <Ice/Process.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>
|
32
31
|
#include <IceUtil/PopDisableWarnings.h>
|
33
32
|
|
33
|
+
#if defined(_MSC_VER)
|
34
|
+
# pragma warning(disable:4458) // declaration of ... hides class member
|
35
|
+
#elif defined(__clang__)
|
36
|
+
# pragma clang diagnostic ignored "-Wshadow"
|
37
|
+
#elif defined(__GNUC__)
|
38
|
+
# pragma GCC diagnostic ignored "-Wshadow"
|
39
|
+
#endif
|
40
|
+
|
34
41
|
#ifndef ICE_IGNORE_VERSION
|
35
|
-
# if ICE_INT_VERSION / 100 !=
|
42
|
+
# if ICE_INT_VERSION / 100 != 307
|
36
43
|
# error Ice version mismatch!
|
37
44
|
# endif
|
38
45
|
# if ICE_INT_VERSION % 100 > 50
|
39
46
|
# error Beta header file detected
|
40
47
|
# endif
|
41
|
-
# if ICE_INT_VERSION % 100 <
|
48
|
+
# if ICE_INT_VERSION % 100 < 0
|
42
49
|
# error Ice patch level mismatch!
|
43
50
|
# endif
|
44
51
|
#endif
|
45
52
|
|
53
|
+
#ifdef ICE_CPP11_MAPPING // C++11 mapping
|
54
|
+
|
46
55
|
namespace
|
47
56
|
{
|
48
57
|
|
49
|
-
const ::std::string
|
58
|
+
const ::std::string iceC_Ice_Process_ids[2] =
|
59
|
+
{
|
60
|
+
"::Ice::Object",
|
61
|
+
"::Ice::Process"
|
62
|
+
};
|
63
|
+
const ::std::string iceC_Ice_Process_ops[] =
|
64
|
+
{
|
65
|
+
"ice_id",
|
66
|
+
"ice_ids",
|
67
|
+
"ice_isA",
|
68
|
+
"ice_ping",
|
69
|
+
"shutdown",
|
70
|
+
"writeMessage"
|
71
|
+
};
|
72
|
+
const ::std::string iceC_Ice_Process_shutdown_name = "shutdown";
|
73
|
+
const ::std::string iceC_Ice_Process_writeMessage_name = "writeMessage";
|
74
|
+
|
75
|
+
}
|
50
76
|
|
51
|
-
|
77
|
+
bool
|
78
|
+
Ice::Process::ice_isA(::std::string s, const ::Ice::Current&) const
|
79
|
+
{
|
80
|
+
return ::std::binary_search(iceC_Ice_Process_ids, iceC_Ice_Process_ids + 2, s);
|
81
|
+
}
|
82
|
+
|
83
|
+
::std::vector<::std::string>
|
84
|
+
Ice::Process::ice_ids(const ::Ice::Current&) const
|
85
|
+
{
|
86
|
+
return ::std::vector<::std::string>(&iceC_Ice_Process_ids[0], &iceC_Ice_Process_ids[2]);
|
87
|
+
}
|
88
|
+
|
89
|
+
::std::string
|
90
|
+
Ice::Process::ice_id(const ::Ice::Current&) const
|
91
|
+
{
|
92
|
+
return ice_staticId();
|
93
|
+
}
|
94
|
+
|
95
|
+
const ::std::string&
|
96
|
+
Ice::Process::ice_staticId()
|
97
|
+
{
|
98
|
+
static const ::std::string typeId = "::Ice::Process";
|
99
|
+
return typeId;
|
100
|
+
}
|
101
|
+
|
102
|
+
bool
|
103
|
+
Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const ::Ice::Current& current)
|
104
|
+
{
|
105
|
+
_iceCheckMode(::Ice::OperationMode::Normal, current.mode);
|
106
|
+
inS.readEmptyParams();
|
107
|
+
this->shutdown(current);
|
108
|
+
inS.writeEmptyParams();
|
109
|
+
return true;
|
110
|
+
}
|
111
|
+
|
112
|
+
bool
|
113
|
+
Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const ::Ice::Current& current)
|
114
|
+
{
|
115
|
+
_iceCheckMode(::Ice::OperationMode::Normal, current.mode);
|
116
|
+
auto istr = inS.startReadParams();
|
117
|
+
::std::string iceP_message;
|
118
|
+
int iceP_fd;
|
119
|
+
istr->readAll(iceP_message, iceP_fd);
|
120
|
+
inS.endReadParams();
|
121
|
+
this->writeMessage(::std::move(iceP_message), iceP_fd, current);
|
122
|
+
inS.writeEmptyParams();
|
123
|
+
return true;
|
124
|
+
}
|
125
|
+
|
126
|
+
bool
|
127
|
+
Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
|
128
|
+
{
|
129
|
+
::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_Process_ops, iceC_Ice_Process_ops + 6, current.operation);
|
130
|
+
if(r.first == r.second)
|
131
|
+
{
|
132
|
+
throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
133
|
+
}
|
134
|
+
|
135
|
+
switch(r.first - iceC_Ice_Process_ops)
|
136
|
+
{
|
137
|
+
case 0:
|
138
|
+
{
|
139
|
+
return _iceD_ice_id(in, current);
|
140
|
+
}
|
141
|
+
case 1:
|
142
|
+
{
|
143
|
+
return _iceD_ice_ids(in, current);
|
144
|
+
}
|
145
|
+
case 2:
|
146
|
+
{
|
147
|
+
return _iceD_ice_isA(in, current);
|
148
|
+
}
|
149
|
+
case 3:
|
150
|
+
{
|
151
|
+
return _iceD_ice_ping(in, current);
|
152
|
+
}
|
153
|
+
case 4:
|
154
|
+
{
|
155
|
+
return _iceD_shutdown(in, current);
|
156
|
+
}
|
157
|
+
case 5:
|
158
|
+
{
|
159
|
+
return _iceD_writeMessage(in, current);
|
160
|
+
}
|
161
|
+
default:
|
162
|
+
{
|
163
|
+
assert(false);
|
164
|
+
throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
165
|
+
}
|
166
|
+
}
|
167
|
+
}
|
168
|
+
|
169
|
+
void
|
170
|
+
Ice::ProcessPrx::_iceI_shutdown(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::Ice::Context& context)
|
171
|
+
{
|
172
|
+
outAsync->invoke(iceC_Ice_Process_shutdown_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
|
173
|
+
nullptr,
|
174
|
+
nullptr);
|
175
|
+
}
|
176
|
+
|
177
|
+
void
|
178
|
+
Ice::ProcessPrx::_iceI_writeMessage(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_message, int iceP_fd, const ::Ice::Context& context)
|
179
|
+
{
|
180
|
+
outAsync->invoke(iceC_Ice_Process_writeMessage_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
|
181
|
+
[&](::Ice::OutputStream* ostr)
|
182
|
+
{
|
183
|
+
ostr->writeAll(iceP_message, iceP_fd);
|
184
|
+
},
|
185
|
+
nullptr);
|
186
|
+
}
|
187
|
+
|
188
|
+
::std::shared_ptr<::Ice::ObjectPrx>
|
189
|
+
Ice::ProcessPrx::_newInstance() const
|
190
|
+
{
|
191
|
+
return ::IceInternal::createProxy<ProcessPrx>();
|
192
|
+
}
|
193
|
+
|
194
|
+
const ::std::string&
|
195
|
+
Ice::ProcessPrx::ice_staticId()
|
196
|
+
{
|
197
|
+
return Ice::Process::ice_staticId();
|
198
|
+
}
|
199
|
+
|
200
|
+
#else // C++98 mapping
|
201
|
+
|
202
|
+
namespace
|
203
|
+
{
|
204
|
+
|
205
|
+
const ::std::string iceC_Ice_Process_shutdown_name = "shutdown";
|
206
|
+
|
207
|
+
const ::std::string iceC_Ice_Process_writeMessage_name = "writeMessage";
|
52
208
|
|
53
209
|
}
|
54
|
-
#ifdef __SUNPRO_CC
|
55
|
-
class ICE_API IceProxy::Ice::Process;
|
56
|
-
#endif
|
57
210
|
ICE_API ::IceProxy::Ice::Object* ::IceProxy::Ice::upCast(::IceProxy::Ice::Process* p) { return p; }
|
58
211
|
|
59
212
|
void
|
60
|
-
::IceProxy::Ice::
|
213
|
+
::IceProxy::Ice::_readProxy(::Ice::InputStream* istr, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Process>& v)
|
61
214
|
{
|
62
215
|
::Ice::ObjectPrx proxy;
|
63
|
-
|
216
|
+
istr->read(proxy);
|
64
217
|
if(!proxy)
|
65
218
|
{
|
66
219
|
v = 0;
|
@@ -68,83 +221,63 @@ void
|
|
68
221
|
else
|
69
222
|
{
|
70
223
|
v = new ::IceProxy::Ice::Process;
|
71
|
-
v->
|
224
|
+
v->_copyFrom(proxy);
|
72
225
|
}
|
73
226
|
}
|
74
227
|
|
75
|
-
void
|
76
|
-
IceProxy::Ice::Process::shutdown(const ::Ice::Context* __ctx)
|
77
|
-
{
|
78
|
-
::IceInternal::Outgoing __og(this, __Ice__Process__shutdown_name, ::Ice::Normal, __ctx);
|
79
|
-
__og.writeEmptyParams();
|
80
|
-
__invoke(__og);
|
81
|
-
}
|
82
|
-
|
83
228
|
::Ice::AsyncResultPtr
|
84
|
-
IceProxy::Ice::Process::
|
229
|
+
IceProxy::Ice::Process::_iceI_begin_shutdown(const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
|
85
230
|
{
|
86
|
-
::IceInternal::OutgoingAsyncPtr
|
231
|
+
::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_Process_shutdown_name, del, cookie, sync);
|
87
232
|
try
|
88
233
|
{
|
89
|
-
|
90
|
-
|
91
|
-
|
234
|
+
result->prepare(iceC_Ice_Process_shutdown_name, ::Ice::Normal, context);
|
235
|
+
result->writeEmptyParams();
|
236
|
+
result->invoke(iceC_Ice_Process_shutdown_name);
|
92
237
|
}
|
93
|
-
catch(const ::Ice::Exception&
|
238
|
+
catch(const ::Ice::Exception& ex)
|
94
239
|
{
|
95
|
-
|
240
|
+
result->abort(ex);
|
96
241
|
}
|
97
|
-
return
|
242
|
+
return result;
|
98
243
|
}
|
99
244
|
|
100
245
|
void
|
101
|
-
IceProxy::Ice::Process::end_shutdown(const ::Ice::AsyncResultPtr&
|
246
|
+
IceProxy::Ice::Process::end_shutdown(const ::Ice::AsyncResultPtr& result)
|
102
247
|
{
|
103
|
-
|
248
|
+
_end(result, iceC_Ice_Process_shutdown_name);
|
104
249
|
}
|
105
250
|
|
106
|
-
|
107
|
-
IceProxy::Ice::Process::
|
251
|
+
::Ice::AsyncResultPtr
|
252
|
+
IceProxy::Ice::Process::_iceI_begin_writeMessage(const ::std::string& iceP_message, ::Ice::Int iceP_fd, const ::Ice::Context& context, const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie, bool sync)
|
108
253
|
{
|
109
|
-
::IceInternal::
|
254
|
+
::IceInternal::OutgoingAsyncPtr result = new ::IceInternal::CallbackOutgoing(this, iceC_Ice_Process_writeMessage_name, del, cookie, sync);
|
110
255
|
try
|
111
256
|
{
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
257
|
+
result->prepare(iceC_Ice_Process_writeMessage_name, ::Ice::Normal, context);
|
258
|
+
::Ice::OutputStream* ostr = result->startWriteParams(::Ice::DefaultFormat);
|
259
|
+
ostr->write(iceP_message);
|
260
|
+
ostr->write(iceP_fd);
|
261
|
+
result->endWriteParams();
|
262
|
+
result->invoke(iceC_Ice_Process_writeMessage_name);
|
116
263
|
}
|
117
|
-
catch(const ::Ice::
|
264
|
+
catch(const ::Ice::Exception& ex)
|
118
265
|
{
|
119
|
-
|
266
|
+
result->abort(ex);
|
120
267
|
}
|
121
|
-
|
268
|
+
return result;
|
122
269
|
}
|
123
270
|
|
124
|
-
|
125
|
-
IceProxy::Ice::Process::
|
271
|
+
void
|
272
|
+
IceProxy::Ice::Process::end_writeMessage(const ::Ice::AsyncResultPtr& result)
|
126
273
|
{
|
127
|
-
|
128
|
-
try
|
129
|
-
{
|
130
|
-
__result->prepare(__Ice__Process__writeMessage_name, ::Ice::Normal, __ctx);
|
131
|
-
::IceInternal::BasicStream* __os = __result->startWriteParams(::Ice::DefaultFormat);
|
132
|
-
__os->write(__p_message);
|
133
|
-
__os->write(__p_fd);
|
134
|
-
__result->endWriteParams();
|
135
|
-
__result->invoke();
|
136
|
-
}
|
137
|
-
catch(const ::Ice::Exception& __ex)
|
138
|
-
{
|
139
|
-
__result->abort(__ex);
|
140
|
-
}
|
141
|
-
return __result;
|
274
|
+
_end(result, iceC_Ice_Process_writeMessage_name);
|
142
275
|
}
|
143
276
|
|
144
|
-
|
145
|
-
IceProxy::Ice::Process::
|
277
|
+
::IceProxy::Ice::Object*
|
278
|
+
IceProxy::Ice::Process::_newInstance() const
|
146
279
|
{
|
147
|
-
|
280
|
+
return new Process;
|
148
281
|
}
|
149
282
|
|
150
283
|
const ::std::string&
|
@@ -153,17 +286,16 @@ IceProxy::Ice::Process::ice_staticId()
|
|
153
286
|
return ::Ice::Process::ice_staticId();
|
154
287
|
}
|
155
288
|
|
156
|
-
|
157
|
-
IceProxy::Ice::Process::__newInstance() const
|
289
|
+
Ice::Process::~Process()
|
158
290
|
{
|
159
|
-
return new Process;
|
160
291
|
}
|
161
292
|
|
162
293
|
ICE_API ::Ice::Object* Ice::upCast(::Ice::Process* p) { return p; }
|
163
294
|
|
295
|
+
|
164
296
|
namespace
|
165
297
|
{
|
166
|
-
const ::std::string
|
298
|
+
const ::std::string iceC_Ice_Process_ids[2] =
|
167
299
|
{
|
168
300
|
"::Ice::Object",
|
169
301
|
"::Ice::Process"
|
@@ -172,21 +304,21 @@ const ::std::string __Ice__Process_ids[2] =
|
|
172
304
|
}
|
173
305
|
|
174
306
|
bool
|
175
|
-
Ice::Process::ice_isA(const ::std::string&
|
307
|
+
Ice::Process::ice_isA(const ::std::string& s, const ::Ice::Current&) const
|
176
308
|
{
|
177
|
-
return ::std::binary_search(
|
309
|
+
return ::std::binary_search(iceC_Ice_Process_ids, iceC_Ice_Process_ids + 2, s);
|
178
310
|
}
|
179
311
|
|
180
312
|
::std::vector< ::std::string>
|
181
313
|
Ice::Process::ice_ids(const ::Ice::Current&) const
|
182
314
|
{
|
183
|
-
return ::std::vector< ::std::string>(&
|
315
|
+
return ::std::vector< ::std::string>(&iceC_Ice_Process_ids[0], &iceC_Ice_Process_ids[2]);
|
184
316
|
}
|
185
317
|
|
186
318
|
const ::std::string&
|
187
319
|
Ice::Process::ice_id(const ::Ice::Current&) const
|
188
320
|
{
|
189
|
-
return
|
321
|
+
return ice_staticId();
|
190
322
|
}
|
191
323
|
|
192
324
|
const ::std::string&
|
@@ -196,38 +328,38 @@ Ice::Process::ice_staticId()
|
|
196
328
|
static const ::std::string typeId = "::Ice::Process";
|
197
329
|
return typeId;
|
198
330
|
#else
|
199
|
-
return
|
331
|
+
return iceC_Ice_Process_ids[1];
|
200
332
|
#endif
|
201
333
|
}
|
202
334
|
|
203
|
-
|
204
|
-
Ice::Process::
|
335
|
+
bool
|
336
|
+
Ice::Process::_iceD_shutdown(::IceInternal::Incoming& inS, const ::Ice::Current& current)
|
205
337
|
{
|
206
|
-
|
207
|
-
|
208
|
-
shutdown(
|
209
|
-
|
210
|
-
return
|
338
|
+
_iceCheckMode(::Ice::Normal, current.mode);
|
339
|
+
inS.readEmptyParams();
|
340
|
+
this->shutdown(current);
|
341
|
+
inS.writeEmptyParams();
|
342
|
+
return true;
|
211
343
|
}
|
212
344
|
|
213
|
-
|
214
|
-
Ice::Process::
|
345
|
+
bool
|
346
|
+
Ice::Process::_iceD_writeMessage(::IceInternal::Incoming& inS, const ::Ice::Current& current)
|
215
347
|
{
|
216
|
-
|
217
|
-
::
|
218
|
-
::std::string
|
219
|
-
::Ice::Int
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
writeMessage(
|
224
|
-
|
225
|
-
return
|
348
|
+
_iceCheckMode(::Ice::Normal, current.mode);
|
349
|
+
::Ice::InputStream* istr = inS.startReadParams();
|
350
|
+
::std::string iceP_message;
|
351
|
+
::Ice::Int iceP_fd;
|
352
|
+
istr->read(iceP_message);
|
353
|
+
istr->read(iceP_fd);
|
354
|
+
inS.endReadParams();
|
355
|
+
this->writeMessage(iceP_message, iceP_fd, current);
|
356
|
+
inS.writeEmptyParams();
|
357
|
+
return true;
|
226
358
|
}
|
227
359
|
|
228
360
|
namespace
|
229
361
|
{
|
230
|
-
const ::std::string
|
362
|
+
const ::std::string iceC_Ice_Process_all[] =
|
231
363
|
{
|
232
364
|
"ice_id",
|
233
365
|
"ice_ids",
|
@@ -239,63 +371,67 @@ const ::std::string __Ice__Process_all[] =
|
|
239
371
|
|
240
372
|
}
|
241
373
|
|
242
|
-
|
243
|
-
Ice::Process::
|
374
|
+
bool
|
375
|
+
Ice::Process::_iceDispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)
|
244
376
|
{
|
245
|
-
::std::pair<
|
377
|
+
::std::pair<const ::std::string*, const ::std::string*> r = ::std::equal_range(iceC_Ice_Process_all, iceC_Ice_Process_all + 6, current.operation);
|
246
378
|
if(r.first == r.second)
|
247
379
|
{
|
248
380
|
throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
249
381
|
}
|
250
382
|
|
251
|
-
switch(r.first -
|
383
|
+
switch(r.first - iceC_Ice_Process_all)
|
252
384
|
{
|
253
385
|
case 0:
|
254
386
|
{
|
255
|
-
return
|
387
|
+
return _iceD_ice_id(in, current);
|
256
388
|
}
|
257
389
|
case 1:
|
258
390
|
{
|
259
|
-
return
|
391
|
+
return _iceD_ice_ids(in, current);
|
260
392
|
}
|
261
393
|
case 2:
|
262
394
|
{
|
263
|
-
return
|
395
|
+
return _iceD_ice_isA(in, current);
|
264
396
|
}
|
265
397
|
case 3:
|
266
398
|
{
|
267
|
-
return
|
399
|
+
return _iceD_ice_ping(in, current);
|
268
400
|
}
|
269
401
|
case 4:
|
270
402
|
{
|
271
|
-
return
|
403
|
+
return _iceD_shutdown(in, current);
|
272
404
|
}
|
273
405
|
case 5:
|
274
406
|
{
|
275
|
-
return
|
407
|
+
return _iceD_writeMessage(in, current);
|
408
|
+
}
|
409
|
+
default:
|
410
|
+
{
|
411
|
+
assert(false);
|
412
|
+
throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
276
413
|
}
|
277
414
|
}
|
278
|
-
|
279
|
-
assert(false);
|
280
|
-
throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
|
281
415
|
}
|
282
416
|
|
283
417
|
void
|
284
|
-
Ice::Process::
|
418
|
+
Ice::Process::_iceWriteImpl(::Ice::OutputStream* ostr) const
|
285
419
|
{
|
286
|
-
|
287
|
-
|
420
|
+
ostr->startSlice(ice_staticId(), -1, true);
|
421
|
+
Ice::StreamWriter< ::Ice::Process, ::Ice::OutputStream>::write(ostr, *this);
|
422
|
+
ostr->endSlice();
|
288
423
|
}
|
289
424
|
|
290
425
|
void
|
291
|
-
Ice::Process::
|
426
|
+
Ice::Process::_iceReadImpl(::Ice::InputStream* istr)
|
292
427
|
{
|
293
|
-
|
294
|
-
|
428
|
+
istr->startSlice();
|
429
|
+
Ice::StreamReader< ::Ice::Process, ::Ice::InputStream>::read(istr, *this);
|
430
|
+
istr->endSlice();
|
295
431
|
}
|
296
432
|
|
297
|
-
void
|
298
|
-
Ice::
|
433
|
+
void
|
434
|
+
Ice::_icePatchObjectPtr(ProcessPtr& handle, const ::Ice::ObjectPtr& v)
|
299
435
|
{
|
300
436
|
handle = ::Ice::ProcessPtr::dynamicCast(v);
|
301
437
|
if(v && !handle)
|
@@ -303,3 +439,9 @@ Ice::__patch(ProcessPtr& handle, const ::Ice::ObjectPtr& v)
|
|
303
439
|
IceInternal::Ex::throwUOE(::Ice::Process::ice_staticId(), v);
|
304
440
|
}
|
305
441
|
}
|
442
|
+
|
443
|
+
namespace Ice
|
444
|
+
{
|
445
|
+
}
|
446
|
+
|
447
|
+
#endif
|