External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -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

10
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -44,6 +44,8 @@ import mage.interfaces.callback.ClientCallback;
import mage.remote.Connection;
import mage.remote.Connection.ProxyType;
import mage.util.DebugUtil;
import mage.util.ThreadUtils;
import mage.util.XMageThreadFactory;
import mage.utils.MageVersion;
import mage.view.GameEndView;
import mage.view.UserRequestMessage;
@ -79,6 +81,8 @@ import java.util.concurrent.TimeUnit;
import java.util.prefs.Preferences;
/**
* Client app
*
* @author BetaSteward_at_googlemail.com, JayDi85
*/
public class MageFrame extends javax.swing.JFrame implements MageClient {
@ -129,7 +133,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
private static final Map<UUID, DraftPanel> DRAFTS = new HashMap<>();
private static final MageUI UI = new MageUI();
private static final ScheduledExecutorService PING_TASK_EXECUTOR = Executors.newSingleThreadScheduledExecutor();
private static final ScheduledExecutorService PING_SENDER_EXECUTOR = Executors.newSingleThreadScheduledExecutor(
new XMageThreadFactory(ThreadUtils.THREAD_PREFIX_CLIENT_PING_SENDER)
);
private static UpdateMemUsageTask updateMemUsageTask;
private static long startTime;
@ -317,7 +323,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
desktopPane.add(errorDialog, JLayeredPane.MODAL_LAYER);
UI.addComponent(MageComponents.DESKTOP_PANE, desktopPane);
PING_TASK_EXECUTOR.scheduleAtFixedRate(() -> SessionHandler.ping(), TablesPanel.PING_SERVER_SECS, TablesPanel.PING_SERVER_SECS, TimeUnit.SECONDS);
PING_SENDER_EXECUTOR.scheduleAtFixedRate(SessionHandler::ping, TablesPanel.PING_SERVER_SECS, TablesPanel.PING_SERVER_SECS, TimeUnit.SECONDS);
updateMemUsageTask = new UpdateMemUsageTask(jMemUsageLabel);

9
Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
View file

@ -25,6 +25,8 @@ import mage.components.CardInfoPane;
import mage.game.GameException;
import mage.remote.Session;
import mage.util.DeckUtil;
import mage.util.ThreadUtils;
import mage.util.XMageThreadFactory;
import mage.view.CardView;
import mage.view.SimpleCardView;
import org.apache.log4j.Logger;
@ -1493,11 +1495,14 @@ public class DeckEditorPanel extends javax.swing.JPanel {
private void btnSubmitTimerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnSubmitTimerActionPerformed
ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(5);
ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor(
new XMageThreadFactory(ThreadUtils.THREAD_PREFIX_CLIENT_SUBMIT_TIMER)
);
timeToSubmit = 60;
this.btnSubmitTimer.setEnabled(false);
scheduledExecutorService.schedule(() -> {
// TODO: need code and feature review. It sends deck every minute -- is it useless? There is another feature with auto-save
executorService.schedule(() -> {
if (updateDeckTask != null) {
updateDeckTask.cancel(true);
}

10
Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
View file

@ -4,11 +4,12 @@ import mage.client.MageFrame;
import mage.client.SessionHandler;
import mage.client.chat.ChatPanelBasic;
import mage.client.dialog.MageDialog;
import mage.client.util.GUISizeHelper;
import mage.client.util.audio.AudioManager;
import mage.client.util.gui.ArrowBuilder;
import mage.constants.PlayerAction;
import mage.constants.TurnPhase;
import mage.util.ThreadUtils;
import mage.util.XMageThreadFactory;
import org.apache.log4j.Logger;
import javax.swing.*;
@ -43,7 +44,9 @@ public class FeedbackPanel extends javax.swing.JPanel {
private Map<String, Serializable> lastOptions = new HashMap<>();
private static final int AUTO_CLOSE_END_DIALOG_TIMEOUT_SECS = 8;
private static final ScheduledExecutorService WORKER = Executors.newSingleThreadScheduledExecutor();
private static final ScheduledExecutorService AUTO_CLOSE_EXECUTOR = Executors.newSingleThreadScheduledExecutor(
new XMageThreadFactory(ThreadUtils.THREAD_PREFIX_CLIENT_AUTO_CLOSE_TIMER)
);
/**
* Creates new form FeedbackPanel
@ -158,6 +161,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
* Close game window by pressing OK button after 8 seconds
*/
private void endWithTimeout() {
// TODO: add auto-close disable, e.g. keep opened game and chat for longer period like 5 minutes
Runnable task = () -> {
SwingUtilities.invokeLater(() -> {
LOGGER.info("Ending game...");
@ -170,7 +174,7 @@ public class FeedbackPanel extends javax.swing.JPanel {
}
});
};
WORKER.schedule(task, AUTO_CLOSE_END_DIALOG_TIMEOUT_SECS, TimeUnit.SECONDS);
AUTO_CLOSE_EXECUTOR.schedule(task, AUTO_CLOSE_END_DIALOG_TIMEOUT_SECS, TimeUnit.SECONDS);
}
public void updateOptions(Map<String, Serializable> options) {

8
Mage.Client/src/main/java/org/mage/plugins/card/dl/Downloader.java
View file

@ -1,5 +1,7 @@
package org.mage.plugins.card.dl;
import mage.util.ThreadUtils;
import mage.util.XMageThreadFactory;
import org.apache.log4j.Logger;
import org.jetlang.channels.Channel;
import org.jetlang.channels.MemoryChannel;
@ -22,7 +24,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
/**
* Downloader
* Symbols downloader
*
* @author Clemens Koza, JayDi85
*/
@ -34,7 +36,9 @@ public class Downloader extends AbstractLaternaBean {
private final Channel<DownloadJob> jobsQueue = new MemoryChannel<>();
private CountDownLatch worksCount = null;
private final ExecutorService pool = Executors.newCachedThreadPool();
private final ExecutorService pool = Executors.newCachedThreadPool(
new XMageThreadFactory(ThreadUtils.THREAD_PREFIX_CLIENT_SYMBOLS_DOWNLOADER, false)
);
private final List<Fiber> fibers = new ArrayList<>();
public Downloader() {

10
Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/WizardCardsImageSource.java
View file

@ -508,7 +508,6 @@ public enum WizardCardsImageSource implements CardImageSource {
private Map<String, String> getSetLinks(String cardSet) {
LinkedHashMap<String, String> setLinks = new LinkedHashMap<>();
ExecutorService executor = Executors.newFixedThreadPool(10);
try {
String setNames = setsAliases.get(cardSet);
if (setNames == null) {
@ -563,15 +562,6 @@ public enum WizardCardsImageSource implements CardImageSource {
logger.error("Exception when parsing the wizards page: " + ex.getMessage());
}
executor.shutdown();
while (!executor.isTerminated()) {
try {
TimeUnit.SECONDS.sleep(1);
} catch (InterruptedException ie) {
}
}
return setLinks;
}

11
Mage.Client/src/main/java/org/mage/plugins/card/images/DownloadPicturesService.java
View file

@ -13,6 +13,8 @@ import mage.client.util.CardLanguage;
import mage.client.util.GUISizeHelper;
import mage.client.util.sets.ConstructedFormats;
import mage.remote.Connection;
import mage.util.ThreadUtils;
import mage.util.XMageThreadFactory;
import net.java.truevfs.access.TFile;
import net.java.truevfs.access.TFileOutputStream;
import net.java.truevfs.access.TVFS;
@ -38,6 +40,8 @@ import java.util.stream.Collectors;
import static org.mage.plugins.card.utils.CardImageUtils.getImagesDir;
/**
* Images downloader
*
* @author JayDi85
*/
public class DownloadPicturesService extends DefaultBoundedRangeModel implements DownloadServiceInfo, Runnable {
@ -629,7 +633,7 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements
}
}
int downloadThreadsAmount = Integer.parseInt((String) uiDialog.getDownloadThreadsCombo().getSelectedItem());
int downloadThreadsAmount = Math.max(1, Integer.parseInt((String) uiDialog.getDownloadThreadsCombo().getSelectedItem()));
if (proxy != null) {
logger.info("Started download of " + cardsDownloadQueue.size() + " images"
@ -639,7 +643,10 @@ public class DownloadPicturesService extends DefaultBoundedRangeModel implements
updateProgressMessage("Preparing download list...");
if (selectedSource.prepareDownloadList(this, cardsDownloadQueue)) {
update(0, cardsDownloadQueue.size());
ExecutorService executor = Executors.newFixedThreadPool(downloadThreadsAmount);
ExecutorService executor = Executors.newFixedThreadPool(
downloadThreadsAmount,
new XMageThreadFactory(ThreadUtils.THREAD_PREFIX_CLIENT_IMAGES_DOWNLOADER, false)
);
for (int i = 0; i < cardsDownloadQueue.size() && !this.isNeedCancel(); i++) {
try {
CardDownloadData card = cardsDownloadQueue.get(i);