make it work on multithread for fuse

Author: umjammer

src/main/java/DiscUtils/Core/Internal/ObjectCache.java

@@ -57,7 +57,7 @@ public ObjectCache() {
         _recent = new ArrayList<>();
     }
 
-    public V get(K key) {
+    public synchronized V get(K key) {
         for (int i = 0; i < _recent.size(); ++i) {
             Tuple<K, V> recentEntry = _recent.get(i);
             if (recentEntry.getKey().equals(key)) {
@@ -77,14 +77,14 @@ public V get(K key) {
         return null;
     }
 
-    public V put(K key, V value) {
+    public synchronized V put(K key, V value) {
         WeakReference<V> v = _entries.put(key, new WeakReference<>(value));
         makeMostRecent(key, value);
         pruneEntries();
         return v != null ? v.get() : null;
     }
 
-    public V remove(Object key) {
+    public synchronized V remove(Object key) {
         for (int i = 0; i < _recent.size(); ++i) {
             if (_recent.get(i).getKey().equals(key)) {
                 _recent.remove(i);
@@ -94,7 +94,7 @@ public V remove(Object key) {
         return _entries.remove(key).get();
     }
 
-    private void pruneEntries() {
+    private synchronized void pruneEntries() {
         _nextPruneCount++;
         if (_nextPruneCount > PruneGap) {
             List<K> toPrune = new ArrayList<>();
@@ -110,7 +110,7 @@ private void pruneEntries() {
         }
     }
 
-    private void makeMostRecent(int i) {
+    private synchronized void makeMostRecent(int i) {
         if (i == 0) {
             return;
         }
@@ -120,7 +120,7 @@ private void makeMostRecent(int i) {
         _recent.add(0, entry);
     }
 
-    private void makeMostRecent(K key, V val) {
+    private synchronized void makeMostRecent(K key, V val) {
         while (_recent.size() >= MostRecentListSize) {
             _recent.remove(_recent.size() - 1);
         }

src/main/java/DiscUtils/Streams/Block/BlockCacheStream.java

@@ -25,6 +25,9 @@
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+import java.util.logging.Level;
+
+import vavi.util.Debug;
 
 import DiscUtils.Streams.SparseStream;
 import DiscUtils.Streams.StreamExtent;
@@ -179,7 +182,7 @@ public List<StreamExtent> getExtentsInRange(long start, long count) {
      * @param count  The number of bytes to read.
      * @return The number of bytes read.
      */
-    public int read(byte[] buffer, int offset, int count) {
+    public synchronized int read(byte[] buffer, int offset, int count) {
         checkDisposed();
 
         if (_position >= getLength()) {
@@ -229,6 +232,7 @@ public int read(byte[] buffer, int offset, int count) {
                 int bytesToRead = Math.min(count - totalBytesRead, block[0].getAvailable() - offsetInNextBlock);
 
                 System.arraycopy(block[0].getData(), offsetInNextBlock, buffer, offset + totalBytesRead, bytesToRead);
+
                 offsetInNextBlock = 0;
                 totalBytesRead += bytesToRead;
                 _position += bytesToRead;
@@ -313,7 +317,7 @@ public void flush() {
      * @param origin The base location.
      * @return The new absolute stream position.
      */
-    public long seek(long offset, SeekOrigin origin) {
+    public synchronized long seek(long offset, SeekOrigin origin) {
         checkDisposed();
         long effectiveOffset = offset;
         if (origin == SeekOrigin.Current) {
@@ -348,7 +352,7 @@ public void setLength(long value) {
      * @param offset The first byte to write from buffer.
      * @param count  The number of bytes to write.
      */
-    public void write(byte[] buffer, int offset, int count) {
+    public synchronized void write(byte[] buffer, int offset, int count) {
         checkDisposed();
 
         _stats.setTotalWritesIn(_stats.getTotalWritesIn() + 1);