replaced inMemory cache with caffeine for performance benchmarks

.gitea/workflows/build-dev.yaml

@@ -1,80 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - 'dev'
-jobs:
-  build:
-    runs-on: hostinger
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v4
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-      - name: Execute Gradle build
-        run: ./gradlew build
-      - name: Prepare Docker image build
-        run: ./gradlew prepareDockerBuild
-      - name: Get project version
-        id: retrieve-version
-        run: ./gradlew -q version >> "$GITHUB_OUTPUT"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-        with:
-          driver: docker-container
-      - name: Login to Gitea container registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.woggioni.net
-          username: woggioni
-          password: ${{ secrets.PUBLISHER_TOKEN }}
-      -
-        name: Build rbcs Docker image
-        uses: docker/build-push-action@v5.3.0
-        with:
-          context: "docker/build/docker"
-          platforms: linux/amd64,linux/arm64
-          push: true
-          pull: true
-          tags: |
-            gitea.woggioni.net/woggioni/rbcs:vanilla-dev
-          target: release-vanilla
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/rbcs:buildx
-      -
-        name: Build rbcs memcache Docker image
-        uses: docker/build-push-action@v5.3.0
-        with:
-          context: "docker/build/docker"
-          platforms: linux/amd64,linux/arm64
-          push: true
-          pull: true
-          tags: |
-            gitea.woggioni.net/woggioni/rbcs:memcache-dev
-          target: release-memcache
-          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/rbcs:buildx
-          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/rbcs:buildx
-      -
-        name: Build rbcs native Docker image
-        uses: docker/build-push-action@v5.3.0
-        with:
-          context: "docker/build/docker"
-          platforms: linux/amd64
-          push: true
-          pull: true
-          tags: |
-            gitea.woggioni.net/woggioni/rbcs:native-dev
-          target: release-native
-      -
-        name: Build rbcs jlink Docker image
-        uses: docker/build-push-action@v5.3.0
-        with:
-          context: "docker/build/docker"
-          platforms: linux/amd64
-          push: true
-          pull: true
-          tags: |
-            gitea.woggioni.net/woggioni/rbcs:jlink-dev
-          target: release-jlink
-

.gitea/workflows/build.yaml

@@ -52,8 +52,6 @@ jobs:
           push: true
           pull: true
           tags: |
-            gitea.woggioni.net/woggioni/rbcs:latest
-            gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}
             gitea.woggioni.net/woggioni/rbcs:memcache
             gitea.woggioni.net/woggioni/rbcs:memcache-${{ steps.retrieve-version.outputs.VERSION }}
           target: release-memcache
@@ -68,21 +66,11 @@ jobs:
           push: true
           pull: true
           tags: |
+            gitea.woggioni.net/woggioni/rbcs:latest
+            gitea.woggioni.net/woggioni/rbcs:${{ steps.retrieve-version.outputs.VERSION }}
             gitea.woggioni.net/woggioni/rbcs:native
             gitea.woggioni.net/woggioni/rbcs:native-${{ steps.retrieve-version.outputs.VERSION }}
           target: release-native
-      -
-        name: Build rbcs jlink Docker image
-        uses: docker/build-push-action@v5.3.0
-        with:
-          context: "docker/build/docker"
-          platforms: linux/amd64
-          push: true
-          pull: true
-          tags: |
-            gitea.woggioni.net/woggioni/rbcs:jlink
-            gitea.woggioni.net/woggioni/rbcs:jlink-${{ steps.retrieve-version.outputs.VERSION }}-jlink
-          target: release-jlink
       - name: Publish artifacts
         env:
           PUBLISHER_TOKEN: ${{ secrets.PUBLISHER_TOKEN }}

docker/Dockerfile

@@ -16,27 +16,8 @@ WORKDIR /home/luser
 ADD logback.xml .
 ENTRYPOINT ["java", "-Dlogback.configurationFile=logback.xml", "-XX:MaxRAMPercentage=70", "-XX:GCTimeRatio=24", "-XX:+UseZGC", "-XX:+ZGenerational", "-jar", "/home/luser/rbcs.jar"]
 
-FROM busybox:musl AS base-native
-RUN mkdir -p /var/lib/rbcs /etc/rbcs
-RUN adduser -D -u 1000 rbcs -h /var/lib/rbcs
-
 FROM scratch AS release-native
