Skip to content

Commit 99a80e6

Browse files
manuelblmanuelbl
committed
Linux: update jextract generated code
1 parent 074344f commit 99a80e6

22 files changed

+833
-434
lines changed

‎java-does-usb/jextract/linux/gen_linux.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
JEXTRACT=../../../../jextract/build/jextract/bin/jextract
3+
JEXTRACT=../../../../jextract/bin/jextract
44

55
rm -rf ../../src/main/java/net/codecrete/usb/linux/gen
66

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/epoll/epoll$shared.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
// Generated by jextract
2+
3+
package net.codecrete.usb.linux.gen.epoll;
4+
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
14+
15+
public class epoll$shared {
16+
17+
epoll$shared() {
18+
// Should not be called directly
19+
}
20+
21+
public static final ValueLayout.OfBoolean C_BOOL = (ValueLayout.OfBoolean) Linker.nativeLinker().canonicalLayouts().get("bool");
22+
public static final ValueLayout.OfByte C_CHAR =(ValueLayout.OfByte)Linker.nativeLinker().canonicalLayouts().get("char");
23+
public static final ValueLayout.OfShort C_SHORT = (ValueLayout.OfShort) Linker.nativeLinker().canonicalLayouts().get("short");
24+
public static final ValueLayout.OfInt C_INT = (ValueLayout.OfInt) Linker.nativeLinker().canonicalLayouts().get("int");
25+
public static final ValueLayout.OfLong C_LONG_LONG = (ValueLayout.OfLong) Linker.nativeLinker().canonicalLayouts().get("long long");
26+
public static final ValueLayout.OfFloat C_FLOAT = (ValueLayout.OfFloat) Linker.nativeLinker().canonicalLayouts().get("float");
27+
public static final ValueLayout.OfDouble C_DOUBLE = (ValueLayout.OfDouble) Linker.nativeLinker().canonicalLayouts().get("double");
28+
public static final AddressLayout C_POINTER = ((AddressLayout) Linker.nativeLinker().canonicalLayouts().get("void*"))
29+
.withTargetLayout(MemoryLayout.sequenceLayout(java.lang.Long.MAX_VALUE, C_CHAR));
30+
public static final ValueLayout.OfLong C_LONG = (ValueLayout.OfLong) Linker.nativeLinker().canonicalLayouts().get("long");
31+
32+
static final boolean TRACE_DOWNCALLS = Boolean.getBoolean("jextract.trace.downcalls");
33+
34+
static void traceDowncall(String name, Object... args) {
35+
String traceArgs = Arrays.stream(args)
36+
.map(Object::toString)
37+
.collect(Collectors.joining(", "));
38+
System.out.printf("%s(%s)\n", name, traceArgs);
39+
}
40+
41+
static MethodHandle upcallHandle(Class<?> fi, String name, FunctionDescriptor fdesc) {
42+
try {
43+
return MethodHandles.lookup().findVirtual(fi, name, fdesc.toMethodType());
44+
} catch (ReflectiveOperationException ex) {
45+
throw new AssertionError(ex);
46+
}
47+
}
48+
49+
static MemoryLayout align(MemoryLayout layout, long align) {
50+
return switch (layout) {
51+
case PaddingLayout p -> p;
52+
case ValueLayout v -> v.withByteAlignment(align);
53+
case GroupLayout g -> {
54+
MemoryLayout[] alignedMembers = g.memberLayouts().stream()
55+
.map(m -> align(m, align)).toArray(MemoryLayout[]::new);
56+
yield g instanceof StructLayout ?
57+
MemoryLayout.structLayout(alignedMembers) : MemoryLayout.unionLayout(alignedMembers);
58+
}
59+
case SequenceLayout s -> MemoryLayout.sequenceLayout(s.elementCount(), align(s.elementLayout(), align));
60+
};
61+
}
62+
}
63+

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/epoll/epoll.java‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,62 +12,17 @@
1212
import static java.lang.foreign.ValueLayout.*;
1313
import static java.lang.foreign.MemoryLayout.PathElement.*;
1414

