diff options
Diffstat (limited to 'ext/standard/php_var.h')
| -rw-r--r-- | ext/standard/php_var.h | 82 |
1 files changed, 67 insertions, 15 deletions
diff --git a/ext/standard/php_var.h b/ext/standard/php_var.h index 771d4876b..39cdb3fe2 100644 --- a/ext/standard/php_var.h +++ b/ext/standard/php_var.h @@ -12,15 +12,16 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ - | Author: Jani Lehtimäki <jkl@njet.net> | + | Author: Jani Lehtimäki <jkl@njet.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_var.h 321634 2012-01-01 13:15:04Z felipe $ */ +/* $Id: php_var.h 322070 2012-01-11 15:04:14Z dmitry $ */ #ifndef PHP_VAR_H #define PHP_VAR_H +#include "ext/standard/basic_functions.h" #include "ext/standard/php_smart_str_public.h" PHP_FUNCTION(var_dump); @@ -37,29 +38,80 @@ PHPAPI void php_var_export_ex(zval **struc, int level, smart_str *buf TSRMLS_DC) PHPAPI void php_debug_zval_dump(zval **struc, int level TSRMLS_DC); -/* typdef HashTable php_serialize_data_t; */ -#define php_serialize_data_t HashTable +typedef HashTable* php_serialize_data_t; struct php_unserialize_data { void *first; + void *last; void *first_dtor; + void *last_dtor; }; -typedef struct php_unserialize_data php_unserialize_data_t; +typedef struct php_unserialize_data* php_unserialize_data_t; PHPAPI void php_var_serialize(smart_str *buf, zval **struc, php_serialize_data_t *var_hash TSRMLS_DC); PHPAPI int php_var_unserialize(zval **rval, const unsigned char **p, const unsigned char *max, php_unserialize_data_t *var_hash TSRMLS_DC); -#define PHP_VAR_SERIALIZE_INIT(var_hash) \ - zend_hash_init(&(var_hash), 10, NULL, NULL, 0) -#define PHP_VAR_SERIALIZE_DESTROY(var_hash) \ - zend_hash_destroy(&(var_hash)) - -#define PHP_VAR_UNSERIALIZE_INIT(var_hash) \ - (var_hash).first = 0; \ - (var_hash).first_dtor = 0 -#define PHP_VAR_UNSERIALIZE_DESTROY(var_hash) \ - var_destroy(&(var_hash)) +#define PHP_VAR_SERIALIZE_INIT(var_hash_ptr) \ +do { \ + /* fprintf(stderr, "SERIALIZE_INIT == lock: %u, level: %u\n", BG(serialize_lock), BG(serialize).level); */ \ + if (BG(serialize_lock) || !BG(serialize).level) { \ + ALLOC_HASHTABLE(var_hash_ptr); \ + zend_hash_init((var_hash_ptr), 10, NULL, NULL, 0); \ + if (!BG(serialize_lock)) { \ + BG(serialize).var_hash = (void *)(var_hash_ptr); \ + BG(serialize).level = 1; \ + } \ + } else { \ + (var_hash_ptr) = (php_serialize_data_t)BG(serialize).var_hash; \ + ++BG(serialize).level; \ + } \ +} while(0) + +#define PHP_VAR_SERIALIZE_DESTROY(var_hash_ptr) \ +do { \ + /* fprintf(stderr, "SERIALIZE_DESTROY == lock: %u, level: %u\n", BG(serialize_lock), BG(serialize).level); */ \ + if (BG(serialize_lock) || !BG(serialize).level) { \ + zend_hash_destroy((var_hash_ptr)); \ + FREE_HASHTABLE(var_hash_ptr); \ + } else { \ + if (!--BG(serialize).level) { \ + zend_hash_destroy((php_serialize_data_t)BG(serialize).var_hash); \ + FREE_HASHTABLE((php_serialize_data_t)BG(serialize).var_hash); \ + BG(serialize).var_hash = NULL; \ + } \ + } \ +} while (0) + +#define PHP_VAR_UNSERIALIZE_INIT(var_hash_ptr) \ +do { \ + /* fprintf(stderr, "UNSERIALIZE_INIT == lock: %u, level: %u\n", BG(serialize_lock), BG(unserialize).level); */ \ + if (BG(serialize_lock) || !BG(unserialize).level) { \ + (var_hash_ptr) = (php_unserialize_data_t)ecalloc(1, sizeof(struct php_unserialize_data)); \ + if (!BG(serialize_lock)) { \ + BG(unserialize).var_hash = (void *)(var_hash_ptr); \ + BG(unserialize).level = 1; \ + } \ + } else { \ + (var_hash_ptr) = (php_unserialize_data_t)BG(unserialize).var_hash; \ + ++BG(unserialize).level; \ + } \ +} while (0) + +#define PHP_VAR_UNSERIALIZE_DESTROY(var_hash_ptr) \ +do { \ + /* fprintf(stderr, "UNSERIALIZE_DESTROY == lock: %u, level: %u\n", BG(serialize_lock), BG(unserialize).level); */ \ + if (BG(serialize_lock) || !BG(unserialize).level) { \ + var_destroy(&(var_hash_ptr)); \ + efree(var_hash_ptr); \ + } else { \ + if (!--BG(unserialize).level) { \ + var_destroy(&(var_hash_ptr)); \ + efree((var_hash_ptr)); \ + BG(unserialize).var_hash = NULL; \ + } \ + } \ +} while (0) PHPAPI void var_replace(php_unserialize_data_t *var_hash, zval *ozval, zval **nzval); PHPAPI void var_push_dtor(php_unserialize_data_t *var_hash, zval **val); |