Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Async chunk api/io/loading #2308

Merged
merged 57 commits into from
Aug 18, 2019
Merged

Async chunk api/io/loading #2308

Show file tree
Hide file tree
Changes from 49 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
b14f28e
First draft for implementing async chunk api
Spottedleaf Jul 8, 2019
1e525f4
Async io progress
Spottedleaf Jul 9, 2019
1ded069
Cleanup diff for PR
Spottedleaf Jul 11, 2019
b666485
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Jul 11, 2019
390ec9d
resolve xray conflicts
Spottedleaf Jul 11, 2019
e0e6414
Fix NPE
Spottedleaf Jul 11, 2019
f804132
Check if data exits on disk before attempting to queue a read
Spottedleaf Jul 11, 2019
601cd5b
Fix import
Spottedleaf Jul 11, 2019
ddfbee7
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Jul 11, 2019
b7efdd8
fix build
Spottedleaf Jul 11, 2019
8e1d94c
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Jul 12, 2019
85524b3
async chunk loading
Spottedleaf Jul 13, 2019
9c9d1f1
scuff merge
Spottedleaf Jul 13, 2019
1bfeef7
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Jul 13, 2019
85e6471
Cleanup stage 1
Spottedleaf Jul 13, 2019
c949e88
Make xray loads async
Spottedleaf Jul 13, 2019
eb8b686
Leave config until later
Spottedleaf Jul 13, 2019
a5c4f72
draft for async chunk saving when unloading chunks
Spottedleaf Jul 14, 2019
89ca225
Actually use POI data after loading it
Spottedleaf Jul 15, 2019
7d204e9
Fix QueueExecutorThread#close
Spottedleaf Jul 15, 2019
e14af16
Document code and fix varies bugs
Spottedleaf Jul 16, 2019
392dbe7
Config
Spottedleaf Jul 16, 2019
2f344bc
Fix deadlock concern with QueueExecutorThread#flush()
Spottedleaf Jul 16, 2019
130e463
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Jul 16, 2019
a1c2114
Prioritize xray loads
Spottedleaf Jul 16, 2019
41a1bc3
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Jul 19, 2019
5fd395d
Docuemnt patch
Spottedleaf Jul 19, 2019
24a8655
Experimental reduce sync loads patch
Spottedleaf Jul 19, 2019
45ad4f0
Update chunk status cache after loading in chunk data
Spottedleaf Jul 19, 2019
3713cee
Fix some issues
Spottedleaf Jul 20, 2019
c043353
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Jul 20, 2019
bdd0413
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Jul 22, 2019
70e9e65
Code cleanup & log coordinates for sync load finder
Spottedleaf Jul 22, 2019
83d727c
Do not schedule to the process queue
Spottedleaf Jul 22, 2019
9a1557c
Handle cancellation of chunk loads
Spottedleaf Jul 23, 2019
5f38812
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Jul 24, 2019
6fad1ad
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Jul 24, 2019
4d59872
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Jul 26, 2019
1832d79
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Jul 28, 2019
48309f7
Code review
Spottedleaf Aug 1, 2019
7bcd1ad
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Aug 1, 2019
5d1ed0e
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Aug 5, 2019
9a7c55e
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Aug 6, 2019
5189ebd
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Aug 7, 2019
c8ea7fc
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Aug 7, 2019
efabbf1
Resolve todo for obfhelpers
Spottedleaf Aug 7, 2019
ba400f1
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Aug 10, 2019
579bcd1
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Aug 11, 2019
a8c5e0f
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Aug 11, 2019
541b3aa
Flush on non-flush saves
Spottedleaf Aug 13, 2019
73172ed
Fix deadlock involving loading unconverted chunks and teleporting to …
Spottedleaf Aug 14, 2019
356a0df
prioritize io for chunk conversions
Spottedleaf Aug 15, 2019
53fe166
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Aug 15, 2019
13855ba
Add some debug to watchdog reports
Spottedleaf Aug 17, 2019
19ad59f
Merge branch 'ver/1.14' of github.com:PaperMC/Paper into async-chunk-api
Spottedleaf Aug 17, 2019
4b854b5
Fix NPE from last commit and rename the loader threads
Spottedleaf Aug 17, 2019
7c70c38
Merge ready
Spottedleaf Aug 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading