Kpg/nmm native driver

.github/workflows/PR.yml

@@ -75,6 +75,10 @@ jobs:
         if: matrix.os == 'macOS-latest' && matrix.job == 'test'
         run: ./gradlew iosX64Test --stacktrace
 
+      - name: Run ios tests with strict memory model
+        if: matrix.os == 'macOS-latest' && matrix.job == 'test'
+        run: ./gradlew iosX64Test -Pkotlin.native.binary.memoryModel=strict --stacktrace
+
       # Build the sample
       - name: Build the sample
         if: matrix.os == 'macOS-latest' && matrix.job == 'gradle-plugin-tests'

docs/native_sqlite/index.md

@@ -26,6 +26,13 @@ kotlin {
 val driver: SqlDriver = NativeSqliteDriver(Database.Schema, "test.db")
 ```
 
+### Kotlin/Native Memory Models
+
+The SQLDelight native driver is compatible with both the original strict memory model and the updated
+memory model. However, it is optimized for the new memory model, and as most of the official Jetbrains
+libraries will be gradually dropping support for the strict memory model, support for the strict
+memory model may be deprecated or removed in future releases.
+
 {% include 'common/index_queries.md' %}
 
 ## Reader Connection Pools

drivers/native-driver/build.gradle

@@ -43,7 +43,6 @@ kotlin {
       dependsOn(commonMain)
       dependencies {
         api deps.sqliter
-        implementation deps.stately.core
       }
     }
     nativeTest {
@@ -52,9 +51,12 @@ kotlin {
         implementation project(':drivers:driver-test')
       }
     }
-    nativeDarwinMain{
+    nativeLinuxLikeMain {
       dependsOn(nativeMain)
     }
+    nativeDarwinMain{
+      dependsOn(nativeLinuxLikeMain)
+    }
     mingwMain{
       dependsOn(nativeMain)
     }
@@ -65,7 +67,7 @@ kotlin {
       dependsOn(mingwMain)
     }
     linuxMain{
-      dependsOn(nativeMain)
+      dependsOn(nativeLinuxLikeMain)
     }
   }
 

drivers/native-driver/src/mingwX64Main/kotlin/app/cash/sqldelight/driver/native/util/PoolLock.kt → drivers/native-driver/src/mingwMain/kotlin/app/cash/sqldelight/driver/native/util/PoolLock.kt

@@ -5,6 +5,7 @@ import kotlinx.cinterop.alloc
 import kotlinx.cinterop.free
 import kotlinx.cinterop.nativeHeap
 import kotlinx.cinterop.ptr
+import platform.posix.PTHREAD_MUTEX_RECURSIVE
 import platform.posix.pthread_cond_destroy
 import platform.posix.pthread_cond_init
 import platform.posix.pthread_cond_signal
@@ -15,11 +16,21 @@ import platform.posix.pthread_mutex_init
 import platform.posix.pthread_mutex_lock
 import platform.posix.pthread_mutex_tVar
 import platform.posix.pthread_mutex_unlock
+import platform.posix.pthread_mutexattr_destroy
+import platform.posix.pthread_mutexattr_init
+import platform.posix.pthread_mutexattr_settype
+import platform.posix.pthread_mutexattr_tVar
 
-internal actual class PoolLock actual constructor() {
+internal actual class PoolLock actual constructor(reentrant: Boolean) {
   private val isActive = AtomicBoolean(true)
+  private val attr = nativeHeap.alloc<pthread_mutexattr_tVar>()
+    .apply {
+      pthread_mutexattr_init(ptr)
+      if (reentrant)
+        pthread_mutexattr_settype(ptr, PTHREAD_MUTEX_RECURSIVE.toInt())
+    }
   private val mutex = nativeHeap.alloc<pthread_mutex_tVar>()
-    .apply { pthread_mutex_init(ptr, null) }
+    .apply { pthread_mutex_init(ptr, attr.ptr) }
   private val cond = nativeHeap.alloc<pthread_cond_tVar>()
     .apply { pthread_cond_init(ptr, null) }
 
@@ -48,8 +59,10 @@ internal actual class PoolLock actual constructor() {
     if (isActive.compareAndSet(expected = true, new = false)) {
       pthread_cond_destroy(cond.ptr)
       pthread_mutex_destroy(mutex.ptr)
+      pthread_mutexattr_destroy(attr.ptr)
       nativeHeap.free(cond)
       nativeHeap.free(mutex)
+      nativeHeap.free(attr)
       return true
     }