ffi 1.9.25 → 1.12.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (285) hide show
  1. checksums.yaml +4 -4
  2. data/{appveyor.yml → .appveyor.yml} +7 -2
  3. data/.gitignore +3 -0
  4. data/.gitmodules +1 -0
  5. data/.travis.yml +22 -30
  6. data/CHANGELOG.md +107 -0
  7. data/Gemfile +2 -2
  8. data/README.md +29 -17
  9. data/Rakefile +17 -89
  10. data/ext/ffi_c/AbstractMemory.c +5 -9
  11. data/ext/ffi_c/Call.c +18 -39
  12. data/ext/ffi_c/Call.h +4 -7
  13. data/ext/ffi_c/DynamicLibrary.c +1 -1
  14. data/ext/ffi_c/Function.c +29 -113
  15. data/ext/ffi_c/LastError.c +47 -2
  16. data/ext/ffi_c/LongDouble.c +7 -7
  17. data/ext/ffi_c/Platform.c +0 -47
  18. data/ext/ffi_c/Struct.c +47 -51
  19. data/ext/ffi_c/Struct.h +12 -6
  20. data/ext/ffi_c/StructLayout.c +13 -12
  21. data/ext/ffi_c/Thread.c +6 -222
  22. data/ext/ffi_c/Thread.h +2 -13
  23. data/ext/ffi_c/Type.c +0 -18
  24. data/ext/ffi_c/Type.h +0 -1
  25. data/ext/ffi_c/Types.c +1 -1
  26. data/ext/ffi_c/Variadic.c +9 -15
  27. data/ext/ffi_c/extconf.rb +34 -21
  28. data/ext/ffi_c/ffi.c +3 -8
  29. data/ext/ffi_c/libffi/.appveyor.yml +29 -13
  30. data/ext/ffi_c/libffi/.gitattributes +4 -0
  31. data/ext/ffi_c/libffi/.travis/bfin-sim.exp +58 -0
  32. data/ext/ffi_c/libffi/.travis/build-cross-in-container.sh +14 -0
  33. data/ext/ffi_c/libffi/.travis/build-in-container.sh +12 -0
  34. data/ext/ffi_c/libffi/.travis/build.sh +112 -8
  35. data/ext/ffi_c/libffi/.travis/install.sh +65 -16
  36. data/ext/ffi_c/libffi/.travis/m32r-sim.exp +58 -0
  37. data/ext/ffi_c/libffi/.travis/or1k-sim.exp +58 -0
  38. data/ext/ffi_c/libffi/.travis/powerpc-eabisim.exp +58 -0
  39. data/ext/ffi_c/libffi/.travis/site.exp +10 -1
  40. data/ext/ffi_c/libffi/.travis/wine-sim.exp +55 -0
  41. data/ext/ffi_c/libffi/.travis.yml +47 -2
  42. data/ext/ffi_c/libffi/{ChangeLog.libffi-3.1 → ChangeLog.old} +1407 -0
  43. data/ext/ffi_c/libffi/LICENSE +1 -1
  44. data/ext/ffi_c/libffi/LICENSE-BUILDTOOLS +5 -4
  45. data/ext/ffi_c/libffi/Makefile.am +33 -40
  46. data/ext/ffi_c/libffi/Makefile.in +392 -176
  47. data/ext/ffi_c/libffi/README.md +23 -8
  48. data/ext/ffi_c/libffi/configure +319 -343
  49. data/ext/ffi_c/libffi/configure.ac +6 -2
  50. data/ext/ffi_c/libffi/configure.host +26 -9
  51. data/ext/ffi_c/libffi/doc/Makefile.in +9 -5
  52. data/ext/ffi_c/libffi/doc/libffi.texi +26 -14
  53. data/ext/ffi_c/libffi/doc/version.texi +4 -4
  54. data/ext/ffi_c/libffi/fficonfig.h.in +4 -0
  55. data/ext/ffi_c/libffi/generate-darwin-source-and-headers.py +1 -3
  56. data/ext/ffi_c/libffi/include/Makefile.in +10 -6
  57. data/ext/ffi_c/libffi/include/ffi.h.in +11 -7
  58. data/ext/ffi_c/libffi/include/ffi_common.h +5 -1
  59. data/ext/ffi_c/libffi/install-sh +23 -13
  60. data/ext/ffi_c/libffi/libffi.xcodeproj/project.pbxproj +2 -48
  61. data/ext/ffi_c/libffi/ltmain.sh +153 -60
  62. data/ext/ffi_c/libffi/m4/asmcfi.m4 +1 -1
  63. data/ext/ffi_c/libffi/m4/ax_append_flag.m4 +5 -26
  64. data/ext/ffi_c/libffi/m4/ax_check_compile_flag.m4 +5 -26
  65. data/ext/ffi_c/libffi/m4/ax_compiler_vendor.m4 +2 -1
  66. data/ext/ffi_c/libffi/m4/ax_configure_args.m4 +5 -26
  67. data/ext/ffi_c/libffi/m4/ax_gcc_archflag.m4 +7 -3
  68. data/ext/ffi_c/libffi/make_sunver.pl +333 -0
  69. data/ext/ffi_c/libffi/man/Makefile.in +9 -5
  70. data/ext/ffi_c/libffi/missing +8 -8
  71. data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.sln +33 -0
  72. data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.vcxproj +130 -0
  73. data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.vcxproj.filters +57 -0
  74. data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.vcxproj.user +4 -0
  75. data/ext/ffi_c/libffi/msvc_build/aarch64/aarch64_include/ffi.h +511 -0
  76. data/ext/ffi_c/libffi/msvc_build/aarch64/aarch64_include/fficonfig.h +219 -0
  77. data/ext/ffi_c/libffi/msvcc.sh +27 -2
  78. data/ext/ffi_c/libffi/src/aarch64/ffi.c +126 -58
  79. data/ext/ffi_c/libffi/src/aarch64/ffitarget.h +13 -2
  80. data/ext/ffi_c/libffi/src/aarch64/sysv.S +8 -6
  81. data/ext/ffi_c/libffi/src/aarch64/win64_armasm.S +506 -0
  82. data/ext/ffi_c/libffi/src/arm/ffi.c +40 -5
  83. data/ext/ffi_c/libffi/src/arm/ffitarget.h +8 -1
  84. data/ext/ffi_c/libffi/src/arm/sysv.S +2 -0
  85. data/ext/ffi_c/libffi/src/arm/sysv_msvc_arm32.S +311 -0
  86. data/ext/ffi_c/libffi/src/closures.c +41 -9
  87. data/ext/ffi_c/libffi/src/frv/ffi.c +1 -1
  88. data/ext/ffi_c/libffi/src/metag/ffi.c +1 -1
  89. data/ext/ffi_c/libffi/src/mips/o32.S +2 -0
  90. data/ext/ffi_c/libffi/src/moxie/ffi.c +1 -1
  91. data/ext/ffi_c/libffi/src/pa/linux.S +23 -2
  92. data/ext/ffi_c/libffi/src/powerpc/ffi.c +6 -4
  93. data/ext/ffi_c/libffi/src/powerpc/ffi_linux64.c +211 -32
  94. data/ext/ffi_c/libffi/src/powerpc/ffi_powerpc.h +18 -7
  95. data/ext/ffi_c/libffi/src/powerpc/ffitarget.h +10 -4
  96. data/ext/ffi_c/libffi/src/powerpc/linux64.S +83 -28
  97. data/ext/ffi_c/libffi/src/powerpc/linux64_closure.S +68 -4
  98. data/ext/ffi_c/libffi/src/prep_cif.c +4 -2
  99. data/ext/ffi_c/libffi/src/riscv/ffi.c +42 -6
  100. data/ext/ffi_c/libffi/src/riscv/ffitarget.h +1 -0
  101. data/ext/ffi_c/libffi/src/riscv/sysv.S +86 -7
  102. data/ext/ffi_c/libffi/src/x86/ffi.c +14 -6
  103. data/ext/ffi_c/libffi/src/x86/ffi64.c +5 -3
  104. data/ext/ffi_c/libffi/src/x86/ffiw64.c +5 -2
  105. data/ext/ffi_c/libffi/src/x86/sysv.S +90 -4
  106. data/ext/ffi_c/libffi/src/x86/sysv_intel.S +995 -0
  107. data/ext/ffi_c/libffi/src/x86/unix64.S +41 -0
  108. data/ext/ffi_c/libffi/src/x86/win64.S +5 -0
  109. data/ext/ffi_c/libffi/testsuite/Makefile.am +114 -109
  110. data/ext/ffi_c/libffi/testsuite/Makefile.in +124 -84
  111. data/ext/ffi_c/libffi/testsuite/lib/libffi.exp +26 -22
  112. data/ext/ffi_c/libffi/testsuite/libffi.bhaible/bhaible.exp +7 -2
  113. data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-call.c +1 -1
  114. data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-callback.c +1 -1
  115. data/ext/ffi_c/libffi/testsuite/libffi.call/call.exp +12 -1
  116. data/ext/ffi_c/libffi/testsuite/libffi.call/float2.c +9 -8
  117. data/ext/ffi_c/libffi/testsuite/libffi.call/va_1.c +1 -1
  118. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure.exp +67 -0
  119. data/ext/ffi_c/libffi/testsuite/libffi.closures/ffitest.h +138 -0
  120. data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/huge_struct.c +1 -1
  121. data/ext/ffi_c/libffi.darwin.mk +1 -1
  122. data/ext/ffi_c/rbffi.h +0 -2
  123. data/ffi.gemspec +12 -5
  124. data/lib/ffi/data_converter.rb +67 -0
  125. data/lib/ffi/ffi.rb +2 -0
  126. data/lib/ffi/library.rb +6 -6
  127. data/lib/ffi/platform/aarch64-freebsd/types.conf +128 -0
  128. data/lib/ffi/platform/aarch64-freebsd12/types.conf +128 -0
  129. data/lib/ffi/platform/aarch64-linux/types.conf +81 -81
  130. data/lib/ffi/platform/arm-freebsd/types.conf +152 -0
  131. data/lib/ffi/platform/arm-freebsd12/types.conf +152 -0
  132. data/lib/ffi/platform/arm-linux/types.conf +79 -79
  133. data/lib/ffi/platform/i386-cygwin/types.conf +1 -1
  134. data/lib/ffi/platform/i386-darwin/types.conf +63 -63
  135. data/lib/ffi/platform/i386-freebsd/types.conf +89 -89
  136. data/lib/ffi/platform/i386-freebsd12/types.conf +152 -0
  137. data/lib/ffi/platform/i386-gnu/types.conf +84 -84
  138. data/lib/ffi/platform/i386-linux/types.conf +77 -77
  139. data/lib/ffi/platform/i386-netbsd/types.conf +87 -87
  140. data/lib/ffi/platform/i386-openbsd/types.conf +89 -89
  141. data/lib/ffi/platform/i386-solaris/types.conf +96 -96
  142. data/lib/ffi/platform/i386-windows/types.conf +84 -84
  143. data/lib/ffi/platform/ia64-linux/types.conf +79 -79
  144. data/lib/ffi/platform/mips-linux/types.conf +79 -79
  145. data/lib/ffi/platform/mips64-linux/types.conf +81 -81
  146. data/lib/ffi/platform/mips64el-linux/types.conf +81 -81
  147. data/lib/ffi/platform/mipsel-linux/types.conf +79 -79
  148. data/lib/ffi/platform/mipsisa32r6-linux/types.conf +79 -79
  149. data/lib/ffi/platform/mipsisa32r6el-linux/types.conf +79 -79
  150. data/lib/ffi/platform/mipsisa64r6-linux/types.conf +81 -81
  151. data/lib/ffi/platform/mipsisa64r6el-linux/types.conf +81 -81
  152. data/lib/ffi/platform/powerpc-aix/types.conf +155 -155
  153. data/lib/ffi/platform/powerpc-darwin/types.conf +63 -63
  154. data/lib/ffi/platform/powerpc-linux/types.conf +77 -77
  155. data/lib/ffi/platform/powerpc64-linux/types.conf +81 -81
  156. data/lib/ffi/platform/s390-linux/types.conf +79 -79
  157. data/lib/ffi/platform/s390x-linux/types.conf +79 -79
  158. data/lib/ffi/platform/sparc-linux/types.conf +79 -79
  159. data/lib/ffi/platform/sparc-solaris/types.conf +103 -103
  160. data/lib/ffi/platform/sparc64-linux/types.conf +79 -79
  161. data/lib/ffi/platform/sparcv9-solaris/types.conf +103 -103
  162. data/lib/ffi/platform/x86_64-cygwin/types.conf +1 -1
  163. data/lib/ffi/platform/x86_64-darwin/types.conf +84 -84
  164. data/lib/ffi/platform/x86_64-dragonflybsd/types.conf +148 -0
  165. data/lib/ffi/platform/x86_64-freebsd/types.conf +90 -90
  166. data/lib/ffi/platform/x86_64-freebsd12/types.conf +158 -0
  167. data/lib/ffi/platform/x86_64-linux/types.conf +86 -77
  168. data/lib/ffi/platform/x86_64-netbsd/types.conf +89 -89
  169. data/lib/ffi/platform/x86_64-openbsd/types.conf +86 -86
  170. data/lib/ffi/platform/x86_64-solaris/types.conf +96 -96
  171. data/lib/ffi/platform/x86_64-windows/types.conf +99 -99
  172. data/lib/ffi/platform.rb +13 -2
  173. data/lib/ffi/pointer.rb +5 -6
  174. data/lib/ffi/struct.rb +5 -66
  175. data/lib/ffi/struct_by_reference.rb +72 -0
  176. data/lib/ffi/struct_layout.rb +96 -0
  177. data/lib/ffi/tools/const_generator.rb +5 -4
  178. data/lib/ffi/tools/generator.rb +47 -2
  179. data/lib/ffi/tools/generator_task.rb +13 -17
  180. data/lib/ffi/tools/struct_generator.rb +4 -4
  181. data/lib/ffi/tools/types_generator.rb +5 -4
  182. data/lib/ffi/types.rb +1 -1
  183. data/lib/ffi/version.rb +1 -1
  184. metadata +144 -115
  185. data/ext/ffi_c/DataConverter.c +0 -91
  186. data/ext/ffi_c/StructByReference.c +0 -190
  187. data/ext/ffi_c/StructByReference.h +0 -50
  188. data/ext/ffi_c/libffi/ChangeLog.libffi +0 -584
  189. data/ext/ffi_c/libffi/ChangeLog.libgcj +0 -40
  190. data/ext/ffi_c/libffi/ChangeLog.v1 +0 -764
  191. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn0.c +0 -0
  192. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn1.c +0 -0
  193. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn2.c +0 -0
  194. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn3.c +0 -0
  195. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn4.c +0 -0
  196. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn5.c +0 -0
  197. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn6.c +0 -0
  198. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_loc_fn0.c +0 -0
  199. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_simple.c +0 -0
  200. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_12byte.c +0 -0
  201. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_16byte.c +0 -0
  202. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_18byte.c +0 -0
  203. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_19byte.c +0 -0
  204. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_1_1byte.c +0 -0
  205. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_20byte.c +0 -0
  206. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_20byte1.c +0 -0
  207. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_24byte.c +0 -0
  208. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_2byte.c +0 -0
  209. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3_1byte.c +0 -0
  210. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3byte1.c +0 -0
  211. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3byte2.c +0 -0
  212. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3float.c +0 -0
  213. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_4_1byte.c +0 -0
  214. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_4byte.c +0 -0
  215. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_5_1_byte.c +0 -0
  216. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_5byte.c +0 -0
  217. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_64byte.c +0 -0
  218. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_6_1_byte.c +0 -0
  219. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_6byte.c +0 -0
  220. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_7_1_byte.c +0 -0
  221. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_7byte.c +0 -0
  222. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_8byte.c +0 -0
  223. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_9byte1.c +0 -0
  224. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_9byte2.c +0 -0
  225. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_double.c +0 -0
  226. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_float.c +0 -0
  227. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble.c +0 -0
  228. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble_split.c +0 -0
  229. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble_split2.c +0 -0
  230. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_pointer.c +0 -0
  231. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint16.c +0 -0
  232. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint32.c +0 -0
  233. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint64.c +0 -0
  234. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint16.c +0 -0
  235. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint32.c +0 -0
  236. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint64.c +0 -0
  237. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_dbls_struct.c +0 -0
  238. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_double.c +0 -0
  239. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_double_va.c +0 -0
  240. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_float.c +0 -0
  241. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_longdouble.c +0 -0
  242. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_longdouble_va.c +0 -0
  243. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_many_mixed_args.c +0 -0
  244. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_many_mixed_float_double.c +0 -0
  245. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_schar.c +0 -0
  246. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_sshort.c +0 -0
  247. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_sshortchar.c +0 -0
  248. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_uchar.c +0 -0
  249. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_ushort.c +0 -0
  250. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_ushortchar.c +0 -0
  251. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_pointer.c +0 -0
  252. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_pointer_stack.c +0 -0
  253. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_schar.c +0 -0
  254. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_sint.c +0 -0
  255. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_sshort.c +0 -0
  256. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_struct_va1.c +0 -0
  257. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uchar.c +0 -0
  258. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uchar_va.c +0 -0
  259. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uint.c +0 -0
  260. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uint_va.c +0 -0
  261. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ulong_va.c +0 -0
  262. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ulonglong.c +0 -0
  263. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ushort.c +0 -0
  264. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ushort_va.c +0 -0
  265. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/err_bad_abi.c +0 -0
  266. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct.c +0 -0
  267. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct1.c +0 -0
  268. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct10.c +0 -0
  269. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct11.c +0 -0
  270. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct2.c +0 -0
  271. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct3.c +0 -0
  272. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct4.c +0 -0
  273. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct5.c +0 -0
  274. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct6.c +0 -0
  275. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct7.c +0 -0
  276. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct8.c +0 -0
  277. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct9.c +0 -0
  278. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/problem1.c +0 -0
  279. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_large.c +0 -0
  280. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_large2.c +0 -0
  281. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_medium.c +0 -0
  282. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_medium2.c +0 -0
  283. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/testclosure.c +0 -0
  284. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/unwindtest.cc +0 -0
  285. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/unwindtest_ffi_call.cc +0 -0
