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

Performance: fixed memory leaks on each card viewer or draft open (10 Mb per call, related to #11285, fixes #9548)

Browse source
This commit is contained in:
Oleg Agafonov 2023-10-14 12:38:32 +04:00
parent ce311fd691
commit 36ccfb0a2a
13 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Client/src/main/java/mage/client/SessionHandler.java
View file

@ -24,6 +24,10 @@ import java.text.SimpleDateFormat;
import java.util.*;
/**
* Network: client side session
*
* Only one session/server per GUI's client
*
* Created by IGOUDT on 15-9-2016.
*/
public final class SessionHandler {

1
Mage.Client/src/main/java/mage/client/deckeditor/CardSelector.java
View file

@ -167,6 +167,7 @@ public class CardSelector extends javax.swing.JPanel implements ComponentListene
MageFrame.getPreferences().put(KEY_DECK_EDITOR_SEARCH_RULES, Boolean.toString(chkRules.isSelected()));
MageFrame.getPreferences().put(KEY_DECK_EDITOR_SEARCH_TYPES, Boolean.toString(chkTypes.isSelected()));
MageFrame.getPreferences().put(KEY_DECK_EDITOR_SEARCH_UNIQUE, Boolean.toString(chkUnique.isSelected()));
ExpansionRepository.instance.unsubscribe(setsDbListener);
}
public void changeGUISize() {

2
Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/CollectionViewerPanel.java
View file

@ -40,6 +40,7 @@ public final class CollectionViewerPanel extends JPanel {
public void cleanUp() {
this.hidePopup();
this.bigCard = null;
ExpansionRepository.instance.unsubscribe(setsDbListener);
}
private void reloadFormatCombobox() {
@ -220,7 +221,6 @@ public final class CollectionViewerPanel extends JPanel {
if (c != null) {
((CollectionViewerPane) c).removeFrame();
}
}
private final class MageBookContainer extends JPanel {

1
Mage.Client/src/main/java/mage/client/util/EventSource.java
View file

@ -3,6 +3,7 @@ package mage.client.util;
import java.io.Serializable;
/**
* TODO: there are duplicated interfaces of EventSource, must combine in single
* @author BetaSteward_at_googlemail.com
*/
public interface EventSource<E extends Event> extends Serializable {

2
Mage.Client/src/main/java/mage/client/util/sets/ConstructedFormats.java
View file

@ -7,6 +7,7 @@ import mage.constants.SetType;
import mage.deck.Standard;
import mage.game.events.Listener;
import javax.swing.*;
import java.util.*;
/**
@ -54,6 +55,7 @@ public final class ConstructedFormats {
}
}
};
// it's a static, so no needs to unsubscribe later
ExpansionRepository.instance.subscribe(setsDbListener);
}

2
Mage.Common/src/main/java/mage/remote/SessionImpl.java
View file

@ -37,6 +37,8 @@ import java.util.concurrent.CancellationException;
import java.util.concurrent.TimeUnit;
/**
* Network: client side session
*
* @author BetaSteward_at_googlemail.com, JayDi85
*/
public class SessionImpl implements Session {

2
Mage.Server/src/main/java/mage/server/TableController.java
View file

@ -607,7 +607,7 @@ public class TableController {
logger.info("Tourn. match started id:" + match.getId() + " tournId: " + table.getTournament().getId());
} else {
managerFactory.userManager().getUser(userId).ifPresent(user -> {
logger.info("MATCH started [" + match.getName() + "] " + match.getId() + '(' + user.getName() + ')');
logger.info("MATCH started [" + match.getName() + "] " + match.getId() + " (" + user.getName() + ')');
logger.debug("- " + match.getOptions().getGameType() + " - " + match.getOptions().getDeckType());
});
}

2
Mage.Server/src/main/java/mage/server/User.java
View file

@ -566,7 +566,7 @@ public class User {
if (!watchedGames.isEmpty()) {
sb.append("Watch: ").append(watchedGames.size()).append(' ');
}
return sb.toString();
return sb.length() == 0 ? "not active" : sb.toString();
}
public void addGameWatchInfo(UUID gameId) {

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

@ -62,10 +62,19 @@ public enum ExpansionRepository {
}
/**
* Warning, don't forget to unsubscribe due memory leak problems
*
* @param listener
*/
public void subscribe(Listener<RepositoryEvent> listener) {
eventSource.addListener(listener);
}
public void unsubscribe(Listener<RepositoryEvent> listener) {
eventSource.removeListener(listener);
}
public void saveSets(final List<ExpansionInfo> newSets, final List<ExpansionInfo> updatedSets, long newContentVersion) {
try {
expansionDao.callBatchTasks(() -> {

7
Mage/src/main/java/mage/cards/repository/RepositoryEventSource.java
View file

@ -20,7 +20,12 @@ public class RepositoryEventSource implements EventSource<RepositoryEvent>, Seri
}
@Override
public void removeAllListener() {
public void removeListener(Listener<RepositoryEvent> listener) {
dispatcher.removeListener(listener);
}
@Override
public void removeAllListeners() {
dispatcher.removeAllListener();
}

8
Mage/src/main/java/mage/game/events/EventSource.java
View file

@ -1,17 +1,17 @@
package mage.game.events;
import java.io.Serializable;
/**
*
* TODO: there are duplicated interfaces of EventSource, must combine in single
* @author BetaSteward_at_googlemail.com
* @param <E>
*/
public interface EventSource<E extends ExternalEvent> extends Serializable {
void addListener(Listener<E> listener);
void removeListener(Listener<E> listener);
void removeAllListener();
void removeAllListeners();
}

7
Mage/src/main/java/mage/game/events/PlayerQueryEventSource.java
View file

@ -29,7 +29,12 @@ public class PlayerQueryEventSource implements EventSource<PlayerQueryEvent>, Se
}
@Override
public void removeAllListener() {
public void removeListener(Listener<PlayerQueryEvent> listener) {
dispatcher.removeListener(listener);
}
@Override
public void removeAllListeners() {
dispatcher.removeAllListener();
}

7
Mage/src/main/java/mage/game/events/TableEventSource.java
View file

@ -26,7 +26,12 @@ public class TableEventSource implements EventSource<TableEvent>, Serializable {
}
@Override
public void removeAllListener() {
public void removeListener(Listener<TableEvent> listener) {
dispatcher.removeListener(listener);
}
@Override
public void removeAllListeners() {
dispatcher.removeAllListener();
}