Fix random-looking OOS following rP24563
ClosedPublic
Actions

Authored by wraitii on Jan 14 2021, 5:46 PM.

Details

Reviewers

Commits

rP24610: Fix common OOS following rP24563.

Summary

rP24563 uses a GCHashTable to recognize objects.
I originally used MovableCellHasher, but that hit a VS17 bug. I then switched to a PointerHasher, and that seemed to work.
Unfortunately, it doesn't actually work, because it uses the object address and that can move. So I _do_ actually need a MovableCellHasher, as the docs explain.

I'll need to fix the VS17 bug.

Test Plan

Run MP games, the replay them -> you wil llikely get random mismatches without this patch.

Diff Detail

Repository

rP 0 A.D. Public Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

wraitii created this revision.Jan 14 2021, 5:46 PM

Build has FAILED

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/3953/display/redirect
See console output for more information: https://jenkins.wildfiregames.com/job/vs2015-differential/3953/display/redirectconsole

Build is green

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libnetwork_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2_dbg.a(precompiled.o) has no symbols
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//Forc

See https://jenkins.wildfiregames.com/job/macos-differential/2865/display/redirect for more details.

Build is green

builderr-debug-gcc7.txt
In file included from ../../../source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.cpp:17:
/zpool0/gcc7/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h: In lambda function:
/zpool0/gcc7/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h:203:17: warning: unused parameter 'includePath' [-Wunused-parameter]
     const CStr& includePath, CStr& out) {
     ~~~~~~~~~~~~^~~~~~~~~~~
/zpool0/gcc7/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h: In lambda function:
/zpool0/gcc7/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h:220:17: warning: unused parameter 'includePath' [-Wunused-parameter]
     const CStr& includePath, CStr& out) {
     ~~~~~~~~~~~~^~~~~~~~~~~
/zpool0/gcc7/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h:220:36: warning: unused parameter 'out' [-Wunused-parameter]
     const CStr& includePath, CStr& out) {
/zpool0/gcc7/source/third_party/ogre3d_preprocessor/test

See https://jenkins.wildfiregames.com/job/docker-differential/4524/display/redirect for more details.

Harbormaster completed remote builds in B15041: Diff 15302.Jan 14 2021, 6:15 PM

wraitii requested review of this revision.Jan 14 2021, 6:15 PM

Use MovableCellObject<JSObject*>, since that appears to work & per moz devs it should be equivalent.

Build is green

builderr-debug-macos.txt
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libnetwork_dbg.a(precompiled.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: ../../../binaries/system/libsimulation2_dbg.a(precompiled.o) has no symbols
ld: warning: text-based stub file /System/Library/Frameworks//CoreAudio.framework/CoreAudio.tbd and library file /System/Library/Frameworks//CoreAudio.framework/CoreAudio are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox.tbd and library file /System/Library/Frameworks//AudioToolbox.framework/AudioToolbox are out of sync. Falling back to library file for linking.
ld: warning: text-based stub file /System/Library/Frameworks//ForceFeedback.framework/ForceFeedback.tbd and library file /System/Library/Frameworks//Forc

See https://jenkins.wildfiregames.com/job/macos-differential/2866/display/redirect for more details.

Build is green

builderr-debug-gcc7.txt
In file included from ../../../source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.cpp:17:
/zpool0/gcc7/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h: In lambda function:
/zpool0/gcc7/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h:203:17: warning: unused parameter 'includePath' [-Wunused-parameter]
     const CStr& includePath, CStr& out) {
     ~~~~~~~~~~~~^~~~~~~~~~~
/zpool0/gcc7/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h: In lambda function:
/zpool0/gcc7/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h:220:17: warning: unused parameter 'includePath' [-Wunused-parameter]
     const CStr& includePath, CStr& out) {
     ~~~~~~~~~~~~^~~~~~~~~~~
/zpool0/gcc7/source/third_party/ogre3d_preprocessor/tests/test_Preprocessor.h:220:36: warning: unused parameter 'out' [-Wunused-parameter]
     const CStr& includePath, CStr& out) {
/zpool0/gcc7/source/third_party/ogre3d_preprocessor/test

See https://jenkins.wildfiregames.com/job/docker-differential/4525/display/redirect for more details.

Harbormaster completed remote builds in B15042: Diff 15303.Jan 14 2021, 8:05 PM