mirror of
https://github.com/php/php-src.git
synced 2024-11-23 18:04:36 +08:00
90b7bde615
- for packed arrays we store just an array of zvals without keys.
- the elements of packed array are accessible throuf as ht->arPacked[i]
instead of ht->arData[i]
- in addition to general ZEND_HASH_FOREACH_* macros, we introduced similar
familied for packed (ZEND_HASH_PACKED_FORECH_*) and real hashes
(ZEND_HASH_MAP_FOREACH_*)
- introduced an additional family of macros to access elements of array
(packed or real hashes) ZEND_ARRAY_ELEMET_SIZE, ZEND_ARRAY_ELEMET_EX,
ZEND_ARRAY_ELEMET, ZEND_ARRAY_NEXT_ELEMENT, ZEND_ARRAY_PREV_ELEMENT
- zend_hash_minmax() prototype was changed to compare only values
Because of smaller data set, this patch may show performance improvement
on some apps and benchmarks that use packed arrays. (~1% on PHP-Parser)
TODO:
- sapi/phpdbg needs special support for packed arrays (WATCH_ON_BUCKET).
- zend_hash_sort_ex() may require converting packed arrays to hash.
82 lines
2.6 KiB
C
82 lines
2.6 KiB
C
/*
|
|
+----------------------------------------------------------------------+
|
|
| Zend Engine |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) Zend Technologies Ltd. (http://www.zend.com) |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 2.00 of the Zend license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.zend.com/license/2_00.txt. |
|
|
| If you did not receive a copy of the Zend license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@zend.com so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
| Authors: Dmitry Stogov <dmitry@php.net> |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#include "zend_vm_handlers.h"
|
|
#include "zend_sort.h"
|
|
|
|
#define GEN_MAP(n, name) do { \
|
|
ZVAL_LONG(&tmp, (zend_long)(uintptr_t)zend_opcode_handlers[n]); \
|
|
zend_hash_str_add(&vm_trace_ht, #name, sizeof(#name) - 1, &tmp); \
|
|
} while (0);
|
|
|
|
#define VM_TRACE_START() do { \
|
|
zval tmp; \
|
|
zend_hash_init(&vm_trace_ht, 0, NULL, NULL, 1); \
|
|
VM_HANDLERS(GEN_MAP) \
|
|
zend_vm_trace_init(); \
|
|
} while (0)
|
|
|
|
#ifdef _WIN64
|
|
# define ADDR_FMT "%016I64x"
|
|
#elif SIZEOF_SIZE_T == 4
|
|
# define ADDR_FMT "%08zx"
|
|
#elif SIZEOF_SIZE_T == 8
|
|
# define ADDR_FMT "%016zx"
|
|
#else
|
|
# error "Unknown SIZEOF_SIZE_T"
|
|
#endif
|
|
|
|
static HashTable vm_trace_ht;
|
|
|
|
static int zend_vm_trace_compare(const Bucket *p1, const Bucket *p2)
|
|
{
|
|
if (Z_LVAL(p1->val) > Z_LVAL(p2->val)) {
|
|
return 1;
|
|
} else if (Z_LVAL(p1->val) < Z_LVAL(p2->val)) {
|
|
return -1;
|
|
} else {
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
static void zend_vm_trace_init(void)
|
|
{
|
|
FILE *f;
|
|
zend_string *key, *prev_key;
|
|
zval *val;
|
|
zend_long prev_addr;
|
|
|
|
f = fopen("zend_vm.map", "w+");
|
|
if (f) {
|
|
zend_hash_sort(&vm_trace_ht, (bucket_compare_func_t)zend_vm_trace_compare, 0);
|
|
prev_key = NULL;
|
|
ZEND_HASH_MAP_FOREACH_STR_KEY_VAL(&vm_trace_ht, key, val) {
|
|
if (prev_key) {
|
|
fprintf(f, ADDR_FMT" "ADDR_FMT" t %s\n", prev_addr, Z_LVAL_P(val) - prev_addr, ZSTR_VAL(prev_key));
|
|
}
|
|
prev_key = key;
|
|
prev_addr = Z_LVAL_P(val);
|
|
} ZEND_HASH_FOREACH_END();
|
|
if (prev_key) {
|
|
fprintf(f, ADDR_FMT" "ADDR_FMT" t %s\n", prev_addr, 0, ZSTR_VAL(prev_key));
|
|
}
|
|
fclose(f);
|
|
}
|
|
zend_hash_destroy(&vm_trace_ht);
|
|
}
|