zeroc-ice 3.6.5 → 3.7.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ICE_LICENSE +17 -17
- data/LICENSE +12 -12
- data/bin/slice2rb +1 -6
- data/ext/Communicator.cpp +223 -61
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +23 -7
- data/ext/Connection.cpp +108 -76
- data/ext/Connection.h +4 -6
- data/ext/Endpoint.cpp +16 -54
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -10
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +4 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +38 -54
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +3 -8
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +111 -70
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +5 -20
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +313 -224
- data/ext/Types.h +118 -71
- data/ext/Util.cpp +69 -36
- data/ext/Util.h +117 -42
- data/ext/ValueFactoryManager.cpp +440 -0
- data/ext/ValueFactoryManager.h +95 -0
- data/ext/extconf.rb +52 -48
- data/ext/ice/cpp/include/Ice/Application.h +275 -105
- data/ext/ice/cpp/include/Ice/AsyncResult.h +124 -337
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -7
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +39 -16
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +10 -15
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +56 -17
- data/ext/ice/cpp/include/Ice/Comparable.h +205 -0
- data/ext/ice/cpp/include/Ice/Config.h +16 -39
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +203 -16
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +7 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +23 -0
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +57 -0
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +20 -12
- data/ext/ice/cpp/include/Ice/Dispatcher.h +35 -19
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -10
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +110 -63
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +74 -0
- data/ext/ice/cpp/include/Ice/FactoryTable.h +22 -18
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +28 -31
- data/ext/ice/cpp/include/Ice/Format.h +17 -18
- data/ext/ice/cpp/include/Ice/Functional.h +38 -38
- data/ext/ice/cpp/include/Ice/GCObject.h +9 -10
- data/ext/ice/cpp/include/Ice/Handle.h +6 -16
- data/ext/ice/cpp/include/Ice/Ice.h +9 -10
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +377 -0
- data/ext/ice/cpp/include/Ice/Incoming.h +132 -38
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +109 -31
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +872 -60
- data/ext/ice/cpp/include/Ice/InputStream.h +1514 -0
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -7
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +57 -0
- data/ext/ice/cpp/include/Ice/LocalObject.h +13 -14
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +56 -24
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +124 -71
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +25 -10
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +116 -32
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +61 -30
- data/ext/ice/cpp/include/Ice/Object.h +413 -78
- data/ext/ice/cpp/include/Ice/ObjectF.h +12 -8
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -13
- data/ext/ice/cpp/include/Ice/Optional.h +1114 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +684 -89
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -11
- data/ext/ice/cpp/include/Ice/OutputStream.h +1092 -0
- data/ext/ice/cpp/include/Ice/Protocol.h +49 -17
- data/ext/ice/cpp/include/Ice/Proxy.h +3438 -745
- data/ext/ice/cpp/include/Ice/ProxyF.h +13 -38
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +43 -55
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +84 -12
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -9
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +42 -0
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +273 -154
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +121 -53
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +17 -11
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +453 -140
- data/ext/ice/cpp/include/Ice/StringConverter.h +78 -0
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +19 -0
- data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +22 -28
- data/ext/ice/cpp/include/Ice/UniqueRef.h +97 -0
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +45 -13
- data/ext/ice/cpp/include/Ice/Value.h +139 -0
- data/ext/ice/cpp/include/Ice/ValueF.h +21 -0
- data/ext/ice/cpp/include/IceSSL/Config.h +8 -28
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -11
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +147 -0
- data/ext/ice/cpp/include/IceSSL/Plugin.h +461 -448
- data/ext/ice/cpp/include/IceSSL/SChannel.h +72 -0
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +72 -0
- data/ext/ice/cpp/include/IceSSL/UWP.h +62 -0
- data/ext/ice/cpp/include/IceUtil/Atomic.h +7 -14
- data/ext/ice/cpp/include/IceUtil/Cond.h +17 -23
- data/ext/ice/cpp/include/IceUtil/Config.h +166 -46
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +92 -0
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -10
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +63 -41
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -13
- data/ext/ice/cpp/include/IceUtil/Exception.h +284 -75
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +143 -0
- data/ext/ice/cpp/include/IceUtil/Functional.h +4 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +11 -16
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -15
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -7
- data/ext/ice/cpp/include/IceUtil/Lock.h +8 -15
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -7
- data/ext/ice/cpp/include/IceUtil/Mutex.h +19 -23
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -7
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/Optional.h +134 -23
- data/ext/ice/cpp/include/IceUtil/Options.h +17 -23
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +61 -37
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -11
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +18 -15
- data/ext/ice/cpp/include/IceUtil/Random.h +39 -8
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -13
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +53 -0
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +10 -15
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -7
- data/ext/ice/cpp/include/IceUtil/Shared.h +5 -12
- data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -7
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +146 -126
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -26
- data/ext/ice/cpp/include/IceUtil/Thread.h +10 -17
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -47
- data/ext/ice/cpp/include/IceUtil/Time.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Timer.h +18 -18
- data/ext/ice/cpp/include/IceUtil/UUID.h +6 -7
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +170 -0
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +1156 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Connection.h +1660 -0
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +119 -0
- data/ext/ice/cpp/include/generated/Ice/Current.h +322 -0
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +943 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +166 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +118 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +31 -15
- data/ext/ice/cpp/include/generated/Ice/Identity.h +264 -0
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +278 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +1143 -0
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +128 -0
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +7041 -0
- data/ext/ice/cpp/include/generated/Ice/Locator.h +3850 -0
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +147 -0
- data/ext/ice/cpp/include/generated/Ice/Logger.h +231 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +4717 -0
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1175 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +197 -0
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +306 -0
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +110 -0
- data/ext/ice/cpp/include/generated/Ice/Process.h +971 -0
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/Properties.h +446 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +1360 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +134 -0
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2689 -0
- data/ext/ice/cpp/include/generated/Ice/Router.h +1838 -0
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +299 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +51 -16
- data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +34 -14
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +318 -0
- data/ext/ice/cpp/include/generated/Ice/Version.h +357 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +223 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +101 -0
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +181 -0
- data/ext/ice/cpp/src/Ice/ACM.cpp +38 -27
- data/ext/ice/cpp/src/Ice/ACM.h +9 -7
- data/ext/ice/cpp/src/Ice/ACMF.h +30 -0
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +4 -8
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +59 -0
- data/ext/ice/cpp/src/Ice/ArgVector.h +36 -0
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -544
- data/ext/ice/cpp/src/Ice/Base64.cpp +22 -28
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +41 -18
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -15
- data/ext/ice/cpp/src/Ice/Buffer.cpp +75 -18
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +21 -12
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +86 -197
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -23
- data/ext/ice/cpp/src/Ice/Communicator.cpp +43 -15
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +318 -117
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +95 -40
- data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +55 -122
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +15 -31
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -7
- data/ext/ice/cpp/src/Ice/Connection.cpp +111 -20
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +300 -107
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +44 -28
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +30 -0
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +785 -713
- data/ext/ice/cpp/src/Ice/ConnectionI.h +105 -80
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -20
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +5 -9
- data/ext/ice/cpp/src/Ice/Connector.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Connector.h +4 -8
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -9
- data/ext/ice/cpp/src/Ice/Current.cpp +30 -12
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +10 -16
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +13 -25
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +34 -28
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +107 -19
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -11
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +41 -36
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -9
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +18 -7
- data/ext/ice/cpp/src/Ice/EndpointI.h +39 -18
- data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -10
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +19 -12
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -9
- data/ext/ice/cpp/src/Ice/EventHandler.h +13 -13
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -7
- data/ext/ice/cpp/src/Ice/Exception.cpp +102 -98
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +21 -12
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -33
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -9
- data/ext/ice/cpp/src/Ice/GCObject.cpp +29 -31
- data/ext/ice/cpp/src/Ice/HashUtil.h +3 -9
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -7
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +128 -111
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +23 -19
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -7
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +51 -0
- data/ext/ice/cpp/src/Ice/Identity.cpp +25 -16
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +11 -28
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -10
- data/ext/ice/cpp/src/Ice/Incoming.cpp +284 -255
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -214
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -9
- data/ext/ice/cpp/src/Ice/Initialize.cpp +309 -193
- data/ext/ice/cpp/src/Ice/InputStream.cpp +2726 -0
- data/ext/ice/cpp/src/Ice/Instance.cpp +243 -262
- data/ext/ice/cpp/src/Ice/Instance.h +30 -23
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +137 -23
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +118 -105
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -36
- data/ext/ice/cpp/src/Ice/LocalException.cpp +1191 -422
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Locator.cpp +1282 -1222
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +150 -186
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +31 -36
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +39 -12
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +182 -88
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -9
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +26 -55
- data/ext/ice/cpp/src/Ice/LoggerI.h +7 -18
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -17
- data/ext/ice/cpp/src/Ice/Metrics.cpp +1280 -1107
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +58 -33
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Network.cpp +753 -408
- data/ext/ice/cpp/src/Ice/Network.h +99 -36
- data/ext/ice/cpp/src/Ice/NetworkF.h +2 -7
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +20 -19
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -7
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
- data/ext/ice/cpp/src/Ice/Object.cpp +227 -232
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +45 -13
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +83 -33
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -12
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +25 -0
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +298 -191
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +44 -39
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -37
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +67 -67
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +15 -11
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +801 -366
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1367 -0
- data/ext/ice/cpp/src/Ice/Plugin.cpp +52 -14
- data/ext/ice/cpp/src/Ice/PluginF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +27 -51
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +7 -13
- data/ext/ice/cpp/src/Ice/Process.cpp +294 -128
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/Properties.cpp +42 -15
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +382 -340
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +83 -24
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -10
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +46 -57
- data/ext/ice/cpp/src/Ice/PropertiesI.h +18 -26
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +112 -19
- data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +6 -19
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -7
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -25
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +729 -957
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +33 -38
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -16
- data/ext/ice/cpp/src/Ice/Reference.cpp +190 -106
- data/ext/ice/cpp/src/Ice/Reference.h +39 -28
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +69 -118
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -17
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +19 -9
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +766 -565
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -8
- data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -18
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -11
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -7
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -11
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -12
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +12 -20
- data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -11
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
- data/ext/ice/cpp/src/Ice/Router.cpp +614 -492
- data/ext/ice/cpp/src/Ice/RouterF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +93 -99
- data/ext/ice/cpp/src/Ice/RouterInfo.h +42 -38
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +23 -28
- data/ext/ice/cpp/src/Ice/Selector.cpp +948 -855
- data/ext/ice/cpp/src/Ice/Selector.h +100 -152
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +24 -45
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +2 -7
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +21 -12
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -7
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -25
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +208 -76
- data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -9
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +57 -22
- data/ext/ice/cpp/src/Ice/StringUtil.h +30 -0
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +6 -7
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -8
- data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
- data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +169 -49
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -10
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -12
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +51 -46
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +12 -14
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +17 -32
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -15
- data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +41 -54
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +242 -274
- data/ext/ice/cpp/src/Ice/ThreadPool.h +46 -48
- data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +38 -26
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -7
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -7
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -36
- data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -11
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Transceiver.h +8 -12
- data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +5 -13
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +118 -60
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +13 -10
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +177 -236
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -22
- data/ext/ice/cpp/src/Ice/Value.cpp +76 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +83 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +61 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +37 -0
- data/ext/ice/cpp/src/Ice/Version.cpp +25 -20
- data/ext/ice/cpp/src/Ice/VirtualShared.h +38 -0
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -14
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -12
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -16
- data/ext/ice/cpp/src/Ice/WSConnector.h +3 -11
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +188 -89
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +22 -37
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +65 -66
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -27
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +596 -281
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1383 -543
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +89 -32
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -28
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -66
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -41
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -64
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -8
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +450 -172
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +863 -406
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +47 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +636 -144
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +20 -173
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -22
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +279 -0
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +64 -0
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +42 -17
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +61 -0
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +15 -64
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -18
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +207 -204
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +43 -40
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +42 -16
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -11
- data/ext/ice/cpp/src/IceSSL/Instance.h +7 -12
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -12
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +583 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +134 -115
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +27 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +127 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +477 -182
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +32 -26
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +286 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +58 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -46
- data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -23
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -60
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -12
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +580 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +523 -74
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +123 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +31 -0
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +73 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +187 -221
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +24 -26
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +97 -94
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +26 -192
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -24
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +868 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +69 -201
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +29 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +75 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +174 -161
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +29 -33
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +864 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +45 -0
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +12 -22
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -9
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -8
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +266 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +338 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +41 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +26 -0
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +89 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +383 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +71 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +71 -1260
- data/ext/ice/cpp/src/IceSSL/Util.h +48 -142
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +157 -0
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -27
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -31
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +22 -36
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +30 -126
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Options.cpp +20 -33
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +47 -21
- data/ext/ice/cpp/src/IceUtil/Random.cpp +15 -20
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +4 -19
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -8
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -269
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +582 -244
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -79
- data/ext/ice/cpp/src/IceUtil/Time.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +17 -22
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +97 -101
- data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -40
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +839 -0
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +894 -234
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +72 -0
- data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -7
- data/ext/ice/cpp/src/Slice/Checksum.h +21 -0
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -83
- data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -14
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1981 -1944
- data/ext/ice/cpp/src/Slice/Grammar.h +39 -19
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -20
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2752 -1948
- data/ext/ice/cpp/src/Slice/JavaUtil.h +398 -0
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
- data/ext/ice/cpp/src/Slice/MD5.h +1 -6
- data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -1
- data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +17 -20
- data/ext/ice/cpp/src/Slice/PHPUtil.h +36 -0
- data/ext/ice/cpp/src/Slice/Parser.cpp +1190 -426
- data/ext/ice/cpp/{include → src}/Slice/Parser.h +143 -91
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +67 -36
- data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +8 -18
- data/ext/ice/cpp/src/Slice/Python.cpp +218 -111
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +787 -699
- data/ext/ice/cpp/src/Slice/PythonUtil.h +70 -0
- data/ext/ice/cpp/src/Slice/Ruby.cpp +42 -43
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +175 -445
- data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -11
- data/ext/ice/cpp/src/Slice/Scanner.cpp +390 -399
- data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +36 -69
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +456 -0
- data/ext/ice/cpp/src/Slice/Util.h +50 -0
- data/ice.gemspec +2 -9
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +6 -50
- data/lib/Glacier2/PermissionsVerifier.rb +23 -99
- data/lib/Glacier2/PermissionsVerifierF.rb +2 -7
- data/lib/Glacier2/Router.rb +31 -78
- data/lib/Glacier2/RouterF.rb +2 -7
- data/lib/Glacier2/SSLInfo.rb +3 -11
- data/lib/Glacier2/Session.rb +87 -311
- data/lib/Ice.rb +84 -58
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +54 -61
- data/lib/Ice/CommunicatorF.rb +2 -7
- data/lib/Ice/Connection.rb +152 -166
- data/lib/Ice/ConnectionF.rb +2 -7
- data/lib/Ice/Current.rb +3 -15
- data/lib/Ice/Endpoint.rb +56 -137
- data/lib/Ice/EndpointF.rb +2 -7
- data/lib/Ice/EndpointTypes.rb +2 -11
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +4 -12
- data/lib/Ice/ImplicitContext.rb +4 -38
- data/lib/Ice/ImplicitContextF.rb +2 -7
- data/lib/Ice/Instrumentation.rb +22 -279
- data/lib/Ice/InstrumentationF.rb +2 -7
- data/lib/Ice/LocalException.rb +94 -145
- data/lib/Ice/Locator.rb +50 -169
- data/lib/Ice/LocatorF.rb +2 -7
- data/lib/Ice/Logger.rb +4 -38
- data/lib/Ice/LoggerF.rb +2 -7
- data/lib/Ice/Metrics.rb +60 -420
- data/lib/Ice/ObjectAdapter.rb +29 -0
- data/lib/Ice/ObjectAdapterF.rb +2 -7
- data/lib/Ice/ObjectFactory.rb +4 -34
- data/lib/Ice/Plugin.rb +6 -64
- data/lib/Ice/PluginF.rb +2 -7
- data/lib/Ice/Process.rb +15 -56
- data/lib/Ice/ProcessF.rb +2 -7
- data/lib/Ice/Properties.rb +4 -45
- data/lib/Ice/PropertiesAdmin.rb +18 -60
- data/lib/Ice/PropertiesF.rb +2 -7
- data/lib/Ice/RemoteLogger.rb +33 -119
- data/lib/Ice/Router.rb +28 -105
- data/lib/Ice/RouterF.rb +2 -7
- data/lib/Ice/ServantLocator.rb +26 -0
- data/lib/Ice/ServantLocatorF.rb +24 -0
- data/lib/Ice/SliceChecksumDict.rb +2 -7
- data/lib/Ice/ValueFactory.rb +28 -0
- data/lib/Ice/Version.rb +4 -15
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +43 -152
- data/lib/IceGrid.rb +1 -9
- data/lib/IceGrid/Admin.rb +550 -431
- data/lib/IceGrid/Descriptor.rb +61 -533
- data/lib/IceGrid/Exception.rb +23 -49
- data/lib/IceGrid/FileParser.rb +13 -54
- data/lib/IceGrid/PluginFacade.rb +35 -0
- data/lib/IceGrid/Registry.rb +150 -62
- data/lib/IceGrid/Session.rb +24 -68
- data/lib/IceGrid/UserAccountMapper.rb +13 -54
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +4 -15
- data/lib/IcePatch2/FileServer.rb +32 -80
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +78 -210
- data/lib/IceStorm/Metrics.rb +10 -93
- data/slice/Glacier2/Metrics.ice +20 -10
- data/slice/Glacier2/PermissionsVerifier.ice +19 -12
- data/slice/Glacier2/PermissionsVerifierF.ice +16 -9
- data/slice/Glacier2/Router.ice +19 -13
- data/slice/Glacier2/RouterF.ice +16 -9
- data/slice/Glacier2/SSLInfo.ice +17 -10
- data/slice/Glacier2/Session.ice +24 -18
- data/slice/Ice/BuiltinSequences.ice +18 -9
- data/slice/Ice/Communicator.ice +180 -64
- data/slice/Ice/CommunicatorF.ice +18 -9
- data/slice/Ice/Connection.ice +208 -75
- data/slice/Ice/ConnectionF.ice +18 -9
- data/slice/Ice/Current.ice +37 -28
- data/slice/Ice/Endpoint.ice +73 -21
- data/slice/Ice/EndpointF.ice +19 -10
- data/slice/Ice/EndpointTypes.ice +21 -13
- data/slice/Ice/FacetMap.ice +19 -10
- data/slice/Ice/Identity.ice +24 -10
- data/slice/Ice/ImplicitContext.ice +41 -33
- data/slice/Ice/ImplicitContextF.ice +17 -9
- data/slice/Ice/Instrumentation.ice +37 -30
- data/slice/Ice/InstrumentationF.ice +19 -10
- data/slice/Ice/LocalException.ice +118 -112
- data/slice/Ice/Locator.ice +28 -21
- data/slice/Ice/LocatorF.ice +18 -9
- data/slice/Ice/Logger.ice +26 -18
- data/slice/Ice/LoggerF.ice +18 -9
- data/slice/Ice/Metrics.ice +42 -30
- data/slice/Ice/ObjectAdapter.ice +88 -53
- data/slice/Ice/ObjectAdapterF.ice +18 -9
- data/slice/Ice/ObjectFactory.ice +28 -17
- data/slice/Ice/Plugin.ice +25 -13
- data/slice/Ice/PluginF.ice +22 -9
- data/slice/Ice/Process.ice +20 -11
- data/slice/Ice/ProcessF.ice +18 -9
- data/slice/Ice/Properties.ice +42 -28
- data/slice/Ice/PropertiesAdmin.ice +20 -10
- data/slice/Ice/PropertiesF.ice +18 -9
- data/slice/Ice/RemoteLogger.ice +23 -19
- data/slice/Ice/Router.ice +28 -13
- data/slice/Ice/RouterF.ice +18 -9
- data/slice/Ice/ServantLocator.ice +40 -29
- data/slice/Ice/ServantLocatorF.ice +18 -9
- data/slice/Ice/SliceChecksumDict.ice +18 -9
- data/slice/Ice/ValueFactory.ice +132 -0
- data/slice/Ice/Version.ice +20 -10
- data/slice/IceBT/ConnectionInfo.ice +58 -0
- data/slice/IceBT/EndpointInfo.ice +56 -0
- data/slice/IceBT/Types.ice +44 -0
- data/slice/IceBox/IceBox.ice +45 -27
- data/slice/IceDiscovery/IceDiscovery.ice +75 -10
- data/slice/IceGrid/Admin.ice +410 -44
- data/slice/IceGrid/Descriptor.ice +47 -34
- data/slice/IceGrid/Exception.ice +43 -32
- data/slice/IceGrid/FileParser.ice +21 -12
- data/slice/IceGrid/PluginFacade.ice +26 -18
- data/slice/IceGrid/Registry.ice +150 -21
- data/slice/IceGrid/Session.ice +25 -17
- data/slice/IceGrid/UserAccountMapper.ice +23 -14
- data/slice/IceIAP/ConnectionInfo.ice +73 -0
- data/slice/IceIAP/EndpointInfo.ice +67 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +19 -12
- data/slice/IcePatch2/FileInfo.ice +19 -13
- data/slice/IcePatch2/FileServer.ice +27 -18
- data/slice/IceSSL/ConnectionInfo.ice +27 -23
- data/slice/IceSSL/ConnectionInfoF.ice +30 -0
- data/slice/IceSSL/EndpointInfo.ice +21 -36
- data/slice/IceStorm/IceStorm.ice +33 -24
- data/slice/IceStorm/Metrics.ice +19 -11
- metadata +148 -120
- data/ext/ObjectFactory.cpp +0 -140
- data/ext/ObjectFactory.h +0 -50
- data/ext/ice/cpp/include/Ice/ACMF.h +0 -30
- data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
- data/ext/ice/cpp/include/Ice/BuiltinSequences.h +0 -82
- data/ext/ice/cpp/include/Ice/Communicator.h +0 -200
- data/ext/ice/cpp/include/Ice/Connection.h +0 -497
- data/ext/ice/cpp/include/Ice/ConnectionF.h +0 -74
- data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +0 -30
- data/ext/ice/cpp/include/Ice/Current.h +0 -102
- data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +0 -48
- data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +0 -62
- data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
- data/ext/ice/cpp/include/Ice/EndpointF.h +0 -93
- data/ext/ice/cpp/include/Ice/EndpointTypes.h +0 -82
- data/ext/ice/cpp/include/Ice/Identity.h +0 -168
- data/ext/ice/cpp/include/Ice/ImplicitContext.h +0 -102
- data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
- data/ext/ice/cpp/include/Ice/InstrumentationF.h +0 -75
- data/ext/ice/cpp/include/Ice/LocalException.h +0 -1030
- data/ext/ice/cpp/include/Ice/Locator.h +0 -2193
- data/ext/ice/cpp/include/Ice/LocatorF.h +0 -93
- data/ext/ice/cpp/include/Ice/Logger.h +0 -100
- data/ext/ice/cpp/include/Ice/Metrics.h +0 -2974
- data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
- data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.h +0 -26
- data/ext/ice/cpp/include/Ice/ObjectFactory.h +0 -92
- data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +0 -66
- data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.h +0 -26
- data/ext/ice/cpp/include/Ice/Outgoing.h +0 -225
- data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
- data/ext/ice/cpp/include/Ice/PluginF.h +0 -70
- data/ext/ice/cpp/include/Ice/Process.h +0 -574
- data/ext/ice/cpp/include/Ice/ProcessF.h +0 -83
- data/ext/ice/cpp/include/Ice/Properties.h +0 -136
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
- data/ext/ice/cpp/include/Ice/PropertiesF.h +0 -87
- data/ext/ice/cpp/include/Ice/RemoteLogger.h +0 -1500
- data/ext/ice/cpp/include/Ice/Router.h +0 -1159
- data/ext/ice/cpp/include/Ice/RouterF.h +0 -83
- data/ext/ice/cpp/include/Ice/ServantLocator.h +0 -96
- data/ext/ice/cpp/include/Ice/Stream.h +0 -447
- data/ext/ice/cpp/include/Ice/StreamF.h +0 -30
- data/ext/ice/cpp/include/Ice/Version.h +0 -262
- data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +0 -158
- data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +0 -142
- data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +0 -119
- data/ext/ice/cpp/include/IceUtil/Cache.h +0 -362
- data/ext/ice/cpp/include/IceUtil/IconvStringConverter.h +0 -302
- data/ext/ice/cpp/include/IceUtil/SHA1.h +0 -47
- data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +0 -65
- data/ext/ice/cpp/include/Slice/Checksum.h +0 -26
- data/ext/ice/cpp/include/Slice/CsUtil.h +0 -92
- data/ext/ice/cpp/include/Slice/DotNetNames.h +0 -34
- data/ext/ice/cpp/include/Slice/JavaUtil.h +0 -279
- data/ext/ice/cpp/include/Slice/ObjCUtil.h +0 -127
- data/ext/ice/cpp/include/Slice/PHPUtil.h +0 -50
- data/ext/ice/cpp/include/Slice/PythonUtil.h +0 -64
- data/ext/ice/cpp/include/Slice/Util.h +0 -56
- data/ext/ice/cpp/src/Ice/BasicStream.cpp +0 -3428
- data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +0 -62
- data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +0 -44
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +0 -139
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +0 -43
- data/ext/ice/cpp/src/Ice/Outgoing.cpp +0 -694
- data/ext/ice/cpp/src/Ice/Stream.cpp +0 -53
- data/ext/ice/cpp/src/Ice/StreamI.cpp +0 -832
- data/ext/ice/cpp/src/Ice/StreamI.h +0 -198
- data/ext/ice/cpp/src/IceSSL/Certificate.cpp +0 -1336
- data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +0 -64
- data/ext/ice/cpp/src/IceUtil/ArgVector.h +0 -41
- data/ext/ice/cpp/src/IceUtil/Exception.cpp +0 -792
- data/ext/ice/cpp/src/IceUtil/FileUtil.h +0 -185
- data/ext/ice/cpp/src/Slice/CsUtil.cpp +0 -2660
- data/ext/ice/cpp/src/Slice/DotNetNames.cpp +0 -146
- data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +0 -1310
- data/lib/Ice/ObjectFactoryF.rb +0 -29
- data/lib/IceGrid/Locator.rb +0 -106
- data/lib/IceGrid/Observer.rb +0 -572
- data/lib/IceGrid/Query.rb +0 -169
- data/slice/Freeze/BackgroundSaveEvictor.ice +0 -111
- data/slice/Freeze/CatalogData.ice +0 -49
- data/slice/Freeze/Connection.ice +0 -121
- data/slice/Freeze/ConnectionF.ice +0 -20
- data/slice/Freeze/DB.ice +0 -37
- data/slice/Freeze/Evictor.ice +0 -346
- data/slice/Freeze/EvictorF.ice +0 -22
- data/slice/Freeze/EvictorStorage.ice +0 -72
- data/slice/Freeze/Exception.ice +0 -100
- data/slice/Freeze/Transaction.ice +0 -58
- data/slice/Freeze/TransactionalEvictor.ice +0 -50
- data/slice/Ice/ObjectFactoryF.ice +0 -21
- data/slice/IceGrid/Locator.ice +0 -57
- data/slice/IceGrid/Observer.ice +0 -395
- data/slice/IceGrid/Query.ice +0 -131
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <Ice/Instance.h>
|
11
6
|
#include <Ice/TraceLevels.h>
|
@@ -18,7 +13,7 @@
|
|
18
13
|
#include <Ice/ProxyFactory.h>
|
19
14
|
#include <Ice/ThreadPool.h>
|
20
15
|
#include <Ice/ConnectionFactory.h>
|
21
|
-
#include <Ice/
|
16
|
+
#include <Ice/ValueFactoryManagerI.h>
|
22
17
|
#include <Ice/LocalException.h>
|
23
18
|
#include <Ice/ObjectAdapterFactory.h>
|
24
19
|
#include <Ice/Exception.h>
|
@@ -42,9 +37,13 @@
|
|
42
37
|
#include <Ice/LoggerAdminI.h>
|
43
38
|
#include <Ice/RegisterPluginsInit.h>
|
44
39
|
#include <Ice/ObserverHelper.h>
|
40
|
+
#include <Ice/Functional.h>
|
41
|
+
#include <Ice/ConsoleUtil.h>
|
45
42
|
|
43
|
+
#include <IceUtil/DisableWarnings.h>
|
44
|
+
#include <IceUtil/FileUtil.h>
|
46
45
|
#include <IceUtil/StringUtil.h>
|
47
|
-
#include <
|
46
|
+
#include <Ice/UUID.h>
|
48
47
|
#include <IceUtil/Mutex.h>
|
49
48
|
#include <IceUtil/MutexPtrLock.h>
|
50
49
|
#include <IceUtil/Atomic.h>
|
@@ -52,8 +51,13 @@
|
|
52
51
|
#include <stdio.h>
|
53
52
|
#include <list>
|
54
53
|
|
54
|
+
#ifdef __APPLE__
|
55
|
+
# include <Ice/OSLogLoggerI.h>
|
56
|
+
#endif
|
57
|
+
|
55
58
|
#ifndef _WIN32
|
56
59
|
# include <Ice/SysLoggerI.h>
|
60
|
+
# include <Ice/SystemdJournalI.h>
|
57
61
|
|
58
62
|
# include <signal.h>
|
59
63
|
# include <syslog.h>
|
@@ -72,8 +76,8 @@ using namespace IceInternal;
|
|
72
76
|
namespace IceUtilInternal
|
73
77
|
{
|
74
78
|
|
75
|
-
extern bool
|
76
|
-
extern bool
|
79
|
+
extern bool nullHandleAbort;
|
80
|
+
extern bool printStackTraces;
|
77
81
|
|
78
82
|
};
|
79
83
|
|
@@ -138,16 +142,16 @@ public:
|
|
138
142
|
|
139
143
|
if(notDestroyedCount > 0)
|
140
144
|
{
|
141
|
-
|
145
|
+
consoleErr << "!! " << IceUtil::Time::now().toDateTime() << " error: ";
|
142
146
|
if(notDestroyedCount == 1)
|
143
147
|
{
|
144
|
-
|
148
|
+
consoleErr << "communicator ";
|
145
149
|
}
|
146
150
|
else
|
147
151
|
{
|
148
|
-
|
152
|
+
consoleErr << notDestroyedCount << " communicators ";
|
149
153
|
}
|
150
|
-
|
154
|
+
consoleErr << "not destroyed during global destruction.";
|
151
155
|
}
|
152
156
|
|
153
157
|
delete instanceList;
|
@@ -226,7 +230,7 @@ Timer::updateObserver(const Ice::Instrumentation::CommunicatorObserverPtr& obsv)
|
|
226
230
|
assert(obsv);
|
227
231
|
_observer.attach(obsv->getThreadObserver("Communicator",
|
228
232
|
"Ice.Timer",
|
229
|
-
|
233
|
+
Instrumentation::ICE_ENUM(ThreadState, ThreadStateIdle),
|
230
234
|
_observer.get()));
|
231
235
|
_hasObserver.exchange(_observer.get() ? 1 : 0);
|
232
236
|
}
|
@@ -243,8 +247,8 @@ Timer::runTimerTask(const IceUtil::TimerTaskPtr& task)
|
|
243
247
|
}
|
244
248
|
if(threadObserver)
|
245
249
|
{
|
246
|
-
threadObserver->stateChanged(
|
247
|
-
|
250
|
+
threadObserver->stateChanged(Instrumentation::ICE_ENUM(ThreadState, ThreadStateIdle),
|
251
|
+
Instrumentation::ICE_ENUM(ThreadState, ThreadStateInUseForOther));
|
248
252
|
}
|
249
253
|
try
|
250
254
|
{
|
@@ -254,14 +258,14 @@ Timer::runTimerTask(const IceUtil::TimerTaskPtr& task)
|
|
254
258
|
{
|
255
259
|
if(threadObserver)
|
256
260
|
{
|
257
|
-
threadObserver->stateChanged(
|
258
|
-
|
261
|
+
threadObserver->stateChanged(Instrumentation::ICE_ENUM(ThreadState, ThreadStateInUseForOther),
|
262
|
+
Instrumentation::ICE_ENUM(ThreadState, ThreadStateIdle));
|
259
263
|
}
|
260
264
|
}
|
261
265
|
if(threadObserver)
|
262
266
|
{
|
263
|
-
threadObserver->stateChanged(
|
264
|
-
|
267
|
+
threadObserver->stateChanged(Instrumentation::ICE_ENUM(ThreadState, ThreadStateInUseForOther),
|
268
|
+
Instrumentation::ICE_ENUM(ThreadState, ThreadStateIdle));
|
265
269
|
}
|
266
270
|
}
|
267
271
|
else
|
@@ -395,20 +399,6 @@ IceInternal::Instance::outgoingConnectionFactory() const
|
|
395
399
|
return _outgoingConnectionFactory;
|
396
400
|
}
|
397
401
|
|
398
|
-
ObjectFactoryManagerPtr
|
399
|
-
IceInternal::Instance::servantFactoryManager() const
|
400
|
-
{
|
401
|
-
Lock sync(*this);
|
402
|
-
|
403
|
-
if(_state == StateDestroyed)
|
404
|
-
{
|
405
|
-
throw CommunicatorDestroyedException(__FILE__, __LINE__);
|
406
|
-
}
|
407
|
-
|
408
|
-
assert(_servantFactoryManager);
|
409
|
-
return _servantFactoryManager;
|
410
|
-
}
|
411
|
-
|
412
402
|
ObjectAdapterFactoryPtr
|
413
403
|
IceInternal::Instance::objectAdapterFactory() const
|
414
404
|
{
|
@@ -575,122 +565,7 @@ IceInternal::Instance::serverACM() const
|
|
575
565
|
return _serverACM;
|
576
566
|
}
|
577
567
|
|
578
|
-
|
579
|
-
IceInternal::Instance::stringToIdentity(const string& s) const
|
580
|
-
{
|
581
|
-
//
|
582
|
-
// This method only accepts printable ascii. Since printable ascii is a subset
|
583
|
-
// of all narrow string encodings, it is not necessary to convert the string
|
584
|
-
// from the native string encoding. Any characters other than printable-ASCII
|
585
|
-
// will cause an IllegalArgumentException. Note that it can contain Unicode
|
586
|
-
// encoded in the escaped form which is the reason why we call fromUTF8 after
|
587
|
-
// unespcaping the printable ASCII string.
|
588
|
-
//
|
589
|
-
|
590
|
-
Identity ident;
|
591
|
-
|
592
|
-
//
|
593
|
-
// Find unescaped separator; note that the string may contain an escaped
|
594
|
-
// backslash before the separator.
|
595
|
-
//
|
596
|
-
string::size_type slash = string::npos, pos = 0;
|
597
|
-
while((pos = s.find('/', pos)) != string::npos)
|
598
|
-
{
|
599
|
-
int escapes = 0;
|
600
|
-
while(static_cast<int>(pos)- escapes > 0 && s[pos - escapes - 1] == '\\')
|
601
|
-
{
|
602
|
-
escapes++;
|
603
|
-
}
|
604
|
-
|
605
|
-
//
|
606
|
-
// We ignore escaped escapes
|
607
|
-
//
|
608
|
-
if(escapes % 2 == 0)
|
609
|
-
{
|
610
|
-
if(slash == string::npos)
|
611
|
-
{
|
612
|
-
slash = pos;
|
613
|
-
}
|
614
|
-
else
|
615
|
-
{
|
616
|
-
//
|
617
|
-
// Extra unescaped slash found.
|
618
|
-
//
|
619
|
-
IdentityParseException ex(__FILE__, __LINE__);
|
620
|
-
ex.str = "unescaped backslash in identity `" + s + "'";
|
621
|
-
throw ex;
|
622
|
-
}
|
623
|
-
}
|
624
|
-
pos++;
|
625
|
-
}
|
626
|
-
|
627
|
-
if(slash == string::npos)
|
628
|
-
{
|
629
|
-
try
|
630
|
-
{
|
631
|
-
ident.name = IceUtilInternal::unescapeString(s, 0, s.size());
|
632
|
-
}
|
633
|
-
catch(const IceUtil::IllegalArgumentException& e)
|
634
|
-
{
|
635
|
-
IdentityParseException ex(__FILE__, __LINE__);
|
636
|
-
ex.str = "invalid identity name `" + s + "': " + e.reason();
|
637
|
-
throw ex;
|
638
|
-
}
|
639
|
-
}
|
640
|
-
else
|
641
|
-
{
|
642
|
-
try
|
643
|
-
{
|
644
|
-
ident.category = IceUtilInternal::unescapeString(s, 0, slash);
|
645
|
-
}
|
646
|
-
catch(const IceUtil::IllegalArgumentException& e)
|
647
|
-
{
|
648
|
-
IdentityParseException ex(__FILE__, __LINE__);
|
649
|
-
ex.str = "invalid category in identity `" + s + "': " + e.reason();
|
650
|
-
throw ex;
|
651
|
-
}
|
652
|
-
if(slash + 1 < s.size())
|
653
|
-
{
|
654
|
-
try
|
655
|
-
{
|
656
|
-
ident.name = IceUtilInternal::unescapeString(s, slash + 1, s.size());
|
657
|
-
}
|
658
|
-
catch(const IceUtil::IllegalArgumentException& e)
|
659
|
-
{
|
660
|
-
IdentityParseException ex(__FILE__, __LINE__);
|
661
|
-
ex.str = "invalid name in identity `" + s + "': " + e.reason();
|
662
|
-
throw ex;
|
663
|
-
}
|
664
|
-
}
|
665
|
-
}
|
666
|
-
|
667
|
-
ident.name = UTF8ToNative(ident.name, _stringConverter);
|
668
|
-
ident.category = UTF8ToNative(ident.category, _stringConverter);
|
669
|
-
|
670
|
-
return ident;
|
671
|
-
}
|
672
|
-
|
673
|
-
string
|
674
|
-
IceInternal::Instance::identityToString(const Identity& ident) const
|
675
|
-
{
|
676
|
-
//
|
677
|
-
// This method returns the stringified identity. The returned string only
|
678
|
-
// contains printable ascii. It can contain UTF8 in the escaped form.
|
679
|
-
//
|
680
|
-
string name = nativeToUTF8(ident.name, _stringConverter);
|
681
|
-
string category = nativeToUTF8(ident.category, _stringConverter);
|
682
|
-
|
683
|
-
if(category.empty())
|
684
|
-
{
|
685
|
-
return IceUtilInternal::escapeString(name, "/");
|
686
|
-
}
|
687
|
-
else
|
688
|
-
{
|
689
|
-
return IceUtilInternal::escapeString(category, "/") + '/' + IceUtilInternal::escapeString(name, "/");
|
690
|
-
}
|
691
|
-
}
|
692
|
-
|
693
|
-
Ice::ObjectPrx
|
568
|
+
Ice::ObjectPrxPtr
|
694
569
|
IceInternal::Instance::createAdmin(const ObjectAdapterPtr& adminAdapter, const Identity& adminIdentity)
|
695
570
|
{
|
696
571
|
ObjectAdapterPtr adapter = adminAdapter;
|
@@ -758,7 +633,7 @@ IceInternal::Instance::createAdmin(const ObjectAdapterPtr& adminAdapter, const I
|
|
758
633
|
return adapter->createProxy(adminIdentity);
|
759
634
|
}
|
760
635
|
|
761
|
-
Ice::
|
636
|
+
Ice::ObjectPrxPtr
|
762
637
|
IceInternal::Instance::getAdmin()
|
763
638
|
{
|
764
639
|
Lock sync(*this);
|
@@ -789,7 +664,7 @@ IceInternal::Instance::getAdmin()
|
|
789
664
|
adminIdentity.category = _initData.properties->getProperty("Ice.Admin.InstanceName");
|
790
665
|
if(adminIdentity.category.empty())
|
791
666
|
{
|
792
|
-
adminIdentity.category =
|
667
|
+
adminIdentity.category = Ice::generateUUID();
|
793
668
|
}
|
794
669
|
|
795
670
|
_adminIdentity = adminIdentity;
|
@@ -849,12 +724,12 @@ IceInternal::Instance::addAllAdminFacets()
|
|
849
724
|
void
|
850
725
|
IceInternal::Instance::setServerProcessProxy(const ObjectAdapterPtr& adminAdapter, const Identity& adminIdentity)
|
851
726
|
{
|
852
|
-
|
853
|
-
|
727
|
+
ObjectPrxPtr admin = adminAdapter->createProxy(adminIdentity);
|
728
|
+
LocatorPrxPtr locator = adminAdapter->getLocator();
|
854
729
|
const string serverId = _initData.properties->getProperty("Ice.Admin.ServerId");
|
855
730
|
if(locator && serverId != "")
|
856
731
|
{
|
857
|
-
|
732
|
+
ProcessPrxPtr process = ICE_UNCHECKED_CAST(ProcessPrx, admin->ice_facet("Process"));
|
858
733
|
try
|
859
734
|
{
|
860
735
|
//
|
@@ -1008,7 +883,7 @@ IceInternal::Instance::findAllAdminFacets()
|
|
1008
883
|
}
|
1009
884
|
|
1010
885
|
void
|
1011
|
-
IceInternal::Instance::setDefaultLocator(const Ice::
|
886
|
+
IceInternal::Instance::setDefaultLocator(const Ice::LocatorPrxPtr& defaultLocator)
|
1012
887
|
{
|
1013
888
|
Lock sync(*this);
|
1014
889
|
|
@@ -1021,7 +896,7 @@ IceInternal::Instance::setDefaultLocator(const Ice::LocatorPrx& defaultLocator)
|
|
1021
896
|
}
|
1022
897
|
|
1023
898
|
void
|
1024
|
-
IceInternal::Instance::setDefaultRouter(const Ice::
|
899
|
+
IceInternal::Instance::setDefaultRouter(const Ice::RouterPrxPtr& defaultRouter)
|
1025
900
|
{
|
1026
901
|
Lock sync(*this);
|
1027
902
|
|
@@ -1042,6 +917,14 @@ IceInternal::Instance::setLogger(const Ice::LoggerPtr& logger)
|
|
1042
917
|
_initData.logger = logger;
|
1043
918
|
}
|
1044
919
|
|
920
|
+
#ifdef ICE_CPP11_MAPPING
|
921
|
+
void
|
922
|
+
IceInternal::Instance::setThreadHook(function<void()> threadStart, function<void()> threadStop)
|
923
|
+
{
|
924
|
+
_initData.threadStart = move(threadStart);
|
925
|
+
_initData.threadStop = move(threadStop);
|
926
|
+
}
|
927
|
+
#else
|
1045
928
|
void
|
1046
929
|
IceInternal::Instance::setThreadHook(const Ice::ThreadNotificationPtr& threadHook)
|
1047
930
|
{
|
@@ -1050,6 +933,7 @@ IceInternal::Instance::setThreadHook(const Ice::ThreadNotificationPtr& threadHoo
|
|
1050
933
|
//
|
1051
934
|
_initData.threadHook = threadHook;
|
1052
935
|
}
|
936
|
+
#endif
|
1053
937
|
|
1054
938
|
namespace
|
1055
939
|
{
|
@@ -1065,9 +949,10 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
|
|
1065
949
|
_batchAutoFlushSize(0),
|
1066
950
|
_classGraphDepthMax(0),
|
1067
951
|
_collectObjects(false),
|
952
|
+
_toStringMode(ICE_ENUM(ToStringMode, Unicode)),
|
1068
953
|
_implicitContext(0),
|
1069
|
-
_stringConverter(
|
1070
|
-
_wstringConverter(
|
954
|
+
_stringConverter(Ice::getProcessStringConverter()),
|
955
|
+
_wstringConverter(Ice::getProcessWstringConverter()),
|
1071
956
|
_adminEnabled(false)
|
1072
957
|
{
|
1073
958
|
try
|
@@ -1095,10 +980,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
|
|
1095
980
|
FILE* file = IceUtilInternal::freopen(stdOutFilename, "a", stdout);
|
1096
981
|
if(file == 0)
|
1097
982
|
{
|
1098
|
-
FileException
|
1099
|
-
ex.path = stdOutFilename;
|
1100
|
-
ex.error = getSystemErrno();
|
1101
|
-
throw ex;
|
983
|
+
throw FileException(__FILE__, __LINE__, getSystemErrno(), stdOutFilename);
|
1102
984
|
}
|
1103
985
|
}
|
1104
986
|
|
@@ -1107,10 +989,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
|
|
1107
989
|
FILE* file = IceUtilInternal::freopen(stdErrFilename, "a", stderr);
|
1108
990
|
if(file == 0)
|
1109
991
|
{
|
1110
|
-
FileException
|
1111
|
-
ex.path = stdErrFilename;
|
1112
|
-
ex.error = getSystemErrno();
|
1113
|
-
throw ex;
|
992
|
+
throw FileException(__FILE__, __LINE__, getSystemErrno(), stdErrFilename);
|
1114
993
|
}
|
1115
994
|
}
|
1116
995
|
|
@@ -1121,12 +1000,15 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
|
|
1121
1000
|
|
1122
1001
|
#ifdef NDEBUG
|
1123
1002
|
if(_initData.properties->getPropertyAsIntWithDefault("Ice.PrintStackTraces", 0) > 0)
|
1124
|
-
#else
|
1125
|
-
if(_initData.properties->getPropertyAsIntWithDefault("Ice.PrintStackTraces", 1) > 0)
|
1126
|
-
#endif
|
1127
1003
|
{
|
1128
1004
|
IceUtilInternal::printStackTraces = true;
|
1129
1005
|
}
|
1006
|
+
#else
|
1007
|
+
if(_initData.properties->getPropertyAsIntWithDefault("Ice.PrintStackTraces", 1) == 0)
|
1008
|
+
{
|
1009
|
+
IceUtilInternal::printStackTraces = false;
|
1010
|
+
}
|
1011
|
+
#endif
|
1130
1012
|
|
1131
1013
|
#ifndef _WIN32
|
1132
1014
|
string newUser = _initData.properties->getProperty("Ice.ChangeUser");
|
@@ -1143,36 +1025,26 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
|
|
1143
1025
|
}
|
1144
1026
|
if(err != 0)
|
1145
1027
|
{
|
1146
|
-
Ice::SyscallException
|
1147
|
-
ex.error = err;
|
1148
|
-
throw ex;
|
1028
|
+
throw Ice::SyscallException(__FILE__, __LINE__, err);
|
1149
1029
|
}
|
1150
1030
|
else if(pw == 0)
|
1151
1031
|
{
|
1152
|
-
InitializationException
|
1153
|
-
ex.reason ="unknown user account `" + newUser + "'";
|
1154
|
-
throw ex;
|
1032
|
+
throw InitializationException(__FILE__, __LINE__, "unknown user account `" + newUser + "'");
|
1155
1033
|
}
|
1156
1034
|
|
1157
1035
|
if(setgid(pw->pw_gid) == -1)
|
1158
1036
|
{
|
1159
|
-
SyscallException
|
1160
|
-
ex.error = getSystemErrno();
|
1161
|
-
throw ex;
|
1037
|
+
throw SyscallException(__FILE__, __LINE__, getSystemErrno());
|
1162
1038
|
}
|
1163
1039
|
|
1164
|
-
if(initgroups(pw->pw_name, pw->pw_gid) == -1)
|
1040
|
+
if(initgroups(pw->pw_name, static_cast<int>(pw->pw_gid)) == -1)
|
1165
1041
|
{
|
1166
|
-
SyscallException
|
1167
|
-
ex.error = getSystemErrno();
|
1168
|
-
throw ex;
|
1042
|
+
throw SyscallException(__FILE__, __LINE__, getSystemErrno());
|
1169
1043
|
}
|
1170
1044
|
|
1171
1045
|
if(setuid(pw->pw_uid) == -1)
|
1172
1046
|
{
|
1173
|
-
SyscallException
|
1174
|
-
ex.error = getSystemErrno();
|
1175
|
-
throw ex;
|
1047
|
+
throw SyscallException(__FILE__, __LINE__, getSystemErrno());
|
1176
1048
|
}
|
1177
1049
|
}
|
1178
1050
|
#endif
|
@@ -1181,14 +1053,12 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
|
|
1181
1053
|
|
1182
1054
|
if(instanceCount() == 1)
|
1183
1055
|
{
|
1184
|
-
#if defined(_WIN32) && !defined(
|
1056
|
+
#if defined(_WIN32) && !defined(ICE_OS_UWP)
|
1185
1057
|
WORD version = MAKEWORD(1, 1);
|
1186
1058
|
WSADATA data;
|
1187
1059
|
if(WSAStartup(version, &data) != 0)
|
1188
1060
|
{
|
1189
|
-
SocketException
|
1190
|
-
ex.error = getSocketErrno();
|
1191
|
-
throw ex;
|
1061
|
+
throw SocketException(__FILE__, __LINE__, getSocketErrno());
|
1192
1062
|
}
|
1193
1063
|
#endif
|
1194
1064
|
|
@@ -1226,25 +1096,46 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
|
|
1226
1096
|
throw InitializationException(__FILE__, __LINE__, "Both syslog and file logger cannot be enabled.");
|
1227
1097
|
}
|
1228
1098
|
|
1229
|
-
_initData.logger =
|
1230
|
-
|
1231
|
-
|
1099
|
+
_initData.logger = ICE_MAKE_SHARED(SysLoggerI,
|
1100
|
+
_initData.properties->getProperty("Ice.ProgramName"),
|
1101
|
+
_initData.properties->getPropertyWithDefault("Ice.SyslogFacility", "LOG_USER"));
|
1102
|
+
}
|
1103
|
+
else
|
1104
|
+
#endif
|
1105
|
+
|
1106
|
+
#ifdef ICE_SWIFT
|
1107
|
+
if(!_initData.logger && _initData.properties->getPropertyAsInt("Ice.UseOSLog") > 0)
|
1108
|
+
{
|
1109
|
+
_initData.logger = ICE_MAKE_SHARED(OSLogLoggerI,
|
1110
|
+
_initData.properties->getProperty("Ice.ProgramName"));
|
1111
|
+
}
|
1112
|
+
else
|
1113
|
+
#endif
|
1114
|
+
|
1115
|
+
#ifdef ICE_USE_SYSTEMD
|
1116
|
+
if(_initData.properties->getPropertyAsInt("Ice.UseSystemdJournal") > 0)
|
1117
|
+
{
|
1118
|
+
_initData.logger = ICE_MAKE_SHARED(SystemdJournalI,
|
1119
|
+
_initData.properties->getProperty("Ice.ProgramName"));
|
1232
1120
|
}
|
1233
1121
|
else
|
1234
1122
|
#endif
|
1235
1123
|
if(!logfile.empty())
|
1236
1124
|
{
|
1237
|
-
_initData.
|
1238
|
-
|
1239
|
-
|
1125
|
+
Int sz = _initData.properties->getPropertyAsIntWithDefault("Ice.LogFile.SizeMax", 0);
|
1126
|
+
if(sz < 0)
|
1127
|
+
{
|
1128
|
+
sz = 0;
|
1129
|
+
}
|
1130
|
+
_initData.logger = ICE_MAKE_SHARED(LoggerI, _initData.properties->getProperty("Ice.ProgramName"),
|
1131
|
+
logfile, true, static_cast<size_t>(sz));
|
1240
1132
|
}
|
1241
1133
|
else
|
1242
1134
|
{
|
1243
1135
|
_initData.logger = getProcessLogger();
|
1244
|
-
if(
|
1136
|
+
if(ICE_DYNAMIC_CAST(LoggerI, _initData.logger))
|
1245
1137
|
{
|
1246
|
-
_initData.logger =
|
1247
|
-
logStdErrConvert, _stringConverter);
|
1138
|
+
_initData.logger = ICE_MAKE_SHARED(LoggerI, _initData.properties->getProperty("Ice.ProgramName"), "", logStdErrConvert);
|
1248
1139
|
}
|
1249
1140
|
}
|
1250
1141
|
}
|
@@ -1294,7 +1185,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
|
|
1294
1185
|
Int num = _initData.properties->getPropertyAsIntWithDefault("Ice.BatchAutoFlushSize", 1024); // 1MB default
|
1295
1186
|
if(num < 1)
|
1296
1187
|
{
|
1297
|
-
const_cast<size_t&>(_batchAutoFlushSize) = num;
|
1188
|
+
const_cast<size_t&>(_batchAutoFlushSize) = static_cast<size_t>(num);
|
1298
1189
|
}
|
1299
1190
|
else if(static_cast<size_t>(num) > static_cast<size_t>(0x7fffffff / 1024))
|
1300
1191
|
{
|
@@ -1308,7 +1199,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
|
|
1308
1199
|
}
|
1309
1200
|
|
1310
1201
|
{
|
1311
|
-
static const int defaultValue =
|
1202
|
+
static const int defaultValue = 100;
|
1312
1203
|
Int num = _initData.properties->getPropertyAsIntWithDefault("Ice.ClassGraphDepthMax", defaultValue);
|
1313
1204
|
if(num < 1 || static_cast<size_t>(num) > static_cast<size_t>(0x7fffffff))
|
1314
1205
|
{
|
@@ -1322,13 +1213,23 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
|
|
1322
1213
|
|
1323
1214
|
const_cast<bool&>(_collectObjects) = _initData.properties->getPropertyAsInt("Ice.CollectObjects") > 0;
|
1324
1215
|
|
1325
|
-
|
1326
|
-
|
1327
|
-
|
1328
|
-
|
1216
|
+
string toStringModeStr = _initData.properties->getPropertyWithDefault("Ice.ToStringMode", "Unicode");
|
1217
|
+
if(toStringModeStr == "ASCII")
|
1218
|
+
{
|
1219
|
+
const_cast<ToStringMode&>(_toStringMode) = ICE_ENUM(ToStringMode, ASCII);
|
1220
|
+
}
|
1221
|
+
else if(toStringModeStr == "Compat")
|
1222
|
+
{
|
1223
|
+
const_cast<ToStringMode&>(_toStringMode) = ICE_ENUM(ToStringMode, Compat);
|
1224
|
+
}
|
1225
|
+
else if(toStringModeStr != "Unicode")
|
1226
|
+
{
|
1227
|
+
throw InitializationException(__FILE__, __LINE__, "The value for Ice.ToStringMode must be Unicode, ASCII or Compat");
|
1228
|
+
}
|
1229
|
+
|
1329
1230
|
const_cast<ImplicitContextIPtr&>(_implicitContext) =
|
1330
1231
|
ImplicitContextI::create(_initData.properties->getProperty("Ice.ImplicitContext"));
|
1331
|
-
|
1232
|
+
|
1332
1233
|
_routerManager = new RouterManager;
|
1333
1234
|
|
1334
1235
|
_locatorManager = new LocatorManager(_initData.properties);
|
@@ -1366,23 +1267,20 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
|
|
1366
1267
|
|
1367
1268
|
_dynamicLibraryList = new DynamicLibraryList;
|
1368
1269
|
|
1369
|
-
_pluginManager =
|
1270
|
+
_pluginManager = ICE_MAKE_SHARED(PluginManagerI, communicator, _dynamicLibraryList);
|
1370
1271
|
|
1371
|
-
|
1272
|
+
if(!_initData.valueFactoryManager)
|
1273
|
+
{
|
1274
|
+
_initData.valueFactoryManager = ICE_MAKE_SHARED(ValueFactoryManagerI);
|
1275
|
+
}
|
1372
1276
|
|
1373
|
-
|
1277
|
+
_objectFactoryMapHint = _objectFactoryMap.end();
|
1374
1278
|
|
1375
|
-
|
1279
|
+
_outgoingConnectionFactory = new OutgoingConnectionFactory(communicator, this);
|
1376
1280
|
|
1377
|
-
|
1281
|
+
_objectAdapterFactory = ICE_MAKE_SHARED(ObjectAdapterFactory, this, communicator);
|
1378
1282
|
|
1379
|
-
|
1380
|
-
// When _wstringConverter isn't set, use the default Unicode wstring converter
|
1381
|
-
//
|
1382
|
-
if(!_wstringConverter)
|
1383
|
-
{
|
1384
|
-
_wstringConverter = new IceUtil::UnicodeWstringConverter;
|
1385
|
-
}
|
1283
|
+
_retryQueue = new RetryQueue(this);
|
1386
1284
|
|
1387
1285
|
__setNoDelete(false);
|
1388
1286
|
}
|
@@ -1405,7 +1303,6 @@ IceInternal::Instance::~Instance()
|
|
1405
1303
|
assert(!_proxyFactory);
|
1406
1304
|
assert(!_outgoingConnectionFactory);
|
1407
1305
|
|
1408
|
-
assert(!_servantFactoryManager);
|
1409
1306
|
assert(!_objectAdapterFactory);
|
1410
1307
|
assert(!_clientThreadPool);
|
1411
1308
|
assert(!_serverThreadPool);
|
@@ -1425,7 +1322,7 @@ IceInternal::Instance::~Instance()
|
|
1425
1322
|
}
|
1426
1323
|
if(instanceCount() == 0)
|
1427
1324
|
{
|
1428
|
-
#if defined(_WIN32) && !defined(
|
1325
|
+
#if defined(_WIN32) && !defined(ICE_OS_UWP)
|
1429
1326
|
WSACleanup();
|
1430
1327
|
#endif
|
1431
1328
|
|
@@ -1442,7 +1339,7 @@ IceInternal::Instance::~Instance()
|
|
1442
1339
|
}
|
1443
1340
|
|
1444
1341
|
void
|
1445
|
-
IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::CommunicatorPtr& communicator)
|
1342
|
+
IceInternal::Instance::finishSetup(int& argc, const char* argv[], const Ice::CommunicatorPtr& communicator)
|
1446
1343
|
{
|
1447
1344
|
//
|
1448
1345
|
// Load plug-ins.
|
@@ -1453,35 +1350,16 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
|
|
1453
1350
|
pluginManagerImpl->loadPlugins(argc, argv);
|
1454
1351
|
|
1455
1352
|
//
|
1456
|
-
//
|
1353
|
+
// Initialize the endpoint factories once all the plugins are loaded. This gives
|
1354
|
+
// the opportunity for the endpoint factories to find underyling factories.
|
1457
1355
|
//
|
1458
|
-
|
1459
|
-
if(tcpFactory)
|
1460
|
-
{
|
1461
|
-
ProtocolInstancePtr instance = new ProtocolInstance(communicator, WSEndpointType, "ws", false);
|
1462
|
-
_endpointFactoryManager->add(new WSEndpointFactory(instance, tcpFactory->clone(instance)));
|
1463
|
-
}
|
1464
|
-
EndpointFactoryPtr sslFactory = _endpointFactoryManager->get(SSLEndpointType);
|
1465
|
-
if(sslFactory)
|
1466
|
-
{
|
1467
|
-
ProtocolInstancePtr instance = new ProtocolInstance(communicator, WSSEndpointType, "wss", true);
|
1468
|
-
_endpointFactoryManager->add(new WSEndpointFactory(instance, sslFactory->clone(instance)));
|
1469
|
-
}
|
1356
|
+
_endpointFactoryManager->initialize();
|
1470
1357
|
|
1471
1358
|
//
|
1472
1359
|
// Reset _stringConverter and _wstringConverter, in case a plugin changed them
|
1473
1360
|
//
|
1474
|
-
_stringConverter =
|
1475
|
-
|
1476
|
-
IceUtil::WstringConverterPtr newWstringConverter = IceUtil::getProcessWstringConverter();
|
1477
|
-
if(newWstringConverter)
|
1478
|
-
{
|
1479
|
-
_wstringConverter = newWstringConverter;
|
1480
|
-
}
|
1481
|
-
else
|
1482
|
-
{
|
1483
|
-
_wstringConverter = new IceUtil::UnicodeWstringConverter;
|
1484
|
-
}
|
1361
|
+
_stringConverter = Ice::getProcessStringConverter();
|
1362
|
+
_wstringConverter = Ice::getProcessWstringConverter();
|
1485
1363
|
|
1486
1364
|
//
|
1487
1365
|
// Create Admin facets, if enabled.
|
@@ -1513,7 +1391,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
|
|
1513
1391
|
const string processFacetName = "Process";
|
1514
1392
|
if(_adminFacetFilter.empty() || _adminFacetFilter.find(processFacetName) != _adminFacetFilter.end())
|
1515
1393
|
{
|
1516
|
-
_adminFacets.insert(make_pair(processFacetName,
|
1394
|
+
_adminFacets.insert(make_pair(processFacetName, ICE_MAKE_SHARED(ProcessI, communicator)));
|
1517
1395
|
}
|
1518
1396
|
|
1519
1397
|
//
|
@@ -1534,7 +1412,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
|
|
1534
1412
|
PropertiesAdminIPtr propsAdmin;
|
1535
1413
|
if(_adminFacetFilter.empty() || _adminFacetFilter.find(propertiesFacetName) != _adminFacetFilter.end())
|
1536
1414
|
{
|
1537
|
-
propsAdmin =
|
1415
|
+
propsAdmin = ICE_MAKE_SHARED(PropertiesAdminI, this);
|
1538
1416
|
_adminFacets.insert(make_pair(propertiesFacetName, propsAdmin));
|
1539
1417
|
}
|
1540
1418
|
|
@@ -1544,7 +1422,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
|
|
1544
1422
|
const string metricsFacetName = "Metrics";
|
1545
1423
|
if(_adminFacetFilter.empty() || _adminFacetFilter.find(metricsFacetName) != _adminFacetFilter.end())
|
1546
1424
|
{
|
1547
|
-
CommunicatorObserverIPtr observer =
|
1425
|
+
CommunicatorObserverIPtr observer = ICE_MAKE_SHARED(CommunicatorObserverI, _initData);
|
1548
1426
|
_initData.observer = observer;
|
1549
1427
|
_adminFacets.insert(make_pair(metricsFacetName, observer->getFacet()));
|
1550
1428
|
|
@@ -1553,7 +1431,13 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
|
|
1553
1431
|
//
|
1554
1432
|
if(propsAdmin)
|
1555
1433
|
{
|
1434
|
+
#ifdef ICE_CPP11_MAPPING
|
1435
|
+
auto metricsAdmin = observer->getFacet();
|
1436
|
+
propsAdmin->addUpdateCallback(
|
1437
|
+
[metricsAdmin](const PropertyDict& changes) { metricsAdmin->updated(changes); });
|
1438
|
+
#else
|
1556
1439
|
propsAdmin->addUpdateCallback(observer->getFacet());
|
1440
|
+
#endif
|
1557
1441
|
}
|
1558
1442
|
}
|
1559
1443
|
}
|
@@ -1563,7 +1447,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
|
|
1563
1447
|
//
|
1564
1448
|
if(_initData.observer)
|
1565
1449
|
{
|
1566
|
-
_initData.observer->setObserverUpdater(
|
1450
|
+
_initData.observer->setObserverUpdater(ICE_MAKE_SHARED(ObserverUpdaterI, this));
|
1567
1451
|
}
|
1568
1452
|
|
1569
1453
|
//
|
@@ -1592,6 +1476,18 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
|
|
1592
1476
|
try
|
1593
1477
|
{
|
1594
1478
|
_endpointHostResolver = new EndpointHostResolver(this);
|
1479
|
+
#ifndef ICE_OS_UWP
|
1480
|
+
bool hasPriority = _initData.properties->getProperty("Ice.ThreadPriority") != "";
|
1481
|
+
int priority = _initData.properties->getPropertyAsInt("Ice.ThreadPriority");
|
1482
|
+
if(hasPriority)
|
1483
|
+
{
|
1484
|
+
_endpointHostResolver->start(0, priority);
|
1485
|
+
}
|
1486
|
+
else
|
1487
|
+
{
|
1488
|
+
_endpointHostResolver->start();
|
1489
|
+
}
|
1490
|
+
#endif
|
1595
1491
|
}
|
1596
1492
|
catch(const IceUtil::Exception& ex)
|
1597
1493
|
{
|
@@ -1608,7 +1504,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
|
|
1608
1504
|
//
|
1609
1505
|
if(!_referenceFactory->getDefaultRouter())
|
1610
1506
|
{
|
1611
|
-
|
1507
|
+
RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, _proxyFactory->propertyToProxy("Ice.Default.Router"));
|
1612
1508
|
if(router)
|
1613
1509
|
{
|
1614
1510
|
_referenceFactory = _referenceFactory->setDefaultRouter(router);
|
@@ -1617,7 +1513,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
|
|
1617
1513
|
|
1618
1514
|
if(!_referenceFactory->getDefaultLocator())
|
1619
1515
|
{
|
1620
|
-
|
1516
|
+
LocatorPrxPtr locator = ICE_UNCHECKED_CAST(LocatorPrx, _proxyFactory->propertyToProxy("Ice.Default.Locator"));
|
1621
1517
|
if(locator)
|
1622
1518
|
{
|
1623
1519
|
_referenceFactory = _referenceFactory->setDefaultLocator(locator);
|
@@ -1645,9 +1541,9 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
|
|
1645
1541
|
if(printProcessId)
|
1646
1542
|
{
|
1647
1543
|
#ifdef _MSC_VER
|
1648
|
-
|
1544
|
+
consoleOut << GetCurrentProcessId() << endl;
|
1649
1545
|
#else
|
1650
|
-
|
1546
|
+
consoleOut << getpid() << endl;
|
1651
1547
|
#endif
|
1652
1548
|
}
|
1653
1549
|
|
@@ -1734,7 +1630,7 @@ IceInternal::Instance::destroy()
|
|
1734
1630
|
|
1735
1631
|
if(_initData.observer)
|
1736
1632
|
{
|
1737
|
-
CommunicatorObserverIPtr observer =
|
1633
|
+
CommunicatorObserverIPtr observer = ICE_DYNAMIC_CAST(CommunicatorObserverI, _initData.observer);
|
1738
1634
|
if(observer)
|
1739
1635
|
{
|
1740
1636
|
observer->destroy(); // Break cyclic reference counts. Don't clear _observer, it's immutable.
|
@@ -1742,7 +1638,7 @@ IceInternal::Instance::destroy()
|
|
1742
1638
|
_initData.observer->setObserverUpdater(0); // Break cyclic reference count.
|
1743
1639
|
}
|
1744
1640
|
|
1745
|
-
LoggerAdminLoggerPtr logger =
|
1641
|
+
LoggerAdminLoggerPtr logger = ICE_DYNAMIC_CAST(LoggerAdminLogger, _initData.logger);
|
1746
1642
|
if(logger)
|
1747
1643
|
{
|
1748
1644
|
//
|
@@ -1784,17 +1680,23 @@ IceInternal::Instance::destroy()
|
|
1784
1680
|
{
|
1785
1681
|
_serverThreadPool->joinWithAllThreads();
|
1786
1682
|
}
|
1787
|
-
#ifndef
|
1683
|
+
#ifndef ICE_OS_UWP
|
1788
1684
|
if(_endpointHostResolver)
|
1789
1685
|
{
|
1790
1686
|
_endpointHostResolver->getThreadControl().join();
|
1791
1687
|
}
|
1792
1688
|
#endif
|
1793
1689
|
|
1794
|
-
|
1690
|
+
#ifdef ICE_CPP11_COMPILER
|
1691
|
+
for(const auto& p : _objectFactoryMap)
|
1795
1692
|
{
|
1796
|
-
|
1693
|
+
p.second->destroy();
|
1797
1694
|
}
|
1695
|
+
#else
|
1696
|
+
for_each(_objectFactoryMap.begin(), _objectFactoryMap.end(),
|
1697
|
+
Ice::secondVoidMemFun<const string, ObjectFactory>(&ObjectFactory::destroy));
|
1698
|
+
#endif
|
1699
|
+
_objectFactoryMap.clear();
|
1798
1700
|
|
1799
1701
|
if(_routerManager)
|
1800
1702
|
{
|
@@ -1845,7 +1747,6 @@ IceInternal::Instance::destroy()
|
|
1845
1747
|
_endpointHostResolver = 0;
|
1846
1748
|
_timer = 0;
|
1847
1749
|
|
1848
|
-
_servantFactoryManager = 0;
|
1849
1750
|
_referenceFactory = 0;
|
1850
1751
|
_requestHandlerFactory = 0;
|
1851
1752
|
_proxyFactory = 0;
|
@@ -1957,6 +1858,82 @@ IceInternal::Instance::setRcvBufSizeWarn(Short type, int size)
|
|
1957
1858
|
_setBufSizeWarn[type] = info;
|
1958
1859
|
}
|
1959
1860
|
|
1861
|
+
void
|
1862
|
+
IceInternal::Instance::addObjectFactory(const Ice::ObjectFactoryPtr& factory, const string& id)
|
1863
|
+
{
|
1864
|
+
Lock sync(*this);
|
1865
|
+
|
1866
|
+
//
|
1867
|
+
// Create a ValueFactory wrapper around the given ObjectFactory and register the wrapper
|
1868
|
+
// with the value factory manager. This may raise AlreadyRegisteredException.
|
1869
|
+
//
|
1870
|
+
#ifdef ICE_CPP11_MAPPING
|
1871
|
+
_initData.valueFactoryManager->add([factory](const string& ident)
|
1872
|
+
{
|
1873
|
+
return factory->create(ident);
|
1874
|
+
},
|
1875
|
+
id);
|
1876
|
+
#else
|
1877
|
+
class ValueFactoryWrapper: public Ice::ValueFactory
|
1878
|
+
{
|
1879
|
+
public:
|
1880
|
+
|
1881
|
+
ValueFactoryWrapper(const Ice::ObjectFactoryPtr& factory) : _objectFactory(factory)
|
1882
|
+
{
|
1883
|
+
}
|
1884
|
+
|
1885
|
+
Ice::ValuePtr create(const std::string& id)
|
1886
|
+
{
|
1887
|
+
return _objectFactory->create(id);
|
1888
|
+
}
|
1889
|
+
|
1890
|
+
private:
|
1891
|
+
|
1892
|
+
Ice::ObjectFactoryPtr _objectFactory;
|
1893
|
+
};
|
1894
|
+
|
1895
|
+
_initData.valueFactoryManager->add(new ValueFactoryWrapper(factory), id);
|
1896
|
+
#endif
|
1897
|
+
|
1898
|
+
//
|
1899
|
+
// Also record the object factory in our own map.
|
1900
|
+
//
|
1901
|
+
_objectFactoryMapHint = _objectFactoryMap.insert(_objectFactoryMapHint,
|
1902
|
+
pair<const string, Ice::ObjectFactoryPtr>(id, factory));
|
1903
|
+
}
|
1904
|
+
|
1905
|
+
Ice::ObjectFactoryPtr
|
1906
|
+
IceInternal::Instance::findObjectFactory(const string& id) const
|
1907
|
+
{
|
1908
|
+
Lock sync(*this);
|
1909
|
+
|
1910
|
+
ObjectFactoryMap& objectfactoryMap = const_cast<ObjectFactoryMap&>(_objectFactoryMap);
|
1911
|
+
|
1912
|
+
ObjectFactoryMap::iterator p = objectfactoryMap.end();
|
1913
|
+
if(_objectFactoryMapHint != objectfactoryMap.end())
|
1914
|
+
{
|
1915
|
+
if(_objectFactoryMapHint->first == id)
|
1916
|
+
{
|
1917
|
+
p = _objectFactoryMapHint;
|
1918
|
+
}
|
1919
|
+
}
|
1920
|
+
|
1921
|
+
if(p == objectfactoryMap.end())
|
1922
|
+
{
|
1923
|
+
p = objectfactoryMap.find(id);
|
1924
|
+
}
|
1925
|
+
|
1926
|
+
if(p != objectfactoryMap.end())
|
1927
|
+
{
|
1928
|
+
_objectFactoryMapHint = p;
|
1929
|
+
return p->second;
|
1930
|
+
}
|
1931
|
+
else
|
1932
|
+
{
|
1933
|
+
return ICE_NULLPTR;
|
1934
|
+
}
|
1935
|
+
}
|
1936
|
+
|
1960
1937
|
IceInternal::ProcessI::ProcessI(const CommunicatorPtr& communicator) :
|
1961
1938
|
_communicator(communicator)
|
1962
1939
|
{
|
@@ -1969,18 +1946,22 @@ IceInternal::ProcessI::shutdown(const Current&)
|
|
1969
1946
|
}
|
1970
1947
|
|
1971
1948
|
void
|
1949
|
+
#ifdef ICE_CPP11_MAPPING
|
1950
|
+
IceInternal::ProcessI::writeMessage(string message, Int fd, const Current&)
|
1951
|
+
#else
|
1972
1952
|
IceInternal::ProcessI::writeMessage(const string& message, Int fd, const Current&)
|
1953
|
+
#endif
|
1973
1954
|
{
|
1974
1955
|
switch(fd)
|
1975
1956
|
{
|
1976
1957
|
case 1:
|
1977
1958
|
{
|
1978
|
-
|
1959
|
+
consoleOut << message << endl;
|
1979
1960
|
break;
|
1980
1961
|
}
|
1981
1962
|
case 2:
|
1982
1963
|
{
|
1983
|
-
|
1964
|
+
consoleErr << message << endl;
|
1984
1965
|
break;
|
1985
1966
|
}
|
1986
1967
|
}
|