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.
Files changed (777) hide show
  1. checksums.yaml +5 -5
  2. data/ICE_LICENSE +17 -17
  3. data/LICENSE +12 -12
  4. data/bin/slice2rb +1 -6
  5. data/ext/Communicator.cpp +223 -61
  6. data/ext/Communicator.h +1 -6
  7. data/ext/Config.h +23 -7
  8. data/ext/Connection.cpp +108 -76
  9. data/ext/Connection.h +4 -6
  10. data/ext/Endpoint.cpp +16 -54
  11. data/ext/Endpoint.h +1 -6
  12. data/ext/ImplicitContext.cpp +1 -10
  13. data/ext/ImplicitContext.h +1 -6
  14. data/ext/Init.cpp +4 -6
  15. data/ext/Logger.cpp +1 -6
  16. data/ext/Logger.h +1 -6
  17. data/ext/Operation.cpp +38 -54
  18. data/ext/Operation.h +1 -6
  19. data/ext/Properties.cpp +3 -8
  20. data/ext/Properties.h +1 -6
  21. data/ext/Proxy.cpp +111 -70
  22. data/ext/Proxy.h +1 -6
  23. data/ext/Slice.cpp +5 -20
  24. data/ext/Slice.h +1 -6
  25. data/ext/Types.cpp +313 -224
  26. data/ext/Types.h +118 -71
  27. data/ext/Util.cpp +69 -36
  28. data/ext/Util.h +117 -42
  29. data/ext/ValueFactoryManager.cpp +440 -0
  30. data/ext/ValueFactoryManager.h +95 -0
  31. data/ext/extconf.rb +52 -48
  32. data/ext/ice/cpp/include/Ice/Application.h +275 -105
  33. data/ext/ice/cpp/include/Ice/AsyncResult.h +124 -337
  34. data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -7
  35. data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +39 -16
  36. data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
  37. data/ext/ice/cpp/include/Ice/Buffer.h +10 -15
  38. data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +56 -17
  39. data/ext/ice/cpp/include/Ice/Comparable.h +205 -0
  40. data/ext/ice/cpp/include/Ice/Config.h +16 -39
  41. data/ext/ice/cpp/include/Ice/ConnectionAsync.h +203 -16
  42. data/ext/ice/cpp/include/Ice/ConnectionIF.h +7 -6
  43. data/ext/ice/cpp/include/Ice/ConsoleUtil.h +23 -0
  44. data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +57 -0
  45. data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +20 -12
  46. data/ext/ice/cpp/include/Ice/Dispatcher.h +35 -19
  47. data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -10
  48. data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
  49. data/ext/ice/cpp/include/Ice/Exception.h +110 -63
  50. data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +74 -0
  51. data/ext/ice/cpp/include/Ice/FactoryTable.h +22 -18
  52. data/ext/ice/cpp/include/Ice/FactoryTableInit.h +28 -31
  53. data/ext/ice/cpp/include/Ice/Format.h +17 -18
  54. data/ext/ice/cpp/include/Ice/Functional.h +38 -38
  55. data/ext/ice/cpp/include/Ice/GCObject.h +9 -10
  56. data/ext/ice/cpp/include/Ice/Handle.h +6 -16
  57. data/ext/ice/cpp/include/Ice/Ice.h +9 -10
  58. data/ext/ice/cpp/include/Ice/IconvStringConverter.h +377 -0
  59. data/ext/ice/cpp/include/Ice/Incoming.h +132 -38
  60. data/ext/ice/cpp/include/Ice/IncomingAsync.h +109 -31
  61. data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -6
  62. data/ext/ice/cpp/include/Ice/Initialize.h +872 -60
  63. data/ext/ice/cpp/include/Ice/InputStream.h +1514 -0
  64. data/ext/ice/cpp/include/Ice/InstanceF.h +1 -7
  65. data/ext/ice/cpp/include/Ice/InterfaceByValue.h +57 -0
  66. data/ext/ice/cpp/include/Ice/LocalObject.h +13 -14
  67. data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
  68. data/ext/ice/cpp/include/Ice/LoggerUtil.h +56 -24
  69. data/ext/ice/cpp/include/Ice/MetricsAdminI.h +124 -71
  70. data/ext/ice/cpp/include/Ice/MetricsFunctional.h +25 -10
  71. data/ext/ice/cpp/include/Ice/MetricsObserverI.h +116 -32
  72. data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +61 -30
  73. data/ext/ice/cpp/include/Ice/Object.h +413 -78
  74. data/ext/ice/cpp/include/Ice/ObjectF.h +12 -8
  75. data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -13
  76. data/ext/ice/cpp/include/Ice/Optional.h +1114 -0
  77. data/ext/ice/cpp/include/Ice/OutgoingAsync.h +684 -89
  78. data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -11
  79. data/ext/ice/cpp/include/Ice/OutputStream.h +1092 -0
  80. data/ext/ice/cpp/include/Ice/Protocol.h +49 -17
  81. data/ext/ice/cpp/include/Ice/Proxy.h +3438 -745
  82. data/ext/ice/cpp/include/Ice/ProxyF.h +13 -38
  83. data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
  84. data/ext/ice/cpp/include/Ice/ProxyHandle.h +43 -55
  85. data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
  86. data/ext/ice/cpp/include/Ice/RegisterPlugins.h +84 -12
  87. data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -9
  88. data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -6
  89. data/ext/ice/cpp/include/Ice/SHA1.h +42 -0
  90. data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
  91. data/ext/ice/cpp/include/Ice/Service.h +273 -154
  92. data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
  93. data/ext/ice/cpp/include/Ice/SlicedData.h +121 -53
  94. data/ext/ice/cpp/include/Ice/SlicedDataF.h +17 -11
  95. data/ext/ice/cpp/include/Ice/StreamHelpers.h +453 -140
  96. data/ext/ice/cpp/include/Ice/StringConverter.h +78 -0
  97. data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
  98. data/ext/ice/cpp/include/Ice/UUID.h +19 -0
  99. data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +22 -28
  100. data/ext/ice/cpp/include/Ice/UniqueRef.h +97 -0
  101. data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +45 -13
  102. data/ext/ice/cpp/include/Ice/Value.h +139 -0
  103. data/ext/ice/cpp/include/Ice/ValueF.h +21 -0
  104. data/ext/ice/cpp/include/IceSSL/Config.h +8 -28
  105. data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -11
  106. data/ext/ice/cpp/include/IceSSL/OpenSSL.h +147 -0
  107. data/ext/ice/cpp/include/IceSSL/Plugin.h +461 -448
  108. data/ext/ice/cpp/include/IceSSL/SChannel.h +72 -0
  109. data/ext/ice/cpp/include/IceSSL/SecureTransport.h +72 -0
  110. data/ext/ice/cpp/include/IceSSL/UWP.h +62 -0
  111. data/ext/ice/cpp/include/IceUtil/Atomic.h +7 -14
  112. data/ext/ice/cpp/include/IceUtil/Cond.h +17 -23
  113. data/ext/ice/cpp/include/IceUtil/Config.h +166 -46
  114. data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +92 -0
  115. data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -10
  116. data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +63 -41
  117. data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -13
  118. data/ext/ice/cpp/include/IceUtil/Exception.h +284 -75
  119. data/ext/ice/cpp/include/IceUtil/FileUtil.h +143 -0
  120. data/ext/ice/cpp/include/IceUtil/Functional.h +4 -6
  121. data/ext/ice/cpp/include/IceUtil/Handle.h +11 -16
  122. data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -15
  123. data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -8
  124. data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -7
  125. data/ext/ice/cpp/include/IceUtil/Lock.h +8 -15
  126. data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -7
  127. data/ext/ice/cpp/include/IceUtil/Mutex.h +19 -23
  128. data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -7
  129. data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -9
  130. data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -9
  131. data/ext/ice/cpp/include/IceUtil/Optional.h +134 -23
  132. data/ext/ice/cpp/include/IceUtil/Options.h +17 -23
  133. data/ext/ice/cpp/include/IceUtil/OutputUtil.h +61 -37
  134. data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -11
  135. data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +18 -15
  136. data/ext/ice/cpp/include/IceUtil/Random.h +39 -8
  137. data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -13
  138. data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +53 -0
  139. data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +10 -15
  140. data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -7
  141. data/ext/ice/cpp/include/IceUtil/Shared.h +5 -12
  142. data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -7
  143. data/ext/ice/cpp/include/IceUtil/StringConverter.h +146 -126
  144. data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -26
  145. data/ext/ice/cpp/include/IceUtil/Thread.h +10 -17
  146. data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -47
  147. data/ext/ice/cpp/include/IceUtil/Time.h +3 -8
  148. data/ext/ice/cpp/include/IceUtil/Timer.h +18 -18
  149. data/ext/ice/cpp/include/IceUtil/UUID.h +6 -7
  150. data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
  151. data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +170 -0
  152. data/ext/ice/cpp/include/generated/Ice/Communicator.h +1156 -0
  153. data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +51 -16
  154. data/ext/ice/cpp/include/generated/Ice/Connection.h +1660 -0
  155. data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +119 -0
  156. data/ext/ice/cpp/include/generated/Ice/Current.h +322 -0
  157. data/ext/ice/cpp/include/generated/Ice/Endpoint.h +943 -0
  158. data/ext/ice/cpp/include/generated/Ice/EndpointF.h +166 -0
  159. data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +118 -0
  160. data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +31 -15
  161. data/ext/ice/cpp/include/generated/Ice/Identity.h +264 -0
  162. data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +278 -0
  163. data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +51 -16
  164. data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +1143 -0
  165. data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +128 -0
  166. data/ext/ice/cpp/include/generated/Ice/LocalException.h +7041 -0
  167. data/ext/ice/cpp/include/generated/Ice/Locator.h +3850 -0
  168. data/ext/ice/cpp/include/generated/Ice/LocatorF.h +147 -0
  169. data/ext/ice/cpp/include/generated/Ice/Logger.h +231 -0
  170. data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +51 -16
  171. data/ext/ice/cpp/include/generated/Ice/Metrics.h +4717 -0
  172. data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1175 -0
  173. data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +51 -16
  174. data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +197 -0
  175. data/ext/ice/cpp/include/generated/Ice/Plugin.h +306 -0
  176. data/ext/ice/cpp/include/generated/Ice/PluginF.h +110 -0
  177. data/ext/ice/cpp/include/generated/Ice/Process.h +971 -0
  178. data/ext/ice/cpp/include/generated/Ice/ProcessF.h +125 -0
  179. data/ext/ice/cpp/include/generated/Ice/Properties.h +446 -0
  180. data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +1360 -0
  181. data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +134 -0
  182. data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2689 -0
  183. data/ext/ice/cpp/include/generated/Ice/Router.h +1838 -0
  184. data/ext/ice/cpp/include/generated/Ice/RouterF.h +125 -0
  185. data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +299 -0
  186. data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +51 -16
  187. data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +34 -14
  188. data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +318 -0
  189. data/ext/ice/cpp/include/generated/Ice/Version.h +357 -0
  190. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +223 -0
  191. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +101 -0
  192. data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +181 -0
  193. data/ext/ice/cpp/src/Ice/ACM.cpp +38 -27
  194. data/ext/ice/cpp/src/Ice/ACM.h +9 -7
  195. data/ext/ice/cpp/src/Ice/ACMF.h +30 -0
  196. data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -6
  197. data/ext/ice/cpp/src/Ice/Acceptor.h +4 -8
  198. data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
  199. data/ext/ice/cpp/src/Ice/ArgVector.cpp +59 -0
  200. data/ext/ice/cpp/src/Ice/ArgVector.h +36 -0
  201. data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -544
  202. data/ext/ice/cpp/src/Ice/Base64.cpp +22 -28
  203. data/ext/ice/cpp/src/Ice/Base64.h +1 -6
  204. data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +41 -18
  205. data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -15
  206. data/ext/ice/cpp/src/Ice/Buffer.cpp +75 -18
  207. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +21 -12
  208. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +86 -197
  209. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -23
  210. data/ext/ice/cpp/src/Ice/Communicator.cpp +43 -15
  211. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +28 -11
  212. data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +318 -117
  213. data/ext/ice/cpp/src/Ice/CommunicatorI.h +95 -40
  214. data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -8
  215. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +55 -122
  216. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +15 -31
  217. data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -7
  218. data/ext/ice/cpp/src/Ice/Connection.cpp +111 -20
  219. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +28 -11
  220. data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +300 -107
  221. data/ext/ice/cpp/src/Ice/ConnectionFactory.h +44 -28
  222. data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +30 -0
  223. data/ext/ice/cpp/src/Ice/ConnectionI.cpp +785 -713
  224. data/ext/ice/cpp/src/Ice/ConnectionI.h +105 -80
  225. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -20
  226. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +5 -9
  227. data/ext/ice/cpp/src/Ice/Connector.cpp +6 -6
  228. data/ext/ice/cpp/src/Ice/Connector.h +4 -8
  229. data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
  230. data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -9
  231. data/ext/ice/cpp/src/Ice/Current.cpp +30 -12
  232. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +10 -16
  233. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
  234. data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
  235. data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +13 -25
  236. data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +34 -28
  237. data/ext/ice/cpp/src/Ice/Endpoint.cpp +107 -19
  238. data/ext/ice/cpp/src/Ice/EndpointF.cpp +28 -11
  239. data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -6
  240. data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -11
  241. data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
  242. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +41 -36
  243. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -9
  244. data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
  245. data/ext/ice/cpp/src/Ice/EndpointI.cpp +18 -7
  246. data/ext/ice/cpp/src/Ice/EndpointI.h +39 -18
  247. data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -10
  248. data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +19 -12
  249. data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -9
  250. data/ext/ice/cpp/src/Ice/EventHandler.h +13 -13
  251. data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -7
  252. data/ext/ice/cpp/src/Ice/Exception.cpp +102 -98
  253. data/ext/ice/cpp/src/Ice/FacetMap.cpp +21 -12
  254. data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -33
  255. data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -9
  256. data/ext/ice/cpp/src/Ice/GCObject.cpp +29 -31
  257. data/ext/ice/cpp/src/Ice/HashUtil.h +3 -9
  258. data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -7
  259. data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
  260. data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +128 -111
  261. data/ext/ice/cpp/src/Ice/IPEndpointI.h +23 -19
  262. data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -7
  263. data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +51 -0
  264. data/ext/ice/cpp/src/Ice/Identity.cpp +25 -16
  265. data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +41 -13
  266. data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +28 -11
  267. data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +11 -28
  268. data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -10
  269. data/ext/ice/cpp/src/Ice/Incoming.cpp +284 -255
  270. data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -214
  271. data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -9
  272. data/ext/ice/cpp/src/Ice/Initialize.cpp +309 -193
  273. data/ext/ice/cpp/src/Ice/InputStream.cpp +2726 -0
  274. data/ext/ice/cpp/src/Ice/Instance.cpp +243 -262
  275. data/ext/ice/cpp/src/Ice/Instance.h +30 -23
  276. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +137 -23
  277. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +28 -11
  278. data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +118 -105
  279. data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -36
  280. data/ext/ice/cpp/src/Ice/LocalException.cpp +1191 -422
  281. data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -7
  282. data/ext/ice/cpp/src/Ice/Locator.cpp +1282 -1222
  283. data/ext/ice/cpp/src/Ice/LocatorF.cpp +30 -12
  284. data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +150 -186
  285. data/ext/ice/cpp/src/Ice/LocatorInfo.h +31 -36
  286. data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
  287. data/ext/ice/cpp/src/Ice/Logger.cpp +39 -12
  288. data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +182 -88
  289. data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -9
  290. data/ext/ice/cpp/src/Ice/LoggerF.cpp +28 -11
  291. data/ext/ice/cpp/src/Ice/LoggerI.cpp +26 -55
  292. data/ext/ice/cpp/src/Ice/LoggerI.h +7 -18
  293. data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -17
  294. data/ext/ice/cpp/src/Ice/Metrics.cpp +1280 -1107
  295. data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +58 -33
  296. data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -7
  297. data/ext/ice/cpp/src/Ice/Network.cpp +753 -408
  298. data/ext/ice/cpp/src/Ice/Network.h +99 -36
  299. data/ext/ice/cpp/src/Ice/NetworkF.h +2 -7
  300. data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +20 -19
  301. data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -7
  302. data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
  303. data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
  304. data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
  305. data/ext/ice/cpp/src/Ice/Object.cpp +227 -232
  306. data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +45 -13
  307. data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +28 -11
  308. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +83 -33
  309. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -12
  310. data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +25 -0
  311. data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +298 -191
  312. data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +44 -39
  313. data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +41 -13
  314. data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -37
  315. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +67 -67
  316. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +15 -11
  317. data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +801 -366
  318. data/ext/ice/cpp/src/Ice/OutputStream.cpp +1367 -0
  319. data/ext/ice/cpp/src/Ice/Plugin.cpp +52 -14
  320. data/ext/ice/cpp/src/Ice/PluginF.cpp +28 -11
  321. data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +27 -51
  322. data/ext/ice/cpp/src/Ice/PluginManagerI.h +7 -13
  323. data/ext/ice/cpp/src/Ice/Process.cpp +294 -128
  324. data/ext/ice/cpp/src/Ice/ProcessF.cpp +30 -12
  325. data/ext/ice/cpp/src/Ice/Properties.cpp +42 -15
  326. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +382 -340
  327. data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +83 -24
  328. data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -10
  329. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +30 -12
  330. data/ext/ice/cpp/src/Ice/PropertiesI.cpp +46 -57
  331. data/ext/ice/cpp/src/Ice/PropertiesI.h +18 -26
  332. data/ext/ice/cpp/src/Ice/PropertyNames.cpp +112 -19
  333. data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -7
  334. data/ext/ice/cpp/src/Ice/Protocol.cpp +6 -19
  335. data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -7
  336. data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -25
  337. data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
  338. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -6
  339. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -6
  340. data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
  341. data/ext/ice/cpp/src/Ice/Proxy.cpp +729 -957
  342. data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +33 -38
  343. data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -16
  344. data/ext/ice/cpp/src/Ice/Reference.cpp +190 -106
  345. data/ext/ice/cpp/src/Ice/Reference.h +39 -28
  346. data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +69 -118
  347. data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -17
  348. data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
  349. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +19 -9
  350. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
  351. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +766 -565
  352. data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
  353. data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -8
  354. data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -18
  355. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -11
  356. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -7
  357. data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -11
  358. data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -12
  359. data/ext/ice/cpp/src/Ice/RetryQueue.cpp +12 -20
  360. data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -11
  361. data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
  362. data/ext/ice/cpp/src/Ice/Router.cpp +614 -492
  363. data/ext/ice/cpp/src/Ice/RouterF.cpp +30 -12
  364. data/ext/ice/cpp/src/Ice/RouterInfo.cpp +93 -99
  365. data/ext/ice/cpp/src/Ice/RouterInfo.h +42 -38
  366. data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
  367. data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +23 -28
  368. data/ext/ice/cpp/src/Ice/Selector.cpp +948 -855
  369. data/ext/ice/cpp/src/Ice/Selector.h +100 -152
  370. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +41 -13
  371. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +28 -11
  372. data/ext/ice/cpp/src/Ice/ServantManager.cpp +24 -45
  373. data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
  374. data/ext/ice/cpp/src/Ice/SharedContext.h +2 -7
  375. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +21 -12
  376. data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -7
  377. data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -25
  378. data/ext/ice/cpp/src/Ice/StreamSocket.cpp +208 -76
  379. data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -9
  380. data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +57 -22
  381. data/ext/ice/cpp/src/Ice/StringUtil.h +30 -0
  382. data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +6 -7
  383. data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -8
  384. data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
  385. data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
  386. data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +169 -49
  387. data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -10
  388. data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -12
  389. data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -7
  390. data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +51 -46
  391. data/ext/ice/cpp/src/Ice/TcpEndpointI.h +12 -14
  392. data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +17 -32
  393. data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -15
  394. data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +41 -54
  395. data/ext/ice/cpp/src/Ice/ThreadPool.cpp +242 -274
  396. data/ext/ice/cpp/src/Ice/ThreadPool.h +46 -48
  397. data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +38 -26
  398. data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -7
  399. data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
  400. data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -7
  401. data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -36
  402. data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -11
  403. data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -7
  404. data/ext/ice/cpp/src/Ice/Transceiver.h +8 -12
  405. data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
  406. data/ext/ice/cpp/src/Ice/UdpConnector.cpp +5 -13
  407. data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -7
  408. data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +118 -60
  409. data/ext/ice/cpp/src/Ice/UdpEndpointI.h +13 -10
  410. data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +177 -236
  411. data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -22
  412. data/ext/ice/cpp/src/Ice/Value.cpp +76 -0
  413. data/ext/ice/cpp/src/Ice/ValueFactory.cpp +83 -0
  414. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +61 -0
  415. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +37 -0
  416. data/ext/ice/cpp/src/Ice/Version.cpp +25 -20
  417. data/ext/ice/cpp/src/Ice/VirtualShared.h +38 -0
  418. data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -14
  419. data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -12
  420. data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -16
  421. data/ext/ice/cpp/src/Ice/WSConnector.h +3 -11
  422. data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +188 -89
  423. data/ext/ice/cpp/src/Ice/WSEndpoint.h +22 -37
  424. data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +65 -66
  425. data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -27
  426. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +596 -281
  427. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1383 -543
  428. data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +89 -32
  429. data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -28
  430. data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -66
  431. data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -41
  432. data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -64
  433. data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -8
  434. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +450 -172
  435. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +863 -406
  436. data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +47 -0
  437. data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +636 -144
  438. data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +20 -173
  439. data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -22
  440. data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +279 -0
  441. data/ext/ice/cpp/src/IceSSL/CertificateI.h +64 -0
  442. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +42 -17
  443. data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +61 -0
  444. data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +15 -64
  445. data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -18
  446. data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +207 -204
  447. data/ext/ice/cpp/src/IceSSL/EndpointI.h +43 -40
  448. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +42 -16
  449. data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -11
  450. data/ext/ice/cpp/src/IceSSL/Instance.h +7 -12
  451. data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -12
  452. data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +583 -0
  453. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +134 -115
  454. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +59 -0
  455. data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +27 -0
  456. data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +127 -0
  457. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +477 -182
  458. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +32 -26
  459. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +286 -0
  460. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +58 -0
  461. data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -46
  462. data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -23
  463. data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -60
  464. data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -12
  465. data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +580 -0
  466. data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +523 -74
  467. data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +123 -0
  468. data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +31 -0
  469. data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +73 -0
  470. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +187 -221
  471. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +24 -26
  472. data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +97 -94
  473. data/ext/ice/cpp/src/IceSSL/SSLEngine.h +26 -192
  474. data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -24
  475. data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +868 -0
  476. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +69 -201
  477. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +59 -0
  478. data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +29 -0
  479. data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +75 -0
  480. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +174 -161
  481. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +29 -33
  482. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +864 -0
  483. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +45 -0
  484. data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +12 -22
  485. data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -9
  486. data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -8
  487. data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +266 -0
  488. data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +338 -0
  489. data/ext/ice/cpp/src/IceSSL/UWPEngine.h +41 -0
  490. data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +26 -0
  491. data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +89 -0
  492. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +383 -0
  493. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +71 -0
  494. data/ext/ice/cpp/src/IceSSL/Util.cpp +71 -1260
  495. data/ext/ice/cpp/src/IceSSL/Util.h +48 -142
  496. data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +157 -0
  497. data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -27
  498. data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -31
  499. data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +22 -36
  500. data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +30 -126
  501. data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
  502. data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
  503. data/ext/ice/cpp/src/IceUtil/Options.cpp +20 -33
  504. data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +47 -21
  505. data/ext/ice/cpp/src/IceUtil/Random.cpp +15 -20
  506. data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +4 -19
  507. data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -8
  508. data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -269
  509. data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +582 -244
  510. data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -79
  511. data/ext/ice/cpp/src/IceUtil/Time.cpp +6 -11
  512. data/ext/ice/cpp/src/IceUtil/UUID.cpp +17 -22
  513. data/ext/ice/cpp/src/IceUtil/Unicode.cpp +97 -101
  514. data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -40
  515. data/ext/ice/cpp/src/IceUtil/UtilException.cpp +839 -0
  516. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +894 -234
  517. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +72 -0
  518. data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -7
  519. data/ext/ice/cpp/src/Slice/Checksum.h +21 -0
  520. data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -83
  521. data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -14
  522. data/ext/ice/cpp/src/Slice/Grammar.cpp +1981 -1944
  523. data/ext/ice/cpp/src/Slice/Grammar.h +39 -19
  524. data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -20
  525. data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2752 -1948
  526. data/ext/ice/cpp/src/Slice/JavaUtil.h +398 -0
  527. data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
  528. data/ext/ice/cpp/src/Slice/MD5.h +1 -6
  529. data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -1
  530. data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
  531. data/ext/ice/cpp/src/Slice/PHPUtil.cpp +17 -20
  532. data/ext/ice/cpp/src/Slice/PHPUtil.h +36 -0
  533. data/ext/ice/cpp/src/Slice/Parser.cpp +1190 -426
  534. data/ext/ice/cpp/{include → src}/Slice/Parser.h +143 -91
  535. data/ext/ice/cpp/src/Slice/Preprocessor.cpp +67 -36
  536. data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +8 -18
  537. data/ext/ice/cpp/src/Slice/Python.cpp +218 -111
  538. data/ext/ice/cpp/src/Slice/PythonUtil.cpp +787 -699
  539. data/ext/ice/cpp/src/Slice/PythonUtil.h +70 -0
  540. data/ext/ice/cpp/src/Slice/Ruby.cpp +42 -43
  541. data/ext/ice/cpp/src/Slice/RubyUtil.cpp +175 -445
  542. data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -11
  543. data/ext/ice/cpp/src/Slice/Scanner.cpp +390 -399
  544. data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +36 -69
  545. data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +456 -0
  546. data/ext/ice/cpp/src/Slice/Util.h +50 -0
  547. data/ice.gemspec +2 -9
  548. data/lib/Glacier2.rb +1 -6
  549. data/lib/Glacier2/Metrics.rb +6 -50
  550. data/lib/Glacier2/PermissionsVerifier.rb +23 -99
  551. data/lib/Glacier2/PermissionsVerifierF.rb +2 -7
  552. data/lib/Glacier2/Router.rb +31 -78
  553. data/lib/Glacier2/RouterF.rb +2 -7
  554. data/lib/Glacier2/SSLInfo.rb +3 -11
  555. data/lib/Glacier2/Session.rb +87 -311
  556. data/lib/Ice.rb +84 -58
  557. data/lib/Ice/BuiltinSequences.rb +3 -8
  558. data/lib/Ice/Communicator.rb +54 -61
  559. data/lib/Ice/CommunicatorF.rb +2 -7
  560. data/lib/Ice/Connection.rb +152 -166
  561. data/lib/Ice/ConnectionF.rb +2 -7
  562. data/lib/Ice/Current.rb +3 -15
  563. data/lib/Ice/Endpoint.rb +56 -137
  564. data/lib/Ice/EndpointF.rb +2 -7
  565. data/lib/Ice/EndpointTypes.rb +2 -11
  566. data/lib/Ice/FacetMap.rb +3 -8
  567. data/lib/Ice/Identity.rb +4 -12
  568. data/lib/Ice/ImplicitContext.rb +4 -38
  569. data/lib/Ice/ImplicitContextF.rb +2 -7
  570. data/lib/Ice/Instrumentation.rb +22 -279
  571. data/lib/Ice/InstrumentationF.rb +2 -7
  572. data/lib/Ice/LocalException.rb +94 -145
  573. data/lib/Ice/Locator.rb +50 -169
  574. data/lib/Ice/LocatorF.rb +2 -7
  575. data/lib/Ice/Logger.rb +4 -38
  576. data/lib/Ice/LoggerF.rb +2 -7
  577. data/lib/Ice/Metrics.rb +60 -420
  578. data/lib/Ice/ObjectAdapter.rb +29 -0
  579. data/lib/Ice/ObjectAdapterF.rb +2 -7
  580. data/lib/Ice/ObjectFactory.rb +4 -34
  581. data/lib/Ice/Plugin.rb +6 -64
  582. data/lib/Ice/PluginF.rb +2 -7
  583. data/lib/Ice/Process.rb +15 -56
  584. data/lib/Ice/ProcessF.rb +2 -7
  585. data/lib/Ice/Properties.rb +4 -45
  586. data/lib/Ice/PropertiesAdmin.rb +18 -60
  587. data/lib/Ice/PropertiesF.rb +2 -7
  588. data/lib/Ice/RemoteLogger.rb +33 -119
  589. data/lib/Ice/Router.rb +28 -105
  590. data/lib/Ice/RouterF.rb +2 -7
  591. data/lib/Ice/ServantLocator.rb +26 -0
  592. data/lib/Ice/ServantLocatorF.rb +24 -0
  593. data/lib/Ice/SliceChecksumDict.rb +2 -7
  594. data/lib/Ice/ValueFactory.rb +28 -0
  595. data/lib/Ice/Version.rb +4 -15
  596. data/lib/IceBox.rb +1 -6
  597. data/lib/IceBox/IceBox.rb +43 -152
  598. data/lib/IceGrid.rb +1 -9
  599. data/lib/IceGrid/Admin.rb +550 -431
  600. data/lib/IceGrid/Descriptor.rb +61 -533
  601. data/lib/IceGrid/Exception.rb +23 -49
  602. data/lib/IceGrid/FileParser.rb +13 -54
  603. data/lib/IceGrid/PluginFacade.rb +35 -0
  604. data/lib/IceGrid/Registry.rb +150 -62
  605. data/lib/IceGrid/Session.rb +24 -68
  606. data/lib/IceGrid/UserAccountMapper.rb +13 -54
  607. data/lib/IcePatch2.rb +1 -6
  608. data/lib/IcePatch2/FileInfo.rb +4 -15
  609. data/lib/IcePatch2/FileServer.rb +32 -80
  610. data/lib/IceStorm.rb +1 -6
  611. data/lib/IceStorm/IceStorm.rb +78 -210
  612. data/lib/IceStorm/Metrics.rb +10 -93
  613. data/slice/Glacier2/Metrics.ice +20 -10
  614. data/slice/Glacier2/PermissionsVerifier.ice +19 -12
  615. data/slice/Glacier2/PermissionsVerifierF.ice +16 -9
  616. data/slice/Glacier2/Router.ice +19 -13
  617. data/slice/Glacier2/RouterF.ice +16 -9
  618. data/slice/Glacier2/SSLInfo.ice +17 -10
  619. data/slice/Glacier2/Session.ice +24 -18
  620. data/slice/Ice/BuiltinSequences.ice +18 -9
  621. data/slice/Ice/Communicator.ice +180 -64
  622. data/slice/Ice/CommunicatorF.ice +18 -9
  623. data/slice/Ice/Connection.ice +208 -75
  624. data/slice/Ice/ConnectionF.ice +18 -9
  625. data/slice/Ice/Current.ice +37 -28
  626. data/slice/Ice/Endpoint.ice +73 -21
  627. data/slice/Ice/EndpointF.ice +19 -10
  628. data/slice/Ice/EndpointTypes.ice +21 -13
  629. data/slice/Ice/FacetMap.ice +19 -10
  630. data/slice/Ice/Identity.ice +24 -10
  631. data/slice/Ice/ImplicitContext.ice +41 -33
  632. data/slice/Ice/ImplicitContextF.ice +17 -9
  633. data/slice/Ice/Instrumentation.ice +37 -30
  634. data/slice/Ice/InstrumentationF.ice +19 -10
  635. data/slice/Ice/LocalException.ice +118 -112
  636. data/slice/Ice/Locator.ice +28 -21
  637. data/slice/Ice/LocatorF.ice +18 -9
  638. data/slice/Ice/Logger.ice +26 -18
  639. data/slice/Ice/LoggerF.ice +18 -9
  640. data/slice/Ice/Metrics.ice +42 -30
  641. data/slice/Ice/ObjectAdapter.ice +88 -53
  642. data/slice/Ice/ObjectAdapterF.ice +18 -9
  643. data/slice/Ice/ObjectFactory.ice +28 -17
  644. data/slice/Ice/Plugin.ice +25 -13
  645. data/slice/Ice/PluginF.ice +22 -9
  646. data/slice/Ice/Process.ice +20 -11
  647. data/slice/Ice/ProcessF.ice +18 -9
  648. data/slice/Ice/Properties.ice +42 -28
  649. data/slice/Ice/PropertiesAdmin.ice +20 -10
  650. data/slice/Ice/PropertiesF.ice +18 -9
  651. data/slice/Ice/RemoteLogger.ice +23 -19
  652. data/slice/Ice/Router.ice +28 -13
  653. data/slice/Ice/RouterF.ice +18 -9
  654. data/slice/Ice/ServantLocator.ice +40 -29
  655. data/slice/Ice/ServantLocatorF.ice +18 -9
  656. data/slice/Ice/SliceChecksumDict.ice +18 -9
  657. data/slice/Ice/ValueFactory.ice +132 -0
  658. data/slice/Ice/Version.ice +20 -10
  659. data/slice/IceBT/ConnectionInfo.ice +58 -0
  660. data/slice/IceBT/EndpointInfo.ice +56 -0
  661. data/slice/IceBT/Types.ice +44 -0
  662. data/slice/IceBox/IceBox.ice +45 -27
  663. data/slice/IceDiscovery/IceDiscovery.ice +75 -10
  664. data/slice/IceGrid/Admin.ice +410 -44
  665. data/slice/IceGrid/Descriptor.ice +47 -34
  666. data/slice/IceGrid/Exception.ice +43 -32
  667. data/slice/IceGrid/FileParser.ice +21 -12
  668. data/slice/IceGrid/PluginFacade.ice +26 -18
  669. data/slice/IceGrid/Registry.ice +150 -21
  670. data/slice/IceGrid/Session.ice +25 -17
  671. data/slice/IceGrid/UserAccountMapper.ice +23 -14
  672. data/slice/IceIAP/ConnectionInfo.ice +73 -0
  673. data/slice/IceIAP/EndpointInfo.ice +67 -0
  674. data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +19 -12
  675. data/slice/IcePatch2/FileInfo.ice +19 -13
  676. data/slice/IcePatch2/FileServer.ice +27 -18
  677. data/slice/IceSSL/ConnectionInfo.ice +27 -23
  678. data/slice/IceSSL/ConnectionInfoF.ice +30 -0
  679. data/slice/IceSSL/EndpointInfo.ice +21 -36
  680. data/slice/IceStorm/IceStorm.ice +33 -24
  681. data/slice/IceStorm/Metrics.ice +19 -11
  682. metadata +148 -120
  683. data/ext/ObjectFactory.cpp +0 -140
  684. data/ext/ObjectFactory.h +0 -50
  685. data/ext/ice/cpp/include/Ice/ACMF.h +0 -30
  686. data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
  687. data/ext/ice/cpp/include/Ice/BuiltinSequences.h +0 -82
  688. data/ext/ice/cpp/include/Ice/Communicator.h +0 -200
  689. data/ext/ice/cpp/include/Ice/Connection.h +0 -497
  690. data/ext/ice/cpp/include/Ice/ConnectionF.h +0 -74
  691. data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +0 -30
  692. data/ext/ice/cpp/include/Ice/Current.h +0 -102
  693. data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +0 -48
  694. data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +0 -62
  695. data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
  696. data/ext/ice/cpp/include/Ice/EndpointF.h +0 -93
  697. data/ext/ice/cpp/include/Ice/EndpointTypes.h +0 -82
  698. data/ext/ice/cpp/include/Ice/Identity.h +0 -168
  699. data/ext/ice/cpp/include/Ice/ImplicitContext.h +0 -102
  700. data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
  701. data/ext/ice/cpp/include/Ice/InstrumentationF.h +0 -75
  702. data/ext/ice/cpp/include/Ice/LocalException.h +0 -1030
  703. data/ext/ice/cpp/include/Ice/Locator.h +0 -2193
  704. data/ext/ice/cpp/include/Ice/LocatorF.h +0 -93
  705. data/ext/ice/cpp/include/Ice/Logger.h +0 -100
  706. data/ext/ice/cpp/include/Ice/Metrics.h +0 -2974
  707. data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
  708. data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.h +0 -26
  709. data/ext/ice/cpp/include/Ice/ObjectFactory.h +0 -92
  710. data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +0 -66
  711. data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.h +0 -26
  712. data/ext/ice/cpp/include/Ice/Outgoing.h +0 -225
  713. data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
  714. data/ext/ice/cpp/include/Ice/PluginF.h +0 -70
  715. data/ext/ice/cpp/include/Ice/Process.h +0 -574
  716. data/ext/ice/cpp/include/Ice/ProcessF.h +0 -83
  717. data/ext/ice/cpp/include/Ice/Properties.h +0 -136
  718. data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
  719. data/ext/ice/cpp/include/Ice/PropertiesF.h +0 -87
  720. data/ext/ice/cpp/include/Ice/RemoteLogger.h +0 -1500
  721. data/ext/ice/cpp/include/Ice/Router.h +0 -1159
  722. data/ext/ice/cpp/include/Ice/RouterF.h +0 -83
  723. data/ext/ice/cpp/include/Ice/ServantLocator.h +0 -96
  724. data/ext/ice/cpp/include/Ice/Stream.h +0 -447
  725. data/ext/ice/cpp/include/Ice/StreamF.h +0 -30
  726. data/ext/ice/cpp/include/Ice/Version.h +0 -262
  727. data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +0 -158
  728. data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +0 -142
  729. data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +0 -119
  730. data/ext/ice/cpp/include/IceUtil/Cache.h +0 -362
  731. data/ext/ice/cpp/include/IceUtil/IconvStringConverter.h +0 -302
  732. data/ext/ice/cpp/include/IceUtil/SHA1.h +0 -47
  733. data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +0 -65
  734. data/ext/ice/cpp/include/Slice/Checksum.h +0 -26
  735. data/ext/ice/cpp/include/Slice/CsUtil.h +0 -92
  736. data/ext/ice/cpp/include/Slice/DotNetNames.h +0 -34
  737. data/ext/ice/cpp/include/Slice/JavaUtil.h +0 -279
  738. data/ext/ice/cpp/include/Slice/ObjCUtil.h +0 -127
  739. data/ext/ice/cpp/include/Slice/PHPUtil.h +0 -50
  740. data/ext/ice/cpp/include/Slice/PythonUtil.h +0 -64
  741. data/ext/ice/cpp/include/Slice/Util.h +0 -56
  742. data/ext/ice/cpp/src/Ice/BasicStream.cpp +0 -3428
  743. data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +0 -62
  744. data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +0 -44
  745. data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +0 -139
  746. data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +0 -43
  747. data/ext/ice/cpp/src/Ice/Outgoing.cpp +0 -694
  748. data/ext/ice/cpp/src/Ice/Stream.cpp +0 -53
  749. data/ext/ice/cpp/src/Ice/StreamI.cpp +0 -832
  750. data/ext/ice/cpp/src/Ice/StreamI.h +0 -198
  751. data/ext/ice/cpp/src/IceSSL/Certificate.cpp +0 -1336
  752. data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +0 -64
  753. data/ext/ice/cpp/src/IceUtil/ArgVector.h +0 -41
  754. data/ext/ice/cpp/src/IceUtil/Exception.cpp +0 -792
  755. data/ext/ice/cpp/src/IceUtil/FileUtil.h +0 -185
  756. data/ext/ice/cpp/src/Slice/CsUtil.cpp +0 -2660
  757. data/ext/ice/cpp/src/Slice/DotNetNames.cpp +0 -146
  758. data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +0 -1310
  759. data/lib/Ice/ObjectFactoryF.rb +0 -29
  760. data/lib/IceGrid/Locator.rb +0 -106
  761. data/lib/IceGrid/Observer.rb +0 -572
  762. data/lib/IceGrid/Query.rb +0 -169
  763. data/slice/Freeze/BackgroundSaveEvictor.ice +0 -111
  764. data/slice/Freeze/CatalogData.ice +0 -49
  765. data/slice/Freeze/Connection.ice +0 -121
  766. data/slice/Freeze/ConnectionF.ice +0 -20
  767. data/slice/Freeze/DB.ice +0 -37
  768. data/slice/Freeze/Evictor.ice +0 -346
  769. data/slice/Freeze/EvictorF.ice +0 -22
  770. data/slice/Freeze/EvictorStorage.ice +0 -72
  771. data/slice/Freeze/Exception.ice +0 -100
  772. data/slice/Freeze/Transaction.ice +0 -58
  773. data/slice/Freeze/TransactionalEvictor.ice +0 -50
  774. data/slice/Ice/ObjectFactoryF.ice +0 -21
  775. data/slice/IceGrid/Locator.ice +0 -57
  776. data/slice/IceGrid/Observer.ice +0 -395
  777. data/slice/IceGrid/Query.ice +0 -131
