HandleAllocator: Always reserve handle zero. NFC #19065
Merged
Conversation
This file contains hidden or 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
sbc100
commented
Mar 24, 2023
| std::shared_ptr<Directory> createDirectory(mode_t mode) override { | ||
| proxy([](auto ctx) { _wasmfs_opfs_init_root_directory(ctx.ctx); }); | ||
| return std::make_shared<OPFSDirectory>(mode, this, 0, proxy); | ||
| return std::make_shared<OPFSDirectory>(mode, this, 1, proxy); |
Collaborator
Author
There was a problem hiding this comment.
I wonder if we should have _wasmfs_opfs_init_root_directory return the id here? Would that be easy?
Collaborator
|
Oh nice. FWIW having this.allocate = function(handle) {
let id = this.freelist.pop() || this.allocated.length;
this.allocated[id] = handle;
return id;
}; |
Collaborator
Author
Oh nice! |
Also, set entries to `undefined` rather than using the `delete` operator on the handle array. Apparently using `delete` can lead to holes in the array which can damage perf. Reserving 0 also allows us to simplify the allocate function a little. This actually revealed a hidden bug in test/other/test_dlopen_promise.c. Split out from #19054
sbc100
force-pushed
the
reserve_zero_handle
branch
from
4c5ba63 to
e5470d3
Compare
tlively
reviewed
Mar 27, 2023
| $HandleAllocator__docs: '/** @constructor */', | ||
| $HandleAllocator: function() { | ||
| this.allocated = []; | ||
| // Reserve slot 0 so that 0 is always and invalid handle |
| if (wasmfsOPFSDirectoryHandles.allocated.length == 0) { | ||
| // allocated.length start of as 1 since 0 is a reserved handle | ||
| if (wasmfsOPFSDirectoryHandles.allocated.length == 1) { | ||
| // Directory 0 is reserved as the root |
Member
There was a problem hiding this comment.
This comment needs to be updated to say "Directory 1"
| std::shared_ptr<Directory> createDirectory(mode_t mode) override { | ||
| proxy([](auto ctx) { _wasmfs_opfs_init_root_directory(ctx.ctx); }); | ||
| return std::make_shared<OPFSDirectory>(mode, this, 0, proxy); | ||
| return std::make_shared<OPFSDirectory>(mode, this, 1, proxy); |
Collaborator
Author
|
Oops, we make a followup with feedback |
sbc100
added a commit
that referenced
this pull request
Mar 27, 2023
sbc100
added a commit
that referenced
this pull request
Mar 27, 2023
RReverser
pushed a commit
that referenced
this pull request
Mar 29, 2023
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.
Also, set entries to
undefinedrather than using thedeleteoperator on thehandle array. Apparently using
deletecan lead to holes in the array whichcan damage perf.
This actually revealed a hidden bug in test/other/test_dlopen_promise.c.
Split out from #19054