External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 21:12:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

server: fixed server app freeze on another instance already running, improved threads usage (related to #11285);

Browse source
This commit is contained in:
Oleg Agafonov 2024-06-23 15:58:25 +04:00
parent f0c38cdb87
commit 7d675de876
21 changed files with 203 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/cards/repository/CardRepository.java
View file

@ -636,7 +636,7 @@ public enum CardRepository {
ConnectionSource connectionSource = new JdbcConnectionSource(JDBC_URL);
RepositoryUtil.updateVersion(connectionSource, VERSION_ENTITY_NAME + "Content", version);
} catch (SQLException e) {
Logger.getLogger(CardRepository.class).error("Error getting content version - " + e, e);
Logger.getLogger(CardRepository.class).error("Error setting content version - " + e, e);
processMemoryErrors(e);
}
}

10
Mage/src/main/java/mage/cards/repository/ExpansionRepository.java
View file

@ -27,7 +27,7 @@ public enum ExpansionRepository {
private static final Logger logger = Logger.getLogger(ExpansionRepository.class);
private static final String JDBC_URL = "jdbc:h2:file:./db/cards.h2;AUTO_SERVER=TRUE";
private static final String JDBC_URL = "jdbc:h2:file:./db/cards.h2;AUTO_SERVER=TRUE;IGNORECASE=TRUE";
private static final String VERSION_ENTITY_NAME = "expansion";
private static final long EXPANSION_DB_VERSION = 5;
private static final long EXPANSION_CONTENT_VERSION = 18;
@ -87,7 +87,7 @@ public enum ExpansionRepository {
expansionDao.create(exp);
}
} catch (SQLException ex) {
Logger.getLogger(CardRepository.class).error("Error adding expansions to DB - ", ex);
logger.error("Error adding expansions to DB - ", ex);
}
}
@ -99,7 +99,7 @@ public enum ExpansionRepository {
expansionDao.update(exp);
}
} catch (SQLException ex) {
Logger.getLogger(CardRepository.class).error("Error adding expansions to DB - ", ex);
logger.error("Error adding expansions to DB - ", ex);
}
}
@ -230,8 +230,8 @@ public enum ExpansionRepository {
try {
ConnectionSource connectionSource = new JdbcConnectionSource(JDBC_URL);
RepositoryUtil.updateVersion(connectionSource, VERSION_ENTITY_NAME + "Content", version);
} catch (SQLException ex) {
ex.printStackTrace();
} catch (SQLException e) {
logger.error("Error setting content version - " + e, e);
}
}

30
Mage/src/main/java/mage/game/draft/DraftImpl.java
View file

