Merge branch 'release/0.7.2'

Author: infeo

.github/workflows/build.yml

@@ -6,9 +6,16 @@ on:
 
 jobs:
 
-  linux-amd64:
-    name: Test jfuse-linux-amd64
-    runs-on: ubuntu-latest
+  linux:
+    name: Test jfuse-linux packages
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            arch: x86_64
+          - os: ubuntu-24.04-arm
+            arch: aarch64
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -21,10 +28,10 @@ jobs:
           sudo apt-get update
           sudo apt-get install fuse3 libfuse3-dev
       - name: Maven build
-        run: mvn -B verify -Dfuse.lib.path="/lib/x86_64-linux-gnu/libfuse3.so.3" --no-transfer-progress
+        run: mvn -B verify -Dfuse.lib.path="/lib/${{ matrix.arch }}-linux-gnu/libfuse3.so.3" --no-transfer-progress
       - uses: actions/upload-artifact@v4
         with:
-          name: coverage-linux-amd64
+          name: coverage-linux-${{ matrix.arch }}
           path: jfuse-tests/target/site/jacoco-aggregate/jacoco.xml
           retention-days: 3
 
@@ -74,7 +81,7 @@ jobs:
 
   sonarcloud:
     name: Run SonarCloud Analysis
-    needs: [linux-amd64, mac, win]
+    needs: [linux, mac, win]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -93,8 +100,12 @@ jobs:
           restore-keys: ${{ runner.os }}-sonar
       - uses: actions/download-artifact@v4
         with:
-          name: coverage-linux-amd64
-          path: coverage/linux-amd64
+          name: coverage-linux-x86_64
+          path: coverage/linux-x86_64
+      - uses: actions/download-artifact@v4
+        with:
+          name: coverage-linux-aarch64
+          path: coverage/linux-aarch64
       - uses: actions/download-artifact@v4
         with:
           name: coverage-mac

jfuse-api/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.7.1</version>
+		<version>0.7.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-api</artifactId>

jfuse-examples/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.7.1</version>
+		<version>0.7.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-examples</artifactId>

jfuse-linux-aarch64/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>jfuse-parent</artifactId>
 		<groupId>org.cryptomator</groupId>
-		<version>0.7.1</version>
+		<version>0.7.2</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-linux-aarch64</artifactId>
@@ -99,12 +99,11 @@
 									<headerClassName>fuse_h</headerClassName>
 									<cPreprocessorMacros>
 										<cPreprocessorMacro>_FILE_OFFSET_BITS=64</cPreprocessorMacro>
-										<cPreprocessorMacro>FUSE_USE_VERSION=312</cPreprocessorMacro>
+										<cPreprocessorMacro>FUSE_USE_VERSION=317</cPreprocessorMacro>
 									</cPreprocessorMacros>
 									<includeFunctions>
 										<includeFunction>fuse_version</includeFunction>
 										<includeFunction>fuse_lib_help</includeFunction>
-										<includeFunction>fuse_new</includeFunction>
 										<includeFunction>fuse_mount</includeFunction>
 										<includeFunction>fuse_get_session</includeFunction>
 										<includeFunction>fuse_loop</includeFunction>
@@ -144,7 +143,7 @@
 									<headerClassName>fuse_lowlevel_h</headerClassName>
 									<cPreprocessorMacros>
 										<cPreprocessorMacro>_FILE_OFFSET_BITS=64</cPreprocessorMacro>
-										<cPreprocessorMacro>FUSE_USE_VERSION=312</cPreprocessorMacro>
+										<cPreprocessorMacro>FUSE_USE_VERSION=317</cPreprocessorMacro>
 									</cPreprocessorMacros>
 									<includeStructs>
 										<includeStruct>fuse_cmdline_opts</includeStruct>

jfuse-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/FuseFFIHelper.java

