Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0c95b3d74c0a
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 013c46f57d87
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 31, 2015

  1. [Truffle] Change signature of NativeSockets.accept

    @bbelleville
    bbelleville committed Jul 31, 2015
    Copy the full SHA
    2168991 View commit details

Commits on Aug 3, 2015

  1. Merge pull request #3201 from bbelleville/socket-accept 

    [Truffle] Change signature of NativeSockets.accept
    @chrisseaton
    chrisseaton committed Aug 3, 2015
    Copy the full SHA
    013c46f View commit details
4 changes: 2 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/nodes/rubinius/IOPrimitiveNodes.java
View file
Original file line number Diff line number Diff line change
@@ -563,8 +563,8 @@ public AcceptNode(RubyContext context, SourceSection sourceSection) {
public int accept(VirtualFrame frame, RubyBasicObject io) {
final int fd = getDescriptor(io);

final IntByReference addressLength = new IntByReference(16);
final long address = UnsafeHolder.U.allocateMemory(addressLength.intValue());
final int[] addressLength = {16};
final long address = UnsafeHolder.U.allocateMemory(addressLength[0]);

final int newFd;

2 changes: 1 addition & 1 deletion truffle/src/main/java/org/jruby/truffle/runtime/sockets/NativeSockets.java
View file
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ public interface NativeSockets {
* socklen_t *restrict address_len);
*/

int accept(int socket, Pointer address, IntByReference addressLength);
int accept(int socket, Pointer address, int[] addressLength);

/*
* int