data/ext/ffi_c/Struct.c CHANGED
@@ -90,7 +90,7 @@ struct_allocate(VALUE klass)
90
90
  {
91
91
  Struct* s;
92
92
  VALUE obj = Data_Make_Struct(klass, Struct, struct_mark, struct_free, s);
93
-
93
+
94
94
  s->rbPointer = Qnil;
95
95
  s->rbLayout = Qnil;
96
96
 
@@ -112,7 +112,7 @@ struct_initialize(int argc, VALUE* argv, VALUE self)
112
112
  int nargs;
113
113
 
114
114
  Data_Get_Struct(self, Struct, s);
115
-
115
+
116
116
  nargs = rb_scan_args(argc, argv, "01*", &rbPointer, &rest);
117
117
 
118
118
  /* Call up into ruby code to adjust the layout */
@@ -127,7 +127,7 @@ struct_initialize(int argc, VALUE* argv, VALUE self)
127
127
  }
128
128
 
129
129
  Data_Get_Struct(s->rbLayout, StructLayout, s->layout);
130
-
130
+
131
131
  if (rbPointer != Qnil) {
132
132
  s->pointer = MEMORY(rbPointer);
133
133
  s->rbPointer = rbPointer;
@@ -148,16 +148,16 @@ struct_initialize_copy(VALUE self, VALUE other)
148
148
  {
149
149
  Struct* src;
150
150
  Struct* dst;
151
-
151
+
152
152
  Data_Get_Struct(self, Struct, dst);
153
153
  Data_Get_Struct(other, Struct, src);
154
154
  if (dst == src) {
155
155
  return self;
156
156
  }
157
-
157
+
158
158
  dst->rbLayout = src->rbLayout;
159
159
  dst->layout = src->layout;
160
-
160
+
161
161
  /*
162
162
  * A new MemoryPointer instance is allocated here instead of just calling
163
163
  * #dup on rbPointer, since the Pointer may not know its length, or may
@@ -176,7 +176,7 @@ struct_initialize_copy(VALUE self, VALUE other)
176
176
  dst->rbReferences = ALLOC_N(VALUE, dst->layout->referenceFieldCount);
177
177
  memcpy(dst->rbReferences, src->rbReferences, dst->layout->referenceFieldCount * sizeof(VALUE));
178
178
  }
179
-
179
+
180
180
  return self;
181
181
  }
182
182
 
@@ -279,24 +279,25 @@ store_reference_value(StructField* f, Struct* s, VALUE value)
279
279
  }
280
280
 
281
281
 
282
- static VALUE
282
+ static StructField *
283
283
  struct_field(Struct* s, VALUE fieldName)
284
284
  {
285
285
  StructLayout* layout = s->layout;
286
- VALUE rbField;
287
-
288
- if (likely(SYMBOL_P(fieldName) && st_lookup(layout->fieldSymbolTable, fieldName, (st_data_t *) &rbField))) {
289
- return rbField;
290
- }
291
-
292
- // TODO does this ever return anything?
293
- rbField = rb_hash_aref(layout->rbFieldMap, fieldName);
294
- if (rbField == Qnil) {
295
- VALUE str = rb_funcall2(fieldName, id_to_s, 0, NULL);
296
- rb_raise(rb_eArgError, "No such field '%s'", StringValuePtr(str));
286
+ struct field_cache_entry *p_ce = FIELD_CACHE_LOOKUP(layout, fieldName);
287
+
288
+ /* Do a hash lookup only if cache entry is empty or fieldName is unexpected? */
289
+ if (unlikely(!SYMBOL_P(fieldName) || !p_ce->fieldName || p_ce->fieldName != fieldName)) {
290
+ VALUE rbField = rb_hash_aref(layout->rbFieldMap, fieldName);
291
+ if (unlikely(NIL_P(rbField))) {
292
+ VALUE str = rb_funcall2(fieldName, id_to_s, 0, NULL);
293
+ rb_raise(rb_eArgError, "No such field '%s'", StringValuePtr(str));
294
+ }
295
+ /* Write the retrieved coder to the cache */
296
+ p_ce->fieldName = fieldName;
297
+ p_ce->field = (StructField *) DATA_PTR(rbField);
297
298
  }
298
299
 
299
- return rbField;
300
+ return p_ce->field;
300
301
  }
301
302
 
302
303
  /*
@@ -308,22 +309,19 @@ static VALUE
308
309
  struct_aref(VALUE self, VALUE fieldName)
309
310
  {
310
311
  Struct* s;
311
- VALUE rbField;
312
312
  StructField* f;
313
313
 
314
314
  s = struct_validate(self);
315
315
 
316
- rbField = struct_field(s, fieldName);
317
- f = (StructField *) DATA_PTR(rbField);
318
-
316
+ f = struct_field(s, fieldName);
319
317
  if (f->get != NULL) {
320
318
  return (*f->get)(f, s);
321
-
319
+
322
320
  } else if (f->memoryOp != NULL) {
323
321
  return (*f->memoryOp->get)(s->pointer, f->offset);
324
322
 
325
323
  } else {
326
-
324
+ VALUE rbField = rb_hash_aref(s->layout->rbFieldMap, fieldName);
327
325
  /* call up to the ruby code to fetch the value */
328
326
  return rb_funcall2(rbField, id_get, 1, &s->rbPointer);
329
327
  }
