Move the file read/write to IO thread (#406)

dydxprotocol · May 31, 2024 · 0d112a9 · 0d112a9
1 parent 3b24959
commit 0d112a9
Show file tree

Hide file tree

Showing 16 changed files with 214 additions and 148 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -51,7 +51,7 @@ allprojects {
 }
 
 group = "exchange.dydx.abacus"
-version = "1.7.45"
+version = "1.7.46"
 
 repositories {
     google()

diff --git a/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj b/integration/iOS/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/...get Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-input-files.xcfilelist b/...get Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-input-files.xcfilelist
diff --git a/...et Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-output-files.xcfilelist b/...et Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Debug-output-files.xcfilelist
diff --git a/...t Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-input-files.xcfilelist b/...t Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-input-files.xcfilelist
diff --git a/... Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-output-files.xcfilelist b/... Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks-Release-output-files.xcfilelist
diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks.sh b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios-frameworks.sh
diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.debug.xcconfig b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.debug.xcconfig
diff --git a/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.release.xcconfig b/integration/iOS/Pods/Target Support Files/Pods-abacus.ios/Pods-abacus.ios.release.xcconfig
diff --git a/...on/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.debug.xcconfig b/...on/iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.debug.xcconfig
diff --git a/.../iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.release.xcconfig b/.../iOS/Pods/Target Support Files/Pods-abacus.iosTests/Pods-abacus.iosTests.release.xcconfig
diff --git a/integration/iOS/Pods/Target Support Files/abacus/abacus.debug.xcconfig b/integration/iOS/Pods/Target Support Files/abacus/abacus.debug.xcconfig
diff --git a/integration/iOS/Pods/Target Support Files/abacus/abacus.release.xcconfig b/integration/iOS/Pods/Target Support Files/abacus/abacus.release.xcconfig
diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/AsyncAbacusStateManager.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/manager/AsyncAbacusStateManager.kt
@@ -260,27 +260,37 @@ class AsyncAbacusStateManager(
     }
 
     private fun load(configFile: ConfigFile) {
-        val path = configFile.path
-        if (appConfigs.loadRemote) {
-            loadFromRemoteConfigFile(configFile)
-            val configFileUrl = "$deploymentUri$path"
-            ioImplementations.rest?.get(configFileUrl, null, callback = { response, httpCode, _ ->
-                if (success(httpCode) && response != null) {
-                    if (parse(response, configFile)) {
-                        writeToLocalFile(response, path)
-                    }
-                }
-            })
-        } else {
-            loadFromBundledLocalConfigFile(configFile)
+        ioImplementations.threading?.async(ThreadingType.network) {
+            val path = configFile.path
+            if (appConfigs.loadRemote) {
+                loadFromRemoteConfigFile(configFile)
+                val configFileUrl = "$deploymentUri$path"
+                ioImplementations.rest?.get(
+                    configFileUrl,
+                    null,
+                    callback = { response, httpCode, _ ->
+                        ioImplementations.threading?.async(ThreadingType.abacus) {
+                            if (success(httpCode) && response != null) {
+                                if (parse(response, configFile)) {
+                                    writeToLocalFile(response, path)
+                                }
+                            }
+                        }
+                    },
+                )
+            } else {
+                loadFromBundledLocalConfigFile(configFile)
+            }
         }
     }
 
     private fun loadFromRemoteConfigFile(configFile: ConfigFile) {
         ioImplementations.fileSystem?.readCachedTextFile(
             configFile.path,
         )?.let {
-            parse(it, configFile)
+            ioImplementations.threading?.async(ThreadingType.abacus) {
+                parse(it, configFile)
+            }
         }
     }
 
@@ -289,7 +299,9 @@ class AsyncAbacusStateManager(
             FileLocation.AppBundle,
             configFile.path,
         )?.let {
-            parse(it, configFile)
+            ioImplementations.threading?.async(ThreadingType.abacus) {
+                parse(it, configFile)
+            }
         }
     }
 
@@ -309,10 +321,12 @@ class AsyncAbacusStateManager(
     }
 
     private fun writeToLocalFile(response: String, file: String) {
-        ioImplementations.fileSystem?.writeTextFile(
-            file,
-            response,
-        )
+        ioImplementations.threading?.async(ThreadingType.network) {
+            ioImplementations.fileSystem?.writeTextFile(
+                file,
+                response,
+            )
+        }
     }
 
     private fun parseDocumentation(response: String) {

diff --git a/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/manager/AsyncAbacusStateManagerV2.kt b/src/commonMain/kotlin/exchange.dydx.abacus/state/v2/manager/AsyncAbacusStateManagerV2.kt
@@ -282,27 +282,37 @@ class AsyncAbacusStateManagerV2(
     }
 
     private fun load(configFile: ConfigFile) {
-        val path = configFile.path
-        if (appConfigs.loadRemote) {
-            loadFromRemoteConfigFile(configFile)
-            val configFileUrl = "$deploymentUri$path"
-            ioImplementations.rest?.get(configFileUrl, null, callback = { response, httpCode, headers ->
-                if (success(httpCode) && response != null) {
-                    if (parse(response, configFile)) {
-                        writeToLocalFile(response, path)
-                    }
-                }
-            })
-        } else {
-            loadFromBundledLocalConfigFile(configFile)
+        ioImplementations.threading?.async(ThreadingType.network) {
+            val path = configFile.path
+            if (appConfigs.loadRemote) {
+                loadFromRemoteConfigFile(configFile)
+                val configFileUrl = "$deploymentUri$path"
+                ioImplementations.rest?.get(
+                    configFileUrl,
+                    null,
+                    callback = { response, httpCode, headers ->
+                        ioImplementations.threading?.async(ThreadingType.abacus) {
+                            if (success(httpCode) && response != null) {
+                                if (parse(response, configFile)) {
+                                    writeToLocalFile(response, path)
+                                }
+                            }
+                        }
+                    },
+                )
+            } else {
+                loadFromBundledLocalConfigFile(configFile)
+            }
         }
     }
 
     private fun loadFromRemoteConfigFile(configFile: ConfigFile) {
         ioImplementations.fileSystem?.readCachedTextFile(
             configFile.path,
         )?.let {
-            parse(it, configFile)
+            ioImplementations.threading?.async(ThreadingType.abacus) {
+                parse(it, configFile)
+            }
         }
     }
 
@@ -311,7 +321,9 @@ class AsyncAbacusStateManagerV2(
             FileLocation.AppBundle,
             configFile.path,
         )?.let {
-            parse(it, configFile)
+            ioImplementations.threading?.async(ThreadingType.abacus) {
+                parse(it, configFile)
+            }
         }
     }
 
@@ -331,10 +343,12 @@ class AsyncAbacusStateManagerV2(
     }
 
     private fun writeToLocalFile(response: String, file: String) {
-        ioImplementations.fileSystem?.writeTextFile(
-            file,
-            response,
-        )
+        ioImplementations.threading?.async(ThreadingType.network) {
+            ioImplementations.fileSystem?.writeTextFile(
+                file,
+                response,
+            )
+        }
     }
 
     private fun parseDocumentation(response: String) {

diff --git a/v4_abacus.podspec b/v4_abacus.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
     spec.name                     = 'v4_abacus'
-    spec.version                  = '1.7.45'
+    spec.version                  = '1.7.46'
     spec.homepage                 = 'https://github.com/dydxprotocol/v4-abacus'
     spec.source                   = { :http=> ''}
     spec.authors                  = ''
@@ -11,7 +11,7 @@ Pod::Spec.new do |spec|
 
 
 
-    if !Dir.exist?('build/cocoapods/framework/Abacus.framework') || Dir.empty?('build/cocoapods/framework/Abacus.framework')
+    if false
         raise "
 
         Kotlin framework 'Abacus' doesn't exist yet, so a proper Xcode project can't be generated.