Changeset 29690 in osm for applications/editors/josm/plugins/imagerycache

Timestamp:

2013-06-21T16:55:42+02:00 (11 years ago)

Author:

akks

Message:

JOSM/ImageryCache: add optional imagerycache.randomAccessFile parameter for slower but less system-dependent storage

Location:

applications/editors/josm/plugins/imagerycache

Files:

• build.xml (modified) (1 diff)
• changelog (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/imagerycache/OsmDBTilesLoader.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/imagerycache/TileDAOMapDB.java (modified) (3 diffs)

applications/editors/josm/plugins/imagerycache/build.xml

@@ -15 +15 @@
 
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="JOSM/ImageryCache: updated MapDB (no more deadlocks, Java 1.6 compatible), less crashes, multiple-JOSM support"/>
+    <property name="commit.message" value="JOSM/ImageryCache: add optional imagerycache.randomAccessFile parameter for slower but less system-dependent storage"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="5779"/>

applications/editors/josm/plugins/imagerycache/changelog

@@ -10 +10 @@
 * Cache directory is created if needed
 
-
-
-        
-
-         
-           
-
-
+21.06.2013 :
+* Add optional imagerycache.randomAccessFile parameter for slower but less system-dependent storage 
+(RandomAccessFile instead of memory mapped file)

applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/OsmDBTilesLoader.java

@@ -18 +18 @@
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource.TileUpdate;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 

applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/TileDAOMapDB.java

@@ -3 +3 @@
 import java.io.File;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 import org.mapdb.DB;
 import org.mapdb.DBMaker;
@@ -17 +14 @@
 public class TileDAOMapDB implements TileDAO {
     public static final boolean debug = new BooleanProperty("imagerycache.debug", false).get();
+    public static final boolean noMmap = new BooleanProperty("imagerycache.randomAccessFile", false).get();
     
     public static boolean dbNotAvailable = false;
@@ -54 +52 @@
                 lock.deleteOnExit();
                 
-                db = DBMaker.newFileDB(f)
-                    .randomAccessFileEnableIfNeeded()
-                    .writeAheadLogDisable().closeOnJvmShutdown().make();
+                if (noMmap) {
+                    db = DBMaker.newFileDB(f)
+                        .randomAccessFileEnable()
+                        .writeAheadLogDisable().closeOnJvmShutdown().make();
+                } else {
+                    db = DBMaker.newFileDB(f)
+                        .randomAccessFileEnableIfNeeded()
+                        .writeAheadLogDisable().closeOnJvmShutdown().make();
+                }