feat: do not wait for chunk loads when calling #2912
+2,986
−3,210
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Bugfix
dordsor21
changed the base branch from
main
to
fix/chunk-get-write-improvements
dordsor21
changed the title
dordsor21
force-pushed
the
feat/no-wait-for-chunk-load
branch
from
3a3648f to
bd3cc64
Compare
|
Please take a moment and address the merge conflicts of your pull request. Thanks! |
dordsor21
force-pushed
the
feat/no-wait-for-chunk-load
branch
from
6c31979 to
45f84fb
Compare
|
Please take a moment and address the merge conflicts of your pull request. Thanks! |
dordsor21
force-pushed
the
feat/no-wait-for-chunk-load
branch
from
45f84fb to
56b7c6e
Compare
dordsor21
force-pushed
the
feat/no-wait-for-chunk-load
branch
from
56b7c6e to
7fe7ec3
Compare
dordsor21
force-pushed
the
feat/no-wait-for-chunk-load
branch
from
5cb0b3b to
051f5c3
Compare
SirYwell
reviewed
Nov 18, 2024
| @@ -118,6 +124,7 @@ public boolean trim(boolean aggressive, int layer) { | |||
| public synchronized IChunkSet reset() { | |||
| for (int i = 0; i < sectionCount; i++) { | |||
| sections[i] = EMPTY; | |||
| VarHandle.storeStoreFence(); | |||
There was a problem hiding this comment.
Should we synchronize on the section lock instead? Although there might be more places (e.g. loadIfPresent) where we don't synchronize...
There was a problem hiding this comment.
This is just to enforce order of operation in compiled code, I did not believe that it would necessarily be enforced given it's nested, despite the sync on the method
| if (!callLock.isHeldByCurrentThread()) { | ||
| throw new IllegalStateException("Attempted to call chunk GET but chunk was not call-locked."); | ||
| } | ||
| forceLoadSections = false; | ||
| LevelChunk nmsChunk = ensureLoaded(serverLevel, chunkX, chunkZ); | ||
| final ServerLevel nmsWorld = serverLevel; |
There was a problem hiding this comment.
Given large parts of that logic aren't version-specific, can we somehow reduce duplication here?
|
Please take a moment and address the merge conflicts of your pull request. Thanks! |
dordsor21
force-pushed
the
feat/no-wait-for-chunk-load
branch
from
051f5c3 to
162dea8
Compare
dordsor21
force-pushed
the
feat/no-wait-for-chunk-load
branch
from
a0b008a to
adb22c7
Compare
dordsor21
force-pushed
the
feat/no-wait-for-chunk-load
branch
from
adb22c7 to
0efd9ed
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.