From a0c7e3d94e37c5ee0df85409f669af640ce3f5ab Mon Sep 17 00:00:00 2001 From: crowetic Date: Fri, 1 Nov 2024 14:49:54 -0700 Subject: [PATCH] made modifications to prevent double-setting the same priorities. Kept any/all hard-coded changes from Alpha for anything that didn't already have a setting created by Kenny. Essentially this is a merger of the two repos from Alpha and Kenny, keeping the changes that are relevant from each, while also keeping the thread priority settings in settings.json. This will give us the best of both worlds (in theory), and dramatically improved overall network performance. --- src/main/java/org/qortal/controller/Synchronizer.java | 1 - .../java/org/qortal/controller/repository/AtStatesPruner.java | 1 - .../java/org/qortal/controller/repository/AtStatesTrimmer.java | 1 - .../java/org/qortal/controller/repository/BlockArchiver.java | 1 - src/main/java/org/qortal/controller/repository/BlockPruner.java | 1 - .../controller/repository/OnlineAccountsSignaturesTrimmer.java | 1 - 6 files changed, 6 deletions(-) diff --git a/src/main/java/org/qortal/controller/Synchronizer.java b/src/main/java/org/qortal/controller/Synchronizer.java index a5a8946d..400e7965 100644 --- a/src/main/java/org/qortal/controller/Synchronizer.java +++ b/src/main/java/org/qortal/controller/Synchronizer.java @@ -132,7 +132,6 @@ public class Synchronizer extends Thread { @Override public void run() { Thread.currentThread().setName("Synchronizer"); - Thread.currentThread().setPriority(MAX_PRIORITY); if (Settings.getInstance().isLite()) { // Lite nodes don't need to sync diff --git a/src/main/java/org/qortal/controller/repository/AtStatesPruner.java b/src/main/java/org/qortal/controller/repository/AtStatesPruner.java index c12a5e6d..467333c8 100644 --- a/src/main/java/org/qortal/controller/repository/AtStatesPruner.java +++ b/src/main/java/org/qortal/controller/repository/AtStatesPruner.java @@ -20,7 +20,6 @@ public class AtStatesPruner implements Runnable { @Override public void run() { Thread.currentThread().setName("AT States pruner"); - Thread.currentThread().setPriority(MIN_PRIORITY); if (Settings.getInstance().isLite()) { // Nothing to prune in lite mode diff --git a/src/main/java/org/qortal/controller/repository/AtStatesTrimmer.java b/src/main/java/org/qortal/controller/repository/AtStatesTrimmer.java index 3fc640d2..26c2931d 100644 --- a/src/main/java/org/qortal/controller/repository/AtStatesTrimmer.java +++ b/src/main/java/org/qortal/controller/repository/AtStatesTrimmer.java @@ -20,7 +20,6 @@ public class AtStatesTrimmer implements Runnable { @Override public void run() { Thread.currentThread().setName("AT States trimmer"); - Thread.currentThread().setPriority(MIN_PRIORITY); if (Settings.getInstance().isLite()) { // Nothing to trim in lite mode diff --git a/src/main/java/org/qortal/controller/repository/BlockArchiver.java b/src/main/java/org/qortal/controller/repository/BlockArchiver.java index a0c866a6..12793f89 100644 --- a/src/main/java/org/qortal/controller/repository/BlockArchiver.java +++ b/src/main/java/org/qortal/controller/repository/BlockArchiver.java @@ -25,7 +25,6 @@ public class BlockArchiver implements Runnable { public void run() { Thread.currentThread().setName("Block archiver"); - Thread.currentThread().setPriority(NORM_PRIORITY); if (!Settings.getInstance().isArchiveEnabled() || Settings.getInstance().isLite()) { return; diff --git a/src/main/java/org/qortal/controller/repository/BlockPruner.java b/src/main/java/org/qortal/controller/repository/BlockPruner.java index 9155671a..624457eb 100644 --- a/src/main/java/org/qortal/controller/repository/BlockPruner.java +++ b/src/main/java/org/qortal/controller/repository/BlockPruner.java @@ -20,7 +20,6 @@ public class BlockPruner implements Runnable { @Override public void run() { Thread.currentThread().setName("Block pruner"); - Thread.currentThread().setPriority(NORM_PRIORITY); if (Settings.getInstance().isLite()) { // Nothing to prune in lite mode diff --git a/src/main/java/org/qortal/controller/repository/OnlineAccountsSignaturesTrimmer.java b/src/main/java/org/qortal/controller/repository/OnlineAccountsSignaturesTrimmer.java index 93ab264e..f6ee3e05 100644 --- a/src/main/java/org/qortal/controller/repository/OnlineAccountsSignaturesTrimmer.java +++ b/src/main/java/org/qortal/controller/repository/OnlineAccountsSignaturesTrimmer.java @@ -22,7 +22,6 @@ public class OnlineAccountsSignaturesTrimmer implements Runnable { public void run() { Thread.currentThread().setName("Online Accounts trimmer"); - Thread.currentThread().setPriority(NORM_PRIORITY); if (Settings.getInstance().isLite()) { // Nothing to trim in lite mode