fixed threading issue and non-uniform progress

2020-02-05 16:43:25 -05:00
parent 76f73f6b5a
commit 4c7e8034d0
2 changed files with 7 additions and 5 deletions
@@ -5,6 +5,7 @@ import kaptainwutax.seedcracker.util.Log;
 public class ProgressListener {

 	protected float progress;
+	protected int count = 0;

 	public ProgressListener() {
 		this(0.0F);
@@ -15,10 +16,11 @@ public class ProgressListener {
 	}

 	public synchronized void addPercent(float percent, boolean debug) {
-		if(debug) {
+		if((this.count & 3) == 0 && debug) {
 			Log.debug("Progress: " + this.progress +  "%");
 		}

+		this.count++;
 		this.progress += percent;
 	}

@@ -82,8 +82,6 @@ public class TimeMachine {
 		if(this.pillarSeeds == null || this.dataStorage.getBaseBits() < 54.0D)return false;
 		this.structureSeeds = new ArrayList<>();

-		Rand rand = new Rand(0L, false);
-
 		SeedData[] cache = new SeedData[this.dataStorage.baseSeedData.size()];
 		int id = 0;

@@ -102,12 +100,14 @@ public class TimeMachine {
 				int fThreadId = threadId;

 				SERVICE.submit(() -> {
+					Rand rand = new Rand(0L, false);
+
 					long lower = (long)fThreadId * (1L << 30);
 					long upper = (long)(fThreadId + 1) * (1L << 30);

 					for(long partialWorldSeed = lower; partialWorldSeed < upper && !this.shouldTerminate; partialWorldSeed++) {
-						if((partialWorldSeed & ((1 << 29) - 1)) == 0) {
-							progressListener.addPercent(12.5F, true);
+						if((partialWorldSeed & ((1 << 27) - 1)) == 0) {
+							progressListener.addPercent(3.125F, true);
 						}

 						long seed = this.timeMachine(partialWorldSeed, pillarSeed);