@@ -1,61 +1,42 @@
1
- // **********************************************************************
2
1
  //
3
- // Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
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_UTIL_UNICODE_H
11
6
  #define ICE_UTIL_UNICODE_H
12
7
 
13
8
  #include <IceUtil/Config.h>
14
- #include <IceUtil/StringConverter.h>
9
+ #include <vector>
15
10
 
16
11
  namespace IceUtilInternal
17
12
  {
18
13
 
19
14
  //
20
- // Converts UTF-8 byte-sequences to and from UTF-16 or UTF-32 (with native
21
- // endianness) depending on sizeof(wchar_t).
22
- //
23
- // These are thin wrappers over the UTF8/16/32 converters provided by
24
- // unicode.org
15
+ // Convert UTF-8 byte-sequences to and from UTF-16 or UTF-32 (with native endianness)
25
16
  //
17
+ // These are wrappers for Unicode's ConvertUTF.h/cpp.
26
18
 
27
- enum ConversionResult
28
- {
29
- conversionOK, /* conversion successful */
30
- sourceExhausted, /* partial character in source, but hit end */
31
- targetExhausted, /* insuff. room in target for conversion */
32
- sourceIllegal /* source sequence is illegal/malformed */
33
- };
34
-
35
- ConversionResult
36
- convertUTFWstringToUTF8(const wchar_t*& sourceStart, const wchar_t* sourceEnd,
37
- IceUtil::Byte*& targetStart, IceUtil::Byte* targetEnd, IceUtil::ConversionFlags flags);
38
-
39
- ConversionResult
40
- convertUTF8ToUTFWstring(const IceUtil::Byte*& sourceStart, const IceUtil::Byte* sourceEnd,
41
- wchar_t*& targetStart, wchar_t* targetEnd, IceUtil::ConversionFlags flags);
42
-
43
- ConversionResult
44
- convertUTF8ToUTFWstring(const IceUtil::Byte*& sourceStart, const IceUtil::Byte* sourceEnd,
45
- std::wstring& target, IceUtil::ConversionFlags flags);
19
+ //
20
+ // Convert wstring encoded with UTF-16 or UTF-32 to UTF-8.
21
+ // Returns false if needs for space and true upon success.
22
+ // Throws IllegalConversionException to report error
23
+ //
24
+ bool
25
+ convertUTFWstringToUTF8(const wchar_t*& sourceStart, const wchar_t* sourceEnd,
26
+ IceUtil::Byte*& targetStart, IceUtil::Byte* targetEnd);
46
27
 
28
+ void
29
+ convertUTF8ToUTFWstring(const IceUtil::Byte*& sourceStart, const IceUtil::Byte* sourceEnd,
30
+ std::wstring& target);
47
31
 
48
- ICE_UTIL_API ConversionResult
49
- convertUTF8ToUTF16(const std::vector<unsigned char>&, std::vector<unsigned short>&,
50
- IceUtil::ConversionFlags);
32
+ void
33
+ convertUTF8ToUTF16(const std::vector<unsigned char>&, std::vector<unsigned short>&);
51
34
 
52
- ICE_UTIL_API ConversionResult
53
- convertUTF8ToUTF32(const std::vector<unsigned char>&, std::vector<unsigned int>&,
54
- IceUtil::ConversionFlags);
35
+ void
36
+ convertUTF8ToUTF32(const std::vector<unsigned char>&, std::vector<unsigned int>&);
55
37
 
56
- ICE_UTIL_API ConversionResult
57
- convertUTF32ToUTF8(const std::vector<unsigned int>&, std::vector<unsigned char>&,
58
- IceUtil::ConversionFlags);
38
+ void
39
+ convertUTF32ToUTF8(const std::vector<unsigned int>&, std::vector<unsigned char>&);
59
40
 
60
41
  }