@ -1,6 +1,5 @@
package mage.game.draft;
import java.util.*;
import mage.cards.Card;
import mage.cards.ExpansionSet;
import mage.game.draft.DraftOptions.TimingOption;
@ -8,15 +7,17 @@ import mage.game.events.*;
import mage.game.events.TableEvent.EventType;
import mage.players.Player;
import mage.players.PlayerList;
import mage.util.ThreadUtils;
import mage.util.XMageThreadFactory;
import org.apache.log4j.Logger;
import java.util.*;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
/**
*
* @author BetaSteward_at_googlemail.com
*/
public abstract class DraftImpl implements Draft {
@ -41,9 +42,9 @@ public abstract class DraftImpl implements Draft {
protected transient TableEventSource tableEventSource = new TableEventSource();
protected transient PlayerQueryEventSource playerQueryEventSource = new PlayerQueryEventSource();
protected ScheduledFuture<?> boosterLoadingHandle;
protected final ScheduledExecutorService boosterLoadingExecutor = Executors.newSingleThreadScheduledExecutor();
protected ScheduledExecutorService boosterLoadingExecutor = null;
public DraftImpl(DraftOptions options, List<ExpansionSet> sets) {
id = UUID.randomUUID();
@ -240,13 +241,20 @@ public abstract class DraftImpl implements Draft {
cardNum++;
return true;
}
protected void setupBoosterLoadingHandle() {
cancelBoosterLoadingHandle();
boosterLoadingCounter = 0;
if (this.boosterLoadingExecutor == null) {
this.boosterLoadingExecutor = Executors.newSingleThreadScheduledExecutor(
new XMageThreadFactory(ThreadUtils.THREAD_PREFIX_TOURNEY_BOOSTERS_SEND)
);
}
boosterLoadingHandle = boosterLoadingExecutor.scheduleAtFixedRate(() -> {
try {
if (loadBoosters() == true) {
if (loadBoosters()) {
cancelBoosterLoadingHandle();
} else {
boosterLoadingCounter++;
@ -256,14 +264,14 @@ public abstract class DraftImpl implements Draft {
}
}, 0, BOOSTER_LOADING_INTERVAL, TimeUnit.SECONDS);
}
protected void cancelBoosterLoadingHandle() {
if (boosterLoadingHandle != null) {
boosterLoadingHandle.cancel(true);
}
}
protected boolean loadBoosters () {
protected boolean loadBoosters() {
boolean allBoostersLoaded = true;
for (DraftPlayer player : players.values()) {
if (player.isPicking() && !player.isBoosterLoaded()) {
@ -273,7 +281,7 @@ public abstract class DraftImpl implements Draft {
}
return allBoostersLoaded;
}
protected boolean donePicking() {
if (isAbort()) {
return true;
@ -345,7 +353,7 @@ public abstract class DraftImpl implements Draft {
}
return !player.isPicking();
}
@Override
public void setBoosterLoaded(UUID playerId) {
DraftPlayer player = players.get(playerId);

31
Mage/src/main/java/mage/util/ThreadUtils.java
View file

@ -8,7 +8,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
/**
* Util method to work with threads.
* Helper class to work with threads
*
* @author ayrat, JayDi85
*/
@ -16,20 +16,37 @@ public final class ThreadUtils {
// basic
public final static String THREAD_PREFIX_GAME = "GAME";
public final static String THREAD_PREFIX_AI_SIMULATION = "AI-SIM";
public final static String THREAD_PREFIX_AI_SIMULATION_MAD = "AI-SIM-MAD";
public final static String THREAD_PREFIX_AI_SIMULATION_MCTS = "AI-SIM-MCTS";
public final static String THREAD_PREFIX_CALL_REQUEST = "CALL";
public final static String THREAD_PREFIX_TOURNEY = "TOURNEY";
public final static String THREAD_PREFIX_TOURNEY_DRAFT = "TOURNEY DRAFT";
public final static String THREAD_PREFIX_TOURNEY_BOOSTERS_SEND = "TOURNEY BOOSTERS SEND";
// game
public final static String THREAD_PREFIX_GAME_JOIN_WAITING = "XMAGE game join waiting";
// services
public final static String THREAD_PREFIX_SERVICE_HEALTH = "XMAGE HEALTH";
public final static String THREAD_PREFIX_SERVICE_HEALTH = "XMAGE service health";
public final static String THREAD_PREFIX_SERVICE_USERS_LIST_REFRESH = "XMAGE users list refresh";
public final static String THREAD_PREFIX_SERVICE_CONNECTION_EXPIRED_CHECK = "XMAGE connection expired check";
public final static String THREAD_PREFIX_SERVICE_LOBBY_REFRESH = "XMAGE lobby refresh";
public final static String THREAD_PREFIX_SERVICE_NEWS_REFRESH = "XMAGE news refresh";
// etc
public final static String THREAD_PREFIX_TIMEOUT = "XMAGE TIMEOUT";
public final static String THREAD_PREFIX_TIMEOUT_IDLE = "XMAGE TIMEOUT_IDLE";
public final static String THREAD_PREFIX_TIMEOUT = "XMAGE timeout";
public final static String THREAD_PREFIX_TIMEOUT_IDLE = "XMAGE timeout_idle";
// client
// TODO: replace single GUI tasks by swing thread (invoke later) or by single executor like (like CALL for server side)
public final static String THREAD_PREFIX_CLIENT_SYMBOLS_DOWNLOADER = "XMAGE symbols downloader";
public final static String THREAD_PREFIX_CLIENT_IMAGES_DOWNLOADER = "XMAGE images downloader";
public final static String THREAD_PREFIX_CLIENT_PING_SENDER = "XMAGE ping sender";
public final static String THREAD_PREFIX_CLIENT_SUBMIT_TIMER = "XMAGE submit timer";
public final static String THREAD_PREFIX_CLIENT_AUTO_CLOSE_TIMER = "XMAGE auto-close timer";
// tests
public final static String THREAD_PREFIX_TESTS_AI_VS_AI_GAMES = "XMAGE tests ai vs ai";
public static void sleep(int millis) {
try {
@ -88,7 +105,7 @@ public final class ThreadUtils {
if (name.startsWith(THREAD_PREFIX_GAME)) {
// server game
return true;
} else if (name.startsWith(THREAD_PREFIX_AI_SIMULATION)) {
} else if (name.startsWith(THREAD_PREFIX_AI_SIMULATION_MAD)) {
// ai simulation
return true;
} else if (name.equals("main")) {

42
Mage/src/main/java/mage/util/XMageThreadFactory.java Normal file
View file

@ -0,0 +1,42 @@
package mage.util;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
/**
* Helper class to give debug friendly names for a threads
*
* @author JayDi85
*/
public class XMageThreadFactory implements ThreadFactory {
private final String prefix;
private final AtomicInteger counter = new AtomicInteger();
private final boolean isDaemon;
public XMageThreadFactory(String prefix) {
this(prefix, true);
}
/**
* @param prefix thread's starting name (can be changed by thread itself later)
* @param isDaemon mark thread as daemon on non-writeable tasks (e.g. can be terminated at any time without data loss)
*/
public XMageThreadFactory(String prefix, boolean isDaemon) {
this.prefix = prefix;
this.isDaemon = isDaemon;
}
@Override
public Thread newThread(Runnable r) {
int instanceNumber = this.counter.incrementAndGet();
Thread thread = new Thread(r);
thread.setDaemon(this.isDaemon);
// gives default name, but threads can change it by Thread.currentThread().setName (example: on game or tourney start)
thread.setName(String.format("%s - %d", this.prefix, instanceNumber));
return thread;
}
}