Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-28 01:15:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

start main wallet when daemon synced with improved UserThread

Browse source
This commit is contained in:
woodser 2023-12-31 10:38:02 -05:00
parent 5466689857
commit 5d88936600
3 changed files with 69 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

18
common/src/main/java/haveno/common/UserThread.java
View file

@ -45,7 +45,7 @@ public class UserThread {
@Getter
@Setter
private static Executor executor;
private static final String USER_THREAD_NAME = "UserThread";
private static Thread USER_THREAD;
public static void setTimerClass(Class<? extends Timer> timerClass) {
UserThread.timerClass = timerClass;
@ -59,8 +59,10 @@ public class UserThread {
public static void execute(Runnable command) {
executor.execute(() -> {
Thread.currentThread().setName(USER_THREAD_NAME);
command.run();
synchronized (executor) {
USER_THREAD = Thread.currentThread();
command.run();
}
});
}
@ -79,9 +81,9 @@ public class UserThread {
}
}
// TODO: better way to determine if on UserThread, since this is not reliable
private static boolean isUserThread(Thread thread) {
return USER_THREAD_NAME.equals(thread.getName());
public static boolean isUserThread(Thread thread) {
return thread == USER_THREAD;
}
// Prefer FxTimer if a delay is needed in a JavaFx class (gui module)
@ -99,7 +101,7 @@ public class UserThread {
}
public static Timer runAfter(Runnable runnable, long delay, TimeUnit timeUnit) {
return getTimer().runLater(Duration.ofMillis(timeUnit.toMillis(delay)), runnable);
return getTimer().runLater(Duration.ofMillis(timeUnit.toMillis(delay)), () -> execute(runnable));
}
public static Timer runPeriodically(Runnable runnable, long intervalInSec) {
@ -107,7 +109,7 @@ public class UserThread {
}
public static Timer runPeriodically(Runnable runnable, long interval, TimeUnit timeUnit) {
return getTimer().runPeriodically(Duration.ofMillis(timeUnit.toMillis(interval)), runnable);
return getTimer().runPeriodically(Duration.ofMillis(timeUnit.toMillis(interval)), () -> execute(runnable));
}
private static Timer getTimer() {