weixin_39802519
weixin_39802519
2021-01-09 05:51

fiddle fixes

fixes https://github.com/jruby/jruby/issues/5956 and https://github.com/jruby/jruby/issues/5955

but this test case doesn't work yet https://github.com/jruby/jruby/blob/4e8bb2666a7257f0f5986800f96bb88efdd6acbd/test/mri/fiddle/test_func.rb#L73 I'm experimanting for now :)

该提问来源于开源项目:jruby/jruby

  • 点赞
  • 写回答
  • 关注问题
  • 收藏
  • 复制链接分享
  • 邀请回答

7条回答

  • weixin_39802519 weixin_39802519 4月前

    I splited two obvious errors into separate PRs https://github.com/jruby/ruby/pull/2 https://github.com/jruby/ruby/pull/3

    点赞 评论 复制链接分享
  • weixin_39802519 weixin_39802519 4月前

    one more interesting failure https://github.com/jruby/jruby/blob/4e8bb2666a7257f0f5986800f96bb88efdd6acbd/test/mri/fiddle/test_func.rb#L44

    a string pointer #to_s should return a ruby string. That would be tricky to implement :)

    点赞 评论 复制链接分享
  • weixin_39918084 weixin_39918084 4月前

    Do you think there's any work remaining here or could we go ahead with a merge?

    点赞 评论 复制链接分享
  • weixin_39918084 weixin_39918084 4月前

    I have merged jruby/ruby#2 and jruby/ruby#3 across the two active branches jruby-ruby_2_5_7 and jruby-ruby_2_6_5 and incorporated their changes into the JRuby branches master and ruby-2.6.

    I also figured out why the libc changes keeps disappearing: we were versioning lib/ruby/stdlib/fiddle/jruby.rb in both places when it's specific to JRuby, without any equivalent in CRuby, and subject to frequent updates. I modified all branches to reflect this, with messages about the proper versioning location added to jruby here and here.

    (I see the spelling error now and will fix that).

    I've also made sure that all changes from jruby/ruby's jruby-ruby_2_5_7 and jruby/jruby's master branch have been incorporated back into the jruby/ruby jruby-ruby_2_6_5 branch upon which the jruby/jruby ruby-2.6 branch is based. See jruby/ruby.

    We need a better way to manage our patch set against CRuby's stdlib.

    点赞 评论 复制链接分享
  • weixin_39802519 weixin_39802519 4月前

    Do you think there's any work remaining here or could we go ahead with a merge?

    there're still many broken parts, but I think it's ready for review

    点赞 评论 复制链接分享
  • weixin_39918084 weixin_39918084 4月前

    Everything here seems appropriate to me. I will merge and we can do other fixes in other PRs.

    点赞 评论 复制链接分享
  • weixin_39918084 weixin_39918084 4月前

    Nice! We definitely want to get Fiddle working better. Long term it might make more sense to do a direct implementation atop jnr-ffi, but for now getting the FFI version working is probably best.

    点赞 评论 复制链接分享

相关推荐