## 4.5.1.13

* Bug Fixes * ATAK performance is slow when using offline imagery stored on an SD card
deptofdefense · Oct 18, 2024 · f1c27c3 · f1c27c3
2 parents cc36daa + 1fb4928
commit f1c27c3
Show file tree

Hide file tree

Showing 14 changed files with 468 additions and 101 deletions.
diff --git a/VERSION.md b/VERSION.md
@@ -1,5 +1,10 @@
 # Version History
 
+## 4.5.1.13
+
+* Bug Fixes
+  * ATAK performance is slow when using offline imagery stored on an SD card
+
 ## 4.5.1.12
 
 * Feature Addition

diff --git a/atak/ATAK/app/build.gradle b/atak/ATAK/app/build.gradle
@@ -26,7 +26,7 @@ buildscript {
     apply from: '../../gradle/versions.gradle', to: project
 
     ext.ATAK_VERSION = "4.5.1"
-    ext.ATAK_VERSION_SUBMINOR = ".12"
+    ext.ATAK_VERSION_SUBMINOR = ".13"
 
     ext.isDevKitEnabled = { ->
         return getProperty('takRepoMavenUrl', null) != null &&

diff --git a/atak/ATAK/app/src/main/java/com/atakmap/android/layers/GLLayerOutlinesLayer.java b/atak/ATAK/app/src/main/java/com/atakmap/android/layers/GLLayerOutlinesLayer.java
diff --git a/atak/gradle/versions.gradle b/atak/gradle/versions.gradle
@@ -1,5 +1,5 @@
 ext {
     jacocoVersion = '0.8.5'
     takDevkitVersion = '3.2.0'
-    takKernelVersion = '0.38.2'
+    takKernelVersion = '0.38.3'
 }
diff --git a/depends/LASzip-3.4.3-mod.tar.gz b/depends/LASzip-3.4.3-mod.tar.gz
diff --git a/depends/assimp-4.0.1-mod.tar.gz b/depends/assimp-4.0.1-mod.tar.gz
diff --git a/depends/gdal-2.4.4-mod.tar.gz b/depends/gdal-2.4.4-mod.tar.gz
diff --git a/depends/libLAS-1.8.2-mod.tar.gz b/depends/libLAS-1.8.2-mod.tar.gz
diff --git a/depends/tinygltf-2.4.1-mod.tar.gz b/depends/tinygltf-2.4.1-mod.tar.gz
diff --git a/depends/tinygltfloader-0.9.5-mod.tar.gz b/depends/tinygltfloader-0.9.5-mod.tar.gz
diff --git a/pluginsdk.zip b/pluginsdk.zip
diff --git a/takkernel/VERSION.md b/takkernel/VERSION.md
@@ -1,5 +1,9 @@
 # Version History
 
+## 0.38.3 (cherrypick `master@0.58.2`)
+
+* Restore preload of mosaic root nodes on worker thread to mitigate lock contention
+
 ## 0.38.2 (cherrypick `master@0.44.3`)
 
 * Add Android 12 compatible implementation for the Unsafe allocator

diff --git a/takkernel/build.gradle b/takkernel/build.gradle
@@ -21,10 +21,10 @@ buildscript { scriptHandler ->
 
 def majorVersion = 0
 def minorVersion = 38
-def patchVersion = 2
+def patchVersion = 3
 
 // Version code for Android builds, you MUST increase this by 1 if you change ANY of the version components above
-ext.versionCode = 74
+ext.versionCode = 75
 
 
 

diff --git a/...nel/engine/src/main/java/com/atakmap/map/layer/raster/mosaic/opengl/GLMosaicMapLayer.java b/...nel/engine/src/main/java/com/atakmap/map/layer/raster/mosaic/opengl/GLMosaicMapLayer.java
@@ -604,6 +604,20 @@ private void queryImpl(ViewState localQuery, MosaicPendingData retval) {
             // dump everything -- we don't need it to persist
             retval.spatialCalc.endBatch(false);
         }
+
+        // instantiate (but do not initialize) renderables for all frames that
+        // are not currently loaded
+        GLResolvableMapRenderable renderable;
+        for(MosaicDatabase2.Frame frame : retval.frames) {
+            if(this.checkQueryThreadAbort())
+                break;
+
+            if(retval.loaded.contains(this.resolvePath(frame.path)))
+                continue;
+            renderable = this.createRootNode(frame);
+            if(renderable != null)
+                retval.renderablePreload.put(frame, renderable);
+        }
     }
 
     @Override