-COPY --from=base-native /etc/passwd /etc/passwd
+ADD rbcs-cli.upx /rbcs/rbcs-cli
-COPY --from=base-native /etc/rbcs /etc/rbcs
+ENV RBCS_CONFIGURATION_DIR="/rbcs"
-COPY --from=base-native /var/lib/rbcs /var/lib/rbcs
+WORKDIR /rbcs
-ADD rbcs-cli.upx /usr/bin/rbcs-cli
+ENTRYPOINT ["/rbcs/rbcs-cli", "-XX:MaximumHeapSizePercent=70"]
-ENV RBCS_CONFIGURATION_DIR="/etc/rbcs"
-USER rbcs
-WORKDIR /var/lib/rbcs
-ENTRYPOINT ["/usr/bin/rbcs-cli", "-XX:MaximumHeapSizePercent=70"]
-
-FROM debian:12-slim AS release-jlink
-RUN mkdir -p /usr/share/java/rbcs
-RUN --mount=type=bind,source=.,target=/build/distributions tar -xf /build/distributions/rbcs-cli*.tar -C /usr/share/java/rbcs
-ADD --chmod=755 rbcs-cli.sh /usr/local/bin/rbcs-cli
-RUN adduser -u 1000 luser
-USER luser
-WORKDIR /home/luser
-ADD logback.xml .
-ENV JAVA_OPTS=-XX:-UseJVMCICompiler\ -Dlogback.configurationFile=logback.xml\ -XX:MaxRAMPercentage=70\ -XX:GCTimeRatio=24\ -XX:+UseZGC\ -XX:+ZGenerational
-ENTRYPOINT ["/usr/local/bin/rbcs-cli"]

docker/README.md

@@ -11,15 +11,11 @@ The `memcache` image is similar to the `vanilla` image, except that it also cont
 the `rbcs-server-memcache` plugin in the `plugins` folder, use this image if you don't want to use the `native`
 image and want to use memcache as the cache backend
 
-The `native` image contains a native, statically-linked executable created with GraalVM Native Image
+The `native` image contains a native, statically-linked executable created with GraalVM
 that has no userspace dependencies. It also embeds the memcache plugin inside the executable.
 Use this image for maximum efficiency and minimal memory footprint. 
 
-The `jlink` image contains a custom Java runtime created with GraalVM's Jlink
+## Which image shoud I use?
-that only depends on glibc. It also contains the memcache plugin in the module path.
-Use this image for best performance.
-
-## Which image should I use?
 The `native` image uses Java's SerialGC, so it's ideal for constrained environment like containers or small servers,
 if you have a lot of resources and want to squeeze out the maximum throughput you should consider the
 `vanilla` or `memcache` image, then choose and fine tune the garbage collector.

docker/build.gradle

