Skip to content

Commit 174b226

Browse files
infeoinfeo
committed
Merge branch 'release/0.5.1'
2 parents 8187bd8 + 373e8fb commit 174b226

12 files changed

Lines changed: 24 additions & 28 deletions

File tree

‎jfuse-api/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>jfuse-parent</artifactId>
8-
<version>0.5.0</version>
8+
<version>0.5.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>jfuse-api</artifactId>

‎jfuse-examples/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>jfuse-parent</artifactId>
8-
<version>0.5.0</version>
8+
<version>0.5.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>jfuse-examples</artifactId>

‎jfuse-linux-aarch64/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>jfuse-parent</artifactId>
77
<groupId>org.cryptomator</groupId>
8-
<version>0.5.0</version>
8+
<version>0.5.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>jfuse-linux-aarch64</artifactId>

‎jfuse-linux-amd64/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>jfuse-parent</artifactId>
8-
<version>0.5.0</version>
8+
<version>0.5.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>jfuse-linux-amd64</artifactId>

‎jfuse-mac/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>jfuse-parent</artifactId>
8-
<version>0.5.0</version>
8+
<version>0.5.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>jfuse-mac</artifactId>

‎jfuse-tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>jfuse-parent</artifactId>
8-
<version>0.5.0</version>
8+
<version>0.5.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>jfuse-tests</artifactId>

‎jfuse-win/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.cryptomator</groupId>
77
<artifactId>jfuse-parent</artifactId>
8-
<version>0.5.0</version>
8+
<version>0.5.1</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<artifactId>jfuse-win</artifactId>
@@ -89,7 +89,7 @@
8989
<headerClassName>fuse_h</headerClassName>
9090
<cPreprocessorMacros>
9191
<cPreprocessorMacro>WINFSP_DLL_INTERNAL</cPreprocessorMacro>
92-
<cPreprocessorMacro>FUSE_USE_VERSION=33</cPreprocessorMacro>
92+
<cPreprocessorMacro>FUSE_USE_VERSION=31</cPreprocessorMacro>
9393
<cPreprocessorMacro>CYGFUSE</cPreprocessorMacro>
9494
</cPreprocessorMacros>
9595
<includeFunctions>
@@ -98,7 +98,7 @@
9898
<includeFunction>fuse3_mount</includeFunction>
9999
<includeFunction>fuse3_get_session</includeFunction>
100100
<includeFunction>fuse3_loop</includeFunction>
101-
<includeFunction>fuse3_loop_mt</includeFunction>
101+
<includeFunction>fuse3_loop_mt_31</includeFunction>
102102
<includeFunction>fuse3_exit</includeFunction>
103103
<includeFunction>fuse3_unmount</includeFunction>
104104
<includeFunction>fuse3_destroy</includeFunction>

‎jfuse-win/src/main/java/org/cryptomator/jfuse/win/FuseMountImpl.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,8 @@ record FuseMountImpl(MemorySegment fuse, FuseArgs fuseArgs) implements FuseMount
1212
@Override
1313
public int loop() {
1414
if (fuseArgs.multiThreaded()) {
15-
try (var arena = Arena.openConfined()) {
16-
var loopCfg = fuse3_loop_config.allocate(arena);
17-
fuse3_loop_config.clone_fd$set(loopCfg,0);
18-
fuse3_loop_config.max_idle_threads$set(loopCfg, 5);
19-
return fuse_h.fuse3_loop_mt(fuse, loopCfg);
20-
}
15+
//We cannot use fuse3_loop_mt(fuse, fuseconfig) due to https://github.com/cryptomator/jfuse/issues/31
16+
return fuse_h.fuse3_loop_mt_31(fuse, 0);
2117
} else {
2218
return fuse_h.fuse3_loop(fuse);
2319
}

‎jfuse-win/src/main/java/org/cryptomator/jfuse/win/extr/constants$1.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ final class constants$1 {
2525
"fuse3_loop",
2626
constants$1.fuse3_loop$FUNC
2727
);
28-
static final FunctionDescriptor fuse3_loop_mt$FUNC = FunctionDescriptor.of(Constants$root.C_LONG$LAYOUT,
28+
static final FunctionDescriptor fuse3_loop_mt_31$FUNC = FunctionDescriptor.of(Constants$root.C_LONG$LAYOUT,
2929
Constants$root.C_POINTER$LAYOUT,
30-
Constants$root.C_POINTER$LAYOUT
30+
Constants$root.C_LONG$LAYOUT
3131
);
32-
static final MethodHandle fuse3_loop_mt$MH = RuntimeHelper.downcallHandle(
33-
"fuse3_loop_mt",
34-
constants$1.fuse3_loop_mt$FUNC
32+
static final MethodHandle fuse3_loop_mt_31$MH = RuntimeHelper.downcallHandle(
33+
"fuse3_loop_mt_31",
34+
constants$1.fuse3_loop_mt_31$FUNC
3535
);
3636
static final FunctionDescriptor fuse3_exit$FUNC = FunctionDescriptor.ofVoid(
3737
Constants$root.C_POINTER$LAYOUT

‎jfuse-win/src/main/java/org/cryptomator/jfuse/win/extr/fuse_h.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,18 @@ public static int fuse3_loop(MemorySegment f) {
113113
throw new AssertionError("should not reach here", ex$);
114114
}
115115
}
116-
public static MethodHandle fuse3_loop_mt$MH() {
117-
return RuntimeHelper.requireNonNull(constants$1.fuse3_loop_mt$MH,"fuse3_loop_mt");
116+
public static MethodHandle fuse3_loop_mt_31$MH() {
117+
return RuntimeHelper.requireNonNull(constants$1.fuse3_loop_mt_31$MH,"fuse3_loop_mt_31");
118118
}
119119
/**
120120
* {@snippet :
121-
* int fuse3_loop_mt(struct fuse3* f, struct fuse3_loop_config* config);
121+
* int fuse3_loop_mt_31(struct fuse3* f, int clone_fd);
122122
* }
123123
*/
124-
public static int fuse3_loop_mt(MemorySegment f, MemorySegment config) {
125-
var mh$ = fuse3_loop_mt$MH();
124+
public static int fuse3_loop_mt_31(MemorySegment f, int clone_fd) {
125+
var mh$ = fuse3_loop_mt_31$MH();
126126
try {
127-
return (int)mh$.invokeExact(f, config);
127+
return (int)mh$.invokeExact(f, clone_fd);
128128
} catch (Throwable ex$) {
129129
throw new AssertionError("should not reach here", ex$);
130130
}

0 commit comments

Comments
 (0)