Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Performance: fixed server's big memory usage in long games and in big stack sizes (related to #11285, fixes #9302)

Browse source
This commit is contained in:
Oleg Agafonov 2023-10-14 15:54:10 +04:00
parent 36ccfb0a2a
commit d57a3c100d
7 changed files with 107 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -118,7 +118,7 @@ public abstract class GameImpl implements Game {
protected Map<UUID, Counters> enterWithCounters = new HashMap<>();
protected GameState state;
private transient Stack<Integer> savedStates = new Stack<>();
private transient Stack<Integer> savedStates = new Stack<>(); // bookmarks - 0-base refs to gameStates
protected transient GameStates gameStates = new GameStates();
// game states to allow player rollback
@ -934,8 +934,7 @@ public abstract class GameImpl implements Game {
}
@Override
public void removeBookmark(int bookmark
) {
public void removeBookmark(int bookmark) {
if (!simulation) {
if (bookmark != 0) {
while (savedStates.size() > bookmark) {
@ -946,6 +945,20 @@ public abstract class GameImpl implements Game {
}
}
@Override
public void removeBookmark_v2(int bookmark) {
if (!simulation) {
if (bookmark != 0) {
while (savedStates.size() >= bookmark) {
int outdatedIndex = savedStates.pop();
while (gameStates.getSize() - 1 >= outdatedIndex) {
gameStates.remove(gameStates.getSize() - 1);
}
}
}
}
}
private void clearAllBookmarks() {
if (!simulation) {
while (!savedStates.isEmpty()) {