[Scummvm-git-logs] scummvm master -> 506c8945ff713b7473c8704388dad8bc50eb89b3

[moralrecordings]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
506c8945ff DIRECTOR: Don't allocate big objects in stack in SpaceMgr


Commit: 506c8945ff713b7473c8704388dad8bc50eb89b3
    https://github.com/scummvm/scummvm/commit/506c8945ff713b7473c8704388dad8bc50eb89b3
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-01-24T17:29:33+08:00

Commit Message:
DIRECTOR: Don't allocate big objects in stack in SpaceMgr

The SpaceMgr objects (especially SpaceCollection) are pretty huge (over
1MB size) because they are made of HashMap which contain their object
pool.
These objects should have never been allocated on stack.
As the nodes are not existing, make sure they are allocated directly on
the heap using the getOrCreateVal call.
When needed, the result is recycled to avoid an extra lookup.

Changed paths:
    engines/director/lingo/xlibs/spacemgr.cpp


diff --git a/engines/director/lingo/xlibs/spacemgr.cpp b/engines/director/lingo/xlibs/spacemgr.cpp
index c9e9ba80996..61965195edd 100644
--- a/engines/director/lingo/xlibs/spacemgr.cpp
+++ b/engines/director/lingo/xlibs/spacemgr.cpp
@@ -217,7 +217,7 @@ void SpaceMgr::m_parseText(int nargs) {
 			me->_curNode = "";
 			me->_curView = "";
 			if (!(me->_spaceCollections.contains(me->_curSpaceCollection) && me->_checkForDups)) {
-				me->_spaceCollections[me->_curSpaceCollection] = SpaceCollection();
+				me->_spaceCollections.getOrCreateVal(me->_curSpaceCollection);
 			}
 		} else if (type == "SPACE") {
 			me->_curSpace = instruction.nextToken();
@@ -225,7 +225,7 @@ void SpaceMgr::m_parseText(int nargs) {
 			me->_curView = "";
 			SpaceCollection &sc = me->_spaceCollections.getVal(me->_curSpaceCollection);
 			if (!(sc.spaces.contains(me->_curSpaceCollection) && me->_checkForDups)) {
-				sc.spaces[me->_curSpace] = Space();
+				sc.spaces.getOrCreateVal(me->_curSpace);
 			}
 		} else if (type == "NODE") {
 			me->_curNode = instruction.nextToken();
@@ -233,7 +233,7 @@ void SpaceMgr::m_parseText(int nargs) {
 			SpaceCollection &sc = me->_spaceCollections.getVal(me->_curSpaceCollection);
 			Space &s = sc.spaces.getVal(me->_curSpace);
 			if (!(s.nodes.contains(me->_curNode) && me->_checkForDups)) {
-				s.nodes[me->_curNode] = Node();
+				s.nodes.getOrCreateVal(me->_curNode);
 			}
 		} else if (type == "VIEW") {
 			me->_curView = instruction.nextToken();
@@ -241,8 +241,7 @@ void SpaceMgr::m_parseText(int nargs) {
 			Space &s = sc.spaces.getVal(me->_curSpace);
 			Node &n = s.nodes.getVal(me->_curNode);
 			if (!(n.views.contains(me->_curView) && me->_checkForDups)) {
-				n.views[me->_curView] = View();
-				n.views[me->_curView].payload = instruction.nextToken();
+				n.views.getOrCreateVal(me->_curView).payload = instruction.nextToken();
 			}
 		} else if (type == "LLINK") {
 			Common::String target = instruction.nextToken();
@@ -252,8 +251,7 @@ void SpaceMgr::m_parseText(int nargs) {
 			Node &n = s.nodes.getVal(me->_curNode);
 			View &v = n.views.getVal(me->_curView);
 			if (!(v.llinks.contains(target) && me->_checkForDups)) {
-				v.llinks[target] = LLink();
-				v.llinks[target].payload = payload;
+				v.llinks.getOrCreateVal(target).payload = payload;
 			}
 		} else {
 			warning("SpaceMgr::m_parseText: Unhandled instruction %s", instructionBody.c_str());