@@ -340,22 +338,20 @@ static VALUE
340
338
  struct_aset(VALUE self, VALUE fieldName, VALUE value)
341
339
  {
342
340
  Struct* s;
343
- VALUE rbField;
344
341
  StructField* f;
345
342
 
346
-
347
343
  s = struct_validate(self);
348
344
 
349
- rbField = struct_field(s, fieldName);
350
- f = (StructField *) DATA_PTR(rbField);
345
+ f = struct_field(s, fieldName);
351
346
  if (f->put != NULL) {
352
347
  (*f->put)(f, s, value);
353
348
 
354
349
  } else if (f->memoryOp != NULL) {
355
350
 
356
351
  (*f->memoryOp->put)(s->pointer, f->offset, value);
357
-
352
+
358
353
  } else {
354
+ VALUE rbField = rb_hash_aref(s->layout->rbFieldMap, fieldName);
359
355
  /* call up to the ruby code to set the value */
360
356
  VALUE argv[2];
361
357
  argv[0] = s->rbPointer;
@@ -366,7 +362,7 @@ struct_aset(VALUE self, VALUE fieldName, VALUE value)
366
362
  if (f->referenceRequired) {
367
363
  store_reference_value(f, s, value);
368
364
  }
369
-
365
+
370
366
  return value;
371
367
  }
372
368
 
@@ -389,7 +385,7 @@ struct_set_pointer(VALUE self, VALUE pointer)
389
385
  return Qnil;
390
386
  }
