ARTEMIS-5972: Replace JNI with Panama Foreign Function & Memory (FFM)…

.github/workflows/build.yml

@@ -55,6 +55,11 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
 
+      - name: Install System libaio Packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libaio1 libaio-dev
+
       # use 'install' so smoke-tests will work
       # By setting anything to org.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory.DISABLED we are disabling libaio loading on the testsuite
       - name: Fast Tests

artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java

@@ -238,6 +238,9 @@ public class Create extends InstallAbstract {
    @Option(names = "--aio", description = "Set the journal as asyncio.")
    private boolean aio;
 
+   @Option(names = "--aio2", description = "Set the journal as asyncio 2 (Panama FFM).")
+   private boolean aio2;
+
    @Option(names = "--nio", description = "Set the journal as nio.")
    private boolean nio;
 
@@ -1010,7 +1013,7 @@ private void setupJournalType() {
             aio = false;
          }
       }
-      int countJournalTypes = countBoolean(aio, nio, mapped);
+      int countJournalTypes = countBoolean(aio2, aio, nio, mapped);
       if (countJournalTypes > 1) {
          throw new RuntimeException("You can only select one journal type (--nio | --aio | --mapped).");
       }
@@ -1023,7 +1026,9 @@ private void setupJournalType() {
          }
       }
 
