Merge branch 'release/0.5.1'

cryptomator · Apr 6, 2023 · 174b226 · 174b226
2 parents 8187bd8 + 373e8fb
commit 174b226
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 28 deletions.
diff --git a/jfuse-api/pom.xml b/jfuse-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.cryptomator</groupId>
  <artifactId>jfuse-parent</artifactId>
- <version>0.5.0</version>
+ <version>0.5.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jfuse-api</artifactId>

diff --git a/jfuse-examples/pom.xml b/jfuse-examples/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.cryptomator</groupId>
  <artifactId>jfuse-parent</artifactId>
- <version>0.5.0</version>
+ <version>0.5.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jfuse-examples</artifactId>

diff --git a/jfuse-linux-aarch64/pom.xml b/jfuse-linux-aarch64/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>jfuse-parent</artifactId>
  <groupId>org.cryptomator</groupId>
- <version>0.5.0</version>
+ <version>0.5.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jfuse-linux-aarch64</artifactId>

diff --git a/jfuse-linux-amd64/pom.xml b/jfuse-linux-amd64/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.cryptomator</groupId>
  <artifactId>jfuse-parent</artifactId>
- <version>0.5.0</version>
+ <version>0.5.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jfuse-linux-amd64</artifactId>

diff --git a/jfuse-mac/pom.xml b/jfuse-mac/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.cryptomator</groupId>
  <artifactId>jfuse-parent</artifactId>
- <version>0.5.0</version>
+ <version>0.5.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jfuse-mac</artifactId>

diff --git a/jfuse-tests/pom.xml b/jfuse-tests/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.cryptomator</groupId>
  <artifactId>jfuse-parent</artifactId>
- <version>0.5.0</version>
+ <version>0.5.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jfuse-tests</artifactId>

diff --git a/jfuse-win/pom.xml b/jfuse-win/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.cryptomator</groupId>
  <artifactId>jfuse-parent</artifactId>
- <version>0.5.0</version>
+ <version>0.5.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jfuse-win</artifactId>
@@ -89,7 +89,7 @@
  <headerClassName>fuse_h</headerClassName>
  <cPreprocessorMacros>
  <cPreprocessorMacro>WINFSP_DLL_INTERNAL</cPreprocessorMacro>
- <cPreprocessorMacro>FUSE_USE_VERSION=33</cPreprocessorMacro>
+ <cPreprocessorMacro>FUSE_USE_VERSION=31</cPreprocessorMacro>
  <cPreprocessorMacro>CYGFUSE</cPreprocessorMacro>
  </cPreprocessorMacros>
  <includeFunctions>
@@ -98,7 +98,7 @@
  <includeFunction>fuse3_mount</includeFunction>
  <includeFunction>fuse3_get_session</includeFunction>
  <includeFunction>fuse3_loop</includeFunction>
- <includeFunction>fuse3_loop_mt</includeFunction>
+ <includeFunction>fuse3_loop_mt_31</includeFunction>
  <includeFunction>fuse3_exit</includeFunction>
  <includeFunction>fuse3_unmount</includeFunction>
  <includeFunction>fuse3_destroy</includeFunction>

