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
|
#ifndef ICE_STREAM_SOCKET_H
|
11
6
|
#define ICE_STREAM_SOCKET_H
|
@@ -36,11 +31,16 @@ public:
|
|
36
31
|
SocketOperation read(Buffer&);
|
37
32
|
SocketOperation write(Buffer&);
|
38
33
|
|
34
|
+
#if !defined(ICE_OS_UWP)
|
39
35
|
ssize_t read(char*, size_t);
|
40
36
|
ssize_t write(const char*, size_t);
|
37
|
+
#endif
|
41
38
|
|
42
|
-
#
|
39
|
+
#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
|
43
40
|
AsyncInfo* getAsyncInfo(SocketOperation);
|
41
|
+
#endif
|
42
|
+
|
43
|
+
#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
|
44
44
|
bool startWrite(Buffer&);
|
45
45
|
void finishWrite(Buffer&);
|
46
46
|
void startRead(Buffer&);
|
@@ -73,16 +73,20 @@ private:
|
|
73
73
|
State _state;
|
74
74
|
std::string _desc;
|
75
75
|
|
76
|
-
#
|
76
|
+
#if defined(ICE_USE_IOCP) || defined(ICE_OS_UWP)
|
77
77
|
size_t _maxSendPacketSize;
|
78
78
|
size_t _maxRecvPacketSize;
|
79
79
|
AsyncInfo _read;
|
80
80
|
AsyncInfo _write;
|
81
81
|
#endif
|
82
|
+
|
83
|
+
#if defined(ICE_OS_UWP)
|
84
|
+
Windows::Storage::Streams::DataReader^ _reader;
|
85
|
+
Windows::Storage::Streams::DataWriter^ _writer;
|
86
|
+
#endif
|
82
87
|
};
|
83
88
|
typedef IceUtil::Handle<StreamSocket> StreamSocketPtr;
|
84
89
|
|
85
90
|
}
|
86
91
|
|
87
92
|
#endif
|
88
|
-
|
@@ -1,30 +1,56 @@
|
|
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/Config.h>
|
11
6
|
|
12
|
-
|
13
|
-
#include <
|
14
|
-
#include <Ice/DeprecatedStringConverter.h>
|
15
|
-
|
16
|
-
#include <IceUtil/IceUtil.h>
|
17
|
-
#include <IceUtil/StringUtil.h>
|
18
|
-
|
19
|
-
#include <Ice/Communicator.h>
|
7
|
+
#include <Ice/StringConverter.h>
|
8
|
+
#include <Ice/IconvStringConverter.h>
|
20
9
|
#include <Ice/Initialize.h>
|
21
|
-
#include <Ice/
|
10
|
+
#include <Ice/Communicator.h>
|
22
11
|
#include <Ice/LoggerUtil.h>
|
12
|
+
#include <IceUtil/StringUtil.h>
|
23
13
|
|
24
|
-
using namespace IceUtilInternal;
|
25
14
|
using namespace Ice;
|
26
15
|
using namespace std;
|
27
16
|
|
17
|
+
namespace
|
18
|
+
{
|
19
|
+
|
20
|
+
class StringConverterPlugin : public Plugin
|
21
|
+
{
|
22
|
+
public:
|
23
|
+
|
24
|
+
StringConverterPlugin(const CommunicatorPtr&,
|
25
|
+
const StringConverterPtr&, const WstringConverterPtr&);
|
26
|
+
|
27
|
+
virtual void initialize();
|
28
|
+
|
29
|
+
virtual void destroy();
|
30
|
+
};
|
31
|
+
|
32
|
+
StringConverterPlugin::StringConverterPlugin(const CommunicatorPtr& /*notused*/,
|
33
|
+
const StringConverterPtr& stringConverter,
|
34
|
+
const WstringConverterPtr& wstringConverter)
|
35
|
+
{
|
36
|
+
setProcessStringConverter(stringConverter);
|
37
|
+
setProcessWstringConverter(wstringConverter);
|
38
|
+
}
|
39
|
+
|
40
|
+
void
|
41
|
+
StringConverterPlugin::initialize()
|
42
|
+
{
|
43
|
+
// no op
|
44
|
+
}
|
45
|
+
|
46
|
+
void
|
47
|
+
StringConverterPlugin::destroy()
|
48
|
+
{
|
49
|
+
// no op
|
50
|
+
}
|
51
|
+
|
52
|
+
}
|
53
|
+
|
28
54
|
//
|
29
55
|
// The entry point for the string converter plugin built-in the Ice library
|
30
56
|
//
|
@@ -78,7 +104,7 @@ createStringConverter(const CommunicatorPtr& communicator, const string& name, c
|
|
78
104
|
return 0;
|
79
105
|
}
|
80
106
|
|
81
|
-
stringConverter =
|
107
|
+
stringConverter = createWindowsStringConverter(static_cast<unsigned int>(cp));
|
82
108
|
#else
|
83
109
|
StringSeq iconvArgs;
|
84
110
|
|
@@ -105,18 +131,18 @@ createStringConverter(const CommunicatorPtr& communicator, const string& name, c
|
|
105
131
|
{
|
106
132
|
case 0:
|
107
133
|
{
|
108
|
-
stringConverter =
|
134
|
+
stringConverter = createIconvStringConverter<char>();
|
109
135
|
break;
|
110
136
|
}
|
111
137
|
case 1:
|
112
138
|
{
|
113
|
-
stringConverter =
|
139
|
+
stringConverter = createIconvStringConverter<char>(iconvArgs[0]);
|
114
140
|
break;
|
115
141
|
}
|
116
142
|
case 2:
|
117
143
|
{
|
118
|
-
stringConverter =
|
119
|
-
wstringConverter =
|
144
|
+
stringConverter = createIconvStringConverter<char>(iconvArgs[0]);
|
145
|
+
wstringConverter = createIconvStringConverter<wchar_t>(iconvArgs[1]);
|
120
146
|
break;
|
121
147
|
}
|
122
148
|
default:
|
@@ -151,7 +177,16 @@ namespace Ice
|
|
151
177
|
ICE_API void
|
152
178
|
registerIceStringConverter(bool loadOnInitialize)
|
153
179
|
{
|
154
|
-
|
180
|
+
registerPluginFactory("IceStringConverter", createStringConverter, loadOnInitialize);
|
181
|
+
}
|
182
|
+
|
155
183
|
}
|
156
184
|
|
185
|
+
//
|
186
|
+
// Objective-C function to allow Objective-C programs to register plugin.
|
187
|
+
//
|
188
|
+
extern "C" ICE_API void
|
189
|
+
ICEregisterIceStringConverter(bool loadOnInitialize)
|
190
|
+
{
|
191
|
+
Ice::registerIceStringConverter(loadOnInitialize);
|
157
192
|
}
|
@@ -0,0 +1,30 @@
|
|
1
|
+
//
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
|
+
//
|
4
|
+
|
5
|
+
#ifndef ICE_STRING_UTIL_H
|
6
|
+
#define ICE_STRING_UTIL_H
|
7
|
+
|
8
|
+
#include <Ice/Initialize.h>
|
9
|
+
#include <IceUtil/StringUtil.h>
|
10
|
+
|
11
|
+
namespace IceInternal
|
12
|
+
{
|
13
|
+
|
14
|
+
//
|
15
|
+
// Adapter for ToStringMode
|
16
|
+
//
|
17
|
+
inline std::string
|
18
|
+
escapeString(const std::string& s, const std::string& special, Ice::ToStringMode mode)
|
19
|
+
{
|
20
|
+
return IceUtilInternal::escapeString(s, special, static_cast<IceUtilInternal::ToStringMode>(mode));
|
21
|
+
}
|
22
|
+
|
23
|
+
//
|
24
|
+
// Provided for consistency with escapeString
|
25
|
+
//
|
26
|
+
using IceUtilInternal::unescapeString;
|
27
|
+
|
28
|
+
}
|
29
|
+
|
30
|
+
#endif
|
@@ -1,11 +1,8 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
|
6
|
-
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
4
|
+
|
5
|
+
#ifndef _WIN32
|
9
6
|
|
10
7
|
#include <Ice/SysLoggerI.h>
|
11
8
|
#include <Ice/LocalException.h>
|
@@ -163,5 +160,7 @@ Ice::SysLoggerI::getPrefix()
|
|
163
160
|
Ice::LoggerPtr
|
164
161
|
Ice::SysLoggerI::cloneWithPrefix(const string& prefix)
|
165
162
|
{
|
166
|
-
return
|
163
|
+
return ICE_MAKE_SHARED(SysLoggerI, prefix, _facility);
|
167
164
|
}
|
165
|
+
|
166
|
+
#endif
|
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#ifndef ICE_SYS_LOGGER_I_H
|
11
6
|
#define ICE_SYS_LOGGER_I_H
|
@@ -21,6 +16,7 @@ class SysLoggerI : public Logger, public ::IceUtil::Mutex
|
|
21
16
|
public:
|
22
17
|
|
23
18
|
SysLoggerI(const std::string&, const std::string&);
|
19
|
+
SysLoggerI(const std::string&, int);
|
24
20
|
~SysLoggerI();
|
25
21
|
|
26
22
|
virtual void print(const std::string&);
|
@@ -32,8 +28,6 @@ public:
|
|
32
28
|
|
33
29
|
private:
|
34
30
|
|
35
|
-
SysLoggerI(const std::string&, int);
|
36
|
-
|
37
31
|
int _facility;
|
38
32
|
const std::string _prefix;
|
39
33
|
};
|
@@ -0,0 +1,66 @@
|
|
1
|
+
//
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
|
+
//
|
4
|
+
|
5
|
+
#ifdef ICE_USE_SYSTEMD
|
6
|
+
|
7
|
+
#include <Ice/SystemdJournalI.h>
|
8
|
+
#include <Ice/LocalException.h>
|
9
|
+
#include <syslog.h>
|
10
|
+
#include <systemd/sd-journal.h>
|
11
|
+
|
12
|
+
using namespace std;
|
13
|
+
using namespace Ice;
|
14
|
+
using namespace IceInternal;
|
15
|
+
|
16
|
+
Ice::SystemdJournalI::SystemdJournalI(const string& prefix) :
|
17
|
+
_prefix(prefix)
|
18
|
+
{
|
19
|
+
}
|
20
|
+
|
21
|
+
void
|
22
|
+
Ice::SystemdJournalI::print(const string& message)
|
23
|
+
{
|
24
|
+
write(LOG_INFO, message);
|
25
|
+
}
|
26
|
+
|
27
|
+
void
|
28
|
+
Ice::SystemdJournalI::trace(const string& category, const string& message)
|
29
|
+
{
|
30
|
+
write(LOG_INFO, category + ": " + message);
|
31
|
+
}
|
32
|
+
|
33
|
+
void
|
34
|
+
Ice::SystemdJournalI::warning(const string& message)
|
35
|
+
{
|
36
|
+
write(LOG_WARNING, message);
|
37
|
+
}
|
38
|
+
|
39
|
+
void
|
40
|
+
Ice::SystemdJournalI::error(const string& message)
|
41
|
+
{
|
42
|
+
write(LOG_ERR, message);
|
43
|
+
}
|
44
|
+
|
45
|
+
string
|
46
|
+
Ice::SystemdJournalI::getPrefix()
|
47
|
+
{
|
48
|
+
return _prefix;
|
49
|
+
}
|
50
|
+
|
51
|
+
Ice::LoggerPtr
|
52
|
+
Ice::SystemdJournalI::cloneWithPrefix(const string& prefix)
|
53
|
+
{
|
54
|
+
return ICE_MAKE_SHARED(SystemdJournalI, prefix);
|
55
|
+
}
|
56
|
+
|
57
|
+
void
|
58
|
+
Ice::SystemdJournalI::write(int priority, const string& message) const
|
59
|
+
{
|
60
|
+
sd_journal_send("MESSAGE=%s", message.c_str(),
|
61
|
+
"PRIORITY=%i", priority,
|
62
|
+
"SYSLOG_IDENTIFIER=%s", _prefix.c_str(),
|
63
|
+
NULL); // Using NULL is necessary for EL7, see #293
|
64
|
+
}
|
65
|
+
|
66
|
+
#endif
|
@@ -0,0 +1,39 @@
|
|
1
|
+
//
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
|
+
//
|
4
|
+
|
5
|
+
#ifndef ICE_SYSTEMD_JOURNAL_I_H
|
6
|
+
#define ICE_SYSTEMD_JOURNAL_I_H
|
7
|
+
|
8
|
+
#ifdef ICE_USE_SYSTEMD
|
9
|
+
|
10
|
+
#include <Ice/Logger.h>
|
11
|
+
|
12
|
+
namespace Ice
|
13
|
+
{
|
14
|
+
|
15
|
+
class SystemdJournalI : public Logger
|
16
|
+
{
|
17
|
+
public:
|
18
|
+
|
19
|
+
SystemdJournalI(const std::string&);
|
20
|
+
|
21
|
+
virtual void print(const std::string&);
|
22
|
+
virtual void trace(const std::string&, const std::string&);
|
23
|
+
virtual void warning(const std::string&);
|
24
|
+
virtual void error(const std::string&);
|
25
|
+
virtual std::string getPrefix();
|
26
|
+
virtual LoggerPtr cloneWithPrefix(const std::string&);
|
27
|
+
|
28
|
+
private:
|
29
|
+
|
30
|
+
void write(int, const std::string&) const;
|
31
|
+
|
32
|
+
const std::string _prefix;
|
33
|
+
};
|
34
|
+
|
35
|
+
}
|
36
|
+
|
37
|
+
#endif
|
38
|
+
|
39
|
+
#endif
|
@@ -1,11 +1,10 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
4
|
+
|
5
|
+
#include <Ice/Config.h>
|
6
|
+
|
7
|
+
#if !defined(__APPLE__) || TARGET_OS_IPHONE == 0
|
9
8
|
|
10
9
|
#include <Ice/TcpAcceptor.h>
|
11
10
|
#include <Ice/TcpTransceiver.h>
|
@@ -17,8 +16,21 @@
|
|
17
16
|
#include <Ice/StreamSocket.h>
|
18
17
|
#include <IceUtil/StringUtil.h>
|
19
18
|
|
20
|
-
#
|
19
|
+
#if defined(ICE_USE_IOCP)
|
21
20
|
# include <Mswsock.h>
|
21
|
+
#elif defined(ICE_OS_UWP)
|
22
|
+
using namespace Platform;
|
23
|
+
using namespace Windows::Foundation;
|
24
|
+
using namespace Windows::Storage::Streams;
|
25
|
+
using namespace Windows::Networking;
|
26
|
+
using namespace Windows::Networking::Sockets;
|
27
|
+
#endif
|
28
|
+
|
29
|
+
//
|
30
|
+
// Use the system default for the listen() backlog or 511 if not defined.
|
31
|
+
//
|
32
|
+
#ifndef SOMAXCONN
|
33
|
+
# define SOMAXCONN 511
|
22
34
|
#endif
|
23
35
|
|
24
36
|
using namespace std;
|
@@ -33,22 +45,35 @@ IceInternal::TcpAcceptor::getNativeInfo()
|
|
33
45
|
return this;
|
34
46
|
}
|
35
47
|
|
36
|
-
#ifdef ICE_USE_IOCP
|
37
|
-
AsyncInfo*
|
38
|
-
# ifndef NDEBUG
|
39
|
-
IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation op)
|
40
|
-
# else
|
41
|
-
IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation)
|
42
|
-
# endif
|
43
|
-
{
|
44
|
-
assert(op == SocketOperationRead);
|
45
|
-
return &_info;
|
46
|
-
}
|
47
|
-
#endif
|
48
|
-
|
49
48
|
void
|
50
49
|
IceInternal::TcpAcceptor::close()
|
51
50
|
{
|
51
|
+
#if defined(ICE_OS_UWP)
|
52
|
+
IceUtil::Mutex::Lock lock(_mutex);
|
53
|
+
if(_acceptPending)
|
54
|
+
{
|
55
|
+
assert(_accepted.empty());
|
56
|
+
completed(SocketOperationRead);
|
57
|
+
_acceptPending = false;
|
58
|
+
}
|
59
|
+
else if(!_accepted.empty())
|
60
|
+
{
|
61
|
+
for(deque<Windows::Networking::Sockets::StreamSocket^>::const_iterator p = _accepted.begin();
|
62
|
+
p != _accepted.end(); ++p)
|
63
|
+
{
|
64
|
+
closeSocket(*p);
|
65
|
+
}
|
66
|
+
_accepted.clear();
|
67
|
+
}
|
68
|
+
#endif
|
69
|
+
|
70
|
+
#if defined(ICE_USE_IOCP)
|
71
|
+
if(_acceptFd != INVALID_SOCKET)
|
72
|
+
{
|
73
|
+
closeSocketNoThrow(_acceptFd);
|
74
|
+
_acceptFd = INVALID_SOCKET;
|
75
|
+
}
|
76
|
+
#endif
|
52
77
|
if(_fd != INVALID_SOCKET)
|
53
78
|
{
|
54
79
|
closeSocketNoThrow(_fd);
|
@@ -62,7 +87,9 @@ IceInternal::TcpAcceptor::listen()
|
|
62
87
|
try
|
63
88
|
{
|
64
89
|
const_cast<Address&>(_addr) = doBind(_fd, _addr);
|
90
|
+
#if !defined(ICE_OS_UWP)
|
65
91
|
doListen(_fd, _backlog);
|
92
|
+
#endif
|
66
93
|
}
|
67
94
|
catch(...)
|
68
95
|
{
|
@@ -73,11 +100,18 @@ IceInternal::TcpAcceptor::listen()
|
|
73
100
|
return _endpoint;
|
74
101
|
}
|
75
102
|
|
76
|
-
#
|
103
|
+
#if defined(ICE_USE_IOCP)
|
104
|
+
|
105
|
+
AsyncInfo*
|
106
|
+
IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation)
|
107
|
+
{
|
108
|
+
return &_info;
|
109
|
+
}
|
110
|
+
|
77
111
|
void
|
78
112
|
IceInternal::TcpAcceptor::startAccept()
|
79
113
|
{
|
80
|
-
LPFN_ACCEPTEX AcceptEx =
|
114
|
+
LPFN_ACCEPTEX AcceptEx = ICE_NULLPTR; // a pointer to the 'AcceptEx()' function
|
81
115
|
GUID GuidAcceptEx = WSAID_ACCEPTEX; // The Guid
|
82
116
|
DWORD dwBytes;
|
83
117
|
if(WSAIoctl(_fd,
|
@@ -87,24 +121,21 @@ IceInternal::TcpAcceptor::startAccept()
|
|
87
121
|
&AcceptEx,
|
88
122
|
sizeof(AcceptEx),
|
89
123
|
&dwBytes,
|
90
|
-
|
91
|
-
|
124
|
+
ICE_NULLPTR,
|
125
|
+
ICE_NULLPTR) == SOCKET_ERROR)
|
92
126
|
{
|
93
|
-
SocketException
|
94
|
-
ex.error = getSocketErrno();
|
95
|
-
throw ex;
|
127
|
+
throw SocketException(__FILE__, __LINE__, getSocketErrno());
|
96
128
|
}
|
97
129
|
|
98
130
|
assert(_acceptFd == INVALID_SOCKET);
|
99
131
|
_acceptFd = createSocket(false, _addr);
|
100
132
|
const int sz = static_cast<int>(_acceptBuf.size() / 2);
|
133
|
+
_info.error = ERROR_SUCCESS;
|
101
134
|
if(!AcceptEx(_fd, _acceptFd, &_acceptBuf[0], 0, sz, sz, &_info.count, &_info))
|
102
135
|
{
|
103
136
|
if(!wouldBlock())
|
104
137
|
{
|
105
|
-
SocketException
|
106
|
-
ex.error = getSocketErrno();
|
107
|
-
throw ex;
|
138
|
+
throw SocketException(__FILE__, __LINE__, getSocketErrno());
|
108
139
|
}
|
109
140
|
}
|
110
141
|
}
|
@@ -112,7 +143,7 @@ IceInternal::TcpAcceptor::startAccept()
|
|
112
143
|
void
|
113
144
|
IceInternal::TcpAcceptor::finishAccept()
|
114
145
|
{
|
115
|
-
if(
|
146
|
+
if(_info.error != ERROR_SUCCESS || _fd == INVALID_SOCKET)
|
116
147
|
{
|
117
148
|
closeSocketNoThrow(_acceptFd);
|
118
149
|
_acceptFd = INVALID_SOCKET;
|
@@ -120,37 +151,99 @@ IceInternal::TcpAcceptor::finishAccept()
|
|
120
151
|
}
|
121
152
|
}
|
122
153
|
|
123
|
-
#endif
|
124
|
-
|
125
154
|
TransceiverPtr
|
126
155
|
IceInternal::TcpAcceptor::accept()
|
127
156
|
{
|
128
|
-
#ifdef ICE_USE_IOCP
|
129
157
|
if(_acceptFd == INVALID_SOCKET)
|
130
158
|
{
|
131
|
-
SocketException
|
132
|
-
ex.error = _acceptError;
|
133
|
-
throw ex;
|
159
|
+
throw SocketException(__FILE__, __LINE__, _acceptError);
|
134
160
|
}
|
135
161
|
if(setsockopt(_acceptFd, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char*)&_acceptFd, sizeof(_acceptFd)) ==
|
136
162
|
SOCKET_ERROR)
|
137
163
|
{
|
138
164
|
closeSocketNoThrow(_acceptFd);
|
139
165
|
_acceptFd = INVALID_SOCKET;
|
140
|
-
SocketException
|
141
|
-
ex.error = getSocketErrno();
|
142
|
-
throw ex;
|
166
|
+
throw SocketException(__FILE__, __LINE__, getSocketErrno());
|
143
167
|
}
|
144
168
|
|
145
169
|
SOCKET fd = _acceptFd;
|
146
170
|
_acceptFd = INVALID_SOCKET;
|
147
|
-
|
148
|
-
|
149
|
-
|
171
|
+
return new TcpTransceiver(_instance, new StreamSocket(_instance, fd));
|
172
|
+
}
|
173
|
+
|
174
|
+
#elif defined(ICE_OS_UWP)
|
175
|
+
|
176
|
+
AsyncInfo*
|
177
|
+
IceInternal::TcpAcceptor::getAsyncInfo(SocketOperation)
|
178
|
+
{
|
179
|
+
return 0; // Not used
|
180
|
+
}
|
181
|
+
|
182
|
+
void
|
183
|
+
IceInternal::TcpAcceptor::startAccept()
|
184
|
+
{
|
185
|
+
assert(_fd != INVALID_SOCKET);
|
186
|
+
|
187
|
+
//
|
188
|
+
// If there are already sockets waiting to be accepted, we just
|
189
|
+
// notify the selector that the acceptor is ready for acceting the
|
190
|
+
// new socket. Otherwise, we set the _acceptPending flag, when a
|
191
|
+
// new socket connection event is received, the message handler
|
192
|
+
// will notify the selector.
|
193
|
+
//
|
194
|
+
IceUtil::Mutex::Lock lock(_mutex);
|
195
|
+
assert(!_acceptPending);
|
196
|
+
if(!_accepted.empty())
|
197
|
+
{
|
198
|
+
completed(SocketOperationRead);
|
199
|
+
}
|
200
|
+
else
|
201
|
+
{
|
202
|
+
_acceptPending = true;
|
203
|
+
}
|
204
|
+
}
|
205
|
+
|
206
|
+
void
|
207
|
+
IceInternal::TcpAcceptor::finishAccept()
|
208
|
+
{
|
209
|
+
//
|
210
|
+
// Nothing to do, we just check there's at least one accepted
|
211
|
+
// socket or the acceptor was closed.
|
212
|
+
//
|
213
|
+
IceUtil::Mutex::Lock lock(_mutex);
|
214
|
+
assert(!_acceptPending && (!_accepted.empty() || _fd == INVALID_SOCKET));
|
215
|
+
}
|
216
|
+
|
217
|
+
TransceiverPtr
|
218
|
+
IceInternal::TcpAcceptor::accept()
|
219
|
+
{
|
220
|
+
if(_fd == INVALID_SOCKET) // Acceptor closed.
|
221
|
+
{
|
222
|
+
assert(_accepted.empty());
|
223
|
+
throw SocketException(__FILE__, __LINE__);
|
224
|
+
}
|
225
|
+
|
226
|
+
Windows::Networking::Sockets::StreamSocket^ fd;
|
227
|
+
{
|
228
|
+
IceUtil::Mutex::Lock lock(_mutex);
|
229
|
+
assert(!_accepted.empty());
|
230
|
+
fd = _accepted.front();
|
231
|
+
_accepted.pop_front();
|
232
|
+
}
|
150
233
|
|
151
234
|
return new TcpTransceiver(_instance, new StreamSocket(_instance, fd));
|
152
235
|
}
|
153
236
|
|
237
|
+
#else
|
238
|
+
|
239
|
+
TransceiverPtr
|
240
|
+
IceInternal::TcpAcceptor::accept()
|
241
|
+
{
|
242
|
+
return new TcpTransceiver(_instance, new StreamSocket(_instance, doAccept(_fd)));
|
243
|
+
}
|
244
|
+
|
245
|
+
#endif
|
246
|
+
|
154
247
|
string
|
155
248
|
IceInternal::TcpAcceptor::protocol() const
|
156
249
|
{
|
@@ -189,25 +282,51 @@ IceInternal::TcpAcceptor::TcpAcceptor(const TcpEndpointIPtr& endpoint,
|
|
189
282
|
int port) :
|
190
283
|
_endpoint(endpoint),
|
191
284
|
_instance(instance),
|
192
|
-
_addr(getAddressForServer(host, port, _instance->protocolSupport(), instance->preferIPv6()))
|
285
|
+
_addr(getAddressForServer(host, port, _instance->protocolSupport(), instance->preferIPv6(), true))
|
193
286
|
#ifdef ICE_USE_IOCP
|
194
|
-
, _acceptFd(INVALID_SOCKET),
|
195
|
-
_info(SocketOperationRead)
|
287
|
+
, _acceptFd(INVALID_SOCKET), _info(SocketOperationRead)
|
196
288
|
#endif
|
197
289
|
{
|
198
|
-
#ifdef SOMAXCONN
|
199
290
|
_backlog = instance->properties()->getPropertyAsIntWithDefault("Ice.TCP.Backlog", SOMAXCONN);
|
291
|
+
|
292
|
+
#if defined(ICE_OS_UWP)
|
293
|
+
_fd = ref new StreamSocketListener();
|
294
|
+
safe_cast<StreamSocketListener^>(_fd)->ConnectionReceived +=
|
295
|
+
ref new TypedEventHandler<StreamSocketListener^, StreamSocketListenerConnectionReceivedEventArgs^>(
|
296
|
+
[=](StreamSocketListener^, StreamSocketListenerConnectionReceivedEventArgs^ args)
|
297
|
+
{
|
298
|
+
IceUtil::Mutex::Lock lock(_mutex);
|
299
|
+
if(_fd == INVALID_SOCKET) // Acceptor was closed.
|
300
|
+
{
|
301
|
+
closeSocket(args->Socket);
|
302
|
+
return;
|
303
|
+
}
|
304
|
+
_accepted.push_back(args->Socket);
|
305
|
+
|
306
|
+
//
|
307
|
+
// If the acceptor is waiting for a socket to be accepted, notify
|
308
|
+
// the selector that the acceptor is ready for "read". This will
|
309
|
+
// in turn caused finishAccept() and accept() to be called by the
|
310
|
+
// thread pool. If the acceptor isn't ready to accept the socket,
|
311
|
+
// it is just queued, when startAccept is called it will be dequed.
|
312
|
+
//
|
313
|
+
if(_acceptPending)
|
314
|
+
{
|
315
|
+
completed(SocketOperationRead);
|
316
|
+
_acceptPending = false;
|
317
|
+
}
|
318
|
+
});
|
200
319
|
#else
|
201
|
-
|
320
|
+
_fd = createServerSocket(false, _addr, instance->protocolSupport());
|
202
321
|
#endif
|
203
322
|
|
204
|
-
_fd = createServerSocket(false, _addr, instance->protocolSupport());
|
205
323
|
#ifdef ICE_USE_IOCP
|
206
324
|
_acceptBuf.resize((sizeof(sockaddr_storage) + 16) * 2);
|
207
325
|
#endif
|
208
326
|
|
209
327
|
setBlock(_fd, false);
|
210
328
|
setTcpBufSize(_fd, _instance);
|
329
|
+
|
211
330
|
#ifndef _WIN32
|
212
331
|
//
|
213
332
|
// Enable SO_REUSEADDR on Unix platforms to allow re-using the
|
@@ -233,3 +352,4 @@ IceInternal::TcpAcceptor::~TcpAcceptor()
|
|
233
352
|
#endif
|
234
353
|
}
|
235
354
|
|
355
|
+
#endif
|