@@ -29,7 +29,7 @@ Provider<Copy> prepareDockerBuild = tasks.register('prepareDockerBuild', Copy) {
     group = 'docker'
     into project.layout.buildDirectory.file('docker')
     from(configurations.docker)
-    from(files('Dockerfile', 'rbcs-cli.sh'))
+    from(file('Dockerfile'))
     from(rootProject.file('conf')) {
         include 'logback.xml'
     }

docker/rbcs-cli.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-DIR=/usr/share/java/rbcs
-$DIR/bin/java $JAVA_OPTS -m net.woggioni.rbcs.cli "$@"

gradle.properties

@@ -2,9 +2,9 @@ org.gradle.configuration-cache=false
 org.gradle.parallel=true
 org.gradle.caching=true
 
-rbcs.version = 0.3.0-SNAPSHOT
+rbcs.version = 0.2.1
 
-lys.version = 2025.06.10
+lys.version = 2025.03.08
 
 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven
 docker.registry.url=gitea.woggioni.net

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

rbcs-cli/build.gradle

@@ -18,7 +18,6 @@ import net.woggioni.gradle.graalvm.UpxTask
 import net.woggioni.gradle.graalvm.JlinkPlugin
 import net.woggioni.gradle.graalvm.JlinkTask
 
-
 sourceSets {
     configureNativeImage {
         java {
@@ -30,7 +29,6 @@ sourceSets {
 }
 
 configurations {
-
     release {
         transitive = false
         canBeConsumed = true
@@ -122,36 +120,16 @@ nativeImage {
     linkAtBuildTime = false
     classpath = project.files(jarTaskProvider, configurations.nativeImage)
     compressExecutable = true
-    compressionLevel = 6
+    compressionLevel = 10
     useLZMA = false
 }
 
 Provider<UpxTask> upxTaskProvider = tasks.named(NativeImagePlugin.UPX_TASK_NAME, UpxTask) {
 }
 
-Provider<JlinkTask> jlinkTaskProvider = tasks.named(JlinkPlugin.JLINK_TASK_NAME, JlinkTask) {
+tasks.named(JlinkPlugin.JLINK_TASK_NAME, JlinkTask) {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
-        vendor = JvmVendorSpec.GRAAL_VM
-    }
-
     mainClass = mainClassName
     mainModule = 'net.woggioni.rbcs.cli'
-    classpath = project.files(
-            configurations.configureNativeImageRuntimeClasspath,
-            sourceSets.configureNativeImage.output
-    )
-    additionalModules = [
-        'net.woggioni.rbcs.server.memcache',
-        'ch.qos.logback.classic',
-        'jdk.crypto.ec'
-    ]
-    compressionLevel = 2
-    stripDebug = false
-}
-
-Provider<Tar> jlinkDistTarTaskProvider = tasks.named(JlinkPlugin.JLINK_DIST_TAR_TASK_NAME, Tar) {
-    exclude 'lib/libjvmcicompiler.so'
 }
 
 tasks.named(JavaPlugin.PROCESS_RESOURCES_TASK_NAME, ProcessResources) {
@@ -165,7 +143,6 @@ tasks.named(JavaPlugin.PROCESS_RESOURCES_TASK_NAME, ProcessResources) {
 artifacts {
     release(envelopeJarTaskProvider)
     release(upxTaskProvider)
-    release(jlinkDistTarTaskProvider)
 }
 
 publishing {

rbcs-cli/native-image/reflect-config.json

@@ -43,6 +43,46 @@
 {
   "name":"com.aayushatharva.brotli4j.Brotli4jLoader"
 },
+{
+  "name":"com.github.benmanes.caffeine.cache.BLCHeader$DrainStatusRef",
+  "fields":[{"name":"drainStatus"}]
+},
+{
+  "name":"com.github.benmanes.caffeine.cache.BaseMpscLinkedArrayQueueColdProducerFields",
+  "fields":[{"name":"producerLimit"}]
+},
+{
+  "name":"com.github.benmanes.caffeine.cache.BaseMpscLinkedArrayQueueConsumerFields",
+  "fields":[{"name":"consumerIndex"}]
+},
+{
+  "name":"com.github.benmanes.caffeine.cache.BaseMpscLinkedArrayQueueProducerFields",
+  "fields":[{"name":"producerIndex"}]
+},
+{
+  "name":"com.github.benmanes.caffeine.cache.BoundedLocalCache",
+  "fields":[{"name":"refreshes"}]
+},
+{
+  "name":"com.github.benmanes.caffeine.cache.PS",
+  "fields":[{"name":"key"}, {"name":"value"}]
+},
+{
+  "name":"com.github.benmanes.caffeine.cache.PSW",
+  "fields":[{"name":"writeTime"}]
+},
+{
+  "name":"com.github.benmanes.caffeine.cache.PSWMS",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
+{
+  "name":"com.github.benmanes.caffeine.cache.SSMSW",
+  "fields":[{"name":"FACTORY"}]
+},
+{
+  "name":"com.github.benmanes.caffeine.cache.StripedBuffer",
+  "fields":[{"name":"tableBusy"}]
+},
 {
   "name":"com.github.luben.zstd.Zstd"
 },
@@ -120,14 +160,6 @@
   "name":"io.netty.buffer.AbstractReferenceCountedByteBuf",
   "fields":[{"name":"refCnt"}]
 },
-{
-  "name":"io.netty.buffer.AdaptivePoolingAllocator$Chunk",
-  "fields":[{"name":"refCnt"}]
-},
-{
-  "name":"io.netty.buffer.AdaptivePoolingAllocator$Magazine",
-  "fields":[{"name":"nextInLine"}]
-},
 {
   "name":"io.netty.channel.AbstractChannelHandlerContext",
   "fields":[{"name":"handlerState"}]
@@ -292,13 +324,20 @@
   "fields":[{"name":"producerIndex"}]
 },
 {
-  "name":"io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerIndexField",
+  "name":"io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField",
   "fields":[{"name":"consumerIndex"}]
 },
 {
-  "name":"io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerIndexField",
+  "name":"io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField",
   "fields":[{"name":"producerIndex"}]
 },
+{
+  "name":"io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField",
+  "fields":[{"name":"producerLimit"}]
+},
+{
+  "name":"java.io.FilePermission"
+},
 {
   "name":"java.lang.Object",
   "allDeclaredFields":true,
@@ -308,14 +347,26 @@
   "name":"java.lang.ProcessHandle",
   "methods":[{"name":"current","parameterTypes":[] }, {"name":"pid","parameterTypes":[] }]
 },
+{
+  "name":"java.lang.RuntimePermission"
+},
 {
   "name":"java.lang.System",
   "methods":[{"name":"console","parameterTypes":[] }]
 },
 {
   "name":"java.lang.Thread",
-  "fields":[{"name":"threadLocalRandomProbe"}],
+  "fields":[{"name":"threadLocalRandomProbe"}]
-  "methods":[{"name":"isVirtual","parameterTypes":[] }]
+},
+{
+  "name":"java.net.NetPermission"
+},
+{
+  "name":"java.net.SocketPermission"
+},
+{
+  "name":"java.net.URLPermission",
+  "methods":[{"name":"<init>","parameterTypes":["java.lang.String","java.lang.String"] }]
 },
 {
   "name":"java.nio.Bits",
@@ -347,12 +398,18 @@
 {
   "name":"java.security.AlgorithmParametersSpi"
 },
+{
+  "name":"java.security.AllPermission"
+},
 {
   "name":"java.security.KeyStoreSpi"
 },
 {
   "name":"java.security.SecureRandomParameters"
 },
+{
+  "name":"java.security.SecurityPermission"
+},
 {
   "name":"java.sql.Connection"
 },
@@ -427,6 +484,9 @@
   "name":"java.time.ZonedDateTime",
   "methods":[{"name":"parse","parameterTypes":["java.lang.CharSequence"] }]
 },
+{
+  "name":"java.util.PropertyPermission"
+},
 {
   "name":"java.util.concurrent.ForkJoinTask",
   "fields":[{"name":"aux"}, {"name":"status"}]
@@ -447,11 +507,22 @@
   "name":"java.util.concurrent.atomic.Striped64$Cell",
   "fields":[{"name":"value"}]
 },
+{
+  "name":"java.util.zip.Adler32",
+  "methods":[{"name":"update","parameterTypes":["java.nio.ByteBuffer"] }]
+},
+{
+  "name":"java.util.zip.CRC32",
+  "methods":[{"name":"update","parameterTypes":["java.nio.ByteBuffer"] }]
+},
 {
   "name":"javax.security.auth.x500.X500Principal",
   "fields":[{"name":"thisX500Name"}],
   "methods":[{"name":"<init>","parameterTypes":["sun.security.x509.X500Name"] }]
 },
+{
+  "name":"javax.smartcardio.CardPermission"
+},
 {
   "name":"jdk.internal.misc.Unsafe",
   "methods":[{"name":"getUnsafe","parameterTypes":[] }]
@@ -587,7 +658,7 @@
 {
   "name":"sun.misc.Unsafe",
   "fields":[{"name":"theUnsafe"}],
-  "methods":[{"name":"copyMemory","parameterTypes":["java.lang.Object","long","java.lang.Object","long","long"] }, {"name":"getAndAddLong","parameterTypes":["java.lang.Object","long","long"] }, {"name":"getAndSetObject","parameterTypes":["java.lang.Object","long","java.lang.Object"] }, {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }]
+  "methods":[{"name":"copyMemory","parameterTypes":["java.lang.Object","long","java.lang.Object","long","long"] }, {"name":"getAndAddLong","parameterTypes":["java.lang.Object","long","long"] }, {"name":"getAndSetObject","parameterTypes":["java.lang.Object","long","java.lang.Object"] }, {"name":"invokeCleaner","parameterTypes":["java.nio.ByteBuffer"] }, {"name":"storeFence","parameterTypes":[] }]
 },
 {
   "name":"sun.nio.ch.SelectorImpl",
@@ -609,6 +680,10 @@
   "name":"sun.security.provider.DSA$SHA256withDSA",
   "methods":[{"name":"<init>","parameterTypes":[] }]
 },
+{
+  "name":"sun.security.provider.JavaKeyStore$JKS",
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+},
 {
   "name":"sun.security.provider.MD5",
   "methods":[{"name":"<init>","parameterTypes":[] }]
@@ -697,14 +772,6 @@
   "name":"sun.security.x509.CertificatePoliciesExtension",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
 },
-{
-  "name":"sun.security.x509.ExtendedKeyUsageExtension",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
-},
-{
-  "name":"sun.security.x509.IssuerAlternativeNameExtension",
-  "methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]
-},
 {
   "name":"sun.security.x509.KeyUsageExtension",
   "methods":[{"name":"<init>","parameterTypes":["java.lang.Boolean","java.lang.Object"] }]

rbcs-cli/native-image/resource-config.json

@@ -32,12 +32,14 @@
     "pattern":"\\Qnet/woggioni/rbcs/cli/logback.xml\\E"
   }, {
     "pattern":"\\Qnet/woggioni/rbcs/client/schema/rbcs-client.xsd\\E"
-  }, {
-    "pattern":"\\Qnet/woggioni/rbcs/server/memcache/schema/rbcs-memcache.xsd\\E"
   }, {
     "pattern":"\\Qnet/woggioni/rbcs/server/rbcs-default.xml\\E"
   }, {
     "pattern":"\\Qnet/woggioni/rbcs/server/schema/rbcs-server.xsd\\E"
+  }, {
+    "pattern":"\\Q/net/woggioni/rbcs/server/memcache/schema/rbcs-memcache.xsd\\E"
+  }, {
+    "pattern":"java.base:\\Qsun/text/resources/LineBreakIteratorData\\E"
   }]},
   "bundles":[{
     "name":"com.sun.org.apache.xerces.internal.impl.xpath.regex.message",

rbcs-cli/src/main/kotlin/net/woggioni/rbcs/cli/impl/RbcsCommand.kt

@@ -12,7 +12,7 @@ abstract class RbcsCommand : Runnable {
         private set
 
     protected fun findConfigurationFile(app: Application, fileName : String): Path {
-        val confDir = app.computeConfigurationDirectory(false)
+        val confDir = app.computeConfigurationDirectory()
         val configurationFile = confDir.resolve(fileName)
         return configurationFile
     }

rbcs-client/src/main/kotlin/net/woggioni/rbcs/client/RemoteBuildCacheClient.kt

@@ -7,10 +7,8 @@ import io.netty.channel.Channel
 import io.netty.channel.ChannelHandlerContext
 import io.netty.channel.ChannelOption
 import io.netty.channel.ChannelPipeline
-import io.netty.channel.IoEventLoopGroup
-import io.netty.channel.MultiThreadIoEventLoopGroup
 import io.netty.channel.SimpleChannelInboundHandler
-import io.netty.channel.nio.NioIoHandler
+import io.netty.channel.nio.NioEventLoopGroup
 import io.netty.channel.pool.AbstractChannelPoolHandler
 import io.netty.channel.pool.ChannelPool
 import io.netty.channel.pool.FixedChannelPool
@@ -34,8 +32,12 @@ import io.netty.handler.timeout.IdleState
 import io.netty.handler.timeout.IdleStateEvent
 import io.netty.handler.timeout.IdleStateHandler
 import io.netty.util.concurrent.Future
-import io.netty.util.concurrent.Future as NettyFuture
 import io.netty.util.concurrent.GenericFutureListener
+import net.woggioni.rbcs.api.CacheValueMetadata
+import net.woggioni.rbcs.common.RBCS.loadKeystore
+import net.woggioni.rbcs.common.createLogger
+import net.woggioni.rbcs.common.debug
+import net.woggioni.rbcs.common.trace
 import java.io.IOException
 import java.net.InetSocketAddress
 import java.net.URI
@@ -48,23 +50,19 @@ import java.util.concurrent.atomic.AtomicInteger
 import javax.net.ssl.TrustManagerFactory
 import javax.net.ssl.X509TrustManager
 import kotlin.random.Random
-import net.woggioni.rbcs.api.CacheValueMetadata
+import io.netty.util.concurrent.Future as NettyFuture
-import net.woggioni.rbcs.common.RBCS.loadKeystore
-import net.woggioni.rbcs.common.createLogger
-import net.woggioni.rbcs.common.debug
-import net.woggioni.rbcs.common.trace
 
 class RemoteBuildCacheClient(private val profile: Configuration.Profile) : AutoCloseable {
     companion object {
         private val log = createLogger<RemoteBuildCacheClient>()
     }
 
-    private val group: IoEventLoopGroup
+    private val group: NioEventLoopGroup
     private val sslContext: SslContext
     private val pool: ChannelPool
 
     init {
-        group = MultiThreadIoEventLoopGroup(NioIoHandler.newFactory())
+        group = NioEventLoopGroup()
         sslContext = SslContextBuilder.forClient().also { builder ->
             (profile.authentication as? Configuration.Authentication.TlsClientAuthenticationCredentials)?.let { tlsClientAuthenticationCredentials ->
                 builder.apply {

rbcs-server/build.gradle

@@ -12,6 +12,7 @@ dependencies {
     implementation catalog.netty.handler
     implementation catalog.netty.buffer
     implementation catalog.netty.transport
+    implementation("com.github.ben-manes.caffeine:caffeine:3.2.0")
 
     api project(':rbcs-common')
     api project(':rbcs-api')

rbcs-server/src/main/java/module-info.java

@@ -3,19 +3,22 @@ import net.woggioni.rbcs.server.cache.FileSystemCacheProvider;
 import net.woggioni.rbcs.server.cache.InMemoryCacheProvider;
 
 module net.woggioni.rbcs.server {
+    requires java.sql;
     requires java.xml;
+    requires java.logging;
     requires java.naming;
     requires kotlin.stdlib;
+    requires io.netty.buffer;
+    requires io.netty.transport;
     requires io.netty.codec.http;
+    requires io.netty.common;
     requires io.netty.handler;
+    requires io.netty.codec;
+    requires org.slf4j;
     requires net.woggioni.jwo;
     requires net.woggioni.rbcs.common;
     requires net.woggioni.rbcs.api;
-    requires io.netty.codec.compression;
+    requires com.github.benmanes.caffeine;
-    requires io.netty.transport;
-    requires io.netty.buffer;
-    requires io.netty.common;
-    requires org.slf4j;
 
     exports net.woggioni.rbcs.server;
 

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/RemoteBuildCacheServer.kt

@@ -11,8 +11,7 @@ import io.netty.channel.ChannelInboundHandlerAdapter
 import io.netty.channel.ChannelInitializer
 import io.netty.channel.ChannelOption
 import io.netty.channel.ChannelPromise
-import io.netty.channel.MultiThreadIoEventLoopGroup
+import io.netty.channel.nio.NioEventLoopGroup
-import io.netty.channel.nio.NioIoHandler
 import io.netty.channel.socket.DatagramChannel
 import io.netty.channel.socket.ServerSocketChannel
 import io.netty.channel.socket.SocketChannel
@@ -35,25 +34,8 @@ import io.netty.handler.timeout.IdleState
 import io.netty.handler.timeout.IdleStateEvent
 import io.netty.handler.timeout.IdleStateHandler
 import io.netty.util.AttributeKey
+import io.netty.util.concurrent.DefaultEventExecutorGroup
 import io.netty.util.concurrent.EventExecutorGroup
-import java.io.OutputStream
-import java.net.InetSocketAddress
-import java.nio.file.Files
-import java.nio.file.Path
-import java.security.PrivateKey
-import java.security.cert.X509Certificate
-import java.time.Duration
-import java.time.Instant
-import java.util.Arrays
-import java.util.Base64
-import java.util.concurrent.CompletableFuture
-import java.util.concurrent.Future
-import java.util.concurrent.TimeUnit
-import java.util.concurrent.TimeoutException
-import java.util.regex.Matcher
-import java.util.regex.Pattern
-import javax.naming.ldap.LdapName
-import javax.net.ssl.SSLPeerUnverifiedException
 import net.woggioni.rbcs.api.AsyncCloseable
 import net.woggioni.rbcs.api.Configuration
 import net.woggioni.rbcs.api.exception.ConfigurationException
@@ -77,6 +59,24 @@ import net.woggioni.rbcs.server.handler.MaxRequestSizeHandler
 import net.woggioni.rbcs.server.handler.ServerHandler
 import net.woggioni.rbcs.server.throttling.BucketManager
 import net.woggioni.rbcs.server.throttling.ThrottlingHandler
+import java.io.OutputStream
+import java.net.InetSocketAddress
+import java.nio.file.Files
+import java.nio.file.Path
+import java.security.PrivateKey
+import java.security.cert.X509Certificate
+import java.time.Duration
+import java.time.Instant
+import java.util.Arrays
+import java.util.Base64
+import java.util.concurrent.CompletableFuture
+import java.util.concurrent.Future
+import java.util.concurrent.TimeUnit
+import java.util.concurrent.TimeoutException
+import java.util.regex.Matcher
+import java.util.regex.Pattern
+import javax.naming.ldap.LdapName
+import javax.net.ssl.SSLPeerUnverifiedException
 
 class RemoteBuildCacheServer(private val cfg: Configuration) {
 
@@ -208,6 +208,7 @@ class RemoteBuildCacheServer(private val cfg: Configuration) {
         private val cfg: Configuration,
         private val channelFactory : ChannelFactory<SocketChannel>,
         private val datagramChannelFactory : ChannelFactory<DatagramChannel>,
+        private val eventExecutorGroup: EventExecutorGroup
     ) : ChannelInitializer<Channel>(), AsyncCloseable {
 
         companion object {
@@ -359,7 +360,7 @@ class RemoteBuildCacheServer(private val cfg: Configuration) {
                     cacheHandlerFactory.newHandler(cfg, ch.eventLoop(), channelFactory, datagramChannelFactory)
                 }
             }
-            pipeline.addLast(ServerHandler.NAME, serverHandler)
+            pipeline.addLast(eventExecutorGroup, ServerHandler.NAME, serverHandler)
             pipeline.addLast(ExceptionHandler.NAME, ExceptionHandler)
             pipeline.addLast(BlackHoleRequestHandler.NAME, BlackHoleRequestHandler())
         }
@@ -440,13 +441,20 @@ class RemoteBuildCacheServer(private val cfg: Configuration) {
 
     fun run(): ServerHandle {
         // Create the multithreaded event loops for the server
-        val bossGroup = MultiThreadIoEventLoopGroup(1, NioIoHandler.newFactory())
+        val bossGroup = NioEventLoopGroup(1)
         val channelFactory = ChannelFactory<SocketChannel> { NioSocketChannel() }
         val datagramChannelFactory = ChannelFactory<DatagramChannel> { NioDatagramChannel() }
         val serverChannelFactory = ChannelFactory<ServerSocketChannel> { NioServerSocketChannel() }
-        val workerGroup = MultiThreadIoEventLoopGroup(0, NioIoHandler.newFactory())
+        val workerGroup = NioEventLoopGroup(0)
-
+        val eventExecutorGroup = run {
-        val serverInitializer = ServerInitializer(cfg, channelFactory, datagramChannelFactory)
+            val threadFactory = if (cfg.eventExecutor.isUseVirtualThreads) {
+                Thread.ofVirtual().factory()
+            } else {
+                null
+            }
+            DefaultEventExecutorGroup(Runtime.getRuntime().availableProcessors(), threadFactory)
+        }
+        val serverInitializer = ServerInitializer(cfg, channelFactory, datagramChannelFactory, workerGroup)
         val bootstrap = ServerBootstrap().apply {
             // Configure the server
             group(bossGroup, workerGroup)
@@ -467,7 +475,7 @@ class RemoteBuildCacheServer(private val cfg: Configuration) {
         return ServerHandle(
             httpChannel.closeFuture(),
             bossGroup,
-            setOf(workerGroup),
+            setOf(workerGroup, eventExecutorGroup),
             serverInitializer
         )
     }

rbcs-server/src/main/kotlin/net/woggioni/rbcs/server/cache/InMemoryCache.kt

@@ -1,16 +1,13 @@
 package net.woggioni.rbcs.server.cache
 
+import com.github.benmanes.caffeine.cache.Cache
+import com.github.benmanes.caffeine.cache.Caffeine
 import io.netty.buffer.ByteBuf
 import net.woggioni.rbcs.api.AsyncCloseable
 import net.woggioni.rbcs.api.CacheValueMetadata
 import net.woggioni.rbcs.common.createLogger
 import java.time.Duration
-import java.time.Instant
-import java.util.PriorityQueue
 import java.util.concurrent.CompletableFuture
-import java.util.concurrent.TimeUnit
-import java.util.concurrent.locks.ReentrantReadWriteLock
-import kotlin.concurrent.withLock
 
 private class CacheKey(private val value: ByteArray) {
     override fun equals(other: Any?) = if (other is CacheKey) {
@@ -26,118 +23,29 @@ class CacheEntry(
 )
 
 class InMemoryCache(
-    private val maxAge: Duration,
+    maxAge: Duration,
-    private val maxSize: Long
+    maxSize: Long
 ) : AsyncCloseable {
 
     companion object {
         private val log = createLogger<InMemoryCache>()
     }
 
-    private var mapSize : Long = 0
+    private val cache: Cache<CacheKey, CacheEntry> = Caffeine.newBuilder()
-    private val map = HashMap<CacheKey, CacheEntry>()
+        .expireAfterWrite(maxAge)
-    private val lock = ReentrantReadWriteLock()
+        .maximumSize(maxSize)
-    private val cond = lock.writeLock().newCondition()
+        .build()
+    override fun asyncClose(): CompletableFuture<Void> = CompletableFuture.completedFuture(null)
 
-    private class RemovalQueueElement(val key: CacheKey, val value: CacheEntry, val expiry: Instant) :
+    fun get(key: ByteArray) = cache.getIfPresent(CacheKey(key))?.run {
-        Comparable<RemovalQueueElement> {
-        override fun compareTo(other: RemovalQueueElement) = expiry.compareTo(other.expiry)
-    }
-
-    private val removalQueue = PriorityQueue<RemovalQueueElement>()
-
-    @Volatile
-    private var running = true
-
-    private val closeFuture = object : CompletableFuture<Void>() {
-        init {
-            Thread.ofVirtual().name("in-memory-cache-gc").start {
-                try {
-                    lock.writeLock().withLock {
-                        while (running) {
-                            val el = removalQueue.poll()
-                            if(el == null) {
-                                cond.await(1000, TimeUnit.MILLISECONDS)
-                                continue
-                            }
-                            val value = el.value
-                            val now = Instant.now()
-                            if (now > el.expiry) {
-                                val removed = map.remove(el.key, value)
-                                if (removed) {
-                                    updateSizeAfterRemoval(value.content)
-                                    //Decrease the reference count for map
-                                    value.content.release()
-                                }
-                            } else {
-                                removalQueue.offer(el)
-                                val interval = minOf(Duration.between(now, el.expiry), Duration.ofSeconds(1))
-                                cond.await(interval.toMillis(), TimeUnit.MILLISECONDS)
-                            }
-                        }
-                        map.forEach {
-                            it.value.content.release()
-                        }
-                        map.clear()
-                    }
-                    complete(null)
-                } catch (ex: Throwable) {
-                    completeExceptionally(ex)
-                }
-            }
-        }
-    }
-
-    fun removeEldest(): Long {
-        while (true) {
-            val el = removalQueue.poll() ?: return mapSize
-            val value = el.value
-            val removed = map.remove(el.key, value)
-            if (removed) {
-                val newSize = updateSizeAfterRemoval(value.content)
-                //Decrease the reference count for map
-                value.content.release()
-                return newSize
-            }
-        }
-    }
-
-    private fun updateSizeAfterRemoval(removed: ByteBuf): Long {
-        mapSize -= removed.readableBytes()
-        return mapSize
-    }
-
-    override fun asyncClose() : CompletableFuture<Void> {
-        running = false
-        lock.writeLock().withLock {
-            cond.signal()
-        }
-        return closeFuture
-    }
-
-    fun get(key: ByteArray) = lock.readLock().withLock {
-        map[CacheKey(key)]?.run {
             CacheEntry(metadata, content.retainedDuplicate())
         }
-    }
 
     fun put(
         key: ByteArray,
         value: CacheEntry,
     ) {
         val cacheKey = CacheKey(key)
-        lock.writeLock().withLock {
+        cache.put(cacheKey, value)
-            val oldSize = map.put(cacheKey, value)?.let { old ->
-                val result = old.content.readableBytes()
-                old.content.release()
-                result
-            } ?: 0
-            val delta = value.content.readableBytes() - oldSize
-            mapSize += delta
-            removalQueue.offer(RemovalQueueElement(cacheKey, value, Instant.now().plus(maxAge)))
-            while (mapSize > maxSize) {
-                removeEldest()
-            }
-        }
     }
 }

rbcs-servlet/conf/server.xml

@@ -53,9 +53,7 @@
 <!--        <Connector port="8080" protocol="HTTP/1.1" executor="tomcatThreadPool"-->
 <!--                   connectionTimeout="20000"-->
 <!--                   redirectPort="8443" />-->
-        <Connector port="8080" protocol="org.apache.coyote.http11.Http11NioProtocol"
+        <Connector port="8080" protocol="HTTP/1.1"
-                   maxKeepAliveRequests="1000000"
-                   keepAliveTimeout="-1"
                    connectionTimeout="20000"
                    redirectPort="8443" />
         <!-- A "Connector" using the shared thread pool-->