15-
public class epoll {
15+
public class epoll extends epoll$shared {
1616

1717
epoll() {
1818
// Should not be called directly
1919
}
2020

2121
static final Arena LIBRARY_ARENA = Arena.ofAuto();
22-
static final boolean TRACE_DOWNCALLS = Boolean.getBoolean("jextract.trace.downcalls");
23-
24-
static void traceDowncall(String name, Object... args) {
25-
String traceArgs = Arrays.stream(args)
26-
.map(Object::toString)
27-
.collect(Collectors.joining(", "));
28-
System.out.printf("%s(%s)\n", name, traceArgs);
29-
}
30-
31-
static MemorySegment findOrThrow(String symbol) {
32-
return SYMBOL_LOOKUP.find(symbol)
33-
.orElseThrow(() -> new UnsatisfiedLinkError("unresolved symbol: " + symbol));
34-
}
35-
36-
static MethodHandle upcallHandle(Class<?> fi, String name, FunctionDescriptor fdesc) {
37-
try {
38-
return MethodHandles.lookup().findVirtual(fi, name, fdesc.toMethodType());
39-
} catch (ReflectiveOperationException ex) {
40-
throw new AssertionError(ex);
41-
}
42-
}
43-
44-
static MemoryLayout align(MemoryLayout layout, long align) {
45-
return switch (layout) {
46-
case PaddingLayout p -> p;
47-
case ValueLayout v -> v.withByteAlignment(align);
48-
case GroupLayout g -> {
49-
MemoryLayout[] alignedMembers = g.memberLayouts().stream()
50-
.map(m -> align(m, align)).toArray(MemoryLayout[]::new);
51-
yield g instanceof StructLayout ?
52-
MemoryLayout.structLayout(alignedMembers) : MemoryLayout.unionLayout(alignedMembers);
53-
}
54-
case SequenceLayout s -> MemoryLayout.sequenceLayout(s.elementCount(), align(s.elementLayout(), align));
55-
};
56-
}
5722

5823
static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup.loaderLookup()
5924
.or(Linker.nativeLinker().defaultLookup());
6025

61-
public static final ValueLayout.OfBoolean C_BOOL = ValueLayout.JAVA_BOOLEAN;
62-
public static final ValueLayout.OfByte C_CHAR = ValueLayout.JAVA_BYTE;
63-
public static final ValueLayout.OfShort C_SHORT = ValueLayout.JAVA_SHORT;
64-
public static final ValueLayout.OfInt C_INT = ValueLayout.JAVA_INT;
65-
public static final ValueLayout.OfLong C_LONG_LONG = ValueLayout.JAVA_LONG;
66-
public static final ValueLayout.OfFloat C_FLOAT = ValueLayout.JAVA_FLOAT;
67-
public static final ValueLayout.OfDouble C_DOUBLE = ValueLayout.JAVA_DOUBLE;
68-
public static final AddressLayout C_POINTER = ValueLayout.ADDRESS
69-
.withTargetLayout(MemoryLayout.sequenceLayout(java.lang.Long.MAX_VALUE, JAVA_BYTE));
70-
public static final ValueLayout.OfLong C_LONG = ValueLayout.JAVA_LONG;
7126
private static final int EPOLL_CTL_ADD = (int)1L;
7227
/**
7328
* {@snippet lang=c :

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/errno/errno$shared.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
// Generated by jextract
2+
3+
package net.codecrete.usb.linux.gen.errno;
4+
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
14+
15+
public class errno$shared {
16+
17+
errno$shared() {
18+
// Should not be called directly
19+
}
20+
21+
public static final ValueLayout.OfBoolean C_BOOL = (ValueLayout.OfBoolean) Linker.nativeLinker().canonicalLayouts().get("bool");
22+
public static final ValueLayout.OfByte C_CHAR =(ValueLayout.OfByte)Linker.nativeLinker().canonicalLayouts().get("char");
23+
public static final ValueLayout.OfShort C_SHORT = (ValueLayout.OfShort) Linker.nativeLinker().canonicalLayouts().get("short");
24+
public static final ValueLayout.OfInt C_INT = (ValueLayout.OfInt) Linker.nativeLinker().canonicalLayouts().get("int");
25+
public static final ValueLayout.OfLong C_LONG_LONG = (ValueLayout.OfLong) Linker.nativeLinker().canonicalLayouts().get("long long");
26+
public static final ValueLayout.OfFloat C_FLOAT = (ValueLayout.OfFloat) Linker.nativeLinker().canonicalLayouts().get("float");
27+
public static final ValueLayout.OfDouble C_DOUBLE = (ValueLayout.OfDouble) Linker.nativeLinker().canonicalLayouts().get("double");
28+
public static final AddressLayout C_POINTER = ((AddressLayout) Linker.nativeLinker().canonicalLayouts().get("void*"))
29+
.withTargetLayout(MemoryLayout.sequenceLayout(java.lang.Long.MAX_VALUE, C_CHAR));
30+
public static final ValueLayout.OfLong C_LONG = (ValueLayout.OfLong) Linker.nativeLinker().canonicalLayouts().get("long");
31+
32+
static final boolean TRACE_DOWNCALLS = Boolean.getBoolean("jextract.trace.downcalls");
33+
34+
static void traceDowncall(String name, Object... args) {
35+
String traceArgs = Arrays.stream(args)
36+
.map(Object::toString)
37+
.collect(Collectors.joining(", "));
38+
System.out.printf("%s(%s)\n", name, traceArgs);
39+
}
40+
41+
static MethodHandle upcallHandle(Class<?> fi, String name, FunctionDescriptor fdesc) {
42+
try {
43+
return MethodHandles.lookup().findVirtual(fi, name, fdesc.toMethodType());
44+
} catch (ReflectiveOperationException ex) {
45+
throw new AssertionError(ex);
46+
}
47+
}
48+
49+
static MemoryLayout align(MemoryLayout layout, long align) {
50+
return switch (layout) {
51+
case PaddingLayout p -> p;
52+
case ValueLayout v -> v.withByteAlignment(align);
53+
case GroupLayout g -> {
54+
MemoryLayout[] alignedMembers = g.memberLayouts().stream()
55+
.map(m -> align(m, align)).toArray(MemoryLayout[]::new);
56+
yield g instanceof StructLayout ?
57+
MemoryLayout.structLayout(alignedMembers) : MemoryLayout.unionLayout(alignedMembers);
58+
}
59+
case SequenceLayout s -> MemoryLayout.sequenceLayout(s.elementCount(), align(s.elementLayout(), align));
60+
};
61+
}
62+
}
63+

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/errno/errno.java‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,62 +12,17 @@
1212
import static java.lang.foreign.ValueLayout.*;
1313
import static java.lang.foreign.MemoryLayout.PathElement.*;
1414

15-
public class errno {
15+
public class errno extends errno$shared {
1616

1717
errno() {
1818
// Should not be called directly
1919
}
2020

2121
static final Arena LIBRARY_ARENA = Arena.ofAuto();
22-
static final boolean TRACE_DOWNCALLS = Boolean.getBoolean("jextract.trace.downcalls");
23-
24-
static void traceDowncall(String name, Object... args) {
25-
String traceArgs = Arrays.stream(args)
26-
.map(Object::toString)
27-
.collect(Collectors.joining(", "));
28-
System.out.printf("%s(%s)\n", name, traceArgs);
29-
}
30-
31-
static MemorySegment findOrThrow(String symbol) {
32-
return SYMBOL_LOOKUP.find(symbol)
33-
.orElseThrow(() -> new UnsatisfiedLinkError("unresolved symbol: " + symbol));
34-
}
35-
36-
static MethodHandle upcallHandle(Class<?> fi, String name, FunctionDescriptor fdesc) {
37-
try {
38-
return MethodHandles.lookup().findVirtual(fi, name, fdesc.toMethodType());
39-
} catch (ReflectiveOperationException ex) {
40-
throw new AssertionError(ex);
41-
}
42-
}
43-
44-
static MemoryLayout align(MemoryLayout layout, long align) {
45-
return switch (layout) {
46-
case PaddingLayout p -> p;
47-
case ValueLayout v -> v.withByteAlignment(align);
48-
case GroupLayout g -> {
49-
MemoryLayout[] alignedMembers = g.memberLayouts().stream()
50-
.map(m -> align(m, align)).toArray(MemoryLayout[]::new);
51-
yield g instanceof StructLayout ?
52-
MemoryLayout.structLayout(alignedMembers) : MemoryLayout.unionLayout(alignedMembers);
53-
}
54-
case SequenceLayout s -> MemoryLayout.sequenceLayout(s.elementCount(), align(s.elementLayout(), align));
55-
};
56-
}
5722

5823
static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup.loaderLookup()
5924
.or(Linker.nativeLinker().defaultLookup());
6025

61-
public static final ValueLayout.OfBoolean C_BOOL = ValueLayout.JAVA_BOOLEAN;
62-
public static final ValueLayout.OfByte C_CHAR = ValueLayout.JAVA_BYTE;
63-
public static final ValueLayout.OfShort C_SHORT = ValueLayout.JAVA_SHORT;
64-
public static final ValueLayout.OfInt C_INT = ValueLayout.JAVA_INT;
65-
public static final ValueLayout.OfLong C_LONG_LONG = ValueLayout.JAVA_LONG;
66-
public static final ValueLayout.OfFloat C_FLOAT = ValueLayout.JAVA_FLOAT;
67-
public static final ValueLayout.OfDouble C_DOUBLE = ValueLayout.JAVA_DOUBLE;
68-
public static final AddressLayout C_POINTER = ValueLayout.ADDRESS
69-
.withTargetLayout(MemoryLayout.sequenceLayout(java.lang.Long.MAX_VALUE, JAVA_BYTE));
70-
public static final ValueLayout.OfLong C_LONG = ValueLayout.JAVA_LONG;
7126
private static final int ENOENT = (int)2L;
7227
/**
7328
* {@snippet lang=c :

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/fcntl/fcntl$shared.java‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
// Generated by jextract
2+
3+
package net.codecrete.usb.linux.gen.fcntl;
4+
5+
import java.lang.invoke.*;
6+
import java.lang.foreign.*;
7+
import java.nio.ByteOrder;
8+
import java.util.*;
9+
import java.util.function.*;
10+
import java.util.stream.*;
11+
12+
import static java.lang.foreign.ValueLayout.*;
13+
import static java.lang.foreign.MemoryLayout.PathElement.*;
14+
15+
public class fcntl$shared {
16+
17+
fcntl$shared() {
18+
// Should not be called directly
19+
}
20+
21+
public static final ValueLayout.OfBoolean C_BOOL = (ValueLayout.OfBoolean) Linker.nativeLinker().canonicalLayouts().get("bool");
22+
public static final ValueLayout.OfByte C_CHAR =(ValueLayout.OfByte)Linker.nativeLinker().canonicalLayouts().get("char");
23+
public static final ValueLayout.OfShort C_SHORT = (ValueLayout.OfShort) Linker.nativeLinker().canonicalLayouts().get("short");
24+
public static final ValueLayout.OfInt C_INT = (ValueLayout.OfInt) Linker.nativeLinker().canonicalLayouts().get("int");
25+
public static final ValueLayout.OfLong C_LONG_LONG = (ValueLayout.OfLong) Linker.nativeLinker().canonicalLayouts().get("long long");
26+
public static final ValueLayout.OfFloat C_FLOAT = (ValueLayout.OfFloat) Linker.nativeLinker().canonicalLayouts().get("float");
27+
public static final ValueLayout.OfDouble C_DOUBLE = (ValueLayout.OfDouble) Linker.nativeLinker().canonicalLayouts().get("double");
28+
public static final AddressLayout C_POINTER = ((AddressLayout) Linker.nativeLinker().canonicalLayouts().get("void*"))
29+
.withTargetLayout(MemoryLayout.sequenceLayout(java.lang.Long.MAX_VALUE, C_CHAR));
30+
public static final ValueLayout.OfLong C_LONG = (ValueLayout.OfLong) Linker.nativeLinker().canonicalLayouts().get("long");
31+
32+
static final boolean TRACE_DOWNCALLS = Boolean.getBoolean("jextract.trace.downcalls");
33+
34+
static void traceDowncall(String name, Object... args) {
35+
String traceArgs = Arrays.stream(args)
36+
.map(Object::toString)
37+
.collect(Collectors.joining(", "));
38+
System.out.printf("%s(%s)\n", name, traceArgs);
39+
}
40+
41+
static MethodHandle upcallHandle(Class<?> fi, String name, FunctionDescriptor fdesc) {
42+
try {
43+
return MethodHandles.lookup().findVirtual(fi, name, fdesc.toMethodType());
44+
} catch (ReflectiveOperationException ex) {
45+
throw new AssertionError(ex);
46+
}
47+
}
48+
49+
static MemoryLayout align(MemoryLayout layout, long align) {
50+
return switch (layout) {
51+
case PaddingLayout p -> p;
52+
case ValueLayout v -> v.withByteAlignment(align);
53+
case GroupLayout g -> {
54+
MemoryLayout[] alignedMembers = g.memberLayouts().stream()
55+
.map(m -> align(m, align)).toArray(MemoryLayout[]::new);
56+
yield g instanceof StructLayout ?
57+
MemoryLayout.structLayout(alignedMembers) : MemoryLayout.unionLayout(alignedMembers);
58+
}
59+
case SequenceLayout s -> MemoryLayout.sequenceLayout(s.elementCount(), align(s.elementLayout(), align));
60+
};
61+
}
62+
}
63+

‎java-does-usb/src/main/java/net/codecrete/usb/linux/gen/fcntl/fcntl.java‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -12,62 +12,17 @@
1212
import static java.lang.foreign.ValueLayout.*;
1313
import static java.lang.foreign.MemoryLayout.PathElement.*;
1414

15-
public class fcntl {
15+
public class fcntl extends fcntl$shared {
1616

1717
fcntl() {
1818
// Should not be called directly
1919
}
2020

2121
static final Arena LIBRARY_ARENA = Arena.ofAuto();
22-
static final boolean TRACE_DOWNCALLS = Boolean.getBoolean("jextract.trace.downcalls");
23-
24-
static void traceDowncall(String name, Object... args) {
25-
String traceArgs = Arrays.stream(args)
26-
.map(Object::toString)
27-
.collect(Collectors.joining(", "));
28-
System.out.printf("%s(%s)\n", name, traceArgs);
29-
}
30-
31-
static MemorySegment findOrThrow(String symbol) {
32-
return SYMBOL_LOOKUP.find(symbol)
33-
.orElseThrow(() -> new UnsatisfiedLinkError("unresolved symbol: " + symbol));
34-
}
35-
36-
static MethodHandle upcallHandle(Class<?> fi, String name, FunctionDescriptor fdesc) {
37-
try {
38-
return MethodHandles.lookup().findVirtual(fi, name, fdesc.toMethodType());
39-
} catch (ReflectiveOperationException ex) {
40-
throw new AssertionError(ex);
41-
}
42-
}
43-
44-
static MemoryLayout align(MemoryLayout layout, long align) {
45-
return switch (layout) {
46-
case PaddingLayout p -> p;
47-
case ValueLayout v -> v.withByteAlignment(align);
48-
case GroupLayout g -> {
49-
MemoryLayout[] alignedMembers = g.memberLayouts().stream()
50-
.map(m -> align(m, align)).toArray(MemoryLayout[]::new);
51-
yield g instanceof StructLayout ?
52-
MemoryLayout.structLayout(alignedMembers) : MemoryLayout.unionLayout(alignedMembers);
53-
}
54-
case SequenceLayout s -> MemoryLayout.sequenceLayout(s.elementCount(), align(s.elementLayout(), align));
55-
};
56-
}
5722

5823
static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup.loaderLookup()
5924
.or(Linker.nativeLinker().defaultLookup());
6025

61-
public static final ValueLayout.OfBoolean C_BOOL = ValueLayout.JAVA_BOOLEAN;
62-
public static final ValueLayout.OfByte C_CHAR = ValueLayout.JAVA_BYTE;
63-
public static final ValueLayout.OfShort C_SHORT = ValueLayout.JAVA_SHORT;
64-
public static final ValueLayout.OfInt C_INT = ValueLayout.JAVA_INT;
65-
public static final ValueLayout.OfLong C_LONG_LONG = ValueLayout.JAVA_LONG;
66-
public static final ValueLayout.OfFloat C_FLOAT = ValueLayout.JAVA_FLOAT;
67-
public static final ValueLayout.OfDouble C_DOUBLE = ValueLayout.JAVA_DOUBLE;
68-
public static final AddressLayout C_POINTER = ValueLayout.ADDRESS
69-
.withTargetLayout(MemoryLayout.sequenceLayout(java.lang.Long.MAX_VALUE, JAVA_BYTE));
70-
public static final ValueLayout.OfLong C_LONG = ValueLayout.JAVA_LONG;
7126
private static final int O_RDWR = (int)2L;
7227
/**
7328
* {@snippet lang=c :

0 commit comments

Comments
 (0)