Add ZEND_API for weakmap functionality via zend_weakrefs_hash_add/del #7600
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
nikic
reviewed
Oct 21, 2021
| ZEND_API zend_result zend_weakrefs_hash_del(HashTable *ht, zend_object *key) { | ||
| zend_result result = zend_hash_index_del(ht, (zend_ulong) key); | ||
| if (result == SUCCESS) { | ||
| zend_weakref_unregister(key, ZEND_WEAKREF_ENCODE(ht, ZEND_WEAKREF_TAG_MAP)); |
There was a problem hiding this comment.
zend_weakref_unregister already does the hash del, so it might make sense to replace your hash_index_del here with hash_index_exists.
There was a problem hiding this comment.
Good point. And yeah will provide a small test for it.
|
@nikic has test now - looks good for merge then, right? |
nikic
approved these changes
Oct 21, 2021
| var_dump(zend_weakmap_remove($id2)); | ||
| var_dump(zend_weakmap_remove($id2)); | ||
|
|
||
| var_dump(zend_weakmap_dump()); |
There was a problem hiding this comment.
Might want to unset($id1) and dump again here, to shows the actual weak part :)
| @@ -0,0 +1,36 @@ | |||
| --TEST-- | |||
| Test internal weakmap API | |||
There was a problem hiding this comment.
This needs a SKIPIF (8.0) or EXTENSIONS (8.1) section.
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.
Exposes a simple API for weakmap functionality (weakref functionality can be trivially emulated by adding a dummy element instead) as ZEND_API to be trivially usable in extensions.
The implementation does not actually change (it's the first element of the struct), but I'm now explicitly passing &zend_weakmap->ht instead of zend_weakmap directly, to make it clearer that the weakmap implementation is generic with respect to the zend_weakmap structure and only cares about the HashTable pointer.