close Admin::Document smaps file when document is expired #11741
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
mmeeks
approved these changes
Apr 24, 2025
Admin::Documents are moved to _expiredDocuments when the matching real document is closed and are persistent until coolwsd exits, keeping the FILE* associated buffers around for coolwsds lifetime. fclose always uses ::close on its fd, but wasn't typically called before now, and ChildProcess always closed the fd. If we starting calling fclose then there is a duplicate ::close. By moving the FILE* to the ChildProcess, managed by shared_ptr, we can avoid having a permanently open FILE* in _expiredDocuments and avoid dup() for extra fds and guessing games as to who should close the smaps file. Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: Ied919f6e0fe614be7ad42cc15ddca60f0a4adab2
|
Nah, that's not going to work, ChildProcess does ::close on the underlying fd, so a fclose on the Admin::Documents FILE* from its fdopen of that is a second ::close. So we're relying on never calling fclose in practice at the moment. We'd need to dup the fd if we want to fclose the FILE* later. Or take ownership of the fd and hope for the best as it bounces around AdminModel callbacks. |
caolanm
force-pushed
the
private/caolan/close_expired_admin_document_smaps_file
branch
from
862ed25 to
2c0388b
Compare
caolanm
deleted the
private/caolan/close_expired_admin_document_smaps_file
branch
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.
Admin::Documents are moved to _expiredDocuments when the matching real document is closed. At which point _memoryDirty won't be updated anymore so we can close the open FILE* to the removed process smaps file to release a fd, and drop the FILE buffer.
Change-Id: Ied919f6e0fe614be7ad42cc15ddca60f0a4adab2
Summary
TODO
Checklist
make prettier-writeand formatted the code.make checkmake runand manually verified that everything looks okay