Some further updates for the layered cache.

Author: pdvrieze

serialization/api/serialization.api

@@ -13,6 +13,7 @@ public final class nl/adaptivity/xmlutil/serialization/AnnotationsKt {
 public final class nl/adaptivity/xmlutil/serialization/DefaultFormatCache : nl/adaptivity/xmlutil/serialization/FormatCache, nl/adaptivity/xmlutil/serialization/DelegatableFormatCache {
 	public fun <init> ()V
 	public fun <init> (I)V
+	public synthetic fun appendFrom (Lnl/adaptivity/xmlutil/serialization/DefaultFormatCache;)Lnl/adaptivity/xmlutil/serialization/DelegatableFormatCache;
 	public fun copy ()Lnl/adaptivity/xmlutil/serialization/DefaultFormatCache;
 	public synthetic fun copy ()Lnl/adaptivity/xmlutil/serialization/DelegatableFormatCache;
 	public synthetic fun copy$serialization ()Lnl/adaptivity/xmlutil/serialization/FormatCache;
@@ -125,9 +126,13 @@ public abstract class nl/adaptivity/xmlutil/serialization/InputKind : java/lang/
 }
 
 public final class nl/adaptivity/xmlutil/serialization/LayeredCache : nl/adaptivity/xmlutil/serialization/FormatCache {
+	public static final field Companion Lnl/adaptivity/xmlutil/serialization/LayeredCache$Companion;
 	public fun <init> ()V
 }
 
+public final class nl/adaptivity/xmlutil/serialization/LayeredCache$Companion {
+}
+
 public class nl/adaptivity/xmlutil/serialization/OutputKind : java/lang/Enum {
 	public static final field Attribute Lnl/adaptivity/xmlutil/serialization/OutputKind;
 	public static final field Element Lnl/adaptivity/xmlutil/serialization/OutputKind;

serialization/api/serialization.klib.api

@@ -622,6 +622,8 @@ final class nl.adaptivity.xmlutil.serialization/DefaultFormatCache : nl.adaptivi
 
 final class nl.adaptivity.xmlutil.serialization/LayeredCache : nl.adaptivity.xmlutil.serialization/FormatCache { // nl.adaptivity.xmlutil.serialization/LayeredCache|null[0]
     constructor <init>() // nl.adaptivity.xmlutil.serialization/LayeredCache.<init>|<init>(){}[0]
+
+    final object Companion // nl.adaptivity.xmlutil.serialization/LayeredCache.Companion|null[0]
 }
 
 final class nl.adaptivity.xmlutil.serialization/PolyInfo { // nl.adaptivity.xmlutil.serialization/PolyInfo|null[0]

serialization/src/commonMain/kotlin/nl/adaptivity/xmlutil/serialization/LayeredCache.kt

@@ -26,6 +26,7 @@ import nl.adaptivity.xmlutil.Namespace
 import nl.adaptivity.xmlutil.QName
 import nl.adaptivity.xmlutil.namespaceURI
 import nl.adaptivity.xmlutil.serialization.impl.CompatLock
+import nl.adaptivity.xmlutil.serialization.impl.invoke
 import nl.adaptivity.xmlutil.serialization.structure.*
 
 public class LayeredCache private constructor(
@@ -235,4 +236,8 @@ public class LayeredCache private constructor(
         }
 
     }
+
+    public companion object {
+        private val MULTI_TREAD_MARKER: Any = Any()
+    }
 }

serialization/src/commonMain/kotlin/nl/adaptivity/xmlutil/serialization/impl/compat.kt

@@ -1,21 +1,21 @@
 /*
- * Copyright (c) 2022.
+ * Copyright (c) 2022-2025.
  *
  * This file is part of xmlutil.
  *
- * This file is licenced to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You should have received a copy of the license with the source distribution.
- * Alternatively, you may obtain a copy of the License at
+ * This file is licenced to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance
+ * with the License.  You should have  received a copy of the license
+ * with the source distribution. Alternatively, 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.
+ * 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 nl.adaptivity.xmlutil.serialization.impl
@@ -24,6 +24,8 @@ import kotlin.reflect.KClass
 
 internal expect val KClass<*>.maybeSerialName: String?
 
-internal expect class CompatLock() {
-    internal operator fun <R> invoke(action: () -> R): R
-}
+internal expect class CompatLock()
+
+internal expect inline fun <R> CompatLock.invoke(action: () -> R): R
+
+internal expect fun currentThreadId(): Any

serialization/src/jsMain/kotlin/nl/adaptivity/xmlutil/serialization/impl/compat.js.kt

@@ -1,21 +1,21 @@
 /*
- * Copyright (c) 2022.
+ * Copyright (c) 2022-2025.
  *
  * This file is part of xmlutil.
  *
- * This file is licenced to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You should have received a copy of the license with the source distribution.
- * Alternatively, you may obtain a copy of the License at
+ * This file is licenced to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance
+ * with the License.  You should have  received a copy of the license
+ * with the source distribution. Alternatively, 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.
+ * 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 nl.adaptivity.xmlutil.serialization.impl
@@ -33,7 +33,7 @@ internal actual val KClass<*>.maybeSerialName: String?
         ?: name.replace('$', '.')
 
 /** Dummy implementation as there are no locks in Javascript */
-internal actual class CompatLock {
-    internal actual operator fun <R> invoke(action: () -> R): R = action()
-}
+internal actual class CompatLock
 
+internal actual inline fun <R> CompatLock.invoke(action: () -> R): R = action()
+internal actual fun currentThreadId(): Any = 1

serialization/src/jvmMain/kotlin/nl/adaptivity/xmlutil/serialization/impl/compat.jvm.kt

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2025.
+ *
+ * This file is part of xmlutil.
+ *
+ * This file is licenced to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance
+ * with the License.  You should have  received a copy of the license
+ * with the source distribution. Alternatively, 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 nl.adaptivity.xmlutil.serialization.impl
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.InternalSerializationApi
+import kotlinx.serialization.serializerOrNull
+import java.util.concurrent.locks.ReentrantLock
+import kotlin.reflect.KClass
+
+@OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
+internal actual val KClass<*>.maybeSerialName: String?
+    get() = this.serializerOrNull()
+        ?.run { descriptor.serialName }
+        ?: qualifiedName
+
+internal actual class CompatLock {
+    internal val lock = ReentrantLock()
+}
+
+internal actual inline fun <R> CompatLock.invoke(action: () -> R): R {
+    lock.lock()
+    try {
+        return action()
+    } finally {
+        lock.unlock()
+    }
+}
+
+internal actual fun currentThreadId(): Any = Thread.currentThread().threadId()

serialization/src/jvmMain/kotlin/nl/adaptivity/xmlutil/serialization/impl/compatJava.kt

@@ -1,21 +1,21 @@
 /*
- * Copyright (c) 2022.
+ * Copyright (c) 2022-2025.
  *
  * This file is part of xmlutil.
  *
- * This file is licenced to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You should have received a copy of the license with the source distribution.
- * Alternatively, you may obtain a copy of the License at
+ * This file is licenced to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance
+ * with the License.  You should have  received a copy of the license
+ * with the source distribution. Alternatively, 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.
+ * 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 nl.adaptivity.xmlutil.serialization.impl
@@ -24,6 +24,7 @@ import kotlinx.atomicfu.locks.ReentrantLock
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.InternalSerializationApi
 import kotlinx.serialization.serializerOrNull
+import platform.posix.pthread_self
 import kotlin.reflect.KClass
 
 @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
@@ -33,14 +34,16 @@ internal actual val KClass<*>.maybeSerialName: String?
         ?: qualifiedName
 
 internal actual class CompatLock {
-    private val lock = ReentrantLock()
-    internal actual operator fun <R> invoke(action: () -> R): R {
-        lock.lock()
-        try {
-            return action()
-        } finally {
-            lock.unlock()
-        }
+    internal val lock = ReentrantLock()
+}
+
+internal actual inline fun <R> CompatLock.invoke(action: () -> R): R {
+    lock.lock()
+    try {
+        return action()
+    } finally {
+        lock.unlock()
     }
 }
 
+internal actual fun currentThreadId(): Any = pthread_self()

serialization/src/nativeMain/kotlin/nl/adaptivity/xmlutil/serialization/impl/compat.native.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2025.
+ *
+ * This file is part of xmlutil.
+ *
+ * This file is licenced to you under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance
+ * with the License.  You should have  received a copy of the license
+ * with the source distribution. Alternatively, 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 nl.adaptivity.xmlutil.serialization.impl
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.InternalSerializationApi
+import kotlinx.serialization.serializerOrNull
+import kotlin.reflect.KClass
+
+// TODO note that wasm doesn't yet support reflection so names are not available
+@OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
+internal actual val KClass<*>.maybeSerialName: String?
+    get() = serializerOrNull()
+        ?.run { descriptor.serialName }
+
+internal actual class CompatLock
+
+internal actual inline fun <R> CompatLock.invoke(action: () -> R): R = action()
+internal actual fun currentThreadId(): Any = 1