From a8bdbd91f7fa7dc5da93eaf10b6d09d8284b949f Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Mon, 28 Jul 2014 22:55:31 +0200 Subject: [PATCH] abuse zend_ptr_stack for better performance --- php_http_header_parser.c | 22 ++++++++++++---------- php_http_header_parser.h | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/php_http_header_parser.c b/php_http_header_parser.c index cfcb5b1..f560a85 100644 --- a/php_http_header_parser.c +++ b/php_http_header_parser.c @@ -44,10 +44,13 @@ php_http_header_parser_state_t php_http_header_parser_state_push(php_http_header unsigned i; php_http_header_parser_state_t state = 0; + /* short circuit */ + ZEND_PTR_STACK_RESIZE_IF_NEEDED((&parser->stack), argc); + va_start(va_args, argc); for (i = 0; i < argc; ++i) { state = va_arg(va_args, php_http_header_parser_state_t); - zend_stack_push(&parser->stack, &state, sizeof(state)); + zend_ptr_stack_push(&parser->stack, (void *) state); } va_end(va_args); @@ -56,28 +59,27 @@ php_http_header_parser_state_t php_http_header_parser_state_push(php_http_header php_http_header_parser_state_t php_http_header_parser_state_is(php_http_header_parser_t *parser) { - php_http_header_parser_state_t *state; + php_http_header_parser_state_t state; - if (SUCCESS == zend_stack_top(&parser->stack, (void *) &state)) { - return *state; + if (parser->stack.top) { + return (php_http_header_parser_state_t) zend_ptr_stack_top(&parser->stack); } + return PHP_HTTP_HEADER_PARSER_STATE_START; } php_http_header_parser_state_t php_http_header_parser_state_pop(php_http_header_parser_t *parser) { - php_http_header_parser_state_t state, *state_ptr; - if (SUCCESS == zend_stack_top(&parser->stack, (void *) &state_ptr)) { - state = *state_ptr; - zend_stack_del_top(&parser->stack); - return state; + if (parser->stack.top) { + return (php_http_header_parser_state_t) zend_ptr_stack_pop(&parser->stack); } + return PHP_HTTP_HEADER_PARSER_STATE_START; } void php_http_header_parser_dtor(php_http_header_parser_t *parser) { - zend_stack_destroy(&parser->stack); + zend_ptr_stack_destroy(&parser->stack); php_http_info_dtor(&parser->info); STR_FREE(parser->_key.str); STR_FREE(parser->_val.str); diff --git a/php_http_header_parser.h b/php_http_header_parser.h index d8ac43c..4c60f6e 100644 --- a/php_http_header_parser.h +++ b/php_http_header_parser.h @@ -28,7 +28,7 @@ typedef enum php_http_header_parser_state { #define PHP_HTTP_HEADER_PARSER_CLEANUP 0x1 typedef struct php_http_header_parser { - zend_stack stack; + zend_ptr_stack stack; php_http_info_t info; struct { char *str; -- 2.30.2