Update shared FFI code #5948

headius · 2019-10-28T14:24:20Z

This PR will track the process of getting files we have in common with the ffi gem updated so we can share updates and maintenance effort.

See #5947

The load path tweaking was breaking other requires, and this change aligns how we load JRuby's version of the extension.

core/src/main/java/org/jruby/ext/ffi/Platform.java

ahorek · 2019-10-28T15:49:56Z

lib/ruby/stdlib/ffi/platform/sysconf.rb.ffi

@@ -1,139 +0,0 @@
-module Platform;end


jruby specific?

I think these are template files that originally lived outside of the generation logic but now live in some form in the gen/ dir?

This fixes issues building the test library on Darwin. There's no reason to build for a platform we won't test.

I'm not sure what the type mapping from the C version corresponds to in the Java version.

* Fill in missing read/write/put/get aliases * Add put and get with type * Change TypeError to ArgumentError * Don't redispatch to Ruby while looking up type

* AutoPointer is in Ruby now * Change TypeError to ArgumentError for pointer type failure Note that this moves AutoPointer cleanup logic from our JVM Reference-based reaper to one based on ObjectSpace finalizers. This will mean additional overhead for AutoPointer compared to the original logic.

This caching breaks code that attempts to layout the same struct class more than once, as in struct_spec.rb's layout specs that reopen PairLayout in two successive specs. I do not think this behavior should be supported, and laying out the same struct twice should probably be an error. Doing it this way requires at least a guard on the layout value and at most repeated lookups of that layout via instance variables.

headius · 2020-01-08T09:14:20Z

I have had to disable the caching of the Struct layout as part of this PR, but I believe this is due to a misfeature in the C FFI. I have filed an issue here: ffi/ffi#734

This reverts commit 21a8a8c. Per ffi/ffi#734, the behavior that broke this caching is now deprecated and will be removed in ffi 2.0.

headius · 2020-01-10T15:39:59Z

I have had to disable the caching of the Struct layout

ffi/ffi#734 is fixed now (deprecated behavior to be removed in 2.0) so I reverted the removal of the caching logic.

headius · 2020-02-12T17:44:45Z

Retargeted to 9.3. Help wanted!

ahorek · 2020-02-15T17:09:33Z