diff --git a/jfuse-win/src/main/java/org/cryptomator/jfuse/win/FuseMountImpl.java b/jfuse-win/src/main/java/org/cryptomator/jfuse/win/FuseMountImpl.java
@@ -12,12 +12,8 @@ record FuseMountImpl(MemorySegment fuse, FuseArgs fuseArgs) implements FuseMount
  @Override
  public int loop() {
  if (fuseArgs.multiThreaded()) {
- try (var arena = Arena.openConfined()) {
- var loopCfg = fuse3_loop_config.allocate(arena);
- fuse3_loop_config.clone_fd$set(loopCfg,0);
- fuse3_loop_config.max_idle_threads$set(loopCfg, 5);
- return fuse_h.fuse3_loop_mt(fuse, loopCfg);
- }
+ //We cannot use fuse3_loop_mt(fuse, fuseconfig) due to https://github.com/cryptomator/jfuse/issues/31
+ return fuse_h.fuse3_loop_mt_31(fuse, 0);
  } else {
  return fuse_h.fuse3_loop(fuse);
  }

diff --git a/jfuse-win/src/main/java/org/cryptomator/jfuse/win/extr/constants$1.java b/jfuse-win/src/main/java/org/cryptomator/jfuse/win/extr/constants$1.java
@@ -25,13 +25,13 @@ final class constants$1 {
  "fuse3_loop",
  constants$1.fuse3_loop$FUNC
  );
- static final FunctionDescriptor fuse3_loop_mt$FUNC = FunctionDescriptor.of(Constants$root.C_LONG$LAYOUT,
+ static final FunctionDescriptor fuse3_loop_mt_31$FUNC = FunctionDescriptor.of(Constants$root.C_LONG$LAYOUT,
  Constants$root.C_POINTER$LAYOUT,
- Constants$root.C_POINTER$LAYOUT
+ Constants$root.C_LONG$LAYOUT
  );
- static final MethodHandle fuse3_loop_mt$MH = RuntimeHelper.downcallHandle(
- "fuse3_loop_mt",
- constants$1.fuse3_loop_mt$FUNC
+ static final MethodHandle fuse3_loop_mt_31$MH = RuntimeHelper.downcallHandle(
+ "fuse3_loop_mt_31",
+ constants$1.fuse3_loop_mt_31$FUNC
  );
  static final FunctionDescriptor fuse3_exit$FUNC = FunctionDescriptor.ofVoid(
  Constants$root.C_POINTER$LAYOUT

diff --git a/jfuse-win/src/main/java/org/cryptomator/jfuse/win/extr/fuse_h.java b/jfuse-win/src/main/java/org/cryptomator/jfuse/win/extr/fuse_h.java
@@ -113,18 +113,18 @@ public static int fuse3_loop(MemorySegment f) {
  throw new AssertionError("should not reach here", ex$);
  }
  }
- public static MethodHandle fuse3_loop_mt$MH() {
- return RuntimeHelper.requireNonNull(constants$1.fuse3_loop_mt$MH,"fuse3_loop_mt");
+ public static MethodHandle fuse3_loop_mt_31$MH() {
+ return RuntimeHelper.requireNonNull(constants$1.fuse3_loop_mt_31$MH,"fuse3_loop_mt_31");
  }
  /**
  * {@snippet :
- * int fuse3_loop_mt(struct fuse3* f, struct fuse3_loop_config* config);
+ * int fuse3_loop_mt_31(struct fuse3* f, int clone_fd);
  * }
  */
- public static int fuse3_loop_mt(MemorySegment f, MemorySegment config) {
- var mh$ = fuse3_loop_mt$MH();
+ public static int fuse3_loop_mt_31(MemorySegment f, int clone_fd) {
+ var mh$ = fuse3_loop_mt_31$MH();
  try {
- return (int)mh$.invokeExact(f, config);
+ return (int)mh$.invokeExact(f, clone_fd);
  } catch (Throwable ex$) {
  throw new AssertionError("should not reach here", ex$);
  }

diff --git a/jfuse/pom.xml b/jfuse/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>org.cryptomator</groupId>
  <artifactId>jfuse-parent</artifactId>
- <version>0.5.0</version>
+ <version>0.5.1</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
  <artifactId>jfuse</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
  <groupId>org.cryptomator</groupId>
  <artifactId>jfuse-parent</artifactId>
  <packaging>pom</packaging>
- <version>0.5.0</version>
+ <version>0.5.1</version>
  <name>jFUSE</name>
  <description>Java bindings for FUSE using foreign functions &amp; memory API</description>
  <url>https://github.com/cryptomator/jfuse</url>