try not passing mode

rjernst · Jul 10, 2024 · 73854bf · 73854bf
1 parent f97bfe1
commit 73854bf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/libs/native/jna/src/main/java/org/elasticsearch/nativeaccess/jna/JnaPosixCLibrary.java b/libs/native/jna/src/main/java/org/elasticsearch/nativeaccess/jna/JnaPosixCLibrary.java
@@ -204,6 +204,11 @@ public int ftruncate(int fd, long length) {
         return functions.ftruncate(fd, new NativeLong(length));
     }
 
+    @Override
+    public int open(String pathname, int flags) {
+        return functions.open(pathname, flags);
+    }
+
     @Override
     public int open(String pathname, int flags, int mode) {
         return functions.open(pathname, flags, mode);

diff --git a/libs/native/src/main/java/org/elasticsearch/nativeaccess/PosixNativeAccess.java b/libs/native/src/main/java/org/elasticsearch/nativeaccess/PosixNativeAccess.java
@@ -131,7 +131,7 @@ public OptionalLong allocatedSizeInBytes(Path path) {
         assert Files.isRegularFile(path) : path;
         var stats = libc.newStat64(constants.statStructSize(), constants.statStructSizeOffset(), constants.statStructBlocksOffset());
 
-        int fd = libc.open(path.toAbsolutePath().toString(), O_RDONLY, 0);
+        int fd = libc.open(path.toAbsolutePath().toString(), O_RDONLY);
         if (fd == -1) {
             logger.warn("Could not open file [" + path + "] to get allocated size: " + libc.strerror(libc.errno()));
             return OptionalLong.empty();

diff --git a/libs/native/src/main/java/org/elasticsearch/nativeaccess/lib/PosixCLibrary.java b/libs/native/src/main/java/org/elasticsearch/nativeaccess/lib/PosixCLibrary.java
@@ -66,6 +66,8 @@ interface Stat64 {
 
     int open(String pathname, int flags, int mode);
 
+    int open(String pathname, int flags);
+
     int close(int fd);
 
     int fstat64(int fd, Stat64 stats);

diff --git a/libs/native/src/main21/java/org/elasticsearch/nativeaccess/jdk/JdkPosixCLibrary.java b/libs/native/src/main21/java/org/elasticsearch/nativeaccess/jdk/JdkPosixCLibrary.java
@@ -166,6 +166,16 @@ public int ftruncate(int fd, long length) {
         }
     }
 
+    @Override
+    public int open(String pathname, int flags) {
+        try (Arena arena = Arena.ofConfined()) {
+            MemorySegment nativePathname = MemorySegmentUtil.allocateString(arena, pathname);
+            return (int) open$mh.invokeExact(errnoState, nativePathname, flags);
+        } catch (Throwable t) {
+            throw new AssertionError(t);
+        }
+    }
+
     @Override
     public int open(String pathname, int flags, int mode) {
         try (Arena arena = Arena.ofConfined()) {