391
387
 
392
-
388
+
393
389
  Data_Get_Struct(self, Struct, s);
394
390
  Data_Get_Struct(pointer, AbstractMemory, memory);
395
391
  layout = struct_layout(self);
@@ -398,7 +394,7 @@ struct_set_pointer(VALUE self, VALUE pointer)
398
394
  rb_raise(rb_eArgError, "memory of %ld bytes too small for struct %s (expected at least %ld)",
399
395
  memory->size, rb_obj_classname(self), (long) layout->base.ffiType->size);
400
396
  }
401
-
397
+
402
398
  s->pointer = MEMORY(pointer);
403
399
  s->rbPointer = pointer;
404
400
  rb_ivar_set(self, id_pointer_ivar, pointer);
@@ -491,7 +487,7 @@ struct_order(int argc, VALUE* argv, VALUE self)
491
487
  VALUE retval = rb_obj_dup(self);
492
488
  VALUE rbPointer = rb_funcall2(s->rbPointer, rb_intern("order"), argc, argv);
493
489
  struct_set_pointer(retval, rbPointer);
494
-
490
+
495
491
  return retval;
496
492
  }
497
493
  }
@@ -527,7 +523,7 @@ static VALUE
527
523
  inline_array_initialize(VALUE self, VALUE rbMemory, VALUE rbField)