61
42
 
@@ -0,0 +1,839 @@
1
+ //
2
+ // Copyright (c) ZeroC, Inc. All rights reserved.
3
+ //
4
+
5
+ #if defined(_MSC_VER) && _MSC_VER >= 1700
6
+ //
7
+ // DbgHelp.dll on Windows XP does not contain Unicode functions, so we
8
+ // "switch on" Unicode only with VS2012 and up
9
+ //
10
+ # ifndef UNICODE
11
+ # define UNICODE
12
+ # endif
13
+ # ifndef _UNICODE
14
+ # define _UNICODE
15
+ # endif
16
+ #endif
17
+
18
+ //
19
+ // For UINTPTR_MAX on Ubuntu Precise
20
+ //
21
+ #ifndef __STDC_LIMIT_MACROS
22
+ # define __STDC_LIMIT_MACROS
23
+ #endif
24
+
25
+ #include <IceUtil/Exception.h>
26
+ #include <IceUtil/MutexPtrLock.h>
27
+ #include <IceUtil/Mutex.h>
28
+ #include <IceUtil/StringUtil.h>
29
+ #include <ostream>
30
+ #include <iomanip>
31
+ #include <cstdlib>
32
+
33
+ #ifdef __GNUC__
34
+ # if defined(ICE_LIBBACKTRACE)
35
+ # include <backtrace.h>
36
+ # include <backtrace-supported.h>
37
+ # if BACKTRACE_SUPPORTED && BACKTRACE_SUPPORTS_THREADS
38
+ # include <algorithm>
39
+ # include <cxxabi.h>
40
+ # else
41
+ // It's available but we cant' use it - shouldn't happen
42
+ # undef ICE_LIBBACKTRACE
43
+ # endif
44
+ # endif
45
+
46
+ # if !defined(_AIX) && !defined(__sun) && !defined(__FreeBSD__) && !defined(__MINGW32__) && !defined(ICE_STATIC_LIBS)
47
+ # include <execinfo.h>
48
+ # include <cxxabi.h>
49
+ # include <stdint.h>
50
+ # define ICE_BACKTRACE
51
+ # endif
52
+ #endif
53
+
54
+ //
55
+ // The Slice compilers don't retrieve the exception stack traces so we don't need the DbgHelp calls.
56
+ //
57
+ #if defined(_WIN32) && !defined(ICE_OS_UWP) && !defined(__MINGW32__) && !defined(ICE_BUILDING_SLICE_COMPILERS)
58
+ # define ICE_DBGHELP
59
+ # if defined(_MSC_VER) && (_MSC_VER >= 1700)
60
+ # define DBGHELP_TRANSLATE_TCHAR
61
+ # include <IceUtil/StringConverter.h>
62
+ # if _MSC_VER >= 1900
63
+ # pragma warning(disable:4091) // VS 2015 RC issues this warning for code in DbgHelp.h
64
+ # endif
65
+ # endif
66
+ # include <DbgHelp.h>
67
+ # include <tchar.h>
68
+ #endif
69
+
70
+ using namespace std;
71
+
72
+ namespace IceUtilInternal
73
+ {
74
+
75
+ #ifdef NDEBUG
76
+ bool ICE_API printStackTraces = false;
77
+ #else
78
+ bool ICE_API printStackTraces = true;
79
+ #endif
80
+
81
+ bool ICE_API nullHandleAbort = false;
82
+
83
+ StackTraceImpl
84
+ stackTraceImpl()
85
+ {
86
+ #if defined(ICE_DBGHELP)
87
+ return STDbghelp;
88
+ #elif defined(ICE_LIBBACKTRACE)
89
+ # if defined(ICE_BACKTRACE)
90
+ return STLibbacktracePlus;
91
+ # else
92
+ return STLibbacktrace;
93
+ # endif
94
+ #elif defined(ICE_BACKTRACE)
95
+ return STBacktrace;
96
+ #else
97
+ return STNone;
98
+ #endif
99
+ }
100
+ }
101
+
102
+ namespace
103
+ {
104
+
105
+ IceUtil::Mutex* globalMutex = 0;
106
+
107
+ #ifdef ICE_DBGHELP
108
+ HANDLE process = 0;
109
+ #endif
110
+
111
+ #ifdef ICE_LIBBACKTRACE
112
+ backtrace_state* bstate = 0;
113
+
114
+ void
115
+ ignoreErrorCallback(void*, const char* /*msg*/, int /*errnum*/)
116
+ {
117
+ // cerr << "Error callback: " << msg << ", errnum = " << errnum << endl;
118
+ }
119
+
120
+ int
121
+ ignoreFrame(void*, ICE_MAYBE_UNUSED uintptr_t pc, const char*, int, const char*)
122
+ {
123
+ assert(pc == 0);
124
+ return 0;
125
+ }
126
+
127
+ #endif
128
+
129
+ class Init
130
+ {
131
+ public:
132
+
133
+ Init()
134
+ {
135
+ globalMutex = new IceUtil::Mutex;
136
+ #ifdef ICE_LIBBACKTRACE
137
+ // Leaked, as libbacktrace does not provide an API to free this state.
138
+ //
139
+ bstate = backtrace_create_state(0, 1, ignoreErrorCallback, 0);
140
+
141
+ // The first call to backtrace_pcinfo does not initialize bstate->fileline_fn
142
+ // in a thread-safe manner, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81098.
143
+ // So we make a "dummy" call to backtrace_pcinfo to initialize it here.
144
+ //
145
+ backtrace_pcinfo(bstate, 0, ignoreFrame, ignoreErrorCallback, 0);
146
+ #endif
147
+ }
148
+
149
+ ~Init()
150
+ {
151
+ delete globalMutex;
152
+ globalMutex = 0;
153
+ #ifdef ICE_DBGHELP
154
+ if(process != 0)
155
+ {
156
+ SymCleanup(process);
157
+ process = 0;
158
+ }
159
+ #endif
160
+ }
161
+ };
162
+
163
+ Init init;
164
+
165
+ #if defined(ICE_LIBBACKTRACE) || defined (ICE_BACKTRACE)
166
+
167
+ struct FrameInfo
168
+ {
169
+ FrameInfo(int i, uintptr_t p) :
170
+ index(i),
171
+ pc(p),
172
+ fallback(0),
173
+ setByErrorCb(false)
174
+ {
175
+ }
176
+
177
+ int index;
178
+ uintptr_t pc;
179
+ const char* fallback;
180
+ bool setByErrorCb;
181
+ string output;
182
+ };
183
+
184
+ void
185
+ decode(const string& line, string& function, string& filename)
186
+ {
187
+ string::size_type openParen = line.find_first_of('(');
188
+ if(openParen != string::npos)
189
+ {
190
+ //
191
+ // Format: "/opt/Ice/lib/libIceUtil.so.33(_ZN7IceUtil9ExceptionC2EPKci+0x51) [0x73b267]"
192
+ //
193
+ string::size_type closeParen = line.find_first_of(')', openParen);
194
+ if(closeParen != string::npos)
195
+ {
196
+ string tmp = line.substr(openParen + 1, closeParen - openParen - 1);
197
+ string::size_type plus = tmp.find_last_of('+');
198
+ if(plus != string::npos)
199
+ {
200
+ function = tmp.substr(0 , plus);
201
+ filename = line.substr(0, openParen);
202
+ }
203
+ }
204
+ }
205
+ else
206
+ {
207
+ //
208
+ // Format: "1 libIce.3.3.1.dylib 0x000933a1 _ZN7IceUtil9ExceptionC2EPKci + 71"
209
+ //
210
+ string::size_type plus = line.find_last_of('+');
211
+ if(plus != string::npos)
212
+ {
213
+ string tmp = line.substr(0, plus - 1);
214
+ string::size_type space = tmp.find_last_of(" \t");
215
+ if(space != string::npos)
216
+ {
217
+ tmp = tmp.substr(space + 1, tmp.size() - space);
218
+
219
+ string::size_type start = line.find_first_not_of(" \t", 3);
220
+ if(start != string::npos)
221
+ {
222
+ string::size_type finish = line.find_first_of(" \t", start);
223
+ if(finish != string::npos)
224
+ {
225
+ function = tmp;
226
+ filename = line.substr(start, finish - start);
227
+ }
228
+ }
229
+ }
230
+ }
231
+ }
232
+ }
233
+
234
+ int
235
+ printFrame(void* data, uintptr_t pc, const char* filename, int lineno, const char* function)
236
+ {
237
+ FrameInfo& frameInfo = *reinterpret_cast<FrameInfo*>(data);
238
+
239
+ ostringstream os;
240
+ os << setw(3) << frameInfo.index << " ";
241
+
242
+ string functionHolder, filenameHolder;
243
+
244
+ if(!function && frameInfo.fallback)
245
+ {
246
+ // Extract function and filename from fallback
247
+ decode(frameInfo.fallback, functionHolder, filenameHolder);
248
+ if(!functionHolder.empty())
249
+ {
250
+ function = functionHolder.c_str();
251
+ }
252
+ if(!filename && !filenameHolder.empty())
253
+ {
254
+ filename = filenameHolder.c_str();
255
+ }
256
+ }
257
+
258
+ int ret = 0;
259
+
260
+ if(function)
261
+ {
262
+ char* demangledFunction = abi::__cxa_demangle(function, 0, 0, 0);
263
+ if(demangledFunction)
264
+ {
265
+ os << demangledFunction;
266
+ free(demangledFunction);
267
+ }
268
+ else
269
+ {
270
+ os << function;
271
+ }
272
+
273
+ if(filename && lineno > 0)
274
+ {
275
+ os << " at " << filename << ":" << lineno;
276
+ }
277
+ else if(filename)
278
+ {
279
+ os << " in " << filename;
280
+ }
281
+ }
282
+ else if(frameInfo.fallback)
283
+ {
284
+ // decode was not able to parse this string
285
+ os << frameInfo.fallback;
286
+ ret = 1;
287
+ }
288
+ else
289
+ {
290
+ os << hex << setw(sizeof(uintptr_t) * 2) << setfill('0') << pc;
291
+ ret = 2;
292
+ }
293
+ os << "\n";
294
+ frameInfo.output = os.str();
295
+ return ret;
296
+ }
297
+ #endif
298
+
299
+ #ifdef ICE_LIBBACKTRACE
300
+
301
+ void
302
+ handlePcInfoError(void* data, const char* /*msg*/, int /*errnum*/)
303
+ {
304
+ FrameInfo& frameInfo = *reinterpret_cast<FrameInfo*>(data);
305
+ printFrame(&frameInfo, frameInfo.pc, 0, 0, 0);
306
+ frameInfo.setByErrorCb = true;
307
+ }
308
+
309
+ int
310
+ addFrame(void* sf, uintptr_t pc)
311
+ {
312
+ if(pc != UINTPTR_MAX)
313
+ {
314
+ vector<void*>* stackFrames = reinterpret_cast<vector<void*>*>(sf);
315
+ stackFrames->push_back(reinterpret_cast<void*>(pc));
316
+ return 0;
317
+ }
318
+ else
319
+ {
320
+ return 1;
321
+ }
322
+ }
323
+ #endif
324
+
325
+ vector<void*>
326
+ getStackFrames()
327
+ {
328
+ vector<void*> stackFrames;
329
+
330
+ if(!IceUtilInternal::printStackTraces)
331
+ {
332
+ return stackFrames;
333
+ }
334
+
335
+ #if defined(ICE_DBGHELP)
336
+
337
+ stackFrames.resize(61);
338
+ //
339
+ // 1: skip the first frame (the call to getStackFrames)
340
+ // 1 + stackSize < 63 on Windows XP according to the documentation for CaptureStackBackTrace
341
+ //
342
+ USHORT frameCount = CaptureStackBackTrace(1, static_cast<DWORD>(stackFrames.size()), &stackFrames.front(), 0);
343
+
344
+ stackFrames.resize(frameCount);
345
+
346
+ #elif defined(ICE_LIBBACKTRACE)
347
+
348
+ backtrace_simple(bstate, 1, addFrame, ignoreErrorCallback, &stackFrames);
349
+
350
+ #elif defined(ICE_BACKTRACE)
351
+
352
+ stackFrames.resize(100);
353
+ int stackDepth = backtrace(&stackFrames.front(), static_cast<int>(stackFrames.size()));
354
+ stackFrames.resize(static_cast<size_t>(stackDepth));
355
+ if(!stackFrames.empty())
356
+ {
357
+ stackFrames.erase(stackFrames.begin()); // drop the first frame
358
+ }
359
+ #endif
360
+
361
+ return stackFrames;
362
+ }
363
+
364
+ string
365
+ getStackTrace(const vector<void*>& stackFrames)
366
+ {
367
+ if(stackFrames.empty())
368
+ {
369
+ return "";
370
+ }
371
+
372
+ string stackTrace;
373
+
374
+ #if defined(ICE_DBGHELP)
375
+
376
+ //
377
+ // Note: the Sym functions are not thread-safe
378
+ //
379
+ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
380
+ bool refreshModuleList = process != 0;
381
+ if(process == 0)
382
+ {
383
+ process = GetCurrentProcess();
384
+
385
+ SymSetOptions(SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS | SYMOPT_EXACT_SYMBOLS | SYMOPT_UNDNAME);
386
+ if(SymInitialize(process, 0, TRUE) == 0)
387
+ {
388
+ process = 0;
389
+ return "No stack trace: SymInitialize failed with " + IceUtilInternal::errorToString(GetLastError());
390
+ }
391
+ }
392
+ lock.release();
393
+
394
+ #if defined(_MSC_VER) && (_MSC_VER >= 1600)
395
+ # if defined(DBGHELP_TRANSLATE_TCHAR)
396
+ static_assert(sizeof(TCHAR) == sizeof(wchar_t), "Bad TCHAR - should be wchar_t");
397
+ # else
398
+ static_assert(sizeof(TCHAR) == sizeof(char), "Bad TCHAR - should be char");
399
+ # endif
400
+ #endif
401
+
402
+ char buffer[sizeof(SYMBOL_INFO) + MAX_SYM_NAME * sizeof(TCHAR)];
403
+
404
+ SYMBOL_INFO* symbol = reinterpret_cast<SYMBOL_INFO*>(buffer);
405
+ symbol->SizeOfStruct = sizeof(SYMBOL_INFO);
406
+ symbol->MaxNameLen = MAX_SYM_NAME;
407
+
408
+ IMAGEHLP_LINE64 line = {};
409
+ line.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
410
+ DWORD displacement = 0;
411
+
412
+ lock.acquire();
413
+
414
+ if(refreshModuleList && SymRefreshModuleList(process) == 0)
415
+ {
416
+ return "No stack trace: SymRefreshModuleList failed with " + IceUtilInternal::errorToString(GetLastError());
417
+ }
418
+ #ifdef DBGHELP_TRANSLATE_TCHAR
419
+ const IceUtil::StringConverterPtr converter = IceUtil::getProcessStringConverter();
420
+ #endif
421
+ for(size_t i = 0; i < stackFrames.size(); i++)
422
+ {
423
+ ostringstream s;
424
+ s << setw(3) << i << " ";
425
+
426
+ DWORD64 address = reinterpret_cast<DWORD64>(stackFrames[i]);
427
+
428
+ BOOL ok = SymFromAddr(process, address, 0, symbol);
429
+ if(ok)
430
+ {
431
+ #ifdef DBGHELP_TRANSLATE_TCHAR
432
+ s << wstringToString(symbol->Name, converter);
433
+ #else
434
+ s << symbol->Name;
435
+ #endif
436
+ ok = SymGetLineFromAddr64(process, address, &displacement, &line);
437
+ if(ok)
438
+ {
439
+ s << " at "
440
+ #ifdef DBGHELP_TRANSLATE_TCHAR
441
+ << wstringToString(line.FileName, converter)
442
+ #else
443
+ << line.FileName
444
+ #endif
445
+ << ":" << line.LineNumber;
446
+ }
447
+ }
448
+ else
449
+ {
450
+ s << hex << setw(sizeof(DWORD64) * 2) << setfill('0') << address;
451
+ }
452
+ s << "\n";
453
+ stackTrace += s.str();
454
+ }
455
+ lock.release();
456
+
457
+ #elif defined(ICE_LIBBACKTRACE) || defined (ICE_BACKTRACE)
458
+
459
+ vector<void*>::const_iterator p = stackFrames.begin();
460
+ int frameIndex = 0;
461
+ int offset = 0;
462
+ char** backtraceStrings = 0;
463
+
464
+ # if defined(ICE_LIBBACKTRACE) && defined(ICE_BACKTRACE)
465
+ bool backtraceStringsInitialized = false;
466
+ # endif
467
+ # if !defined(ICE_LIBBACKTRACE)
468
+ // Initialize backtraceStrings immediately
469
+ if(p != stackFrames.end())
470
+ {
471
+ backtraceStrings = backtrace_symbols(&*p, static_cast<int>(stackFrames.size()));
472
+ }
473
+ # endif
474
+
475
+ do
476
+ {
477
+ FrameInfo frameInfo(frameIndex, reinterpret_cast<uintptr_t>(*p));
478
+ bool retry = false;
479
+
480
+ if(backtraceStrings)
481
+ {
482
+ frameInfo.fallback = backtraceStrings[frameIndex - offset];
483
+ }
484
+
485
+ # if defined(ICE_LIBBACKTRACE)
486
+ bool ok = backtrace_pcinfo(bstate, frameInfo.pc, printFrame, handlePcInfoError, &frameInfo) == 0;
487
+
488
+ // When error callback is called, pcinfo returns 0
489
+ if(!ok || frameInfo.setByErrorCb)
490
+ {
491
+ # if defined(ICE_BACKTRACE)
492
+ if(!backtraceStringsInitialized)
493
+ {
494
+ offset = frameIndex;
495
+ // Initialize backtraceStrings as fallback
496
+ backtraceStrings = backtrace_symbols(&*p, stackFrames.size() - offset);
497
+ backtraceStringsInitialized = true;
498
+ retry = true;
499
+ }
500
+ # endif
501
+ }
502
+ # else // not using libbacktrace:
503
+ printFrame(&frameInfo, frameInfo.pc, 0, 0, 0);
504
+ # endif
505
+ if(!retry)
506
+ {
507
+ stackTrace += frameInfo.output;
508
+ ++p;
509
+ ++frameIndex;
510
+ }
511
+ } while(p != stackFrames.end());
512
+
513
+ if(backtraceStrings)
514
+ {
515
+ free(backtraceStrings);
516
+ }
517
+
518
+ #endif
519
+ return stackTrace;
520
+ }
521
+ }
522
+
523
+ IceUtil::Exception::Exception() :
524
+ _file(0),
525
+ _line(0),
526
+ _stackFrames(getStackFrames())
527
+ {
528
+ }
529
+
530
+ IceUtil::Exception::Exception(const char* file, int line) :
531
+ _file(file),
532
+ _line(line),
533
+ _stackFrames(getStackFrames())
534
+ {
535
+ }
536
+
537
+ #ifndef ICE_CPP11_COMPILER
538
+ IceUtil::Exception::~Exception() throw()
539
+ {
540
+ }
541
+ #endif
542
+
543
+ void
544
+ IceUtil::Exception::ice_print(ostream& out) const
545
+ {
546
+ if(_file && _line > 0)
547
+ {
548
+ out << _file << ':' << _line << ": ";
549
+ }
550
+ out << ice_id();
551
+ }
552
+
553
+ const char*
554
+ IceUtil::Exception::what() const ICE_NOEXCEPT
555
+ {
556
+ try
557
+ {
558
+ IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
559
+ {
560
+ if(_str.empty())
561
+ {
562
+ stringstream s;
563
+ ice_print(s);
564
+ _str = s.str(); // Lazy initialization.
565
+ }
566
+ }
567
+ return _str.c_str();
568
+ }
569
+ catch(...)
570
+ {
571
+ }
572
+ return "";
573
+ }
574
+
575
+ #ifndef ICE_CPP11_MAPPING
576
+ string
577
+ IceUtil::Exception::ice_name() const
578
+ {
579
+ return ice_id().substr(2);
580
+ }
581
+ #endif
582
+
583
+ const char*
584
+ IceUtil::Exception::ice_file() const
585
+ {
586
+ return _file;
587
+ }
588
+
589
+ int
590
+ IceUtil::Exception::ice_line() const
591
+ {
592
+ return _line;
593
+ }
594
+
595
+ string
596
+ IceUtil::Exception::ice_stackTrace() const
597
+ {
598
+ return getStackTrace(_stackFrames);
599
+ }
600
+
601
+ #ifdef ICE_CPP11_MAPPING
602
+ unique_ptr<IceUtil::Exception>
603
+ IceUtil::Exception::ice_clone() const
604
+ {
605
+ return unique_ptr<Exception>(ice_cloneImpl());
606
+ }
607
+ #endif
608
+
609
+ ostream&
610
+ IceUtil::operator<<(ostream& out, const IceUtil::Exception& ex)
611
+ {
612
+ ex.ice_print(out);
613
+ return out;
614
+ }
615
+
616
+ IceUtil::NullHandleException::NullHandleException(const char* file, int line) :
617
+ ExceptionHelper<NullHandleException>(file, line)
618
+ {
619
+ if(IceUtilInternal::nullHandleAbort)
620
+ {
621
+ abort();
622
+ }
623
+ }
624
+
625
+ string
626
+ IceUtil::NullHandleException::ice_id() const
627
+ {
628
+ return "::IceUtil::NullHandleException";
629
+ }
630
+
631
+ #ifndef ICE_CPP11_MAPPING
632
+ IceUtil::NullHandleException*
633
+ IceUtil::NullHandleException::ice_clone() const
634
+ {
635
+ return new NullHandleException(*this);
636
+ }
637
+ #endif
638
+
639
+ IceUtil::IllegalArgumentException::IllegalArgumentException(const char* file, int line) :
640
+ ExceptionHelper<IllegalArgumentException>(file, line)
641
+ {
642
+ }
643
+
644
+ IceUtil::IllegalArgumentException::IllegalArgumentException(const char* file, int line, const string& r) :
645
+ ExceptionHelper<IllegalArgumentException>(file, line),
646
+ _reason(r)
647
+ {
648
+ }
649
+
650
+ #ifndef ICE_CPP11_COMPILER
651
+ IceUtil::IllegalArgumentException::~IllegalArgumentException() throw()
652
+ {
653
+ }
654
+ #endif
655
+
656
+ void
657
+ IceUtil::IllegalArgumentException::ice_print(ostream& out) const
658
+ {
659
+ Exception::ice_print(out);
660
+ out << ": " << _reason;
661
+ }
662
+
663
+ string
664
+ IceUtil::IllegalArgumentException::ice_id() const
665
+ {
666
+ return "::IceUtil::IllegalArgumentException";
667
+ }
668
+
669
+ #ifndef ICE_CPP11_MAPPING
670
+ IceUtil::IllegalArgumentException*
671
+ IceUtil::IllegalArgumentException::ice_clone() const
672
+ {
673
+ return new IllegalArgumentException(*this);
674
+ }
675
+ #endif
676
+
677
+ string
678
+ IceUtil::IllegalArgumentException::reason() const
679
+ {
680
+ return _reason;
681
+ }
682
+
683
+ //
684
+ // IllegalConversionException
685
+ //
686
+ IceUtil::IllegalConversionException::IllegalConversionException(const char* file, int line):
687
+ ExceptionHelper<IllegalConversionException>(file, line)
688
+ {
689
+ }
690
+
691
+ IceUtil::IllegalConversionException::IllegalConversionException(const char* file, int line,
692
+ const string& reason):
693
+ ExceptionHelper<IllegalConversionException>(file, line),
694
+ _reason(reason)
695
+ {
696
+ }
697
+
698
+ #ifndef ICE_CPP11_COMPILER
699
+ IceUtil::IllegalConversionException::~IllegalConversionException() throw()
700
+ {
701
+ }
702
+ #endif
703
+
704
+ void
705
+ IceUtil::IllegalConversionException::ice_print(ostream& out) const
706
+ {
707
+ Exception::ice_print(out);
708
+ out << ": " << _reason;
709
+
710
+ }
711
+
712
+ string
713
+ IceUtil::IllegalConversionException::ice_id() const
714
+ {
715
+ return "::IceUtil::IllegalConversionException";
716
+ }
717
+
718
+ #ifndef ICE_CPP11_MAPPING
719
+ IceUtil::IllegalConversionException*
720
+ IceUtil::IllegalConversionException::ice_clone() const
721
+ {
722
+ return new IllegalConversionException(*this);
723
+ }
724
+ #endif
725
+
726
+ string
727
+ IceUtil::IllegalConversionException::reason() const
728
+ {
729
+ return _reason;
730
+ }
731
+
732
+ IceUtil::SyscallException::SyscallException(const char* file, int line, int err ):
733
+ ExceptionHelper<SyscallException>(file, line),
734
+ _error(err)
735
+ {
736
+ }
737
+
738
+ #ifndef ICE_CPP11_COMPILER
739
+ IceUtil::SyscallException::~SyscallException() throw()
740
+ {
741
+ }
742
+ #endif
743
+
744
+ void
745
+ IceUtil::SyscallException::ice_print(ostream& os) const
746
+ {
747
+ Exception::ice_print(os);
748
+ if(_error != 0)
749
+ {
750
+ os << ":\nsyscall exception: " << IceUtilInternal::errorToString(_error);
751
+ }
752
+ }
753
+
754
+ string
755
+ IceUtil::SyscallException::ice_id() const
756
+ {
757
+ return "::IceUtil::SyscallException";
758
+ }
759
+
760
+ #ifndef ICE_CPP11_MAPPING
761
+ IceUtil::SyscallException*
762
+ IceUtil::SyscallException::ice_clone() const
763
+ {
764
+ return new SyscallException(*this);
765
+ }
766
+ #endif
767
+
768
+ int
769
+ IceUtil::SyscallException::error() const
770
+ {
771
+ return _error;
772
+ }
773
+
774
+ IceUtil::FileLockException::FileLockException(const char* file, int line, int err, const string& path):
775
+ ExceptionHelper<FileLockException>(file, line),
776
+ _error(err),
777
+ _path(path)
778
+ {
779
+ }
780
+
781
+ #ifndef ICE_CPP11_COMPILER
782
+ IceUtil::FileLockException::~FileLockException() throw()
783
+ {
784
+ }
785
+ #endif
786
+
787
+ void
788
+ IceUtil::FileLockException::ice_print(ostream& os) const
789
+ {
790
+ Exception::ice_print(os);
791
+ os << ":\ncould not lock file: `" << _path << "'";
792
+ if(_error != 0)
793
+ {
794
+ os << "\nsyscall exception: " << IceUtilInternal::errorToString(_error);
795
+ }
796
+ }
797
+
798
+ string
799
+ IceUtil::FileLockException::ice_id() const
800
+ {
801
+ return "::IceUtil::FileLockException";
802
+ }
803
+
804
+ #ifndef ICE_CPP11_MAPPING
805
+ IceUtil::FileLockException*
806
+ IceUtil::FileLockException::ice_clone() const
807
+ {
808
+ return new FileLockException(*this);
809
+ }
810
+ #endif
811
+
812
+ int
813
+ IceUtil::FileLockException::error() const
814
+ {
815
+ return _error;
816
+ }
817
+
818
+ IceUtil::OptionalNotSetException::OptionalNotSetException(const char* file, int line) :
819
+ ExceptionHelper<OptionalNotSetException>(file, line)
820
+ {
821
+ if(IceUtilInternal::nullHandleAbort)
822
+ {
823
+ abort();
824
+ }
825
+ }
826
+
827
+ string
828
+ IceUtil::OptionalNotSetException::ice_id() const
829
+ {
830
+ return "::IceUtil::OptionalNotSetException";
831
+ }
832
+
833
+ #ifndef ICE_CPP11_MAPPING
834
+ IceUtil::OptionalNotSetException*
835
+ IceUtil::OptionalNotSetException::ice_clone() const
836
+ {
837
+ return new OptionalNotSetException(*this);
838
+ }
839
+ #endif