the remaining failure is

  Struct tests :enum field r/w
     Failure/Error: @orig_field.put(ptr, type.to_native(value, nil))

     NoMethodError:
       undefined method `put' for #<FFI::StructLayout::Number:0x71a509c>
       Did you mean?  puts
                      putc

this change 221b11d is in conflict with
https://github.com/ffi/ffi/blob/21dc3d48f672ecf334058b36f485292721de8a87/lib/ffi/struct_layout.rb#L92

should we fork the ruby version?

headius · 2020-02-16T13:56:02Z

should we fork the ruby version?

Ideally, no, we should match the Ruby code exactly.

I'm not sure what you mean by a conflict. It seems that Field simply doesn't define put and get. I'm adding those now.

ahorek · 2020-02-16T14:07:17Z

the previous java version used to delegate the put method to MappedFieldIO

jruby/core/src/main/java/org/jruby/ext/ffi/StructLayout.java

Line 1417 in 221b11d

    
           public void put(ThreadContext context, Storage cache, Member m, AbstractMemory ptr, IRubyObject value) {

your fix looks good f40efb1 thanks

headius · 2020-02-16T14:07:55Z

With these last changes from @ahorek and the missing Field put and get in place, it appears we are green!

headius · 2020-02-16T14:49:30Z

the previous java version used to delegate the put method to MappedFieldIO

Ahh yes, but it was never bound in Ruby. All good now!

Update configs from FFI and remove generator code.

740be10

headius added this to the JRuby 9.2.10.0 milestone Oct 28, 2019

headius added 2 commits October 28, 2019 09:31

Update shared sources from FFI gem.

ea20d2d

Update FFI specs from FFI gem.

84b5c39

headius mentioned this pull request Oct 28, 2019

Support for DragonFly BSD #5768

Closed

headius added 2 commits October 28, 2019 10:04

Add JRuby-specific setup.

7ab6328

The load path tweaking was breaking other requires, and this change aligns how we load JRuby's version of the extension.

Eliminate double-def of FFI::Platform consts and methods.

03d2063

ahorek reviewed Oct 28, 2019

View reviewed changes

core/src/main/java/org/jruby/ext/ffi/Platform.java Outdated Show resolved Hide resolved

ahorek reviewed Oct 28, 2019

View reviewed changes

headius added 5 commits October 28, 2019 11:02

Align VariadicInvoker with FFI gem.

aab7c6b

Only add i386 and x86_64 arch if that's the platform.

8209ab6

This fixes issues building the test library on Darwin. There's no reason to build for a platform we won't test.

Just use the Ruby definition of this type.

221b11d

javadoc fixes.

de3c22a

Partial impl of StructLayout#__union!

051e506

I'm not sure what the type mapping from the C version corresponds to in the Java version.

headius mentioned this pull request Oct 28, 2019

Update FFI scripts and other files from FFI gem #5947

Closed

headius added 8 commits January 7, 2020 16:22

Merge branch 'master' into update_ffi

fa1e977

Enums, Enum, and DataConverter are in Ruby now

6cc8235

Align error handling with C ffi

4d84cca

Fix all MemoryPointer specs

69a1731

* Fill in missing read/write/put/get aliases * Add put and get with type * Change TypeError to ArgumentError * Don't redispatch to Ruby while looking up type

Order type checks the same as C FFI

c647799

Remove whitespace.

a5eb643

headius mentioned this pull request Jan 9, 2020

Undefined method read_uint64 in JRuby. djberg96/sys-proctable#77

Closed

headius added 2 commits January 10, 2020 08:16

Update specs and libs from ffi gem.

3d0cb54

Revert "Do not cache the struct layout in the metaclass"

95c73a6

This reverts commit 21a8a8c. Per ffi/ffi#734, the behavior that broke this caching is now deprecated and will be removed in ffi 2.0.

gaffneyc mentioned this pull request Feb 4, 2020

Support JRuby and fix travis failures karafka/rdkafka-ruby#108

Merged

headius removed this from the JRuby 9.2.10.0 milestone Feb 12, 2020

headius added this to the JRuby 9.3.0.0 milestone Feb 12, 2020

headius added 2 commits February 14, 2020 15:30

Merge branch 'master' into update_ffi

24f7fc4

IS_DRAGONFLYBSD is define in Ruby elsewhere now

5996596

ahorek mentioned this pull request Feb 15, 2020

remove struct by reference #6066

Closed

remove struct by reference

2ab63ec

This was referenced Feb 15, 2020

throw ArgumentError instead of SecurityError #6064

Closed

Add FFI::LastError.winapi_error #6065

Closed

[RbConfig] add RUBY_SO_NAME and RUBY_BASE_NAME #6063

Closed

ahorek and others added 5 commits February 16, 2020 07:32

throw ArgumentError instead of SecurityError

bcec463

Add FFI::LastError.winapi_error

16ea5d2

[RbConfig] RUBY_SO_NAME and RUBY_BASE_NAME

eeb3f6f

x32 build shouldnt contain a prefix

843067e

Update specs from ffi gem

be3c5c1

Add missing Field#get and Field#put

f40efb1

headius mentioned this pull request Feb 16, 2020

Load JRuby ext under JRuby ffi/ffi#747

Merged

headius merged commit b267aa1 into jruby:master Feb 18, 2020

headius deleted the update_ffi branch February 18, 2020 22:56

GabrielNagy mentioned this pull request Sep 25, 2020

Fix segfault if high-entropy 64-bit ASLR is enabled chef/win32-dir#28

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update shared FFI code #5948

Update shared FFI code #5948

headius commented Oct 28, 2019

ahorek Oct 28, 2019

headius Oct 28, 2019

headius commented Jan 8, 2020

headius commented Jan 10, 2020

headius commented Feb 12, 2020

ahorek commented Feb 15, 2020

headius commented Feb 16, 2020 •

edited

ahorek commented Feb 16, 2020

headius commented Feb 16, 2020

headius commented Feb 16, 2020

Update shared FFI code #5948

Update shared FFI code #5948

Conversation

headius commented Oct 28, 2019

ahorek Oct 28, 2019

Choose a reason for hiding this comment

headius Oct 28, 2019

Choose a reason for hiding this comment

headius commented Jan 8, 2020

headius commented Jan 10, 2020

headius commented Feb 12, 2020

ahorek commented Feb 15, 2020

headius commented Feb 16, 2020 • edited

ahorek commented Feb 16, 2020

headius commented Feb 16, 2020

headius commented Feb 16, 2020

headius commented Feb 16, 2020 •

edited