Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages 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

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);