zeroc-ice 3.7.0 → 3.7.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/ICE_LICENSE +1 -1
- data/bin/slice2rb +1 -1
- data/ext/Communicator.cpp +72 -2
- data/ext/Communicator.h +1 -1
- data/ext/Config.h +11 -1
- data/ext/Connection.cpp +22 -2
- data/ext/Connection.h +4 -1
- data/ext/Endpoint.cpp +1 -1
- data/ext/Endpoint.h +1 -1
- data/ext/ImplicitContext.cpp +1 -1
- data/ext/ImplicitContext.h +1 -1
- data/ext/Init.cpp +1 -1
- data/ext/Logger.cpp +1 -1
- data/ext/Logger.h +1 -1
- data/ext/Operation.cpp +1 -1
- data/ext/Operation.h +1 -1
- data/ext/Properties.cpp +1 -1
- data/ext/Properties.h +1 -1
- data/ext/Proxy.cpp +70 -1
- data/ext/Proxy.h +1 -1
- data/ext/Slice.cpp +1 -1
- data/ext/Slice.h +1 -1
- data/ext/Types.cpp +21 -5
- data/ext/Types.h +1 -1
- data/ext/Util.cpp +1 -1
- data/ext/Util.h +1 -1
- data/ext/ValueFactoryManager.cpp +2 -2
- data/ext/ValueFactoryManager.h +2 -2
- data/ext/ice/cpp/include/Ice/Application.h +234 -76
- data/ext/ice/cpp/include/Ice/AsyncResult.h +77 -1
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +1 -1
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +35 -2
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -1
- data/ext/ice/cpp/include/Ice/Buffer.h +1 -1
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +43 -1
- data/ext/ice/cpp/include/Ice/Comparable.h +81 -1
- data/ext/ice/cpp/include/Ice/Config.h +8 -1
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +97 -1
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +3 -1
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +1 -1
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +1 -1
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +17 -2
- data/ext/ice/cpp/include/Ice/Dispatcher.h +22 -2
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +1 -1
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -1
- data/ext/ice/cpp/include/Ice/Exception.h +57 -15
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +19 -1
- data/ext/ice/cpp/include/Ice/FactoryTable.h +12 -2
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +1 -1
- data/ext/ice/cpp/include/Ice/Format.h +13 -14
- data/ext/ice/cpp/include/Ice/Functional.h +6 -1
- data/ext/ice/cpp/include/Ice/GCObject.h +1 -1
- data/ext/ice/cpp/include/Ice/Handle.h +1 -1
- data/ext/ice/cpp/include/Ice/Ice.h +1 -1
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +38 -3
- data/ext/ice/cpp/include/Ice/Incoming.h +15 -2
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +37 -4
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +1 -1
- data/ext/ice/cpp/include/Ice/Initialize.h +764 -98
- data/ext/ice/cpp/include/Ice/InputStream.h +637 -112
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -1
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +17 -1
- data/ext/ice/cpp/include/Ice/LocalObject.h +5 -1
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -1
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +37 -6
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +3 -1
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +3 -1
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +3 -1
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +46 -23
- data/ext/ice/cpp/include/Ice/Object.h +338 -47
- data/ext/ice/cpp/include/Ice/ObjectF.h +5 -1
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +1 -1
- data/ext/ice/cpp/include/Ice/Optional.h +22 -6
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +15 -1
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +1 -1
- data/ext/ice/cpp/include/Ice/OutputStream.h +436 -92
- data/ext/ice/cpp/include/Ice/Protocol.h +31 -1
- data/ext/ice/cpp/include/Ice/Proxy.h +2244 -190
- data/ext/ice/cpp/include/Ice/ProxyF.h +3 -1
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -1
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +10 -1
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -1
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +67 -9
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +1 -1
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +1 -1
- data/ext/ice/cpp/include/Ice/SHA1.h +1 -1
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -1
- data/ext/ice/cpp/include/Ice/Service.h +267 -138
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -1
- data/ext/ice/cpp/include/Ice/SlicedData.h +80 -33
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +4 -1
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +324 -116
- data/ext/ice/cpp/include/Ice/StringConverter.h +32 -1
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -1
- data/ext/ice/cpp/include/Ice/UUID.h +2 -1
- data/ext/ice/cpp/include/Ice/UniquePtr.h +2 -2
- data/ext/ice/cpp/include/Ice/UniqueRef.h +6 -2
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +6 -1
- data/ext/ice/cpp/include/Ice/Value.h +41 -1
- data/ext/ice/cpp/include/Ice/ValueF.h +3 -1
- data/ext/ice/cpp/include/IceSSL/Config.h +1 -1
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +1 -1
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +75 -53
- data/ext/ice/cpp/include/IceSSL/Plugin.h +323 -218
- data/ext/ice/cpp/include/IceSSL/SChannel.h +34 -27
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +35 -28
- data/ext/ice/cpp/include/IceSSL/UWP.h +33 -24
- data/ext/ice/cpp/include/IceUtil/Atomic.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Cond.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Config.h +11 -3
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +1 -1
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +59 -31
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Exception.h +1 -1
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Functional.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Handle.h +1 -1
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Iterator.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Lock.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Mutex.h +2 -5
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +1 -1
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +1 -1
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Optional.h +95 -1
- data/ext/ice/cpp/include/IceUtil/Options.h +1 -1
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +1 -1
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Random.h +1 -1
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +1 -1
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +4 -4
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +5 -3
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Shared.h +1 -1
- data/ext/ice/cpp/include/IceUtil/StopWatch.h +1 -1
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +106 -86
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Thread.h +1 -1
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Time.h +1 -1
- data/ext/ice/cpp/include/IceUtil/Timer.h +5 -1
- data/ext/ice/cpp/include/IceUtil/UUID.h +5 -1
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -1
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +80 -20
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +927 -130
- data/ext/ice/cpp/include/generated/Ice/CommunicatorF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/Connection.h +990 -194
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +21 -9
- data/ext/ice/cpp/include/generated/Ice/Current.h +180 -17
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +484 -118
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +41 -17
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +29 -3
- data/ext/ice/cpp/include/generated/Ice/FacetMap.h +11 -5
- data/ext/ice/cpp/include/generated/Ice/Identity.h +56 -7
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +150 -28
- data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +629 -83
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +19 -7
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +5104 -794
- data/ext/ice/cpp/include/generated/Ice/Locator.h +2222 -443
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +27 -9
- data/ext/ice/cpp/include/generated/Ice/Logger.h +104 -26
- data/ext/ice/cpp/include/generated/Ice/LoggerF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +2534 -455
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1004 -126
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapterF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +72 -12
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +142 -28
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +17 -7
- data/ext/ice/cpp/include/generated/Ice/Process.h +511 -71
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +18 -6
- data/ext/ice/cpp/include/generated/Ice/Properties.h +306 -58
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +737 -121
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +22 -8
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +1526 -279
- data/ext/ice/cpp/include/generated/Ice/Router.h +1009 -198
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +18 -6
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +174 -18
- data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h +13 -5
- data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h +13 -3
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +177 -23
- data/ext/ice/cpp/include/generated/Ice/Version.h +43 -13
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +71 -15
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +13 -5
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +39 -9
- data/ext/ice/cpp/src/Ice/ACM.cpp +12 -3
- data/ext/ice/cpp/src/Ice/ACM.h +1 -1
- data/ext/ice/cpp/src/Ice/ACMF.h +1 -1
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Acceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ArgVector.h +1 -1
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Base64.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Base64.h +1 -1
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +1 -1
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +1 -1
- data/ext/ice/cpp/src/Ice/Buffer.cpp +1 -1
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +3 -3
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/Communicator.cpp +6 -4
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +34 -13
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +10 -10
- data/ext/ice/cpp/src/Ice/Cond.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +11 -6
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +1 -1
- data/ext/ice/cpp/src/Ice/Connection.cpp +27 -11
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +24 -19
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +45 -37
- data/ext/ice/cpp/src/Ice/ConnectionI.h +10 -8
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/Connector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Connector.h +1 -1
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -1
- data/ext/ice/cpp/src/Ice/CountDownLatch.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Current.cpp +3 -3
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +5 -7
- 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 +1 -1
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +24 -10
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +7 -13
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +2 -2
- data/ext/ice/cpp/src/Ice/EndpointI.h +5 -5
- data/ext/ice/cpp/src/Ice/EndpointIF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +3 -3
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/EventHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +1 -1
- data/ext/ice/cpp/src/Ice/Exception.cpp +1 -1
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +3 -3
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +1 -1
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +1 -1
- data/ext/ice/cpp/src/Ice/GCObject.cpp +1 -1
- data/ext/ice/cpp/src/Ice/HashUtil.h +1 -1
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -1
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -1
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +24 -29
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +5 -5
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +1 -1
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Identity.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +2 -13
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +1 -1
- data/ext/ice/cpp/src/Ice/Incoming.cpp +1 -1
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +1 -1
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +1 -1
- data/ext/ice/cpp/src/Ice/Initialize.cpp +10 -16
- data/ext/ice/cpp/src/Ice/InputStream.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Instance.cpp +13 -34
- data/ext/ice/cpp/src/Ice/Instance.h +1 -1
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +33 -13
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +1 -1
- data/ext/ice/cpp/src/Ice/LocalException.cpp +279 -279
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Locator.cpp +287 -174
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +4 -9
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +1 -1
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -1
- data/ext/ice/cpp/src/Ice/Logger.cpp +6 -4
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +1 -1
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/LoggerI.h +1 -1
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Metrics.cpp +297 -109
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +2 -7
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Network.cpp +188 -225
- data/ext/ice/cpp/src/Ice/Network.h +3 -12
- data/ext/ice/cpp/src/Ice/NetworkF.h +1 -1
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +1 -1
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +1 -1
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -1
- data/ext/ice/cpp/src/Ice/Object.cpp +7 -4
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +53 -19
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +116 -150
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +11 -11
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +1 -1
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +25 -42
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +2 -2
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +1 -1
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Plugin.cpp +9 -5
- data/ext/ice/cpp/src/Ice/PluginF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +15 -34
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +3 -3
- data/ext/ice/cpp/src/Ice/Process.cpp +69 -40
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/Properties.cpp +6 -4
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +89 -54
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +1 -1
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +15 -21
- data/ext/ice/cpp/src/Ice/PropertiesI.h +10 -10
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +4 -2
- data/ext/ice/cpp/src/Ice/PropertyNames.h +2 -2
- data/ext/ice/cpp/src/Ice/Protocol.cpp +5 -13
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -1
- data/ext/ice/cpp/src/Ice/Proxy.cpp +46 -1
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/Reference.cpp +56 -6
- data/ext/ice/cpp/src/Ice/Reference.h +13 -2
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +51 -90
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -1
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +203 -117
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +1 -1
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +1 -1
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +1 -1
- data/ext/ice/cpp/src/Ice/RetryQueue.h +1 -1
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -1
- data/ext/ice/cpp/src/Ice/Router.cpp +167 -89
- data/ext/ice/cpp/src/Ice/RouterF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +6 -28
- data/ext/ice/cpp/src/Ice/RouterInfo.h +1 -3
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -1
- data/ext/ice/cpp/src/Ice/SHA1.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Selector.cpp +19 -26
- data/ext/ice/cpp/src/Ice/Selector.h +1 -1
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +6 -4
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +15 -31
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -1
- data/ext/ice/cpp/src/Ice/SharedContext.h +1 -1
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +3 -3
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +1 -1
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +1 -1
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +32 -52
- data/ext/ice/cpp/src/Ice/StreamSocket.h +1 -1
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +10 -1
- data/ext/ice/cpp/src/Ice/StringUtil.h +1 -1
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +1 -1
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +1 -1
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +5 -13
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -1
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +8 -11
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +2 -2
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +1 -1
- data/ext/ice/cpp/src/Ice/Thread.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +13 -13
- data/ext/ice/cpp/src/Ice/ThreadPool.h +1 -1
- data/ext/ice/cpp/src/Ice/Timer.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +1 -1
- data/ext/ice/cpp/src/Ice/TraceUtil.h +1 -1
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -1
- data/ext/ice/cpp/src/Ice/Transceiver.h +1 -1
- data/ext/ice/cpp/src/Ice/TransceiverF.h +1 -1
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -1
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +19 -27
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +2 -2
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +17 -54
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +1 -1
- data/ext/ice/cpp/src/Ice/Value.cpp +1 -1
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +9 -5
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +3 -6
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +2 -2
- data/ext/ice/cpp/src/Ice/Version.cpp +3 -3
- data/ext/ice/cpp/src/Ice/VirtualShared.h +1 -1
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +1 -1
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +1 -1
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +1 -1
- data/ext/ice/cpp/src/Ice/WSConnector.h +1 -1
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +4 -5
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +2 -2
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +8 -9
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +85 -27
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +599 -113
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +1 -1
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +1 -1
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +70 -24
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +635 -69
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +1 -1
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +71 -9
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +2 -4
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +6 -4
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +3 -3
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +2 -4
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +2 -2
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +2 -2
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +6 -4
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/Instance.h +1 -1
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +25 -62
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +1 -1
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/PluginI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +19 -27
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +7 -16
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +7 -10
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +1 -1
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +4 -5
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +1 -1
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +1 -1
- data/ext/ice/cpp/src/IceSSL/Util.cpp +1 -1
- data/ext/ice/cpp/src/IceSSL/Util.h +1 -1
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +1 -1
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +5 -5
- 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 +1 -1
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Random.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +1 -5
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +3 -3
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Unicode.h +1 -1
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +1 -1
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +160 -150
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +9 -8
- data/ext/ice/cpp/src/Slice/Checksum.cpp +1 -1
- data/ext/ice/cpp/src/Slice/Checksum.h +1 -1
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +1 -1
- data/ext/ice/cpp/src/Slice/FileTracker.h +1 -1
- data/ext/ice/cpp/src/Slice/Grammar.cpp +567 -585
- data/ext/ice/cpp/src/Slice/Grammar.h +2 -2
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +131 -47
- data/ext/ice/cpp/src/Slice/JavaUtil.h +10 -5
- 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/PHPUtil.cpp +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/Parser.cpp +383 -101
- data/ext/ice/cpp/src/Slice/Parser.h +40 -3
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +2 -1
- data/ext/ice/cpp/src/Slice/Preprocessor.h +2 -2
- data/ext/ice/cpp/src/Slice/Python.cpp +7 -15
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +66 -9
- data/ext/ice/cpp/src/Slice/PythonUtil.h +2 -2
- data/ext/ice/cpp/src/Slice/Ruby.cpp +1 -1
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +2 -2
- data/ext/ice/cpp/src/Slice/RubyUtil.h +1 -1
- data/ext/ice/cpp/src/Slice/Scanner.cpp +214 -135
- data/ext/ice/cpp/src/Slice/SliceUtil.cpp +1 -1
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +99 -17
- data/ext/ice/cpp/src/Slice/Util.h +5 -4
- data/ice.gemspec +2 -2
- data/lib/Glacier2.rb +1 -1
- data/lib/Glacier2/Metrics.rb +2 -2
- data/lib/Glacier2/PermissionsVerifier.rb +2 -2
- data/lib/Glacier2/PermissionsVerifierF.rb +2 -2
- data/lib/Glacier2/Router.rb +2 -2
- data/lib/Glacier2/RouterF.rb +2 -2
- data/lib/Glacier2/SSLInfo.rb +2 -2
- data/lib/Glacier2/Session.rb +2 -2
- data/lib/Ice.rb +2 -2
- data/lib/Ice/BuiltinSequences.rb +2 -2
- data/lib/Ice/Communicator.rb +2 -2
- data/lib/Ice/CommunicatorF.rb +2 -2
- data/lib/Ice/Connection.rb +2 -2
- data/lib/Ice/ConnectionF.rb +2 -2
- data/lib/Ice/Current.rb +2 -2
- data/lib/Ice/Endpoint.rb +2 -2
- data/lib/Ice/EndpointF.rb +2 -2
- data/lib/Ice/EndpointTypes.rb +2 -2
- data/lib/Ice/FacetMap.rb +2 -2
- data/lib/Ice/Identity.rb +2 -2
- data/lib/Ice/ImplicitContext.rb +2 -2
- data/lib/Ice/ImplicitContextF.rb +2 -2
- data/lib/Ice/Instrumentation.rb +2 -2
- data/lib/Ice/InstrumentationF.rb +2 -2
- data/lib/Ice/LocalException.rb +2 -2
- data/lib/Ice/Locator.rb +2 -2
- data/lib/Ice/LocatorF.rb +2 -2
- data/lib/Ice/Logger.rb +2 -2
- data/lib/Ice/LoggerF.rb +2 -2
- data/lib/Ice/Metrics.rb +2 -2
- data/lib/Ice/ObjectAdapter.rb +2 -2
- data/lib/Ice/ObjectAdapterF.rb +2 -2
- data/lib/Ice/ObjectFactory.rb +2 -2
- data/lib/Ice/Plugin.rb +2 -2
- data/lib/Ice/PluginF.rb +2 -2
- data/lib/Ice/Process.rb +2 -2
- data/lib/Ice/ProcessF.rb +2 -2
- data/lib/Ice/Properties.rb +2 -2
- data/lib/Ice/PropertiesAdmin.rb +2 -2
- data/lib/Ice/PropertiesF.rb +2 -2
- data/lib/Ice/RemoteLogger.rb +2 -2
- data/lib/Ice/Router.rb +2 -2
- data/lib/Ice/RouterF.rb +2 -2
- data/lib/Ice/ServantLocator.rb +2 -2
- data/lib/Ice/ServantLocatorF.rb +2 -2
- data/lib/Ice/SliceChecksumDict.rb +2 -2
- data/lib/Ice/ValueFactory.rb +2 -2
- data/lib/Ice/Version.rb +2 -2
- data/lib/IceBox.rb +1 -1
- data/lib/IceBox/IceBox.rb +2 -2
- data/lib/IceGrid.rb +1 -1
- data/lib/IceGrid/Admin.rb +2 -2
- data/lib/IceGrid/Descriptor.rb +2 -2
- data/lib/IceGrid/Exception.rb +2 -2
- data/lib/IceGrid/FileParser.rb +2 -2
- data/lib/IceGrid/PluginFacade.rb +2 -2
- data/lib/IceGrid/Registry.rb +2 -2
- data/lib/IceGrid/Session.rb +2 -2
- data/lib/IceGrid/UserAccountMapper.rb +2 -2
- data/lib/IcePatch2.rb +1 -1
- data/lib/IcePatch2/FileInfo.rb +2 -2
- data/lib/IcePatch2/FileServer.rb +2 -2
- data/lib/IceStorm.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +2 -2
- data/lib/IceStorm/Metrics.rb +2 -2
- data/slice/Glacier2/Metrics.ice +2 -2
- data/slice/Glacier2/PermissionsVerifier.ice +2 -2
- data/slice/Glacier2/PermissionsVerifierF.ice +2 -2
- data/slice/Glacier2/Router.ice +2 -2
- data/slice/Glacier2/RouterF.ice +2 -2
- data/slice/Glacier2/SSLInfo.ice +2 -2
- data/slice/Glacier2/Session.ice +2 -2
- data/slice/Ice/BuiltinSequences.ice +2 -2
- data/slice/Ice/Communicator.ice +66 -73
- data/slice/Ice/CommunicatorF.ice +2 -2
- data/slice/Ice/Connection.ice +47 -17
- data/slice/Ice/ConnectionF.ice +2 -2
- data/slice/Ice/Current.ice +4 -5
- data/slice/Ice/Endpoint.ice +16 -16
- data/slice/Ice/EndpointF.ice +2 -2
- data/slice/Ice/EndpointTypes.ice +2 -2
- data/slice/Ice/FacetMap.ice +2 -2
- data/slice/Ice/Identity.ice +2 -2
- data/slice/Ice/ImplicitContext.ice +6 -6
- data/slice/Ice/ImplicitContextF.ice +2 -2
- data/slice/Ice/Instrumentation.ice +2 -2
- data/slice/Ice/InstrumentationF.ice +2 -2
- data/slice/Ice/LocalException.ice +2 -2
- data/slice/Ice/Locator.ice +3 -3
- data/slice/Ice/LocatorF.ice +2 -2
- data/slice/Ice/Logger.ice +2 -2
- data/slice/Ice/LoggerF.ice +2 -2
- data/slice/Ice/Metrics.ice +2 -2
- data/slice/Ice/ObjectAdapter.ice +10 -10
- data/slice/Ice/ObjectAdapterF.ice +2 -2
- data/slice/Ice/ObjectFactory.ice +3 -3
- data/slice/Ice/Plugin.ice +4 -4
- data/slice/Ice/PluginF.ice +2 -2
- data/slice/Ice/Process.ice +2 -2
- data/slice/Ice/ProcessF.ice +2 -2
- data/slice/Ice/Properties.ice +11 -11
- data/slice/Ice/PropertiesAdmin.ice +2 -2
- data/slice/Ice/PropertiesF.ice +2 -2
- data/slice/Ice/RemoteLogger.ice +12 -23
- data/slice/Ice/Router.ice +2 -2
- data/slice/Ice/RouterF.ice +2 -2
- data/slice/Ice/ServantLocator.ice +2 -2
- data/slice/Ice/ServantLocatorF.ice +2 -2
- data/slice/Ice/SliceChecksumDict.ice +2 -2
- data/slice/Ice/ValueFactory.ice +14 -16
- data/slice/Ice/Version.ice +2 -2
- data/slice/IceBT/ConnectionInfo.ice +2 -2
- data/slice/IceBT/EndpointInfo.ice +2 -2
- data/slice/IceBT/Types.ice +2 -2
- data/slice/IceBox/IceBox.ice +3 -4
- data/slice/IceDiscovery/IceDiscovery.ice +2 -2
- data/slice/IceGrid/Admin.ice +2 -2
- data/slice/IceGrid/Descriptor.ice +2 -2
- data/slice/IceGrid/Exception.ice +2 -2
- data/slice/IceGrid/FileParser.ice +2 -2
- data/slice/IceGrid/PluginFacade.ice +6 -6
- data/slice/IceGrid/Registry.ice +2 -2
- data/slice/IceGrid/Session.ice +2 -2
- data/slice/IceGrid/UserAccountMapper.ice +2 -2
- data/slice/IceIAP/ConnectionInfo.ice +2 -2
- data/slice/IceIAP/EndpointInfo.ice +2 -2
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +2 -2
- data/slice/IcePatch2/FileInfo.ice +2 -2
- data/slice/IcePatch2/FileServer.ice +2 -2
- data/slice/IceSSL/ConnectionInfo.ice +2 -2
- data/slice/IceSSL/ConnectionInfoF.ice +2 -2
- data/slice/IceSSL/EndpointInfo.ice +2 -2
- data/slice/IceStorm/IceStorm.ice +5 -6
- data/slice/IceStorm/Metrics.ice +2 -2
- metadata +3 -13
- data/BZIP2_LICENSE +0 -42
- data/ext/ice/bzip2/blocksort.c +0 -1094
- data/ext/ice/bzip2/bzlib.c +0 -1572
- data/ext/ice/bzip2/bzlib.h +0 -282
- data/ext/ice/bzip2/bzlib_private.h +0 -509
- data/ext/ice/bzip2/compress.c +0 -672
- data/ext/ice/bzip2/crctable.c +0 -104
- data/ext/ice/bzip2/decompress.c +0 -646
- data/ext/ice/bzip2/huffman.c +0 -205
- data/ext/ice/bzip2/randtable.c +0 -84
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -18,7 +18,9 @@ namespace Ice
|
|
18
18
|
{
|
19
19
|
|
20
20
|
class ObjectPrx;
|
21
|
+
/// \cond INTERNAL
|
21
22
|
using ObjectPrxPtr = ::std::shared_ptr<ObjectPrx>;
|
23
|
+
/// \endcond
|
22
24
|
|
23
25
|
}
|
24
26
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -38,12 +38,21 @@ class Object;
|
|
38
38
|
namespace Ice
|
39
39
|
{
|
40
40
|
|
41
|
+
/** Smart pointer for an object proxy. */
|
41
42
|
typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Object> ObjectPrx;
|
42
43
|
|
43
44
|
class ObjectAdapter;
|
44
45
|
typedef ::IceInternal::Handle< ::Ice::ObjectAdapter> ObjectAdapterPtr;
|
45
46
|
|
47
|
+
/**
|
48
|
+
* A request context. Context is used to transmit metadata about a
|
49
|
+
* request from the server to the client, such as Quality-of-Service
|
50
|
+
* (QoS) parameters. Each remote operation on a proxy optionally
|
51
|
+
* accepts a Context parameter.
|
52
|
+
**/
|
46
53
|
typedef ::std::map< ::std::string, ::std::string> Context;
|
54
|
+
|
55
|
+
/** Sentinel value indicating that no explicit context argument was passed to a remote invocation. */
|
47
56
|
ICE_API extern const Context noExplicitContext;
|
48
57
|
|
49
58
|
}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -35,32 +35,90 @@ namespace Ice
|
|
35
35
|
//
|
36
36
|
|
37
37
|
#ifndef ICE_API_EXPORTS
|
38
|
-
|
39
|
-
|
40
|
-
|
38
|
+
/**
|
39
|
+
* When using static libraries, calling this function ensures the string converter plug-in is
|
40
|
+
* linked with the application.
|
41
|
+
* @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
|
42
|
+
* If false, the plug-in is only loaded during communicator initialization if its corresponding
|
43
|
+
* plug-in property is set to 1.
|
44
|
+
*/
|
45
|
+
ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceStringConverter(bool loadOnInitialize = true);
|
46
|
+
|
47
|
+
/**
|
48
|
+
* When using static libraries, calling this function ensures the UDP transport is
|
49
|
+
* linked with the application.
|
50
|
+
* @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
|
51
|
+
* If false, the plug-in is only loaded during communicator initialization if its corresponding
|
52
|
+
* plug-in property is set to 1.
|
53
|
+
*/
|
54
|
+
ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceUDP(bool loadOnInitialize = true);
|
55
|
+
|
56
|
+
/**
|
57
|
+
* When using static libraries, calling this function ensures the WebSocket transport is
|
58
|
+
* linked with the application.
|
59
|
+
* @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
|
60
|
+
* If false, the plug-in is only loaded during communicator initialization if its corresponding
|
61
|
+
* plug-in property is set to 1.
|
62
|
+
*/
|
63
|
+
ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceWS(bool loadOnInitialize = true);
|
41
64
|
#endif
|
42
65
|
|
43
66
|
#ifndef ICESSL_API_EXPORTS
|
44
|
-
|
67
|
+
/**
|
68
|
+
* When using static libraries, calling this function ensures the SSL transport is
|
69
|
+
* linked with the application.
|
70
|
+
* @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
|
71
|
+
* If false, the plug-in is only loaded during communicator initialization if its corresponding
|
72
|
+
* plug-in property is set to 1.
|
73
|
+
*/
|
74
|
+
ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceSSL(bool loadOnInitialize = true);
|
45
75
|
#endif
|
46
76
|
|
47
77
|
#ifndef ICE_DISCOVERY_API_EXPORTS
|
48
|
-
|
78
|
+
/**
|
79
|
+
* When using static libraries, calling this function ensures the IceDiscovery plug-in is
|
80
|
+
* linked with the application.
|
81
|
+
* @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
|
82
|
+
* If false, the plug-in is only loaded during communicator initialization if its corresponding
|
83
|
+
* plug-in property is set to 1.
|
84
|
+
*/
|
85
|
+
ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceDiscovery(bool loadOnInitialize = true);
|
49
86
|
#endif
|
50
87
|
|
51
88
|
#ifndef ICE_LOCATOR_DISCOVERY_API_EXPORTS
|
52
|
-
|
89
|
+
/**
|
90
|
+
* When using static libraries, calling this function ensures the IceLocatorDiscovery plug-in is
|
91
|
+
* linked with the application.
|
92
|
+
* @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
|
93
|
+
* If false, the plug-in is only loaded during communicator initialization if its corresponding
|
94
|
+
* plug-in property is set to 1.
|
95
|
+
*/
|
96
|
+
ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceLocatorDiscovery(bool loadOnInitialize = true);
|
53
97
|
#endif
|
54
98
|
|
55
99
|
#if !defined(_WIN32) && !defined(__APPLE__)
|
56
100
|
# ifndef ICEBT_API_EXPORTS
|
57
|
-
|
101
|
+
/**
|
102
|
+
* When using static libraries, calling this function ensures the IceBT plug-in is
|
103
|
+
* linked with the application.
|
104
|
+
* @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
|
105
|
+
* If false, the plug-in is only loaded during communicator initialization if its corresponding
|
106
|
+
* plug-in property is set to 1.
|
107
|
+
*/
|
108
|
+
ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceBT(bool loadOnInitialize = true);
|
58
109
|
# endif
|
59
110
|
#endif
|
60
111
|
|
61
112
|
#if defined(__APPLE__) && TARGET_OS_IPHONE != 0
|
62
113
|
# ifndef ICEIAP_API_EXPORTS
|
63
|
-
|
114
|
+
/**
|
115
|
+
* When using static libraries, calling this function ensures the iAP plug-in is
|
116
|
+
* linked with the application.
|
117
|
+
* @param loadOnInitialize If true, the plug-in is loaded (created) during communicator initialization.
|
118
|
+
* If false, the plug-in is only loaded during communicator initialization if its corresponding
|
119
|
+
* plug-in property is set to 1.
|
120
|
+
*/
|
121
|
+
ICE_PLUGIN_REGISTER_DECLSPEC_IMPORT void registerIceIAP(bool loadOnInitialize = true);
|
64
122
|
# endif
|
65
123
|
#endif
|
66
124
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2018 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.
|
@@ -20,6 +20,11 @@
|
|
20
20
|
namespace Ice
|
21
21
|
{
|
22
22
|
|
23
|
+
/**
|
24
|
+
* A singleton class comparable to Ice::Application but also provides the low-level, platform-specific
|
25
|
+
* initialization and shutdown procedures common to system services.
|
26
|
+
* \headerfile Ice/Ice.h
|
27
|
+
*/
|
23
28
|
class ICE_API Service
|
24
29
|
{
|
25
30
|
public:
|
@@ -27,190 +32,312 @@ public:
|
|
27
32
|
Service();
|
28
33
|
virtual ~Service();
|
29
34
|
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
35
|
+
/**
|
36
|
+
* Shutdown the service. The default implementation invokes shutdown()
|
37
|
+
* on the communicator.
|
38
|
+
*/
|
34
39
|
virtual bool shutdown();
|
35
40
|
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
41
|
+
/**
|
42
|
+
* Notify the service about a signal interrupt. The default
|
43
|
+
* implementation invokes shutdown().
|
44
|
+
*/
|
40
45
|
virtual void interrupt();
|
41
46
|
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
47
|
+
/**
|
48
|
+
* The primary entry point for services. This function examines
|
49
|
+
* the given argument vector for reserved options and takes the
|
50
|
+
* appropriate action. The reserved options are shown below.
|
51
|
+
*
|
52
|
+
* Win32:
|
53
|
+
*
|
54
|
+
* --service NAME
|
55
|
+
*
|
56
|
+
* Unix:
|
57
|
+
*
|
58
|
+
* --daemon [--nochdir] [--noclose]
|
59
|
+
*
|
60
|
+
* If --service or --daemon are specified, the program runs as
|
61
|
+
* a service, otherwise the program runs as a regular foreground
|
62
|
+
* process. Any service-specific (and Ice-specific) options
|
63
|
+
* are stripped from argv (just as for Ice::initialize()).
|
64
|
+
*
|
65
|
+
* @param argc Specifies the number of arguments in argv.
|
66
|
+
* @param argv The command-line arguments.
|
67
|
+
* @param initData Configuration data for the new Communicator.
|
68
|
+
* @param version Indicates the Ice version with which the application is compatible. If not
|
69
|
+
* specified, the version of the Ice installation is used.
|
70
|
+
* @return The application's exit status: EXIT_FAILURE or EXIT_SUCCESS.
|
71
|
+
*/
|
72
|
+
int main(int argc, const char* const argv[], const InitializationData& initData = InitializationData(),
|
73
|
+
int version = ICE_INT_VERSION);
|
64
74
|
|
65
75
|
#ifdef _WIN32
|
66
|
-
|
76
|
+
/**
|
77
|
+
* The primary entry point for services. This function examines
|
78
|
+
* the given argument vector for reserved options and takes the
|
79
|
+
* appropriate action. The reserved options are shown below.
|
80
|
+
*
|
81
|
+
* Win32:
|
82
|
+
*
|
83
|
+
* --service NAME
|
84
|
+
*
|
85
|
+
* Unix:
|
86
|
+
*
|
87
|
+
* --daemon [--nochdir] [--noclose]
|
88
|
+
*
|
89
|
+
* If --service or --daemon are specified, the program runs as
|
90
|
+
* a service, otherwise the program runs as a regular foreground
|
91
|
+
* process. Any service-specific (and Ice-specific) options
|
92
|
+
* are stripped from argv (just as for Ice::initialize()).
|
93
|
+
*
|
94
|
+
* @param argc Specifies the number of arguments in argv.
|
95
|
+
* @param argv The command-line arguments.
|
96
|
+
* @param initData Configuration data for the new Communicator.
|
97
|
+
* @param version Indicates the Ice version with which the application is compatible. If not
|
98
|
+
* specified, the version of the Ice installation is used.
|
99
|
+
* @return The application's exit status: EXIT_FAILURE or EXIT_SUCCESS.
|
100
|
+
*/
|
101
|
+
int main(int argc, const wchar_t* const argv[], const InitializationData& initData = InitializationData(),
|
102
|
+
int version = ICE_INT_VERSION);
|
67
103
|
#endif
|
68
104
|
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
105
|
+
/**
|
106
|
+
* The primary entry point for services. This function examines
|
107
|
+
* the given argument vector for reserved options and takes the
|
108
|
+
* appropriate action. The reserved options are shown below.
|
109
|
+
*
|
110
|
+
* Win32:
|
111
|
+
*
|
112
|
+
* --service NAME
|
113
|
+
*
|
114
|
+
* Unix:
|
115
|
+
*
|
116
|
+
* --daemon [--nochdir] [--noclose]
|
117
|
+
*
|
118
|
+
* If --service or --daemon are specified, the program runs as
|
119
|
+
* a service, otherwise the program runs as a regular foreground
|
120
|
+
* process. Any service-specific (and Ice-specific) options
|
121
|
+
* are stripped from argv (just as for Ice::initialize()).
|
122
|
+
*
|
123
|
+
* @param args The command-line arguments.
|
124
|
+
* @param initData Configuration data for the new Communicator.
|
125
|
+
* @param version Indicates the Ice version with which the application is compatible. If not
|
126
|
+
* specified, the version of the Ice installation is used.
|
127
|
+
* @return The application's exit status: EXIT_FAILURE or EXIT_SUCCESS.
|
128
|
+
*/
|
129
|
+
int main(const StringSeq& args, const InitializationData& initData = InitializationData(),
|
130
|
+
int version = ICE_INT_VERSION);
|
131
|
+
|
132
|
+
/**
|
133
|
+
* Obtains the communicator created by the service.
|
134
|
+
* @return The service's communicator.
|
135
|
+
*/
|
74
136
|
Ice::CommunicatorPtr communicator() const;
|
75
137
|
|
76
|
-
|
77
|
-
|
78
|
-
|
138
|
+
/**
|
139
|
+
* Obtains the Service singleton.
|
140
|
+
* @return A pointer to this service.
|
141
|
+
*/
|
79
142
|
static Service* instance();
|
80
143
|
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
144
|
+
/**
|
145
|
+
* Indicates whether the program is running as a Win32 service or Unix daemon.
|
146
|
+
* @return True if the program is running as a service, false otherwise.
|
147
|
+
*/
|
85
148
|
bool service() const;
|
86
149
|
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
150
|
+
/**
|
151
|
+
* Obtains the program name. If the program is running as a Win32
|
152
|
+
* service, the return value is the service name. Otherwise the
|
153
|
+
* return value is the executable name (i.e., argv[0]).
|
154
|
+
* @return The service name.
|
155
|
+
*/
|
92
156
|
std::string name() const;
|
93
157
|
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
158
|
+
/**
|
159
|
+
* Determines whether the operating system supports running the
|
160
|
+
* program as a Win32 service or Unix daemon.
|
161
|
+
* @return True if the system supports services, false otherwise.
|
162
|
+
*/
|
98
163
|
bool checkSystem() const;
|
99
164
|
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
165
|
+
/**
|
166
|
+
* Alternative entry point for services that use their own
|
167
|
+
* command-line options. Instead of invoking main(), the
|
168
|
+
* program processes its command-line options and invokes
|
169
|
+
* run(). To run as a Win32 service or Unix daemon, the
|
170
|
+
* program must first invoke configureService() or
|
171
|
+
* configureDaemon(), respectively.
|
172
|
+
*
|
173
|
+
* @param argc Specifies the number of arguments in argv.
|
174
|
+
* @param argv The command-line arguments.
|
175
|
+
* @param initData Configuration data for the new Communicator.
|
176
|
+
* @param version Indicates the Ice version with which the application is compatible. If not
|
177
|
+
* specified, the version of the Ice installation is used.
|
178
|
+
* @return The application's exit status: EXIT_FAILURE or EXIT_SUCCESS.
|
179
|
+
*/
|
111
180
|
#ifdef _WIN32
|
112
|
-
int run(int, const wchar_t* const[], const InitializationData& = InitializationData(),
|
181
|
+
int run(int argc, const wchar_t* const argv[], const InitializationData& initData = InitializationData(),
|
182
|
+
int version = ICE_INT_VERSION);
|
113
183
|
#endif
|
114
184
|
|
115
|
-
|
185
|
+
/**
|
186
|
+
* Alternative entry point for services that use their own
|
187
|
+
* command-line options. Instead of invoking main(), the
|
188
|
+
* program processes its command-line options and invokes
|
189
|
+
* run(). To run as a Win32 service or Unix daemon, the
|
190
|
+
* program must first invoke configureService() or
|
191
|
+
* configureDaemon(), respectively.
|
192
|
+
*
|
193
|
+
* @param argc Specifies the number of arguments in argv.
|
194
|
+
* @param argv The command-line arguments.
|
195
|
+
* @param initData Configuration data for the new Communicator.
|
196
|
+
* @param version Indicates the Ice version with which the application is compatible. If not
|
197
|
+
* specified, the version of the Ice installation is used.
|
198
|
+
* @return The application's exit status: EXIT_FAILURE or EXIT_SUCCESS.
|
199
|
+
*/
|
200
|
+
int run(int argc, const char* const argv[], const InitializationData& initData = InitializationData(),
|
201
|
+
int version = ICE_INT_VERSION);
|
116
202
|
|
117
203
|
#ifdef _WIN32
|
118
204
|
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
void configureService(const std::string&);
|
205
|
+
/**
|
206
|
+
* Configures the program to run as a Win32 service with the given name.
|
207
|
+
* @param name The service name.
|
208
|
+
*/
|
209
|
+
void configureService(const std::string& name);
|
124
210
|
|
211
|
+
/// \cond INTERNAL
|
125
212
|
static void setModuleHandle(HMODULE);
|
213
|
+
/// \endcond
|
126
214
|
|
127
215
|
#else
|
128
216
|
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
217
|
+
/**
|
218
|
+
* Configures the program to run as a Unix daemon. The first
|
219
|
+
* argument indicates whether the daemon should change its
|
220
|
+
* working directory to the root directory. The second
|
221
|
+
* argument indicates whether extraneous file descriptors are
|
222
|
+
* closed. If the value of the last argument is not an empty
|
223
|
+
* string, the daemon writes its process ID to the given
|
224
|
+
* filename.
|
225
|
+
*
|
226
|
+
* @param changeDirectory True if the daemon should change its working directory to the root directory,
|
227
|
+
* false otherwise.
|
228
|
+
* @param closeFiles True if the daemon should close unnecessary file descriptors (i.e., stdin, stdout, etc.),
|
229
|
+
* false otherwise.
|
230
|
+
* @param pidFile If a non-empty string is provided, the daemon writes its process ID to the given file.
|
231
|
+
*/
|
232
|
+
void configureDaemon(bool changeDirectory, bool closeFiles, const std::string& pidFile);
|
139
233
|
|
140
234
|
#endif
|
141
235
|
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
236
|
+
/**
|
237
|
+
* Invoked by the signal handler when it catches a signal.
|
238
|
+
* @param sig The signal that was caught.
|
239
|
+
*/
|
240
|
+
virtual void handleInterrupt(int sig);
|
146
241
|
|
147
242
|
protected:
|
148
243
|
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
244
|
+
/**
|
245
|
+
* Prepares a service for execution, including the creation and
|
246
|
+
* activation of object adapters and servants.
|
247
|
+
* @param argc Specifies the number of arguments in argv.
|
248
|
+
* @param argv The command-line arguments.
|
249
|
+
* @param status The exit status, which is returned by main
|
250
|
+
* @return True if startup was successful, false otherwise.
|
251
|
+
*/
|
252
|
+
virtual bool start(int argc, char* argv[], int& status) = 0;
|
253
|
+
|
254
|
+
/**
|
255
|
+
* Blocks until the service shuts down. The default implementation
|
256
|
+
* invokes waitForShutdown() on the communicator.
|
257
|
+
*/
|
159
258
|
virtual void waitForShutdown();
|
160
259
|
|
161
|
-
|
162
|
-
|
163
|
-
|
260
|
+
/**
|
261
|
+
* Cleans up resources after shutting down.
|
262
|
+
*/
|
164
263
|
virtual bool stop();
|
165
264
|
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
virtual
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
virtual void
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
265
|
+
/**
|
266
|
+
* Initializes a communicator.
|
267
|
+
* @param argc Specifies the number of arguments in argv.
|
268
|
+
* @param argv The command-line arguments.
|
269
|
+
* @param initData Configuration data for the new Communicator.
|
270
|
+
* @param version Indicates the Ice version with which the application is compatible. If not
|
271
|
+
* specified, the version of the Ice installation is used.
|
272
|
+
* @return The new communicator instance.
|
273
|
+
*/
|
274
|
+
virtual Ice::CommunicatorPtr initializeCommunicator(int& argc, char* argv[], const InitializationData& initData,
|
275
|
+
int version);
|
276
|
+
|
277
|
+
/**
|
278
|
+
* Logs a system error, which includes a description of the
|
279
|
+
* current system error code.
|
280
|
+
* @param msg The log message.
|
281
|
+
*/
|
282
|
+
virtual void syserror(const std::string& msg);
|
283
|
+
|
284
|
+
/**
|
285
|
+
* Logs an error.
|
286
|
+
* @param msg The log message.
|
287
|
+
*/
|
288
|
+
virtual void error(const std::string& msg);
|
289
|
+
|
290
|
+
/**
|
291
|
+
* Logs a warning.
|
292
|
+
* @param msg The log message.
|
293
|
+
*/
|
294
|
+
virtual void warning(const std::string& msg);
|
295
|
+
|
296
|
+
/**
|
297
|
+
* Logs trace information.
|
298
|
+
* @param msg The log message.
|
299
|
+
*/
|
300
|
+
virtual void trace(const std::string& msg);
|
301
|
+
|
302
|
+
/**
|
303
|
+
* Logs a literal message.
|
304
|
+
* @param msg The log message.
|
305
|
+
*/
|
306
|
+
virtual void print(const std::string& msg);
|
307
|
+
|
308
|
+
/**
|
309
|
+
* Enables the signal handler to invoke interrupt() when a signal occurs.
|
310
|
+
*/
|
200
311
|
void enableInterrupt();
|
201
312
|
|
202
|
-
|
203
|
-
|
204
|
-
|
313
|
+
/**
|
314
|
+
* Ignore signals.
|
315
|
+
*/
|
205
316
|
void disableInterrupt();
|
206
317
|
|
207
|
-
|
208
|
-
|
209
|
-
|
318
|
+
/**
|
319
|
+
* Logger utility class for a system error.
|
320
|
+
*/
|
210
321
|
typedef LoggerOutput<Service, Service*, &Service::syserror> ServiceSysError;
|
322
|
+
|
323
|
+
/**
|
324
|
+
* Logger utility class for an error.
|
325
|
+
*/
|
211
326
|
typedef LoggerOutput<Service, Service*, &Service::error> ServiceError;
|
327
|
+
|
328
|
+
/**
|
329
|
+
* Logger utility class for a warning.
|
330
|
+
*/
|
212
331
|
typedef LoggerOutput<Service, Service*, &Service::warning> ServiceWarning;
|
332
|
+
|
333
|
+
/**
|
334
|
+
* Logger utility class for a trace message.
|
335
|
+
*/
|
213
336
|
typedef LoggerOutput<Service, Service*, &Service::trace> ServiceTrace;
|
337
|
+
|
338
|
+
/**
|
339
|
+
* Logger utility class for a literal message.
|
340
|
+
*/
|
214
341
|
typedef LoggerOutput<Service, Service*, &Service::print> ServicePrint;
|
215
342
|
|
216
343
|
private:
|
@@ -236,8 +363,10 @@ private:
|
|
236
363
|
|
237
364
|
public:
|
238
365
|
|
366
|
+
/// \cond INTERNAL
|
239
367
|
void serviceMain(int, const wchar_t* const[]);
|
240
368
|
void control(int);
|
369
|
+
/// \endcond
|
241
370
|
|
242
371
|
#else
|
243
372
|
|