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

phpdbg: remove dead code and sillyness #13322

Merged
merged 1 commit into from
Feb 4, 2024
Merged

phpdbg: remove dead code and sillyness #13322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 4 additions & 10 deletions sapi/phpdbg/phpdbg_watch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ void phpdbg_set_addr_watchpoint(void *addr, size_t size, phpdbg_watchpoint_t *wa
watch->size = size;
watch->ref = NULL;
watch->coll = NULL;
zend_hash_init(&watch->elements, 8, brml, NULL, 0);
zend_hash_init(&watch->elements, 8, NULL, NULL, 0);
}

void phpdbg_set_zval_watchpoint(zval *zv, phpdbg_watchpoint_t *watch) {
Expand Down Expand Up @@ -460,7 +460,7 @@ void phpdbg_update_watch_ref(phpdbg_watchpoint_t *watch) {
coll->reference.addr.ptr = NULL;
}

zend_hash_init(&coll->parents, 8, shitty stupid parameter, NULL, 0);
zend_hash_init(&coll->parents, 8, NULL, NULL, 0);
zend_hash_index_add_ptr(&PHPDBG_G(watch_collisions), (zend_ulong) watch->ref, coll);
}
zend_hash_index_add_ptr(&coll->parents, (zend_long) watch, watch);
Expand All @@ -484,7 +484,7 @@ void phpdbg_update_watch_ref(phpdbg_watchpoint_t *watch) {
phpdbg_activate_watchpoint(&coll->ref);
phpdbg_watch_backup_data(&coll->ref);

zend_hash_init(&coll->parents, 8, shitty stupid parameter, NULL, 0);
zend_hash_init(&coll->parents, 8, NULL, NULL, 0);
zend_hash_index_add_ptr(&PHPDBG_G(watch_collisions), (zend_ulong) watch->ref, coll);
}
zend_hash_index_add_ptr(&coll->parents, (zend_long) watch, watch);
Expand Down Expand Up @@ -642,14 +642,13 @@ void phpdbg_recurse_watch_element(phpdbg_watch_element *element) {
void phpdbg_watch_parent_ht(phpdbg_watch_element *element) {
if (element->watch->type == WATCH_ON_BUCKET) {
phpdbg_btree_result *res;
HashPosition pos;
phpdbg_watch_ht_info *hti;
ZEND_ASSERT(element->parent_container);
if (!(res = phpdbg_btree_find(&PHPDBG_G(watch_HashTables), (zend_ulong) element->parent_container))) {
hti = emalloc(sizeof(*hti));
hti->ht = element->parent_container;

zend_hash_init(&hti->watches, 0, grrrrr, ZVAL_PTR_DTOR, 0);
zend_hash_init(&hti->watches, 0, NULL, ZVAL_PTR_DTOR, 0);
phpdbg_btree_insert(&PHPDBG_G(watch_HashTables), (zend_ulong) hti->ht, hti);

phpdbg_set_addr_watchpoint(HT_GET_DATA_ADDR(hti->ht), HT_HASH_SIZE(hti->ht->nTableMask), &hti->hash_watch);
Expand All @@ -660,11 +659,6 @@ void phpdbg_watch_parent_ht(phpdbg_watch_element *element) {
hti = (phpdbg_watch_ht_info *) res->ptr;
}

zend_hash_internal_pointer_end_ex(hti->ht, &pos);
hti->last = hti->ht->arData + pos;
hti->last_str = hti->last->key;
hti->last_idx = hti->last->h;

zend_hash_add_ptr(&hti->watches, element->name_in_parent, element);
}
}
Expand Down
5 changes: 0 additions & 5 deletions sapi/phpdbg/phpdbg_watch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,7 @@ typedef struct _phpdbg_watch_element {
typedef struct {
/* to watch rehashes (yes, this is not *perfect*, but good enough for everything in PHP...) */
phpdbg_watchpoint_t hash_watch; /* must be first element */
Bucket *last;
zend_string *last_str;
zend_ulong last_idx;

HashTable *ht;
size_t data_size;
HashTable watches; /* contains phpdbg_watch_element */
} phpdbg_watch_ht_info;

Expand Down
Loading