@@ -0,0 +1,73 @@
+package org.cryptomator.jfuse.linux.aarch64;
+
+import org.cryptomator.jfuse.linux.aarch64.extr.fuse3.fuse_h;
+
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.Linker;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.SymbolLookup;
+import java.lang.invoke.MethodHandle;
+
+/**
+ * Class for not jextract'able symbols, e.g. fuse_new_31
+ */
+public class FuseFFIHelper {
+
+
+	static final SymbolLookup SYMBOL_LOOKUP = SymbolLookup.loaderLookup()
+			.or(Linker.nativeLinker().defaultLookup());
+
+	static MemorySegment findOrThrow(String symbol) {
+		return SYMBOL_LOOKUP.find(symbol)
+				.orElseThrow(() -> new UnsatisfiedLinkError("unresolved symbol: " + symbol));
+	}
+
+	private static class fuse_new_31 {
+		public static final FunctionDescriptor DESC = FunctionDescriptor.of(
+				fuse_h.C_POINTER,
+				fuse_h.C_POINTER,
+				fuse_h.C_POINTER,
+				fuse_h.C_LONG,
+				fuse_h.C_POINTER
+		);
+
+		public static final MethodHandle HANDLE = Linker.nativeLinker().downcallHandle(
+				findOrThrow("fuse_new_31"),
+				DESC);
+	}
+
+	/**
+	 * Function descriptor for:
+	 * {@snippet lang = c:
+	 * struct fuse *fuse_new(struct fuse_args *args, const struct fuse_operations *op, size_t op_size, void *private_data)
+	 *}
+	 */
+	public static FunctionDescriptor fuse_new_31$descriptor() {
+		return fuse_new_31.DESC;
+	}
+
+
+	/**
+	 * Downcall method handle for:
+	 * {@snippet lang = c:
+	 * struct fuse *fuse_new(struct fuse_args *args, const struct fuse_operations *op, size_t op_size, void *private_data)
+	 *}
+	 */
+	public static MethodHandle fuse_new_31$handle() {
+		return fuse_new_31.HANDLE;
+	}
+
+	/**
+	 * {@snippet lang = c:
+	 * struct fuse *fuse_new(struct fuse_args *args, const struct fuse_operations *op, size_t op_size, void *private_data)
+	 *}
+	 */
+	public static MemorySegment fuse_new_31(MemorySegment args, MemorySegment op, long op_size, MemorySegment private_data) {
+		var mh$ = fuse_new_31.HANDLE;
+		try {
+			return (MemorySegment) mh$.invokeExact(args, op, op_size, private_data);
+		} catch (Throwable ex$) {
+			throw new AssertionError("should not reach here", ex$);
+		}
+	}
+}

jfuse-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/FuseImpl.java

@@ -28,16 +28,22 @@ public FuseImpl(FuseOperations fuseOperations) {
 	@Override
 	protected FuseMount mount(List<String> args) throws FuseMountFailedException {
 		var fuseArgs = parseArgs(args);
-		var fuse = fuse_h.fuse_new(fuseArgs.args(), fuseOperationsStruct, fuseOperationsStruct.byteSize(), MemorySegment.NULL);
-		if (MemorySegment.NULL.equals(fuse)) {
-			throw new FuseMountFailedException("fuse_new failed");
-		}
+		var fuse = createFuseFS(fuseArgs);
 		if (fuse_h.fuse_mount(fuse, fuseArgs.mountPoint()) != 0) {
 			throw new FuseMountFailedException("fuse_mount failed");
 		}
 		return new FuseMountImpl(fuse, fuseArgs);
 	}
 
+	@VisibleForTesting
+	MemorySegment createFuseFS(FuseArgs fuseArgs) throws FuseMountFailedException {
+		var fuse = FuseFFIHelper.fuse_new_31(fuseArgs.args(), fuseOperationsStruct, fuseOperationsStruct.byteSize(), MemorySegment.NULL);
+		if (MemorySegment.NULL.equals(fuse)) {
+			throw new FuseMountFailedException("fuse_new failed");
+		}
+		return fuse;
+	}
+
 	@VisibleForTesting
 	FuseArgs parseArgs(List<String> cmdLineArgs) throws IllegalArgumentException {
 		var args = fuse_args.allocate(fuseArena);

jfuse-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/extr/fuse3/fuse_args.java

@@ -203,15 +203,15 @@ public static MemorySegment allocateArray(long elementCount, SegmentAllocator al
     }
 
     /**
-     * Reinterprets {@code addr} using target {@code arena} and {@code cleanupAction) (if any).
+     * Reinterprets {@code addr} using target {@code arena} and {@code cleanupAction} (if any).
      * The returned segment has size {@code layout().byteSize()}
      */
     public static MemorySegment reinterpret(MemorySegment addr, Arena arena, Consumer<MemorySegment> cleanup) {
         return reinterpret(addr, 1, arena, cleanup);
     }
 
     /**
-     * Reinterprets {@code addr} using target {@code arena} and {@code cleanupAction) (if any).
+     * Reinterprets {@code addr} using target {@code arena} and {@code cleanupAction} (if any).
      * The returned segment has size {@code elementCount * layout().byteSize()}
      */
     public static MemorySegment reinterpret(MemorySegment addr, long elementCount, Arena arena, Consumer<MemorySegment> cleanup) {