528
524
  {
529
525
  InlineArray* array;
530
-
526
+
531
527
  Data_Get_Struct(self, InlineArray, array);
532
528
  array->rbMemory = rbMemory;
533
529
  array->rbField = rbField;
@@ -536,12 +532,12 @@ inline_array_initialize(VALUE self, VALUE rbMemory, VALUE rbField)
536
532
  Data_Get_Struct(rbField, StructField, array->field);
537
533
  Data_Get_Struct(array->field->rbType, ArrayType, array->arrayType);
538
534
  Data_Get_Struct(array->arrayType->rbComponentType, Type, array->componentType);
539
-
535
+
540
536
  array->op = get_memory_op(array->componentType);
541
537
  if (array->op == NULL && array->componentType->nativeType == NATIVE_MAPPED) {
542
538
  array->op = get_memory_op(((MappedType *) array->componentType)->type);
543
539
  }
544
-
540
+
545
541
  array->length = array->arrayType->length;
546
542
 
547
543
  return self;
@@ -585,15 +581,15 @@ inline_array_aref(VALUE self, VALUE rbIndex)
585
581
  Data_Get_Struct(self, InlineArray, array);
586
582
 
587
583
  if (array->op != NULL) {
588
- VALUE rbNativeValue = array->op->get(array->memory,
584
+ VALUE rbNativeValue = array->op->get(array->memory,
589
585
  inline_array_offset(array, NUM2INT(rbIndex)));
590
586
  if (unlikely(array->componentType->nativeType == NATIVE_MAPPED)) {
591
- return rb_funcall(((MappedType *) array->componentType)->rbConverter,
587
+ return rb_funcall(((MappedType *) array->componentType)->rbConverter,
592
588
  rb_intern("from_native"), 2, rbNativeValue, Qnil);
593
589
  } else {
594
- return rbNativeValue;
590
+ return rbNativeValue;
595
591
  }
596
-
592
+
597
593
  } else if (array->componentType->nativeType == NATIVE_STRUCT) {
598
594
  VALUE rbOffset = INT2NUM(inline_array_offset(array, NUM2INT(rbIndex)));
599
595
  VALUE rbLength = INT2NUM(array->componentType->ffiType->size);
@@ -622,12 +618,12 @@ inline_array_aset(VALUE self, VALUE rbIndex, VALUE rbValue)
622
618
 
623
619
  if (array->op != NULL) {
624
620
  if (unlikely(array->componentType->nativeType == NATIVE_MAPPED)) {
625
- rbValue = rb_funcall(((MappedType *) array->componentType)->rbConverter,
621
+ rbValue = rb_funcall(((MappedType *) array->componentType)->rbConverter,
626
622
  rb_intern("to_native"), 2, rbValue, Qnil);
627
623
  }
628
624
  array->op->put(array->memory, inline_array_offset(array, NUM2INT(rbIndex)),
629
625
  rbValue);
630
-
626
+
631
627
  } else if (array->componentType->nativeType == NATIVE_STRUCT) {
632
628
  int offset = inline_array_offset(array, NUM2INT(rbIndex));
633
629
  Struct* s;
@@ -665,11 +661,11 @@ static VALUE
665
661
  inline_array_each(VALUE self)
666
662
  {
667
663
  InlineArray* array;
668
-
664
+
669
665
  int i;
670
666
 
671
667
  Data_Get_Struct(self, InlineArray, array);
672
-
668
+
673
669
  for (i = 0; i < array->length; ++i) {
674
670
  rb_yield(inline_array_aref(self, INT2FIX(i)));
675
671
  }
@@ -692,7 +688,7 @@ inline_array_to_a(VALUE self)
692
688
  Data_Get_Struct(self, InlineArray, array);
693
689
  obj = rb_ary_new2(array->length);
694
690
 
695
-
691
+
696
692
  for (i = 0; i < array->length; ++i) {
697
693
  rb_ary_push(obj, inline_array_aref(self, INT2FIX(i)));
698
694
  }
@@ -713,7 +709,7 @@ inline_array_to_s(VALUE self)
713
709
  VALUE argv[2];
714
710
 
715
711
  Data_Get_Struct(self, InlineArray, array);
716
-
712
+
717
713
  if (array->componentType->nativeType != NATIVE_INT8 && array->componentType->nativeType != NATIVE_UINT8) {
718
714
  VALUE dummy = Qnil;
719
715
  return rb_call_super(0, &dummy);
@@ -734,7 +730,7 @@ static VALUE
734
730
  inline_array_to_ptr(VALUE self)
735
731
  {
736
732
  InlineArray* array;
737
-
733
+
738
734
  Data_Get_Struct(self, InlineArray, array);
739
735
 
740
736
  return rb_funcall(array->rbMemory, rb_intern("slice"), 2,
@@ -778,7 +774,7 @@ rbffi_Struct_Init(VALUE moduleFFI)
778
774
  /*
779
775
  * Document-class: FFI::StructLayout::CharArray < FFI::Struct::InlineArray
780
776
  */
781
- rbffi_StructLayoutCharArrayClass = rb_define_class_under(rbffi_StructLayoutClass, "CharArray",
777
+ rbffi_StructLayoutCharArrayClass = rb_define_class_under(rbffi_StructLayoutClass, "CharArray",
782
778
  rbffi_StructInlineArrayClass);
783
779
  rb_global_variable(&rbffi_StructLayoutCharArrayClass);
784
780
 
@@ -787,7 +783,7 @@ rbffi_Struct_Init(VALUE moduleFFI)
787
783
  rb_define_method(StructClass, "initialize", struct_initialize, -1);
788
784
  rb_define_method(StructClass, "initialize_copy", struct_initialize_copy, 1);
789
785
  rb_define_method(StructClass, "order", struct_order, -1);
790
-
786
+
791
787
  rb_define_alias(rb_singleton_class(StructClass), "alloc_in", "new");
792
788
  rb_define_alias(rb_singleton_class(StructClass), "alloc_out", "new");
793
789
  rb_define_alias(rb_singleton_class(StructClass), "alloc_inout", "new");
data/ext/ffi_c/Struct.h CHANGED
@@ -34,11 +34,7 @@
34
34
  #include "extconf.h"
35
35
  #include "AbstractMemory.h"
36
36
  #include "Type.h"
37
- #ifdef RUBY_1_9
38
37
  #include <ruby/st.h>
39
- #else
40
- #include <st.h>
41
- #endif
42
38
 
43
39
  #ifdef __cplusplus
44
40
  extern "C" {
@@ -73,11 +69,21 @@ extern "C" {
73
69
  int size;
74
70
  int align;
75
71
  ffi_type** ffiTypes;
76
- struct st_table* fieldSymbolTable;
72
+
73
+ /*
74
+ * We use the fieldName's minor 8 Bits as index to a 256 entry cache.
75
+ * This avoids full ruby hash lookups for repeated lookups.
76
+ */
77
+ #define FIELD_CACHE_LOOKUP(this, sym) ( &(this)->cache_row[((sym) >> 8) & 0xff] )
78
+
79
+ struct field_cache_entry {
80
+ VALUE fieldName;
81
+ StructField *field;
82
+ } cache_row[0x100];
77
83
 
78
84
  /** The number of reference tracking fields in this struct */
79
85
  int referenceFieldCount;
80
-
86
+
81
87
  VALUE rbFieldNames;
82
88
  VALUE rbFieldMap;
83
89
  VALUE rbFields;
@@ -138,7 +138,7 @@ struct_field_initialize(int argc, VALUE* argv, VALUE self)
138
138
  && RTEST(rb_funcall2(rbType, rb_intern("reference_required?"), 0, NULL)));
139
139
  break;
140
140
  }
141
-
141
+
142
142
  return self;
143
143
  }
144
144
 
@@ -239,7 +239,7 @@ static VALUE
239
239
  struct_field_put(VALUE self, VALUE pointer, VALUE value)
240
240
  {
241
241
  StructField* f;
242
-
242
+
243
243
  Data_Get_Struct(self, StructField, f);
244
244
  if (f->memoryOp == NULL) {
245
245
  rb_raise(rb_eArgError, "put not supported for %s", rb_obj_classname(f->rbType));
@@ -261,7 +261,7 @@ static VALUE
261
261
  function_field_get(VALUE self, VALUE pointer)
262
262
  {
263
263
  StructField* f;
264
-
264
+
265
265
  Data_Get_Struct(self, StructField, f);
266
266
 
267
267
  return rbffi_Function_NewInstance(f->rbType, (*rbffi_AbstractMemoryOps.pointer->get)(MEMORY(pointer), f->offset));
@@ -272,7 +272,7 @@ function_field_get(VALUE self, VALUE pointer)
272
272
  * @param [AbstractMemory] pointer pointer to a {Struct}
273
273
  * @param [Function, Proc] proc
274
274
  * @return [Function]
275
- * Set a {Function} to memory pointed by +pointer+ as a function.
275
+ * Set a {Function} to memory pointed by +pointer+ as a function.
276
276
  *
277
277
  * If a Proc is submitted as +proc+, it is automatically transformed to a {Function}.
278
278
  */
@@ -339,11 +339,11 @@ array_field_put(VALUE self, VALUE pointer, VALUE value)
339
339
  {
340
340
  StructField* f;
341
341
  ArrayType* array;
342
-
342
+
343
343
 
344
344
  Data_Get_Struct(self, StructField, f);
345
345
  Data_Get_Struct(f->rbType, ArrayType, array);
346
-
346
+
347
347
  if (isCharArray(array) && rb_obj_is_instance_of(value, rb_cString)) {
348
348
  VALUE argv[2];
349
349
 
@@ -419,7 +419,6 @@ struct_layout_allocate(VALUE klass)
419
419
  layout->rbFieldMap = Qnil;
420
420
  layout->rbFieldNames = Qnil;
421
421
  layout->rbFields = Qnil;
422
- layout->fieldSymbolTable = st_init_numtable();
423
422
  layout->base.ffiType = xcalloc(1, sizeof(*layout->base.ffiType));
424
423
  layout->base.ffiType->size = 0;
425
424
  layout->base.ffiType->alignment = 0;
@@ -488,7 +487,6 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
488
487
 
489
488
 
490
489
  layout->ffiTypes[i] = ftype->size > 0 ? ftype : NULL;
491
- st_insert(layout->fieldSymbolTable, rbName, rbField);
492
490
  rb_hash_aset(layout->rbFieldMap, rbName, rbField);
493
491
  rb_ary_push(layout->rbFields, rbField);
494
492
  rb_ary_push(layout->rbFieldNames, rbName);
@@ -501,14 +499,14 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
501
499
  return self;
502
500
  }
503
501
 
504
- /*
502
+ /*
505
503
  * call-seq: [](field)
506
504
  * @param [Symbol] field
507
505
  * @return [StructLayout::Field]
508
506
  * Get a field from the layout.
509
507
  */
510
508
  static VALUE
511
- struct_layout_union_bang(VALUE self)
509
+ struct_layout_union_bang(VALUE self)
512
510
  {
513
511
  const ffi_type *alignment_types[] = { &ffi_type_sint8, &ffi_type_sint16, &ffi_type_sint32, &ffi_type_sint64,
514
512
  &ffi_type_float, &ffi_type_double, &ffi_type_longdouble, NULL };
@@ -602,6 +600,10 @@ struct_layout_mark(StructLayout *layout)
602
600
  rb_gc_mark(layout->rbFieldMap);
603
601
  rb_gc_mark(layout->rbFieldNames);
604
602
  rb_gc_mark(layout->rbFields);
603
+ /* Clear the cache, to be safe from changes of fieldName VALUE by GC.compact.
604
+ * TODO: Move cache clearing to compactation callback provided by Ruby-2.7+.
605
+ */
606
+ memset(&layout->cache_row, 0, sizeof(layout->cache_row));
605
607
  }
606
608
 
607
609
  static void
@@ -610,7 +612,6 @@ struct_layout_free(StructLayout *layout)
610
612
  xfree(layout->ffiTypes);
611
613
  xfree(layout->base.ffiType);
612
614
  xfree(layout->fields);
613
- st_free_table(layout->fieldSymbolTable);
614
615
  xfree(layout);
615
616
  }
616
617
 
@@ -627,7 +628,7 @@ rbffi_StructLayout_Init(VALUE moduleFFI)
627
628
  */
628
629
  rbffi_StructLayoutClass = rb_define_class_under(moduleFFI, "StructLayout", ffi_Type);
629
630
  rb_global_variable(&rbffi_StructLayoutClass);
630
-
631
+
631
632
  /*
632
633
  * Document-class: FFI::StructLayout::Field
633
634
  * A field in a {StructLayout}.
data/ext/ffi_c/Thread.c CHANGED
@@ -70,13 +70,15 @@ rbffi_frame_current(void)
70
70
  #endif
71
71
  }
72
72
 
73
- void
73
+ void
74
74
  rbffi_frame_push(rbffi_frame_t* frame)
75
75
  {
76
76
  memset(frame, 0, sizeof(*frame));
77
+ #ifndef HAVE_RUBY_THREAD_HAS_GVL_P
77
78
  frame->has_gvl = true;
79
+ #endif
78
80
  frame->exc = Qnil;
79
-
81
+
80
82
  #ifdef _WIN32
81
83
  frame->prev = TlsGetValue(frame_thread_key);
82
84
  TlsSetValue(frame_thread_key, frame);
@@ -87,7 +89,7 @@ rbffi_frame_push(rbffi_frame_t* frame)
87
89
  #endif
88
90
  }
89
91
 
90
- void
92
+ void
91
93
  rbffi_frame_pop(rbffi_frame_t* frame)
92
94
  {
93
95
  #ifdef _WIN32
@@ -97,224 +99,6 @@ rbffi_frame_pop(rbffi_frame_t* frame)
97
99
  #endif
98
100
  }
99
101
 
100
- #if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
101
-
102
- #if !defined(_WIN32)
103
-
104
- struct BlockingThread {
105
- pthread_t tid;
106
- VALUE (*fn)(void *);
107
- void *data;
108
- void (*ubf)(void *);
109
- void *data2;
110
- VALUE retval;
111
- int wrfd;
112
- int rdfd;
113
- };
114
-
115
- static void*
116
- rbffi_blocking_thread(void* args)
117
- {
118
- struct BlockingThread* thr = (struct BlockingThread *) args;
119
- char c = 1;
120
- VALUE retval;
121
-
122
- retval = (*thr->fn)(thr->data);
123
-
124
- pthread_testcancel();
125
-
126
- thr->retval = retval;
127
-
128
- write(thr->wrfd, &c, sizeof(c));
129
-
130
- return NULL;
131
- }
132
-
133
- static VALUE
134
- wait_for_thread(void *data)
135
- {
136
- struct BlockingThread* thr = (struct BlockingThread *) data;
137
- char c;
138
-
139
- if (read(thr->rdfd, &c, 1) < 1) {
140
- rb_thread_wait_fd(thr->rdfd);
141
- while (read(thr->rdfd, &c, 1) < 1 && rb_io_wait_readable(thr->rdfd) == Qtrue) {
142
- ;
143
- }
144
- }
145
-
146
- return Qnil;
147
- }
148
-
149
- static VALUE
150
- cleanup_blocking_thread(void *data, VALUE exc)
151
- {
152
- struct BlockingThread* thr = (struct BlockingThread *) data;
153
-
154
- if (thr->ubf != (void (*)(void *)) -1) {
155
- (*thr->ubf)(thr->data2);
156
- } else {
157
- pthread_kill(thr->tid, SIGVTALRM);
158
- }
159
-
160
- return exc;
161
- }
162
-
163
- VALUE
164
- rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ubf)(void *), void *data2)
165
- {
166
- struct BlockingThread* thr;
167
- int fd[2];
168
- VALUE exc;
169
-
170
- if (pipe(fd) < 0) {
171
- rb_raise(rb_eSystemCallError, "pipe(2) failed");
172
- return Qnil;
173
- }
174
- fcntl(fd[0], F_SETFL, fcntl(fd[0], F_GETFL) | O_NONBLOCK);
175
-
176
- thr = ALLOC_N(struct BlockingThread, 1);
177
- thr->rdfd = fd[0];
178
- thr->wrfd = fd[1];
179
- thr->fn = func;
180
- thr->data = data1;
181
- thr->ubf = ubf;
182
- thr->data2 = data2;
183
- thr->retval = Qnil;
184
-
185
- if (pthread_create(&thr->tid, NULL, rbffi_blocking_thread, thr) != 0) {
186
- close(fd[0]);
187
- close(fd[1]);
188
- xfree(thr);
189
- rb_raise(rb_eSystemCallError, "pipe(2) failed");
190
- return Qnil;
191
- }
192
-
193
- exc = rb_rescue2(wait_for_thread, (VALUE) thr, cleanup_blocking_thread, (VALUE) thr,
194
- rb_eException);
195
-
196
- pthread_join(thr->tid, NULL);
197
- close(fd[1]);
198
- close(fd[0]);
199
- xfree(thr);
200
-
201
- if (exc != Qnil) {
202
- rb_exc_raise(exc);
203
- }
204
-
205
- return thr->retval;
206
- }
207
-
208
- #else
209
- /* win32 implementation */
210
-
211
- struct BlockingThread {
212
- HANDLE tid;
213
- VALUE (*fn)(void *);
214
- void *data;
215
- void (*ubf)(void *);
216
- void *data2;
217
- VALUE retval;
218
- int wrfd;
219
- int rdfd;
220
- };
221
-
222
- static DWORD __stdcall
223
- rbffi_blocking_thread(LPVOID args)
224
- {
225
- struct BlockingThread* thr = (struct BlockingThread *) args;
226
- char c = 1;
227
- VALUE retval;
228
-
229
- retval = (*thr->fn)(thr->data);
230
- thr->retval = retval;
231
-
232
- write(thr->wrfd, &c, sizeof(c));
233
-
234
- return 0;
235
- }
236
-
237
- static VALUE
238
- wait_for_thread(void *data)
239
- {
240
- struct BlockingThread* thr = (struct BlockingThread *) data;
241
- char c, res;
242
- fd_set rfds;
243
-
244
- FD_ZERO(&rfds);
245
- FD_SET(thr->rdfd, &rfds);
246
- rb_thread_select(thr->rdfd + 1, &rfds, NULL, NULL, NULL);
247
- read(thr->rdfd, &c, 1);
248
- return Qnil;
249
- }
250
-
251
- static VALUE
252
- cleanup_blocking_thread(void *data, VALUE exc)
253
- {
254
- struct BlockingThread* thr = (struct BlockingThread *) data;
255
-
256
- if (thr->ubf != (void (*)(void *)) -1) {
257
- (*thr->ubf)(thr->data2);
258
- } else {
259
- TerminateThread(thr->tid, 0);
260
- }
261
-
262
- return exc;
263
- }
264
-
265
- VALUE
266
- rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ubf)(void *), void *data2)
267
- {
268
- struct BlockingThread* thr;
269
- int fd[2];
270
- VALUE exc;
271
- DWORD state;
272
- DWORD res;
273
-
274
- if (_pipe(fd, 1024, O_BINARY) == -1) {
275
- rb_raise(rb_eSystemCallError, "_pipe() failed");
276
- return Qnil;
277
- }
278
-
279
- thr = ALLOC_N(struct BlockingThread, 1);
280
- thr->rdfd = fd[0];
281
- thr->wrfd = fd[1];
282
- thr->fn = func;
283
- thr->data = data1;
284
- thr->ubf = ubf;
285
- thr->data2 = data2;
286
- thr->retval = Qnil;
287
-
288
- thr->tid = CreateThread(NULL, 0, rbffi_blocking_thread, thr, 0, NULL);
289
- if (!thr->tid) {
290
- close(fd[0]);
291
- close(fd[1]);
292
- xfree(thr);
293
- rb_raise(rb_eSystemCallError, "CreateThread() failed");
294
- return Qnil;
295
- }
296
-
297
- exc = rb_rescue2(wait_for_thread, (VALUE) thr, cleanup_blocking_thread, (VALUE) thr,
298
- rb_eException);
299
-
300
- /* The thread should be finished, already. */
301
- WaitForSingleObject(thr->tid, INFINITE);
302
- CloseHandle(thr->tid);
303
- close(fd[1]);
304
- close(fd[0]);
305
- xfree(thr);
306
-
307
- if (exc != Qnil) {
308
- rb_exc_raise(exc);
309
- }
310
-
311
- return thr->retval;
312
- }
313
-
314
- #endif /* !_WIN32 */
315
-
316
- #endif /* HAVE_RB_THREAD_BLOCKING_REGION */
317
-
318
102
  #ifndef _WIN32
319
103
  static struct thread_data* thread_data_init(void);
320
104
 
@@ -348,6 +132,6 @@ rbffi_Thread_Init(VALUE moduleFFI)
348
132
  #ifdef _WIN32
349
133
  frame_thread_key = TlsAlloc();
350
134
  #else
351
- pthread_key_create(&thread_data_key, thread_data_free);
135
+ pthread_key_create(&thread_data_key, thread_data_free);
352
136
  #endif
353
137
  }