echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more synching for coherence

Browse Source
This commit is contained in:
zzz
2013-10-06 00:43:12 +00:00
parent af0e72ac4d
commit 7764257e41
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/i2psnark/java/src/org/klomp/snark/Storage.java
View File

@ -1180,8 +1180,8 @@ public class Storage
* This must be called before using the RAF to ensure it is open * This must be called before using the RAF to ensure it is open
* locking: this * locking: this
*/ */
public RandomAccessFile checkRAF() throws IOException { public synchronized RandomAccessFile checkRAF() throws IOException {
if (RAFtime > 0) if (raf != null)
RAFtime = System.currentTimeMillis(); RAFtime = System.currentTimeMillis();
else else
openRAF(); openRAF();
@ -1191,14 +1191,14 @@ public class Storage
/** /**
* locking: this * locking: this
*/ */
private void openRAF() throws IOException { private synchronized void openRAF() throws IOException {
openRAF(_probablyComplete); openRAF(_probablyComplete);
} }
/** /**
* locking: this * locking: this
*/ */
private void openRAF(boolean readonly) throws IOException { private synchronized void openRAF(boolean readonly) throws IOException {
raf = new RandomAccessFile(RAFfile, (readonly || !RAFfile.canWrite()) ? "r" : "rw"); raf = new RandomAccessFile(RAFfile, (readonly || !RAFfile.canWrite()) ? "r" : "rw");
RAFtime = System.currentTimeMillis(); RAFtime = System.currentTimeMillis();
} }
@ -1207,7 +1207,7 @@ public class Storage
* Close if last used time older than cutoff. * Close if last used time older than cutoff.
* locking: this * locking: this
*/ */
public void closeRAF(long cutoff) { public synchronized void closeRAF(long cutoff) {
if (RAFtime > 0 && RAFtime < cutoff) { if (RAFtime > 0 && RAFtime < cutoff) {
try { try {
closeRAF(); closeRAF();
@ -1219,7 +1219,7 @@ public class Storage
* Can be called even if not open * Can be called even if not open
* locking: this * locking: this
*/ */
public void closeRAF() throws IOException { public synchronized void closeRAF() throws IOException {
RAFtime = 0; RAFtime = 0;
if (raf == null) if (raf == null)
return; return;
@ -1235,7 +1235,7 @@ public class Storage
* *
* This calls openRAF(); caller must synchronize and call closeRAF(). * This calls openRAF(); caller must synchronize and call closeRAF().
*/ */
public void allocateFile() throws IOException { public synchronized void allocateFile() throws IOException {
// caller synchronized // caller synchronized
openRAF(false); // RW openRAF(false); // RW
raf.setLength(length); raf.setLength(length);
@ -1256,7 +1256,7 @@ public class Storage
* Caller must synchronize and call checkRAF() or openRAF(). * Caller must synchronize and call checkRAF() or openRAF().
* @since 0.9.1 * @since 0.9.1
*/ */
public void balloonFile() throws IOException public synchronized void balloonFile() throws IOException
{ {
long remaining = length; long remaining = length;
final int ZEROBLOCKSIZE = (int) Math.min(remaining, 32*1024); final int ZEROBLOCKSIZE = (int) Math.min(remaining, 32*1024);