Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-07-23 04:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

ExecuteProduceConsume and networking improvements

Browse Source 
Added "volatile" to more fields, for thread-safety on reads.
Changes to field values are done inside synchronized blocks
so no need for AtomicInteger/AtomicBoolean. (Could be changed
in the future to show intention/readability though).

Added more statistics (tasks produced/consumed).

Limited Network's EPC executor to 10 threads max.
This commit is contained in:
catbref
2019-08-16 08:28:26 +01:00
parent c597f11c37
commit f83dc26ae0
3 changed files with 124 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
src/test/java/org/qora/test/ThreadTests.java → src/test/java/org/qora/test/EPCTests.java
View File

@@ -4,11 +4,48 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.junit.Test;
import org.qora.utils.ExecuteProduceConsume;
public class ThreadTests {
public class EPCTests {
class RandomEPC extends ExecuteProduceConsume {
private final int TASK_PERCENT;
private final int PAUSE_PERCENT;
public RandomEPC(ExecutorService executor, int taskPercent, int pausePercent) {
super(executor);
this.TASK_PERCENT = taskPercent;
this.PAUSE_PERCENT = pausePercent;
}
@Override
protected Task produceTask(boolean canIdle) throws InterruptedException {
if (Thread.interrupted())
throw new InterruptedException();
Random random = new Random();
final int percent = random.nextInt(100);
// Sometimes produce a task
if (percent < TASK_PERCENT) {
return () -> {
Thread.sleep(random.nextInt(500) + 100);
};
} else {
// If we don't produce a task, then maybe simulate a pause until work arrives
if (canIdle && percent < PAUSE_PERCENT)
Thread.sleep(random.nextInt(100));
return null;
}
}
}
private void testEPC(ExecuteProduceConsume testEPC) throws InterruptedException {
testEPC.start();
@@ -16,7 +53,10 @@ public class ThreadTests {
// Let it run for a minute
for (int s = 1; s <= 60; ++s) {
Thread.sleep(1000);
System.out.println(String.format("After %d second%s, active threads: %d, greatest thread count: %d", s, (s != 1 ? "s" : "") , testEPC.getActiveThreadCount(), testEPC.getGreatestActiveThreadCount()));
System.out.println(String.format("After %d second%s, active threads: %d, greatest thread count: %d, tasks produced: %d, tasks consumed: %d",
s, (s != 1 ? "s" : ""),
testEPC.getActiveThreadCount(), testEPC.getGreatestActiveThreadCount(),
testEPC.getTasksProduced(), testEPC.getTasksConsumed()));
}
final long before = System.currentTimeMillis();
@@ -25,6 +65,9 @@ public class ThreadTests {
System.out.println(String.format("Shutdown took %d milliseconds", after - before));
System.out.println(String.format("Greatest thread count: %d", testEPC.getGreatestActiveThreadCount()));
System.out.println(String.format("Tasks produced: %d", testEPC.getTasksProduced()));
System.out.println(String.format("Tasks consumed: %d", testEPC.getTasksConsumed()));
}
@Test
@@ -32,32 +75,20 @@ public class ThreadTests {
final int TASK_PERCENT = 25; // Produce a task this % of the time
final int PAUSE_PERCENT = 80; // Pause for new work this % of the time
class RandomEPC extends ExecuteProduceConsume {
@Override
protected Task produceTask(boolean canIdle) throws InterruptedException {
Random random = new Random();
final ExecutorService executor = Executors.newCachedThreadPool();
final int percent = random.nextInt(100);
testEPC(new RandomEPC(executor, TASK_PERCENT, PAUSE_PERCENT));
}
// Sometimes produce a task
if (percent < TASK_PERCENT) {
return new Task() {
@Override
public void perform() throws InterruptedException {
Thread.sleep(random.nextInt(500) + 100);
}
};
} else {
// If we don't produce a task, then maybe simulate a pause until work arrives
if (canIdle && percent < PAUSE_PERCENT)
Thread.sleep(random.nextInt(100));
@Test
public void testRandomFixedPoolEPC() throws InterruptedException {
final int TASK_PERCENT = 25; // Produce a task this % of the time
final int PAUSE_PERCENT = 80; // Pause for new work this % of the time
final int MAX_THREADS = 3;
return null;
}
}
}
final ExecutorService executor = Executors.newFixedThreadPool(MAX_THREADS);
testEPC(new RandomEPC());
testEPC(new RandomEPC(executor, TASK_PERCENT, PAUSE_PERCENT));
}
/**