zeroc-ice 3.6.5 → 3.7.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ICE_LICENSE +17 -17
- data/LICENSE +12 -12
- data/bin/slice2rb +1 -6
- data/ext/Communicator.cpp +223 -61
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +23 -7
- data/ext/Connection.cpp +108 -76
- data/ext/Connection.h +4 -6
- data/ext/Endpoint.cpp +16 -54
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -10
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +4 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +38 -54
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +3 -8
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +111 -70
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +5 -20
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +313 -224
- data/ext/Types.h +118 -71
- data/ext/Util.cpp +69 -36
- data/ext/Util.h +117 -42
- data/ext/ValueFactoryManager.cpp +440 -0
- data/ext/ValueFactoryManager.h +95 -0
- data/ext/extconf.rb +52 -48
- data/ext/ice/cpp/include/Ice/Application.h +275 -105
- data/ext/ice/cpp/include/Ice/AsyncResult.h +124 -337
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -7
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +39 -16
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +10 -15
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +56 -17
- data/ext/ice/cpp/include/Ice/Comparable.h +205 -0
- data/ext/ice/cpp/include/Ice/Config.h +16 -39
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +203 -16
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +7 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +23 -0
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +57 -0
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +20 -12
- data/ext/ice/cpp/include/Ice/Dispatcher.h +35 -19
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -10
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +110 -63
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +74 -0
- data/ext/ice/cpp/include/Ice/FactoryTable.h +22 -18
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +28 -31
- data/ext/ice/cpp/include/Ice/Format.h +17 -18
- data/ext/ice/cpp/include/Ice/Functional.h +38 -38
- data/ext/ice/cpp/include/Ice/GCObject.h +9 -10
- data/ext/ice/cpp/include/Ice/Handle.h +6 -16
- data/ext/ice/cpp/include/Ice/Ice.h +9 -10
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +377 -0
- data/ext/ice/cpp/include/Ice/Incoming.h +132 -38
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +109 -31
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +872 -60
- data/ext/ice/cpp/include/Ice/InputStream.h +1514 -0
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -7
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +57 -0
- data/ext/ice/cpp/include/Ice/LocalObject.h +13 -14
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +56 -24
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +124 -71
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +25 -10
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +116 -32
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +61 -30
- data/ext/ice/cpp/include/Ice/Object.h +413 -78
- data/ext/ice/cpp/include/Ice/ObjectF.h +12 -8
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -13
- data/ext/ice/cpp/include/Ice/Optional.h +1114 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +684 -89
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -11
- data/ext/ice/cpp/include/Ice/OutputStream.h +1092 -0
- data/ext/ice/cpp/include/Ice/Protocol.h +49 -17
- data/ext/ice/cpp/include/Ice/Proxy.h +3438 -745
- data/ext/ice/cpp/include/Ice/ProxyF.h +13 -38
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +43 -55
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +84 -12
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -9
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +42 -0
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +273 -154
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +121 -53
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +17 -11
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +453 -140
- data/ext/ice/cpp/include/Ice/StringConverter.h +78 -0
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +19 -0
- data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +22 -28
- data/ext/ice/cpp/include/Ice/UniqueRef.h +97 -0
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +45 -13
- data/ext/ice/cpp/include/Ice/Value.h +139 -0
- data/ext/ice/cpp/include/Ice/ValueF.h +21 -0
- data/ext/ice/cpp/include/IceSSL/Config.h +8 -28
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -11
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +147 -0
- data/ext/ice/cpp/include/IceSSL/Plugin.h +461 -448
- data/ext/ice/cpp/include/IceSSL/SChannel.h +72 -0
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +72 -0
- data/ext/ice/cpp/include/IceSSL/UWP.h +62 -0
- data/ext/ice/cpp/include/IceUtil/Atomic.h +7 -14
- data/ext/ice/cpp/include/IceUtil/Cond.h +17 -23
- data/ext/ice/cpp/include/IceUtil/Config.h +166 -46
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +92 -0
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -10
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +63 -41
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -13
- data/ext/ice/cpp/include/IceUtil/Exception.h +284 -75
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +143 -0
- data/ext/ice/cpp/include/IceUtil/Functional.h +4 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +11 -16
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -15
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -7
- data/ext/ice/cpp/include/IceUtil/Lock.h +8 -15
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -7
- data/ext/ice/cpp/include/IceUtil/Mutex.h +19 -23
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -7
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/Optional.h +134 -23
- data/ext/ice/cpp/include/IceUtil/Options.h +17 -23
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +61 -37
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -11
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +18 -15
- data/ext/ice/cpp/include/IceUtil/Random.h +39 -8
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -13
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +53 -0
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +10 -15
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -7
- data/ext/ice/cpp/include/IceUtil/Shared.h +5 -12
- data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -7
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +146 -126
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -26
- data/ext/ice/cpp/include/IceUtil/Thread.h +10 -17
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -47
- data/ext/ice/cpp/include/IceUtil/Time.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Timer.h +18 -18
- data/ext/ice/cpp/include/IceUtil/UUID.h +6 -7
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +170 -0
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +1156 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Connection.h +1660 -0
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +119 -0
- data/ext/ice/cpp/include/generated/Ice/Current.h +322 -0
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +943 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +166 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +118 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +31 -15
- data/ext/ice/cpp/include/generated/Ice/Identity.h +264 -0
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +278 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +1143 -0
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +128 -0
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +7041 -0
- data/ext/ice/cpp/include/generated/Ice/Locator.h +3850 -0
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +147 -0
- data/ext/ice/cpp/include/generated/Ice/Logger.h +231 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +4717 -0
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1175 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +197 -0
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +306 -0
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +110 -0
- data/ext/ice/cpp/include/generated/Ice/Process.h +971 -0
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/Properties.h +446 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +1360 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +134 -0
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2689 -0
- data/ext/ice/cpp/include/generated/Ice/Router.h +1838 -0
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +299 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +51 -16
- data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +34 -14
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +318 -0
- data/ext/ice/cpp/include/generated/Ice/Version.h +357 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +223 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +101 -0
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +181 -0
- data/ext/ice/cpp/src/Ice/ACM.cpp +38 -27
- data/ext/ice/cpp/src/Ice/ACM.h +9 -7
- data/ext/ice/cpp/src/Ice/ACMF.h +30 -0
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +4 -8
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +59 -0
- data/ext/ice/cpp/src/Ice/ArgVector.h +36 -0
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -544
- data/ext/ice/cpp/src/Ice/Base64.cpp +22 -28
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +41 -18
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -15
- data/ext/ice/cpp/src/Ice/Buffer.cpp +75 -18
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +21 -12
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +86 -197
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -23
- data/ext/ice/cpp/src/Ice/Communicator.cpp +43 -15
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +318 -117
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +95 -40
- data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +55 -122
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +15 -31
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -7
- data/ext/ice/cpp/src/Ice/Connection.cpp +111 -20
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +300 -107
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +44 -28
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +30 -0
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +785 -713
- data/ext/ice/cpp/src/Ice/ConnectionI.h +105 -80
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -20
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +5 -9
- data/ext/ice/cpp/src/Ice/Connector.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Connector.h +4 -8
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -9
- data/ext/ice/cpp/src/Ice/Current.cpp +30 -12
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +10 -16
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +13 -25
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +34 -28
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +107 -19
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -11
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +41 -36
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -9
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +18 -7
- data/ext/ice/cpp/src/Ice/EndpointI.h +39 -18
- data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -10
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +19 -12
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -9
- data/ext/ice/cpp/src/Ice/EventHandler.h +13 -13
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -7
- data/ext/ice/cpp/src/Ice/Exception.cpp +102 -98
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +21 -12
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -33
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -9
- data/ext/ice/cpp/src/Ice/GCObject.cpp +29 -31
- data/ext/ice/cpp/src/Ice/HashUtil.h +3 -9
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -7
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +128 -111
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +23 -19
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -7
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +51 -0
- data/ext/ice/cpp/src/Ice/Identity.cpp +25 -16
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +11 -28
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -10
- data/ext/ice/cpp/src/Ice/Incoming.cpp +284 -255
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -214
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -9
- data/ext/ice/cpp/src/Ice/Initialize.cpp +309 -193
- data/ext/ice/cpp/src/Ice/InputStream.cpp +2726 -0
- data/ext/ice/cpp/src/Ice/Instance.cpp +243 -262
- data/ext/ice/cpp/src/Ice/Instance.h +30 -23
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +137 -23
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +118 -105
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -36
- data/ext/ice/cpp/src/Ice/LocalException.cpp +1191 -422
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Locator.cpp +1282 -1222
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +150 -186
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +31 -36
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +39 -12
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +182 -88
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -9
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +26 -55
- data/ext/ice/cpp/src/Ice/LoggerI.h +7 -18
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -17
- data/ext/ice/cpp/src/Ice/Metrics.cpp +1280 -1107
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +58 -33
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Network.cpp +753 -408
- data/ext/ice/cpp/src/Ice/Network.h +99 -36
- data/ext/ice/cpp/src/Ice/NetworkF.h +2 -7
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +20 -19
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -7
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
- data/ext/ice/cpp/src/Ice/Object.cpp +227 -232
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +45 -13
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +83 -33
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -12
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +25 -0
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +298 -191
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +44 -39
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -37
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +67 -67
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +15 -11
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +801 -366
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1367 -0
- data/ext/ice/cpp/src/Ice/Plugin.cpp +52 -14
- data/ext/ice/cpp/src/Ice/PluginF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +27 -51
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +7 -13
- data/ext/ice/cpp/src/Ice/Process.cpp +294 -128
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/Properties.cpp +42 -15
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +382 -340
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +83 -24
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -10
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +46 -57
- data/ext/ice/cpp/src/Ice/PropertiesI.h +18 -26
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +112 -19
- data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +6 -19
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -7
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -25
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +729 -957
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +33 -38
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -16
- data/ext/ice/cpp/src/Ice/Reference.cpp +190 -106
- data/ext/ice/cpp/src/Ice/Reference.h +39 -28
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +69 -118
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -17
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +19 -9
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +766 -565
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -8
- data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -18
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -11
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -7
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -11
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -12
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +12 -20
- data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -11
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
- data/ext/ice/cpp/src/Ice/Router.cpp +614 -492
- data/ext/ice/cpp/src/Ice/RouterF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +93 -99
- data/ext/ice/cpp/src/Ice/RouterInfo.h +42 -38
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +23 -28
- data/ext/ice/cpp/src/Ice/Selector.cpp +948 -855
- data/ext/ice/cpp/src/Ice/Selector.h +100 -152
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +24 -45
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +2 -7
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +21 -12
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -7
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -25
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +208 -76
- data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -9
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +57 -22
- data/ext/ice/cpp/src/Ice/StringUtil.h +30 -0
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +6 -7
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -8
- data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
- data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +169 -49
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -10
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -12
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +51 -46
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +12 -14
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +17 -32
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -15
- data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +41 -54
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +242 -274
- data/ext/ice/cpp/src/Ice/ThreadPool.h +46 -48
- data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +38 -26
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -7
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -7
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -36
- data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -11
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Transceiver.h +8 -12
- data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +5 -13
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +118 -60
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +13 -10
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +177 -236
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -22
- data/ext/ice/cpp/src/Ice/Value.cpp +76 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +83 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +61 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +37 -0
- data/ext/ice/cpp/src/Ice/Version.cpp +25 -20
- data/ext/ice/cpp/src/Ice/VirtualShared.h +38 -0
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -14
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -12
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -16
- data/ext/ice/cpp/src/Ice/WSConnector.h +3 -11
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +188 -89
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +22 -37
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +65 -66
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -27
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +596 -281
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1383 -543
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +89 -32
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -28
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -66
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -41
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -64
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -8
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +450 -172
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +863 -406
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +47 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +636 -144
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +20 -173
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -22
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +279 -0
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +64 -0
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +42 -17
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +61 -0
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +15 -64
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -18
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +207 -204
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +43 -40
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +42 -16
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -11
- data/ext/ice/cpp/src/IceSSL/Instance.h +7 -12
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -12
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +583 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +134 -115
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +27 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +127 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +477 -182
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +32 -26
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +286 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +58 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -46
- data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -23
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -60
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -12
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +580 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +523 -74
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +123 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +31 -0
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +73 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +187 -221
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +24 -26
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +97 -94
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +26 -192
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -24
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +868 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +69 -201
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +29 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +75 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +174 -161
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +29 -33
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +864 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +45 -0
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +12 -22
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -9
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -8
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +266 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +338 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +41 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +26 -0
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +89 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +383 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +71 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +71 -1260
- data/ext/ice/cpp/src/IceSSL/Util.h +48 -142
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +157 -0
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -27
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -31
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +22 -36
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +30 -126
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Options.cpp +20 -33
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +47 -21
- data/ext/ice/cpp/src/IceUtil/Random.cpp +15 -20
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +4 -19
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -8
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -269
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +582 -244
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -79
- data/ext/ice/cpp/src/IceUtil/Time.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +17 -22
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +97 -101
- data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -40
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +839 -0
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +894 -234
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +72 -0
- data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -7
- data/ext/ice/cpp/src/Slice/Checksum.h +21 -0
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -83
- data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -14
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1981 -1944
- data/ext/ice/cpp/src/Slice/Grammar.h +39 -19
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -20
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2752 -1948
- data/ext/ice/cpp/src/Slice/JavaUtil.h +398 -0
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
- data/ext/ice/cpp/src/Slice/MD5.h +1 -6
- data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -1
- data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +17 -20
- data/ext/ice/cpp/src/Slice/PHPUtil.h +36 -0
- data/ext/ice/cpp/src/Slice/Parser.cpp +1190 -426
- data/ext/ice/cpp/{include → src}/Slice/Parser.h +143 -91
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +67 -36
- data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +8 -18
- data/ext/ice/cpp/src/Slice/Python.cpp +218 -111
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +787 -699
- data/ext/ice/cpp/src/Slice/PythonUtil.h +70 -0
- data/ext/ice/cpp/src/Slice/Ruby.cpp +42 -43
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +175 -445
- data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -11
- data/ext/ice/cpp/src/Slice/Scanner.cpp +390 -399
- data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +36 -69
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +456 -0
- data/ext/ice/cpp/src/Slice/Util.h +50 -0
- data/ice.gemspec +2 -9
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +6 -50
- data/lib/Glacier2/PermissionsVerifier.rb +23 -99
- data/lib/Glacier2/PermissionsVerifierF.rb +2 -7
- data/lib/Glacier2/Router.rb +31 -78
- data/lib/Glacier2/RouterF.rb +2 -7
- data/lib/Glacier2/SSLInfo.rb +3 -11
- data/lib/Glacier2/Session.rb +87 -311
- data/lib/Ice.rb +84 -58
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +54 -61
- data/lib/Ice/CommunicatorF.rb +2 -7
- data/lib/Ice/Connection.rb +152 -166
- data/lib/Ice/ConnectionF.rb +2 -7
- data/lib/Ice/Current.rb +3 -15
- data/lib/Ice/Endpoint.rb +56 -137
- data/lib/Ice/EndpointF.rb +2 -7
- data/lib/Ice/EndpointTypes.rb +2 -11
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +4 -12
- data/lib/Ice/ImplicitContext.rb +4 -38
- data/lib/Ice/ImplicitContextF.rb +2 -7
- data/lib/Ice/Instrumentation.rb +22 -279
- data/lib/Ice/InstrumentationF.rb +2 -7
- data/lib/Ice/LocalException.rb +94 -145
- data/lib/Ice/Locator.rb +50 -169
- data/lib/Ice/LocatorF.rb +2 -7
- data/lib/Ice/Logger.rb +4 -38
- data/lib/Ice/LoggerF.rb +2 -7
- data/lib/Ice/Metrics.rb +60 -420
- data/lib/Ice/ObjectAdapter.rb +29 -0
- data/lib/Ice/ObjectAdapterF.rb +2 -7
- data/lib/Ice/ObjectFactory.rb +4 -34
- data/lib/Ice/Plugin.rb +6 -64
- data/lib/Ice/PluginF.rb +2 -7
- data/lib/Ice/Process.rb +15 -56
- data/lib/Ice/ProcessF.rb +2 -7
- data/lib/Ice/Properties.rb +4 -45
- data/lib/Ice/PropertiesAdmin.rb +18 -60
- data/lib/Ice/PropertiesF.rb +2 -7
- data/lib/Ice/RemoteLogger.rb +33 -119
- data/lib/Ice/Router.rb +28 -105
- data/lib/Ice/RouterF.rb +2 -7
- data/lib/Ice/ServantLocator.rb +26 -0
- data/lib/Ice/ServantLocatorF.rb +24 -0
- data/lib/Ice/SliceChecksumDict.rb +2 -7
- data/lib/Ice/ValueFactory.rb +28 -0
- data/lib/Ice/Version.rb +4 -15
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +43 -152
- data/lib/IceGrid.rb +1 -9
- data/lib/IceGrid/Admin.rb +550 -431
- data/lib/IceGrid/Descriptor.rb +61 -533
- data/lib/IceGrid/Exception.rb +23 -49
- data/lib/IceGrid/FileParser.rb +13 -54
- data/lib/IceGrid/PluginFacade.rb +35 -0
- data/lib/IceGrid/Registry.rb +150 -62
- data/lib/IceGrid/Session.rb +24 -68
- data/lib/IceGrid/UserAccountMapper.rb +13 -54
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +4 -15
- data/lib/IcePatch2/FileServer.rb +32 -80
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +78 -210
- data/lib/IceStorm/Metrics.rb +10 -93
- data/slice/Glacier2/Metrics.ice +20 -10
- data/slice/Glacier2/PermissionsVerifier.ice +19 -12
- data/slice/Glacier2/PermissionsVerifierF.ice +16 -9
- data/slice/Glacier2/Router.ice +19 -13
- data/slice/Glacier2/RouterF.ice +16 -9
- data/slice/Glacier2/SSLInfo.ice +17 -10
- data/slice/Glacier2/Session.ice +24 -18
- data/slice/Ice/BuiltinSequences.ice +18 -9
- data/slice/Ice/Communicator.ice +180 -64
- data/slice/Ice/CommunicatorF.ice +18 -9
- data/slice/Ice/Connection.ice +208 -75
- data/slice/Ice/ConnectionF.ice +18 -9
- data/slice/Ice/Current.ice +37 -28
- data/slice/Ice/Endpoint.ice +73 -21
- data/slice/Ice/EndpointF.ice +19 -10
- data/slice/Ice/EndpointTypes.ice +21 -13
- data/slice/Ice/FacetMap.ice +19 -10
- data/slice/Ice/Identity.ice +24 -10
- data/slice/Ice/ImplicitContext.ice +41 -33
- data/slice/Ice/ImplicitContextF.ice +17 -9
- data/slice/Ice/Instrumentation.ice +37 -30
- data/slice/Ice/InstrumentationF.ice +19 -10
- data/slice/Ice/LocalException.ice +118 -112
- data/slice/Ice/Locator.ice +28 -21
- data/slice/Ice/LocatorF.ice +18 -9
- data/slice/Ice/Logger.ice +26 -18
- data/slice/Ice/LoggerF.ice +18 -9
- data/slice/Ice/Metrics.ice +42 -30
- data/slice/Ice/ObjectAdapter.ice +88 -53
- data/slice/Ice/ObjectAdapterF.ice +18 -9
- data/slice/Ice/ObjectFactory.ice +28 -17
- data/slice/Ice/Plugin.ice +25 -13
- data/slice/Ice/PluginF.ice +22 -9
- data/slice/Ice/Process.ice +20 -11
- data/slice/Ice/ProcessF.ice +18 -9
- data/slice/Ice/Properties.ice +42 -28
- data/slice/Ice/PropertiesAdmin.ice +20 -10
- data/slice/Ice/PropertiesF.ice +18 -9
- data/slice/Ice/RemoteLogger.ice +23 -19
- data/slice/Ice/Router.ice +28 -13
- data/slice/Ice/RouterF.ice +18 -9
- data/slice/Ice/ServantLocator.ice +40 -29
- data/slice/Ice/ServantLocatorF.ice +18 -9
- data/slice/Ice/SliceChecksumDict.ice +18 -9
- data/slice/Ice/ValueFactory.ice +132 -0
- data/slice/Ice/Version.ice +20 -10
- data/slice/IceBT/ConnectionInfo.ice +58 -0
- data/slice/IceBT/EndpointInfo.ice +56 -0
- data/slice/IceBT/Types.ice +44 -0
- data/slice/IceBox/IceBox.ice +45 -27
- data/slice/IceDiscovery/IceDiscovery.ice +75 -10
- data/slice/IceGrid/Admin.ice +410 -44
- data/slice/IceGrid/Descriptor.ice +47 -34
- data/slice/IceGrid/Exception.ice +43 -32
- data/slice/IceGrid/FileParser.ice +21 -12
- data/slice/IceGrid/PluginFacade.ice +26 -18
- data/slice/IceGrid/Registry.ice +150 -21
- data/slice/IceGrid/Session.ice +25 -17
- data/slice/IceGrid/UserAccountMapper.ice +23 -14
- data/slice/IceIAP/ConnectionInfo.ice +73 -0
- data/slice/IceIAP/EndpointInfo.ice +67 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +19 -12
- data/slice/IcePatch2/FileInfo.ice +19 -13
- data/slice/IcePatch2/FileServer.ice +27 -18
- data/slice/IceSSL/ConnectionInfo.ice +27 -23
- data/slice/IceSSL/ConnectionInfoF.ice +30 -0
- data/slice/IceSSL/EndpointInfo.ice +21 -36
- data/slice/IceStorm/IceStorm.ice +33 -24
- data/slice/IceStorm/Metrics.ice +19 -11
- metadata +148 -120
- data/ext/ObjectFactory.cpp +0 -140
- data/ext/ObjectFactory.h +0 -50
- data/ext/ice/cpp/include/Ice/ACMF.h +0 -30
- data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
- data/ext/ice/cpp/include/Ice/BuiltinSequences.h +0 -82
- data/ext/ice/cpp/include/Ice/Communicator.h +0 -200
- data/ext/ice/cpp/include/Ice/Connection.h +0 -497
- data/ext/ice/cpp/include/Ice/ConnectionF.h +0 -74
- data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +0 -30
- data/ext/ice/cpp/include/Ice/Current.h +0 -102
- data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +0 -48
- data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +0 -62
- data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
- data/ext/ice/cpp/include/Ice/EndpointF.h +0 -93
- data/ext/ice/cpp/include/Ice/EndpointTypes.h +0 -82
- data/ext/ice/cpp/include/Ice/Identity.h +0 -168
- data/ext/ice/cpp/include/Ice/ImplicitContext.h +0 -102
- data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
- data/ext/ice/cpp/include/Ice/InstrumentationF.h +0 -75
- data/ext/ice/cpp/include/Ice/LocalException.h +0 -1030
- data/ext/ice/cpp/include/Ice/Locator.h +0 -2193
- data/ext/ice/cpp/include/Ice/LocatorF.h +0 -93
- data/ext/ice/cpp/include/Ice/Logger.h +0 -100
- data/ext/ice/cpp/include/Ice/Metrics.h +0 -2974
- data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
- data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.h +0 -26
- data/ext/ice/cpp/include/Ice/ObjectFactory.h +0 -92
- data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +0 -66
- data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.h +0 -26
- data/ext/ice/cpp/include/Ice/Outgoing.h +0 -225
- data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
- data/ext/ice/cpp/include/Ice/PluginF.h +0 -70
- data/ext/ice/cpp/include/Ice/Process.h +0 -574
- data/ext/ice/cpp/include/Ice/ProcessF.h +0 -83
- data/ext/ice/cpp/include/Ice/Properties.h +0 -136
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
- data/ext/ice/cpp/include/Ice/PropertiesF.h +0 -87
- data/ext/ice/cpp/include/Ice/RemoteLogger.h +0 -1500
- data/ext/ice/cpp/include/Ice/Router.h +0 -1159
- data/ext/ice/cpp/include/Ice/RouterF.h +0 -83
- data/ext/ice/cpp/include/Ice/ServantLocator.h +0 -96
- data/ext/ice/cpp/include/Ice/Stream.h +0 -447
- data/ext/ice/cpp/include/Ice/StreamF.h +0 -30
- data/ext/ice/cpp/include/Ice/Version.h +0 -262
- data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +0 -158
- data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +0 -142
- data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +0 -119
- data/ext/ice/cpp/include/IceUtil/Cache.h +0 -362
- data/ext/ice/cpp/include/IceUtil/IconvStringConverter.h +0 -302
- data/ext/ice/cpp/include/IceUtil/SHA1.h +0 -47
- data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +0 -65
- data/ext/ice/cpp/include/Slice/Checksum.h +0 -26
- data/ext/ice/cpp/include/Slice/CsUtil.h +0 -92
- data/ext/ice/cpp/include/Slice/DotNetNames.h +0 -34
- data/ext/ice/cpp/include/Slice/JavaUtil.h +0 -279
- data/ext/ice/cpp/include/Slice/ObjCUtil.h +0 -127
- data/ext/ice/cpp/include/Slice/PHPUtil.h +0 -50
- data/ext/ice/cpp/include/Slice/PythonUtil.h +0 -64
- data/ext/ice/cpp/include/Slice/Util.h +0 -56
- data/ext/ice/cpp/src/Ice/BasicStream.cpp +0 -3428
- data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +0 -62
- data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +0 -44
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +0 -139
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +0 -43
- data/ext/ice/cpp/src/Ice/Outgoing.cpp +0 -694
- data/ext/ice/cpp/src/Ice/Stream.cpp +0 -53
- data/ext/ice/cpp/src/Ice/StreamI.cpp +0 -832
- data/ext/ice/cpp/src/Ice/StreamI.h +0 -198
- data/ext/ice/cpp/src/IceSSL/Certificate.cpp +0 -1336
- data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +0 -64
- data/ext/ice/cpp/src/IceUtil/ArgVector.h +0 -41
- data/ext/ice/cpp/src/IceUtil/Exception.cpp +0 -792
- data/ext/ice/cpp/src/IceUtil/FileUtil.h +0 -185
- data/ext/ice/cpp/src/Slice/CsUtil.cpp +0 -2660
- data/ext/ice/cpp/src/Slice/DotNetNames.cpp +0 -146
- data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +0 -1310
- data/lib/Ice/ObjectFactoryF.rb +0 -29
- data/lib/IceGrid/Locator.rb +0 -106
- data/lib/IceGrid/Observer.rb +0 -572
- data/lib/IceGrid/Query.rb +0 -169
- data/slice/Freeze/BackgroundSaveEvictor.ice +0 -111
- data/slice/Freeze/CatalogData.ice +0 -49
- data/slice/Freeze/Connection.ice +0 -121
- data/slice/Freeze/ConnectionF.ice +0 -20
- data/slice/Freeze/DB.ice +0 -37
- data/slice/Freeze/Evictor.ice +0 -346
- data/slice/Freeze/EvictorF.ice +0 -22
- data/slice/Freeze/EvictorStorage.ice +0 -72
- data/slice/Freeze/Exception.ice +0 -100
- data/slice/Freeze/Transaction.ice +0 -58
- data/slice/Freeze/TransactionalEvictor.ice +0 -50
- data/slice/Ice/ObjectFactoryF.ice +0 -21
- data/slice/IceGrid/Locator.ice +0 -57
- data/slice/IceGrid/Observer.ice +0 -395
- data/slice/IceGrid/Query.ice +0 -131
data/ext/Util.h
CHANGED
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#ifndef ICE_RUBY_UTIL_H
|
11
6
|
#define ICE_RUBY_UTIL_H
|
@@ -13,6 +8,14 @@
|
|
13
8
|
#include <Config.h>
|
14
9
|
#include <Ice/Ice.h>
|
15
10
|
|
11
|
+
//
|
12
|
+
// Avoid clang conversion warnings in "callRuby" calls
|
13
|
+
//
|
14
|
+
#if defined(__clang__)
|
15
|
+
# pragma clang diagnostic ignored "-Wconversion"
|
16
|
+
# pragma clang diagnostic ignored "-Wsign-conversion"
|
17
|
+
#endif
|
18
|
+
|
16
19
|
namespace IceRuby
|
17
20
|
{
|
18
21
|
|
@@ -90,6 +93,12 @@ bool arrayToStringSeq(VALUE, std::vector
|
|
90
93
|
//
|
91
94
|
VALUE stringSeqToArray(const std::vector<std::string>&);
|
92
95
|
|
96
|
+
//
|
97
|
+
// Convert a vector of Ice::Byte into a Ruby array of numbers.
|
98
|
+
// May raise RubyException.
|
99
|
+
//
|
100
|
+
VALUE createNumSeq(const std::vector<Ice::Byte>&);
|
101
|
+
|
93
102
|
//
|
94
103
|
// Convert a Ruby hash to Ice::Context. Returns true on success
|
95
104
|
// and false if the value is not a hash. May raise RubyException.
|
@@ -166,6 +175,9 @@ VALUE callRuby(Fun fun, T1 t1, T2 t2, T3 t3);
|
|
166
175
|
template<typename Fun, typename T1, typename T2, typename T3, typename T4>
|
167
176
|
VALUE callRuby(Fun fun, T1 t1, T2 t2, T3 t3, T4 t4);
|
168
177
|
|
178
|
+
template<typename Fun, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
|
179
|
+
VALUE callRuby(Fun fun, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6);
|
180
|
+
|
169
181
|
extern "C" typedef VALUE (*RubyFunction)(VALUE);
|
170
182
|
|
171
183
|
VALUE callProtected(RubyFunction, VALUE);
|
@@ -177,7 +189,10 @@ public:
|
|
177
189
|
|
178
190
|
RF_0(Fun f) : _f(f) {}
|
179
191
|
inline VALUE operator()() { return _f(); }
|
180
|
-
static inline VALUE call(
|
192
|
+
static inline VALUE call(VALUE f)
|
193
|
+
{
|
194
|
+
return (*reinterpret_cast<RF_0*>(f))();
|
195
|
+
}
|
181
196
|
|
182
197
|
private:
|
183
198
|
|
@@ -189,7 +204,7 @@ inline VALUE callRuby(Fun fun)
|
|
189
204
|
{
|
190
205
|
typedef RF_0<Fun> RF;
|
191
206
|
RF f(fun);
|
192
|
-
return callProtected(
|
207
|
+
return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
193
208
|
}
|
194
209
|
|
195
210
|
template<typename Fun, typename T1>
|
@@ -199,7 +214,10 @@ public:
|
|
199
214
|
|
200
215
|
RF_1(Fun f, T1 t1) : _f(f), _t1(t1) {}
|
201
216
|
inline VALUE operator()() { return _f(_t1); }
|
202
|
-
static inline VALUE call(
|
217
|
+
static inline VALUE call(VALUE f)
|
218
|
+
{
|
219
|
+
return (*reinterpret_cast<RF_1*>(f))();
|
220
|
+
}
|
203
221
|
|
204
222
|
private:
|
205
223
|
|
@@ -212,7 +230,7 @@ inline VALUE callRuby(Fun fun, T1 t1)
|
|
212
230
|
{
|
213
231
|
typedef RF_1<Fun, T1> RF;
|
214
232
|
RF f(fun, t1);
|
215
|
-
return callProtected(
|
233
|
+
return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
216
234
|
}
|
217
235
|
|
218
236
|
template<typename Fun, typename T1, typename T2>
|
@@ -221,8 +239,11 @@ class RF_2
|
|
221
239
|
public:
|
222
240
|
|
223
241
|
RF_2(Fun f, T1 t1, T2 t2) : _f(f), _t1(t1), _t2(t2) {}
|
224
|
-
inline VALUE operator()()
|
225
|
-
static inline VALUE call(
|
242
|
+
inline VALUE operator()(){ return _f(_t1, _t2); }
|
243
|
+
static inline VALUE call(VALUE f)
|
244
|
+
{
|
245
|
+
return (*reinterpret_cast<RF_2*>(f))();
|
246
|
+
}
|
226
247
|
|
227
248
|
private:
|
228
249
|
|
@@ -236,7 +257,7 @@ inline VALUE callRuby(Fun fun, T1 t1, T2 t2)
|
|
236
257
|
{
|
237
258
|
typedef RF_2<Fun, T1, T2> RF;
|
238
259
|
RF f(fun, t1, t2);
|
239
|
-
return callProtected(
|
260
|
+
return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
240
261
|
}
|
241
262
|
|
242
263
|
template<typename Fun, typename T1, typename T2, typename T3>
|
@@ -246,7 +267,10 @@ public:
|
|
246
267
|
|
247
268
|
RF_3(Fun f, T1 t1, T2 t2, T3 t3) : _f(f), _t1(t1), _t2(t2), _t3(t3) {}
|
248
269
|
inline VALUE operator()() { return _f(_t1, _t2, _t3); }
|
249
|
-
static inline VALUE call(
|
270
|
+
static inline VALUE call(VALUE f)
|
271
|
+
{
|
272
|
+
return (*reinterpret_cast<RF_3*>(f))();
|
273
|
+
}
|
250
274
|
|
251
275
|
private:
|
252
276
|
|
@@ -261,7 +285,7 @@ inline VALUE callRuby(Fun fun, T1 t1, T2 t2, T3 t3)
|
|
261
285
|
{
|
262
286
|
typedef RF_3<Fun, T1, T2, T3> RF;
|
263
287
|
RF f(fun, t1, t2, t3);
|
264
|
-
return callProtected(
|
288
|
+
return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
265
289
|
}
|
266
290
|
|
267
291
|
template<typename Fun, typename T1, typename T2, typename T3, typename T4>
|
@@ -271,7 +295,10 @@ public:
|
|
271
295
|
|
272
296
|
RF_4(Fun f, T1 t1, T2 t2, T3 t3, T4 t4) : _f(f), _t1(t1), _t2(t2), _t3(t3), _t4(t4) {}
|
273
297
|
inline VALUE operator()() { return _f(_t1, _t2, _t3, _t4); }
|
274
|
-
static inline VALUE call(
|
298
|
+
static inline VALUE call(VALUE f)
|
299
|
+
{
|
300
|
+
return (*reinterpret_cast<RF_4*>(f))();
|
301
|
+
}
|
275
302
|
|
276
303
|
private:
|
277
304
|
|
@@ -287,7 +314,40 @@ inline VALUE callRuby(Fun fun, T1 t1, T2 t2, T3 t3, T4 t4)
|
|
287
314
|
{
|
288
315
|
typedef RF_4<Fun, T1, T2, T3, T4> RF;
|
289
316
|
RF f(fun, t1, t2, t3, t4);
|
290
|
-
return callProtected(
|
317
|
+
return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
318
|
+
}
|
319
|
+
|
320
|
+
template<typename Fun, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
|
321
|
+
class RF_6
|
322
|
+
{
|
323
|
+
public:
|
324
|
+
|
325
|
+
RF_6(Fun f, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) : _f(f), _t1(t1), _t2(t2), _t3(t3), _t4(t4), _t5(t5), _t6(t6)
|
326
|
+
{
|
327
|
+
}
|
328
|
+
inline VALUE operator()() { return _f(_t1, _t2, _t3, _t4, _t5, _t6); }
|
329
|
+
static inline VALUE call(VALUE f)
|
330
|
+
{
|
331
|
+
return (*reinterpret_cast<RF_6*>(f))();
|
332
|
+
}
|
333
|
+
|
334
|
+
private:
|
335
|
+
|
336
|
+
Fun _f;
|
337
|
+
T1 _t1;
|
338
|
+
T2 _t2;
|
339
|
+
T3 _t3;
|
340
|
+
T4 _t4;
|
341
|
+
T5 _t5;
|
342
|
+
T6 _t6;
|
343
|
+
};
|
344
|
+
|
345
|
+
template<typename Fun, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6>
|
346
|
+
inline VALUE callRuby(Fun fun, T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6)
|
347
|
+
{
|
348
|
+
typedef RF_6<Fun, T1, T2, T3, T4, T5, T6> RF;
|
349
|
+
RF f(fun, t1, t2, t3, t4, t5, t6);
|
350
|
+
return callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
291
351
|
}
|
292
352
|
|
293
353
|
//
|
@@ -318,7 +378,12 @@ public:
|
|
318
378
|
|
319
379
|
RFV_0(Fun f) : _f(f) {}
|
320
380
|
inline void operator()() { _f(); }
|
321
|
-
|
381
|
+
|
382
|
+
static inline VALUE call(VALUE f)
|
383
|
+
{
|
384
|
+
(*reinterpret_cast<RFV_0*>(f))();
|
385
|
+
return Qnil;
|
386
|
+
}
|
322
387
|
|
323
388
|
private:
|
324
389
|
|
@@ -330,7 +395,7 @@ inline void callRubyVoid(Fun fun)
|
|
330
395
|
{
|
331
396
|
typedef RFV_0<Fun> RF;
|
332
397
|
RF f(fun);
|
333
|
-
callProtected(
|
398
|
+
callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
334
399
|
}
|
335
400
|
|
336
401
|
template<typename Fun, typename T1>
|
@@ -340,7 +405,11 @@ public:
|
|
340
405
|
|
341
406
|
RFV_1(Fun f, T1 t1) : _f(f), _t1(t1) {}
|
342
407
|
inline void operator()() { _f(_t1); }
|
343
|
-
static inline VALUE call(
|
408
|
+
static inline VALUE call(VALUE f)
|
409
|
+
{
|
410
|
+
(*reinterpret_cast<RFV_1*>(f))();
|
411
|
+
return Qnil;
|
412
|
+
}
|
344
413
|
|
345
414
|
private:
|
346
415
|
|
@@ -353,7 +422,7 @@ inline void callRubyVoid(Fun fun, T1 t1)
|
|
353
422
|
{
|
354
423
|
typedef RFV_1<Fun, T1> RF;
|
355
424
|
RF f(fun, t1);
|
356
|
-
callProtected(
|
425
|
+
callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
357
426
|
}
|
358
427
|
|
359
428
|
template<typename Fun, typename T1, typename T2>
|
@@ -363,7 +432,11 @@ public:
|
|
363
432
|
|
364
433
|
RFV_2(Fun f, T1 t1, T2 t2) : _f(f), _t1(t1), _t2(t2) {}
|
365
434
|
inline void operator()() { _f(_t1, _t2); }
|
366
|
-
static inline VALUE call(
|
435
|
+
static inline VALUE call(VALUE f)
|
436
|
+
{
|
437
|
+
(*reinterpret_cast<RFV_2*>(f))();
|
438
|
+
return Qnil;
|
439
|
+
}
|
367
440
|
|
368
441
|
private:
|
369
442
|
|
@@ -377,7 +450,7 @@ inline void callRubyVoid(Fun fun, T1 t1, T2 t2)
|
|
377
450
|
{
|
378
451
|
typedef RFV_2<Fun, T1, T2> RF;
|
379
452
|
RF f(fun, t1, t2);
|
380
|
-
callProtected(
|
453
|
+
callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
381
454
|
}
|
382
455
|
|
383
456
|
template<typename Fun, typename T1, typename T2, typename T3>
|
@@ -387,7 +460,11 @@ public:
|
|
387
460
|
|
388
461
|
RFV_3(Fun f, T1 t1, T2 t2, T3 t3) : _f(f), _t1(t1), _t2(t2), _t3(t3) {}
|
389
462
|
inline void operator()() { _f(_t1, _t2, _t3); }
|
390
|
-
static inline VALUE call(
|
463
|
+
static inline VALUE call(VALUE f)
|
464
|
+
{
|
465
|
+
(*reinterpret_cast<RFV_3*>(f))();
|
466
|
+
return Qnil;
|
467
|
+
}
|
391
468
|
|
392
469
|
private:
|
393
470
|
|
@@ -402,7 +479,7 @@ inline void callRubyVoid(Fun fun, T1 t1, T2 t2, T3 t3)
|
|
402
479
|
{
|
403
480
|
typedef RFV_3<Fun, T1, T2, T3> RF;
|
404
481
|
RF f(fun, t1, t2, t3);
|
405
|
-
callProtected(
|
482
|
+
callProtected(RF::call, reinterpret_cast<VALUE>(&f));
|
406
483
|
}
|
407
484
|
|
408
485
|
template<typename Fun, typename T1, typename T2, typename T3, typename T4>
|
@@ -412,7 +489,11 @@ public:
|
|
412
489
|
|
413
490
|
RFV_4(Fun f, T1 t1, T2 t2, T3 t3, T4 t4) : _f(f), _t1(t1), _t2(t2), _t3(t3), _t4(t4) {}
|
414
491
|
inline void operator()() { _f(_t1, _t2, _t3, _t4); }
|
415
|
-
static inline VALUE call(
|
492
|
+
static inline VALUE call(VALUE f)
|
493
|
+
{
|
494
|
+
(*reinterpret_cast<RFV_4*>(f))();
|
495
|
+
return Qnil;
|
496
|
+
}
|
416
497
|
|
417
498
|
private:
|
418
499
|
|
@@ -431,8 +512,6 @@ inline void callRubyVoid(Fun fun, T1 t1, T2 t2, T3 t3, T4 t4)
|
|
431
512
|
callProtected(RubyFunction(RF::call), reinterpret_cast<VALUE>(&f));
|
432
513
|
}
|
433
514
|
|
434
|
-
VALUE createArrayHelper(long);
|
435
|
-
|
436
515
|
//
|
437
516
|
// Create an array with the given size. May raise RubyException.
|
438
517
|
//
|
@@ -448,11 +527,7 @@ VALUE createArrayHelper(long);
|
|
448
527
|
// RARRAY_ASET(arr, i, val);
|
449
528
|
// }
|
450
529
|
//
|
451
|
-
|
452
|
-
inline VALUE createArray(T sz)
|
453
|
-
{
|
454
|
-
return createArrayHelper(static_cast<long>(sz));
|
455
|
-
}
|
530
|
+
VALUE createArray(long);
|
456
531
|
|
457
532
|
//
|
458
533
|
// Create the Ruby equivalent of an Ice local exception.
|
@@ -467,19 +542,19 @@ VALUE convertLocalException(const Ice::LocalException&);
|
|
467
542
|
// exceptions into Ruby exceptions and ensure that C++ objects are cleaned up properly.
|
468
543
|
//
|
469
544
|
#define ICE_RUBY_TRY \
|
470
|
-
volatile VALUE
|
545
|
+
volatile VALUE ex_ = Qnil; \
|
471
546
|
\
|
472
|
-
goto
|
547
|
+
goto ice_start; \
|
473
548
|
\
|
474
|
-
|
475
|
-
rb_exc_raise(
|
549
|
+
ice_handle_exception: \
|
550
|
+
rb_exc_raise(ex_); \
|
476
551
|
\
|
477
|
-
|
552
|
+
ice_start: \
|
478
553
|
try
|
479
554
|
|
480
555
|
#define ICE_RUBY_RETHROW(ex) \
|
481
|
-
|
482
|
-
goto
|
556
|
+
ex_ = ex; \
|
557
|
+
goto ice_handle_exception;
|
483
558
|
|
484
559
|
#define ICE_RUBY_CATCH \
|
485
560
|
catch(const ::IceRuby::RubyException& ex) \
|
@@ -492,8 +567,8 @@ VALUE convertLocalException(const Ice::LocalException&);
|
|
492
567
|
} \
|
493
568
|
catch(const ::Ice::Exception& ex) \
|
494
569
|
{ \
|
495
|
-
string
|
496
|
-
ICE_RUBY_RETHROW(rb_exc_new2(rb_eRuntimeError,
|
570
|
+
string msg_ = "unknown Ice exception: " + ex.ice_id(); \
|
571
|
+
ICE_RUBY_RETHROW(rb_exc_new2(rb_eRuntimeError, msg_.c_str())); \
|
497
572
|
} \
|
498
573
|
catch(const std::bad_alloc& ex) \
|
499
574
|
{ \
|
@@ -0,0 +1,440 @@
|
|
1
|
+
//
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
|
+
//
|
4
|
+
|
5
|
+
#include <ValueFactoryManager.h>
|
6
|
+
#include <Types.h>
|
7
|
+
#include <Util.h>
|
8
|
+
#include <Ice/LocalException.h>
|
9
|
+
|
10
|
+
using namespace std;
|
11
|
+
using namespace IceRuby;
|
12
|
+
|
13
|
+
static VALUE _valueFactoryManagerClass;
|
14
|
+
|
15
|
+
namespace
|
16
|
+
{
|
17
|
+
|
18
|
+
ClassInfoPtr
|
19
|
+
getClassInfo(const string& id)
|
20
|
+
{
|
21
|
+
ClassInfoPtr info;
|
22
|
+
|
23
|
+
if(id == Ice::Object::ice_staticId())
|
24
|
+
{
|
25
|
+
//
|
26
|
+
// When the ID is that of Ice::Object, it indicates that the stream has not
|
27
|
+
// found a factory and is providing us an opportunity to preserve the object.
|
28
|
+
//
|
29
|
+
info = lookupClassInfo("::Ice::UnknownSlicedValue");
|
30
|
+
}
|
31
|
+
else
|
32
|
+
{
|
33
|
+
info = lookupClassInfo(id);
|
34
|
+
}
|
35
|
+
|
36
|
+
return info;
|
37
|
+
}
|
38
|
+
|
39
|
+
}
|
40
|
+
|
41
|
+
extern "C"
|
42
|
+
void
|
43
|
+
IceRuby_ValueFactoryManager_mark(ValueFactoryManagerPtr* p)
|
44
|
+
{
|
45
|
+
assert(p);
|
46
|
+
(*p)->mark();
|
47
|
+
}
|
48
|
+
|
49
|
+
extern "C"
|
50
|
+
void
|
51
|
+
IceRuby_ValueFactoryManager_free(ValueFactoryManagerPtr* p)
|
52
|
+
{
|
53
|
+
assert(p);
|
54
|
+
delete p;
|
55
|
+
}
|
56
|
+
|
57
|
+
IceRuby::ValueFactoryManager::ValueFactoryManager()
|
58
|
+
{
|
59
|
+
//
|
60
|
+
// Create a Ruby wrapper around this object. Note that this is a cyclic reference.
|
61
|
+
//
|
62
|
+
_self = Data_Wrap_Struct(_valueFactoryManagerClass, IceRuby_ValueFactoryManager_mark,
|
63
|
+
IceRuby_ValueFactoryManager_free, new ValueFactoryManagerPtr(this));
|
64
|
+
|
65
|
+
_defaultFactory = new DefaultValueFactory;
|
66
|
+
}
|
67
|
+
|
68
|
+
IceRuby::ValueFactoryManager::~ValueFactoryManager()
|
69
|
+
{
|
70
|
+
assert(_factories.empty());
|
71
|
+
}
|
72
|
+
|
73
|
+
void
|
74
|
+
IceRuby::ValueFactoryManager::add(const Ice::ValueFactoryPtr& f, const string& id)
|
75
|
+
{
|
76
|
+
Lock lock(*this);
|
77
|
+
|
78
|
+
if(id.empty())
|
79
|
+
{
|
80
|
+
if(_defaultFactory->getDelegate())
|
81
|
+
{
|
82
|
+
throw Ice::AlreadyRegisteredException(__FILE__, __LINE__, "value factory", id);
|
83
|
+
}
|
84
|
+
|
85
|
+
_defaultFactory->setDelegate(f);
|
86
|
+
}
|
87
|
+
else
|
88
|
+
{
|
89
|
+
FactoryMap::iterator p = _factories.find(id);
|
90
|
+
if(p != _factories.end())
|
91
|
+
{
|
92
|
+
throw Ice::AlreadyRegisteredException(__FILE__, __LINE__, "value factory", id);
|
93
|
+
}
|
94
|
+
|
95
|
+
_factories.insert(FactoryMap::value_type(id, f));
|
96
|
+
}
|
97
|
+
}
|
98
|
+
|
99
|
+
Ice::ValueFactoryPtr
|
100
|
+
IceRuby::ValueFactoryManager::find(const string& id) const ICE_NOEXCEPT
|
101
|
+
{
|
102
|
+
Lock lock(*this);
|
103
|
+
|
104
|
+
if(id.empty())
|
105
|
+
{
|
106
|
+
return _defaultFactory;
|
107
|
+
}
|
108
|
+
|
109
|
+
FactoryMap::const_iterator p = _factories.find(id);
|
110
|
+
if(p != _factories.end())
|
111
|
+
{
|
112
|
+
return p->second;
|
113
|
+
}
|
114
|
+
|
115
|
+
return 0;
|
116
|
+
}
|
117
|
+
|
118
|
+
void
|
119
|
+
IceRuby::ValueFactoryManager::addValueFactory(VALUE f, const string& id)
|
120
|
+
{
|
121
|
+
ICE_RUBY_TRY
|
122
|
+
{
|
123
|
+
add(new FactoryWrapper(f, false), id);
|
124
|
+
}
|
125
|
+
ICE_RUBY_CATCH
|
126
|
+
}
|
127
|
+
|
128
|
+
VALUE
|
129
|
+
IceRuby::ValueFactoryManager::findValueFactory(const string& id) const
|
130
|
+
{
|
131
|
+
Ice::ValueFactoryPtr f = find(id);
|
132
|
+
if(f)
|
133
|
+
{
|
134
|
+
FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(f);
|
135
|
+
if(w)
|
136
|
+
{
|
137
|
+
return w->getObject();
|
138
|
+
}
|
139
|
+
}
|
140
|
+
|
141
|
+
return Qnil;
|
142
|
+
}
|
143
|
+
|
144
|
+
void
|
145
|
+
IceRuby::ValueFactoryManager::addObjectFactory(VALUE f, const string& id)
|
146
|
+
{
|
147
|
+
ICE_RUBY_TRY
|
148
|
+
{
|
149
|
+
add(new FactoryWrapper(f, true), id);
|
150
|
+
}
|
151
|
+
ICE_RUBY_CATCH
|
152
|
+
}
|
153
|
+
|
154
|
+
VALUE
|
155
|
+
IceRuby::ValueFactoryManager::findObjectFactory(const string& id) const
|
156
|
+
{
|
157
|
+
Ice::ValueFactoryPtr f = find(id);
|
158
|
+
if(f)
|
159
|
+
{
|
160
|
+
FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(f);
|
161
|
+
if(w && w->isObjectFactory())
|
162
|
+
{
|
163
|
+
return w->getObject();
|
164
|
+
}
|
165
|
+
}
|
166
|
+
|
167
|
+
return Qnil;
|
168
|
+
}
|
169
|
+
|
170
|
+
void
|
171
|
+
IceRuby::ValueFactoryManager::mark()
|
172
|
+
{
|
173
|
+
Lock lock(*this);
|
174
|
+
|
175
|
+
for(FactoryMap::iterator p = _factories.begin(); p != _factories.end(); ++p)
|
176
|
+
{
|
177
|
+
FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(p->second);
|
178
|
+
if(w)
|
179
|
+
{
|
180
|
+
w->mark();
|
181
|
+
}
|
182
|
+
}
|
183
|
+
|
184
|
+
_defaultFactory->mark();
|
185
|
+
}
|
186
|
+
|
187
|
+
void
|
188
|
+
IceRuby::ValueFactoryManager::markSelf()
|
189
|
+
{
|
190
|
+
volatile VALUE self;
|
191
|
+
|
192
|
+
{
|
193
|
+
Lock lock(*this);
|
194
|
+
|
195
|
+
self = _self;
|
196
|
+
}
|
197
|
+
|
198
|
+
if(!NIL_P(self))
|
199
|
+
{
|
200
|
+
rb_gc_mark(self);
|
201
|
+
}
|
202
|
+
}
|
203
|
+
|
204
|
+
VALUE
|
205
|
+
IceRuby::ValueFactoryManager::getObject() const
|
206
|
+
{
|
207
|
+
return _self;
|
208
|
+
}
|
209
|
+
|
210
|
+
void
|
211
|
+
IceRuby::ValueFactoryManager::destroy()
|
212
|
+
{
|
213
|
+
FactoryMap factories;
|
214
|
+
|
215
|
+
{
|
216
|
+
Lock lock(*this);
|
217
|
+
if(_self == Qnil)
|
218
|
+
{
|
219
|
+
//
|
220
|
+
// Nothing to do if already destroyed (this can occur if communicator destroy is called multiple times)
|
221
|
+
//
|
222
|
+
return;
|
223
|
+
}
|
224
|
+
|
225
|
+
factories.swap(_factories);
|
226
|
+
|
227
|
+
_self = Qnil;
|
228
|
+
}
|
229
|
+
|
230
|
+
for(FactoryMap::iterator p = factories.begin(); p != factories.end(); ++p)
|
231
|
+
{
|
232
|
+
FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(p->second);
|
233
|
+
if(w)
|
234
|
+
{
|
235
|
+
w->destroy();
|
236
|
+
}
|
237
|
+
}
|
238
|
+
|
239
|
+
_defaultFactory->destroy();
|
240
|
+
}
|
241
|
+
|
242
|
+
IceRuby::FactoryWrapper::FactoryWrapper(VALUE factory, bool isObjectFactory) :
|
243
|
+
_factory(factory),
|
244
|
+
_isObjectFactory(isObjectFactory)
|
245
|
+
{
|
246
|
+
}
|
247
|
+
|
248
|
+
Ice::ValuePtr
|
249
|
+
IceRuby::FactoryWrapper::create(const string& id)
|
250
|
+
{
|
251
|
+
//
|
252
|
+
// Get the type information.
|
253
|
+
//
|
254
|
+
ClassInfoPtr info = getClassInfo(id);
|
255
|
+
|
256
|
+
if(!info)
|
257
|
+
{
|
258
|
+
return 0;
|
259
|
+
}
|
260
|
+
|
261
|
+
//
|
262
|
+
// Invoke the create method on the Ruby factory object.
|
263
|
+
//
|
264
|
+
volatile VALUE str = createString(id);
|
265
|
+
volatile VALUE obj = callRuby(rb_funcall, _factory, rb_intern("create"), 1, str);
|
266
|
+
if(NIL_P(obj))
|
267
|
+
{
|
268
|
+
return 0;
|
269
|
+
}
|
270
|
+
|
271
|
+
return new ObjectReader(obj, info);
|
272
|
+
}
|
273
|
+
|
274
|
+
VALUE
|
275
|
+
IceRuby::FactoryWrapper::getObject() const
|
276
|
+
{
|
277
|
+
return _factory;
|
278
|
+
}
|
279
|
+
|
280
|
+
bool
|
281
|
+
IceRuby::FactoryWrapper::isObjectFactory() const
|
282
|
+
{
|
283
|
+
return _isObjectFactory;
|
284
|
+
}
|
285
|
+
|
286
|
+
void
|
287
|
+
IceRuby::FactoryWrapper::mark()
|
288
|
+
{
|
289
|
+
rb_gc_mark(_factory);
|
290
|
+
}
|
291
|
+
|
292
|
+
void
|
293
|
+
IceRuby::FactoryWrapper::destroy()
|
294
|
+
{
|
295
|
+
if(_isObjectFactory)
|
296
|
+
{
|
297
|
+
callRuby(rb_funcall, _factory, rb_intern("destroy"), 0);
|
298
|
+
}
|
299
|
+
}
|
300
|
+
|
301
|
+
Ice::ValuePtr
|
302
|
+
IceRuby::DefaultValueFactory::create(const string& id)
|
303
|
+
{
|
304
|
+
Ice::ValuePtr v;
|
305
|
+
|
306
|
+
//
|
307
|
+
// Give the application-provided default factory a chance to create the object first.
|
308
|
+
//
|
309
|
+
if(_delegate)
|
310
|
+
{
|
311
|
+
v = _delegate->create(id);
|
312
|
+
if(v)
|
313
|
+
{
|
314
|
+
return v;
|
315
|
+
}
|
316
|
+
}
|
317
|
+
|
318
|
+
//
|
319
|
+
// Get the type information.
|
320
|
+
//
|
321
|
+
ClassInfoPtr info = getClassInfo(id);
|
322
|
+
|
323
|
+
if(!info)
|
324
|
+
{
|
325
|
+
return 0;
|
326
|
+
}
|
327
|
+
|
328
|
+
//
|
329
|
+
// NOTE: We don't do this in Ruby because a generated class can be re-opened to define operations.
|
330
|
+
//
|
331
|
+
////
|
332
|
+
//// If the requested type is an abstract class, then we give up.
|
333
|
+
////
|
334
|
+
//if(info->isAbstract)
|
335
|
+
//{
|
336
|
+
// return 0;
|
337
|
+
//}
|
338
|
+
|
339
|
+
//
|
340
|
+
// Instantiate the object.
|
341
|
+
//
|
342
|
+
volatile VALUE obj = callRuby(rb_class_new_instance, 0, reinterpret_cast<VALUE*>(0), info->rubyClass);
|
343
|
+
assert(!NIL_P(obj));
|
344
|
+
return new ObjectReader(obj, info);
|
345
|
+
}
|
346
|
+
|
347
|
+
void
|
348
|
+
IceRuby::DefaultValueFactory::setDelegate(const Ice::ValueFactoryPtr& d)
|
349
|
+
{
|
350
|
+
_delegate = d;
|
351
|
+
}
|
352
|
+
|
353
|
+
VALUE
|
354
|
+
IceRuby::DefaultValueFactory::getObject() const
|
355
|
+
{
|
356
|
+
if(_delegate)
|
357
|
+
{
|
358
|
+
FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(_delegate);
|
359
|
+
if(w)
|
360
|
+
{
|
361
|
+
return w->getObject();
|
362
|
+
}
|
363
|
+
}
|
364
|
+
|
365
|
+
return Qnil;
|
366
|
+
}
|
367
|
+
|
368
|
+
void
|
369
|
+
IceRuby::DefaultValueFactory::mark()
|
370
|
+
{
|
371
|
+
if(_delegate)
|
372
|
+
{
|
373
|
+
FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(_delegate);
|
374
|
+
if(w)
|
375
|
+
{
|
376
|
+
w->mark();
|
377
|
+
}
|
378
|
+
}
|
379
|
+
}
|
380
|
+
|
381
|
+
void
|
382
|
+
IceRuby::DefaultValueFactory::destroy()
|
383
|
+
{
|
384
|
+
if(_delegate)
|
385
|
+
{
|
386
|
+
FactoryWrapperPtr w = FactoryWrapperPtr::dynamicCast(_delegate);
|
387
|
+
if(w)
|
388
|
+
{
|
389
|
+
w->destroy();
|
390
|
+
}
|
391
|
+
}
|
392
|
+
|
393
|
+
_delegate = 0;
|
394
|
+
}
|
395
|
+
|
396
|
+
extern "C"
|
397
|
+
VALUE
|
398
|
+
IceRuby_ValueFactoryManager_add(VALUE self, VALUE factory, VALUE id)
|
399
|
+
{
|
400
|
+
ICE_RUBY_TRY
|
401
|
+
{
|
402
|
+
ValueFactoryManagerPtr* p = reinterpret_cast<ValueFactoryManagerPtr*>(DATA_PTR(self));
|
403
|
+
assert(p);
|
404
|
+
|
405
|
+
string type = getString(id);
|
406
|
+
(*p)->addValueFactory(factory, type);
|
407
|
+
}
|
408
|
+
ICE_RUBY_CATCH
|
409
|
+
return Qnil;
|
410
|
+
}
|
411
|
+
|
412
|
+
extern "C"
|
413
|
+
VALUE
|
414
|
+
IceRuby_ValueFactoryManager_find(VALUE self, VALUE id)
|
415
|
+
{
|
416
|
+
ICE_RUBY_TRY
|
417
|
+
{
|
418
|
+
ValueFactoryManagerPtr* p = reinterpret_cast<ValueFactoryManagerPtr*>(DATA_PTR(self));
|
419
|
+
assert(p);
|
420
|
+
|
421
|
+
string type = getString(id);
|
422
|
+
return (*p)->findValueFactory(type);
|
423
|
+
}
|
424
|
+
ICE_RUBY_CATCH
|
425
|
+
return Qnil;
|
426
|
+
}
|
427
|
+
|
428
|
+
bool
|
429
|
+
IceRuby::initValueFactoryManager(VALUE iceModule)
|
430
|
+
{
|
431
|
+
_valueFactoryManagerClass = rb_define_class_under(iceModule, "ValueFactoryManagerI", rb_cObject);
|
432
|
+
|
433
|
+
//
|
434
|
+
// Instance methods.
|
435
|
+
//
|
436
|
+
rb_define_method(_valueFactoryManagerClass, "add", CAST_METHOD(IceRuby_ValueFactoryManager_add), 2);
|
437
|
+
rb_define_method(_valueFactoryManagerClass, "find", CAST_METHOD(IceRuby_ValueFactoryManager_find), 1);
|
438
|
+
|
439
|
+
return true;
|
440
|
+
}
|