Merge lp:~widelands-dev/widelands/bug-1831583-fri02 into lp:widelands
Proposed by
Benedikt Straub
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 9142 | ||||
Proposed branch: | lp:~widelands-dev/widelands/bug-1831583-fri02 | ||||
Merge into: | lp:widelands | ||||
Diff against target: |
31 lines (+4/-2) 1 file modified
data/campaigns/fri02.wmf/scripting/mission_thread.lua (+4/-2) |
||||
To merge this branch: | bzr merge lp:~widelands-dev/widelands/bug-1831583-fri02 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
hessenfarmer | Approve | ||
GunChleoc | Approve | ||
Review via email: mp+368348@code.launchpad.net |
Commit message
Add some sleep time to costly loops in fri02 to prevent freezing
Description of the change
This is a Lua problem. gdb shows that masses of new Lua objects are created, and Lua doesn´t care to release the memory again. Hopefully, some additional sleep() will give the game and the garbage collector time to catch up.
I don´t want to fix this by increasing the base sleep time or the objective will be marked done only after an enormous delay.
Another way to fix the bug while perhaps improving performance would be to move the checks to C++, but I feel bad about having such specialised functions there.
To post a comment you must log in.
Continuous integration builds have changed state:
Travis build 5152. State: errored. Details: https:/ /travis- ci.org/ widelands/ widelands/ builds/ 541383420. /ci.appveyor. com/project/ widelands- dev/widelands/ build/_ widelands_ dev_widelands_ bug_1831583_ fri02-4934.
Appveyor build 4934. State: success. Details: https:/