Fix required memory size passed to expunge() #534
Merged
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
nikic
reviewed
Mar 2, 2025
apc_sma.c
Outdated
| @@ -449,7 +449,7 @@ PHP_APCU_API void *apc_sma_malloc_ex(apc_sma_t *sma, size_t n, size_t *allocated | |||
|
|
|||
| /* Expunge cache in hope of freeing up memory, but only once */ | |||
| if (!nuked) { | |||
| sma->expunge(*sma->data, n+fragment); | |||
| sma->expunge(*sma->data, ALIGNWORD(n + ALIGNWORD(sizeof(struct block_t)))); | |||
There was a problem hiding this comment.
I don't think we should be passing the real size to the expunge hook. Instead apc_sma_get_avail_size should be computing the real size for its check.
There was a problem hiding this comment.
yes, I absolutely agree. Fixed.
madmajestro
force-pushed
the
fix-size-passed-to-expunge
branch
from
fefa7a6 to
10ffa35
Compare
The function apc_sma_get_avail_size() now takes care of computing the real size to achieve better separation of layers. In addition, the computation of the real size has been fixed.
madmajestro
force-pushed
the
fix-size-passed-to-expunge
branch
from
10ffa35 to
037ea17
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.
The size passed to expunge() must match the size passed to find_block().