-      if (aio) {
+      if (aio2) {
+         journalType = JournalType.ASYNCIO_2;
+      } else if (aio) {
          journalType = JournalType.ASYNCIO;
       } else if (nio) {
          journalType = JournalType.NIO;

artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/util/SyncCalculation.java

@@ -28,6 +28,7 @@
 import org.apache.activemq.artemis.core.io.SequentialFile;
 import org.apache.activemq.artemis.core.io.SequentialFileFactory;
 import org.apache.activemq.artemis.core.io.aio.AIOSequentialFileFactory;
+import org.apache.artemis.core.io.aio2.AIO2Helper;
 import org.apache.activemq.artemis.core.io.mapped.MappedSequentialFileFactory;
 import org.apache.activemq.artemis.core.io.nio.NIOSequentialFileFactory;
 import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle;
@@ -247,7 +248,12 @@ private static SequentialFileFactory newFactory(File datafolder, boolean datasyn
          case ASYNCIO:
             factory = new AIOSequentialFileFactory(datafolder, maxAIO).setDatasync(datasync);
             factory.start();
-            ((AIOSequentialFileFactory) factory).disableBufferReuse();
+            factory.disableBufferReuse();
+            return factory;
+         case ASYNCIO_2:
+            factory = AIO2Helper.getAIO2SequentialFileFactory(datafolder, maxAIO).setDatasync(datasync);
+            factory.start();
+            factory.disableBufferReuse();
             return factory;
          case MAPPED:
             factory = new MappedSequentialFileFactory(datafolder, fileSize, false, 0, 0, null)

artemis-journal/pom.xml

@@ -28,6 +28,17 @@
    <packaging>jar</packaging>
    <name>Apache Artemis Journal</name>
 
+   <properties>
+      <test.stress.time>5000</test.stress.time>
+
+      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+      <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+      <activemq-child-surefire-argline>
+         -Dtest.stress.time=${test.stress.time} --enable-native-access=ALL-UNNAMED
+      </activemq-child-surefire-argline>
+   </properties>
+
    <dependencies>
 
       <!-- logging -->
@@ -70,6 +81,17 @@
          <artifactId>netty-common</artifactId>
       </dependency>
       <!-- needed to compile the tests -->
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <scope>test</scope>
+         <!-- License: EPL 1.0 -->
+      </dependency>
+      <dependency>
+         <groupId>org.junit.vintage</groupId>
+         <artifactId>junit-vintage-engine</artifactId>
+         <scope>test</scope>
+      </dependency>
       <dependency>
          <groupId>org.junit.jupiter</groupId>
          <artifactId>junit-jupiter-api</artifactId>
@@ -92,4 +114,74 @@
          <scope>test</scope>
       </dependency>
    </dependencies>
+   <profiles>
+      <profile>
+         <id>jdk24onwards</id>
+         <activation>
+            <jdk>[24,)</jdk>
+         </activation>
+         <build>
+            <plugins>
+               <plugin>
+                  <artifactId>maven-compiler-plugin</artifactId>
+                  <configuration>
+                     <release>24</release>
+                  </configuration>
+                  <executions>
+                     <execution>
+                        <id>java24-compile</id>
+                        <phase>compile</phase>
+                        <goals>
+                           <goal>compile</goal>
+                        </goals>
+                        <configuration>
+                           <compileSourceRoots>
+                              <compileSourceRoot>${project.basedir}/src/main/java24</compileSourceRoot>
+                              <multiReleaseOutput>true</multiReleaseOutput>
+                           </compileSourceRoots>
+                        </configuration>
+                     </execution>
+                     <execution>
+                        <id>java24-test-compile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                           <goal>testCompile</goal>
+                        </goals>
+                        <configuration>
+                           <compileSourceRoots>${project.basedir}/src/test/java24</compileSourceRoots>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
+               <plugin>
+                  <artifactId>maven-jar-plugin</artifactId>
+                  <!-- Do jar creation earlier, before the "test" phase, so that the
+                       multi-release-jar content is visible to any dependent modules,
+                       enabling them to use the relevant classes during their tests. -->
+                  <executions>
+                     <execution>
+                        <id>default-jar</id>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                           <goal>jar</goal>
+                        </goals>
+                     </execution>
+                  </executions>
+               </plugin>
+            </plugins>
+         </build>
+      </profile>
+   </profiles>
+
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <argLine>${activemq-surefire-argline} ${activemq-child-surefire-argline}</argLine>
+            </configuration>
+         </plugin>
+      </plugins>
+   </build>
 </project>

artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/SequentialFileFactory.java

@@ -34,6 +34,18 @@ default IOCriticalErrorListener getCriticalErrorListener() {
    default void setCriticalErrorListener(IOCriticalErrorListener listener) {
    }
 
+   default SequentialFileFactory disableBufferReuse() {
+      return this;
+   }
+
+   default ByteBuffer newNativeBuffer(int size, int alignment) {
+      throw new UnsupportedOperationException();
+   }
+
+   default void freeNativeBuffer(ByteBuffer buffer) {
+      throw new UnsupportedOperationException();
+   }
+
    default CriticalAnalyzer getCriticalAnalyzer() {
       return null;
    }

artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFileFactory.java

@@ -132,8 +132,10 @@ public void enableBufferReuse() {
       this.reuseBuffers = true;
    }
 
-   public void disableBufferReuse() {
+   @Override
+   public AIOSequentialFileFactory disableBufferReuse() {
       this.reuseBuffers = false;
+      return this;
    }
 
    @Override

artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/mapped/MappedSequentialFileFactory.java

@@ -98,6 +98,7 @@ public MappedSequentialFileFactory enableBufferReuse() {
       return this;
    }
 
+   @Override
    public MappedSequentialFileFactory disableBufferReuse() {
       this.bufferPooling = false;
       return this;

artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/nio/NIOSequentialFileFactory.java

@@ -110,8 +110,10 @@ public void enableBufferReuse() {
       this.bufferPooling = true;
    }
 
-   public void disableBufferReuse() {
+   @Override
+   public NIOSequentialFileFactory disableBufferReuse() {
       this.bufferPooling = false;
+      return this;
    }
 
    @Override

artemis-journal/src/main/java/org/apache/artemis/core/io/aio2/AIO2Helper.java

@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.artemis.core.io.aio2;
+
+import java.io.File;
+import java.lang.invoke.MethodHandles;
+
+import org.apache.activemq.artemis.core.io.IOCriticalErrorListener;
+import org.apache.activemq.artemis.core.io.SequentialFileFactory;
+import org.apache.activemq.artemis.utils.critical.CriticalAnalyzer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * AIO2 helper for JDK less than version 24.
+ * This version uses stub implementations that throw UnsupportedOperationException.
+ * For JDK 24+, see the real implementation in src/main/java24.
+ */
+public class AIO2Helper {
+
+   private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+   public static boolean isSupported() {
+      logger.debug("AIO2Helper from earlier JDKs being used");
+      return false;
+   }
+
+   public static long getTotalMaxIO() {
+      return 0;
+   }
+
+   public static SequentialFileFactory getAIO2SequentialFileFactory(File journalDir, int maxIO) {
+      return null;
+   }
+
+   public static SequentialFileFactory getAIO2SequentialFileFactory(File journalDir,
+                                                                    IOCriticalErrorListener listener,
+                                                                    int maxIO) {
+      return null;
+   }
+
+   public static SequentialFileFactory getAIO2SequentialFileFactory(File journalDir,
+                                                                    int bufferSize,
+                                                                    int bufferTimeout,
+                                                                    int maxIO,
+                                                                    boolean logRates) {
+      return null;
+   }
+
+   public static SequentialFileFactory getAIO2SequentialFileFactory(File journalDir,
+                                                                    int bufferSize,
+                                                                    int bufferTimeout,
+                                                                    int maxIO,
+                                                                    boolean logRates,
+                                                                    IOCriticalErrorListener listener,
+                                                                    CriticalAnalyzer analyzer) {
+      return null;
+   }
+
+}

artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/ActiveMQFileLock.java → artemis-journal/src/main/java/org/apache/artemis/nativo/jlibaio/LibaioContext.java

@@ -14,30 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.artemis.core.io.aio;
+package org.apache.artemis.nativo.jlibaio;
 
+import java.io.Closeable;
 import java.io.IOException;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
 
-import org.apache.activemq.artemis.nativo.jlibaio.LibaioFile;
+public class LibaioContext<Callback extends SubmitInfo> implements Closeable {
 
-public class ActiveMQFileLock extends FileLock {
-
-   private final LibaioFile file;
-
-   public ActiveMQFileLock(final LibaioFile handle) {
-      super((FileChannel) null, 0, 0, false);
-      this.file = handle;
-   }
-
-   @Override
-   public boolean isValid() {
-      return true;
+   public static boolean isSupported() {
+      return false;
    }
 
    @Override
-   public void release() throws IOException {
-      file.close();
+   public void close() throws IOException {
    }
 }

artemis-journal/src/main/java/org/apache/artemis/nativo/jlibaio/LibaioFile.java

@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.artemis.nativo.jlibaio;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+public class LibaioFile<Callback extends SubmitInfo> implements Closeable {
+
+   private final String errorMsg = "This is not supported for JDK < 24.";
+
+   LibaioFile(int fd, LibaioContext ctx) {
+   }
+
+   public int getBlockSize() throws IOException {
+      throw new UnsupportedOperationException(errorMsg);
+   }
+
+   public void fill(int alignment, long size) throws IOException {
+      throw new UnsupportedOperationException(errorMsg);
+   }
+
+   @Override
+   public void close() throws IOException {
+   }
+}