felipe Fri Aug 15 19:47:44 2008 UTC Modified files: (Branch: PHP_5_3) /ZendEngine2 zend.c zend.h zend_alloc.c zend_alloc.h zend_execute.c zend_gc.c zend_gc.h zend_language_scanner.c zend_language_scanner.l zend_operators.c zend_stream.c zend_vm_def.h zend_vm_execute.h /php-src/main main.c Log: - MFH: Removed some TSRMLS_FETCH()s
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.35.2.22&r2=1.308.2.12.2.35.2.23&diff_format=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.308.2.12.2.35.2.22 ZendEngine2/zend.c:1.308.2.12.2.35.2.23 --- ZendEngine2/zend.c:1.308.2.12.2.35.2.22 Thu Aug 14 10:24:51 2008 +++ ZendEngine2/zend.c Fri Aug 15 19:47:23 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.308.2.12.2.35.2.22 2008/08/14 10:24:51 helly Exp $ */ +/* $Id: zend.c,v 1.308.2.12.2.35.2.23 2008/08/15 19:47:23 felipe Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -50,7 +50,7 @@ ZEND_API zend_class_entry *zend_standard_class_def = NULL; ZEND_API int (*zend_printf)(const char *format, ...); ZEND_API zend_write_func_t zend_write; -ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path); +ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path TSRMLS_DC); ZEND_API int (*zend_stream_open_function)(const char *filename, zend_file_handle *handle TSRMLS_DC); ZEND_API void (*zend_block_interruptions)(void); ZEND_API void (*zend_unblock_interruptions)(void); @@ -62,7 +62,7 @@ void (*zend_on_timeout)(int seconds TSRMLS_DC); -static void (*zend_message_dispatcher_p)(long message, void *data); +static void (*zend_message_dispatcher_p)(long message, void *data TSRMLS_DC); static int (*zend_get_configuration_directive_p)(const char *name, uint name_length, zval *contents); static ZEND_INI_MH(OnUpdateErrorReporting) /* {{{ */ @@ -423,7 +423,7 @@ } /* }}} */ -static FILE *zend_fopen_wrapper(const char *filename, char **opened_path) /* {{{ */ +static FILE *zend_fopen_wrapper(const char *filename, char **opened_path TSRMLS_DC) /* {{{ */ { if (opened_path) { *opened_path = estrdup(filename); @@ -601,7 +601,7 @@ void zend_init_opcodes_handlers(void); -int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions) /* {{{ */ +int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions TSRMLS_DC) /* {{{ */ { #ifdef ZTS zend_compiler_globals *compiler_globals; @@ -612,7 +612,6 @@ extern zend_ini_scanner_globals ini_scanner_globals; extern zend_php_scanner_globals language_scanner_globals; #endif - TSRMLS_FETCH(); start_memory_manager(TSRMLS_C); @@ -680,7 +679,6 @@ ts_allocate_id(&ini_scanner_globals_id, sizeof(zend_ini_scanner_globals), (ts_allocate_ctor) ini_scanner_globals_ctor, NULL); compiler_globals = ts_resource(compiler_globals_id); executor_globals = ts_resource(executor_globals_id); - tsrm_ls = ts_resource_ex(0, NULL); compiler_globals_dtor(compiler_globals TSRMLS_CC); compiler_globals->in_compilation = 0; @@ -949,10 +947,10 @@ /* }}} */ BEGIN_EXTERN_C() -ZEND_API void zend_message_dispatcher(long message, void *data) /* {{{ */ +ZEND_API void zend_message_dispatcher(long message, void *data TSRMLS_DC) /* {{{ */ { if (zend_message_dispatcher_p) { - zend_message_dispatcher_p(message, data); + zend_message_dispatcher_p(message, data TSRMLS_CC); } } /* }}} */ http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.h?r1=1.293.2.11.2.9.2.27&r2=1.293.2.11.2.9.2.28&diff_format=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.293.2.11.2.9.2.27 ZendEngine2/zend.h:1.293.2.11.2.9.2.28 --- ZendEngine2/zend.h:1.293.2.11.2.9.2.27 Tue Aug 12 17:20:23 2008 +++ ZendEngine2/zend.h Fri Aug 15 19:47:23 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.h,v 1.293.2.11.2.9.2.27 2008/08/12 17:20:23 felipe Exp $ */ +/* $Id: zend.h,v 1.293.2.11.2.9.2.28 2008/08/15 19:47:23 felipe Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -469,8 +469,8 @@ void (*error_function)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) ZEND_ATTRIBUTE_PTR_FORMAT(printf, 4, 0); int (*printf_function)(const char *format, ...) ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2); int (*write_function)(const char *str, uint str_length); - FILE *(*fopen_function)(const char *filename, char **opened_path); - void (*message_handler)(long message, void *data); + FILE *(*fopen_function)(const char *filename, char **opened_path TSRMLS_DC); + void (*message_handler)(long message, void *data TSRMLS_DC); void (*block_interruptions)(void); void (*unblock_interruptions)(void); int (*get_configuration_directive)(const char *name, uint name_length, zval *contents); @@ -526,7 +526,7 @@ #define OE_IS_OBJECT (1<<1) #define OE_IS_METHOD (1<<2) -int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions); +int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions TSRMLS_DC); void zend_shutdown(TSRMLS_D); void zend_register_standard_ini_entries(TSRMLS_D); void zend_post_startup(TSRMLS_D); @@ -610,7 +610,7 @@ BEGIN_EXTERN_C() extern ZEND_API int (*zend_printf)(const char *format, ...) ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2); extern ZEND_API zend_write_func_t zend_write; -extern ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path); +extern ZEND_API FILE *(*zend_fopen)(const char *filename, char **opened_path TSRMLS_DC); extern ZEND_API void (*zend_block_interruptions)(void); extern ZEND_API void (*zend_unblock_interruptions)(void); extern ZEND_API void (*zend_ticks_function)(int ticks); @@ -639,7 +639,7 @@ #define HANDLE_UNBLOCK_INTERRUPTIONS() if (zend_unblock_interruptions) { zend_unblock_interruptions(); } BEGIN_EXTERN_C() -ZEND_API void zend_message_dispatcher(long message, void *data); +ZEND_API void zend_message_dispatcher(long message, void *data TSRMLS_DC); ZEND_API int zend_get_configuration_directive(const char *name, uint name_length, zval *contents); END_EXTERN_C() http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_alloc.c?r1=1.144.2.3.2.43.2.15&r2=1.144.2.3.2.43.2.16&diff_format=u Index: ZendEngine2/zend_alloc.c diff -u ZendEngine2/zend_alloc.c:1.144.2.3.2.43.2.15 ZendEngine2/zend_alloc.c:1.144.2.3.2.43.2.16 --- ZendEngine2/zend_alloc.c:1.144.2.3.2.43.2.15 Fri Aug 1 22:43:16 2008 +++ ZendEngine2/zend_alloc.c Fri Aug 15 19:47:23 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_alloc.c,v 1.144.2.3.2.43.2.15 2008/08/01 22:43:16 stas Exp $ */ +/* $Id: zend_alloc.c,v 1.144.2.3.2.43.2.16 2008/08/15 19:47:23 felipe Exp $ */ #include "zend.h" #include "zend_alloc.h" @@ -1186,7 +1186,7 @@ return leaks; } -static void zend_mm_check_leaks(zend_mm_heap *heap) +static void zend_mm_check_leaks(zend_mm_heap *heap TSRMLS_DC) { zend_mm_segment *segment = heap->segments_list; zend_mm_block *p, *q; @@ -1217,12 +1217,12 @@ leak.orig_filename = p->debug.orig_filename; leak.orig_lineno = p->debug.orig_lineno; - zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL); - zend_message_dispatcher(ZMSG_MEMORY_LEAK_DETECTED, &leak); + zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL TSRMLS_CC); + zend_message_dispatcher(ZMSG_MEMORY_LEAK_DETECTED, &leak TSRMLS_CC); repeated = zend_mm_find_leaks(segment, p); total += 1 + repeated; if (repeated) { - zend_message_dispatcher(ZMSG_MEMORY_LEAK_REPEATED, (void *)(zend_uintptr_t)repeated); + zend_message_dispatcher(ZMSG_MEMORY_LEAK_REPEATED, (void *)(zend_uintptr_t)repeated TSRMLS_CC); } #if ZEND_MM_CACHE } else if (p->magic == MEM_BLOCK_CACHED) { @@ -1242,7 +1242,7 @@ p = q; } if (total) { - zend_message_dispatcher(ZMSG_MEMORY_LEAKS_GRAND_TOTAL, &total); + zend_message_dispatcher(ZMSG_MEMORY_LEAKS_GRAND_TOTAL, &total TSRMLS_CC); } } @@ -1261,7 +1261,9 @@ no_cache_notice = 1; } if (!silent) { - zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL); + TSRMLS_FETCH(); + + zend_message_dispatcher(ZMSG_LOG_SCRIPT_NAME, NULL TSRMLS_CC); zend_debug_alloc_output("---------------------------------------\n"); zend_debug_alloc_output("%s(%d) : Block "PTR_FMT" status:\n" ZEND_FILE_LINE_RELAY_CC, ptr); if (__zend_orig_filename) { @@ -1510,7 +1512,7 @@ } #endif -ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent) +ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC) { zend_mm_storage *storage; zend_mm_segment *segment; @@ -1574,7 +1576,7 @@ #if ZEND_DEBUG if (!silent) { - zend_mm_check_leaks(heap); + zend_mm_check_leaks(heap TSRMLS_CC); } #endif @@ -2490,7 +2492,7 @@ ZEND_API void shutdown_memory_manager(int silent, int full_shutdown TSRMLS_DC) { - zend_mm_shutdown(AG(mm_heap), full_shutdown, silent); + zend_mm_shutdown(AG(mm_heap), full_shutdown, silent TSRMLS_CC); } static void alloc_globals_ctor(zend_alloc_globals *alloc_globals TSRMLS_DC) http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_alloc.h?r1=1.63.2.2.2.12.2.5&r2=1.63.2.2.2.12.2.6&diff_format=u Index: ZendEngine2/zend_alloc.h diff -u ZendEngine2/zend_alloc.h:1.63.2.2.2.12.2.5 ZendEngine2/zend_alloc.h:1.63.2.2.2.12.2.6 --- ZendEngine2/zend_alloc.h:1.63.2.2.2.12.2.5 Fri Jun 13 04:16:58 2008 +++ ZendEngine2/zend_alloc.h Fri Aug 15 19:47:23 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_alloc.h,v 1.63.2.2.2.12.2.5 2008/06/13 04:16:58 mattwil Exp $ */ +/* $Id: zend_alloc.h,v 1.63.2.2.2.12.2.6 2008/08/15 19:47:23 felipe Exp $ */ #ifndef ZEND_ALLOC_H #define ZEND_ALLOC_H @@ -191,7 +191,7 @@ typedef struct _zend_mm_heap zend_mm_heap; ZEND_API zend_mm_heap *zend_mm_startup(void); -ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent); +ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, int full_shutdown, int silent TSRMLS_DC); ZEND_API void *_zend_mm_alloc(zend_mm_heap *heap, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; ZEND_API void _zend_mm_free(zend_mm_heap *heap, void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); ZEND_API void *_zend_mm_realloc(zend_mm_heap *heap, void *p, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.c?r1=1.716.2.12.2.24.2.35&r2=1.716.2.12.2.24.2.36&diff_format=u Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.35 ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.36 --- ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.35 Tue Aug 12 17:20:24 2008 +++ ZendEngine2/zend_execute.c Fri Aug 15 19:47:23 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.716.2.12.2.24.2.35 2008/08/12 17:20:24 felipe Exp $ */ +/* $Id: zend_execute.c,v 1.716.2.12.2.24.2.36 2008/08/15 19:47:23 felipe Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -81,11 +81,9 @@ } } -static inline void zend_pzval_unlock_free_func(zval *z) +static inline void zend_pzval_unlock_free_func(zval *z TSRMLS_DC) { if (!Z_DELREF_P(z)) { - TSRMLS_FETCH(); - if (z != &EG(uninitialized_zval)) { GC_REMOVE_ZVAL_FROM_BUFFER(z); zval_dtor(z); @@ -96,7 +94,7 @@ #define PZVAL_UNLOCK(z, f) zend_pzval_unlock_func(z, f, 1 TSRMLS_CC) #define PZVAL_UNLOCK_EX(z, f, u) zend_pzval_unlock_func(z, f, u TSRMLS_CC) -#define PZVAL_UNLOCK_FREE(z) zend_pzval_unlock_free_func(z) +#define PZVAL_UNLOCK_FREE(z) zend_pzval_unlock_free_func(z TSRMLS_CC) #define PZVAL_LOCK(z) Z_ADDREF_P((z)) #define RETURN_VALUE_UNUSED(pzn) (((pzn)->u.EA.type & EXT_TYPE_UNUSED)) #define SELECTIVE_PZVAL_LOCK(pzv, pzn) if (!RETURN_VALUE_UNUSED(pzn)) { PZVAL_LOCK(pzv); } http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_gc.c?r1=1.1.2.15&r2=1.1.2.16&diff_format=u Index: ZendEngine2/zend_gc.c diff -u ZendEngine2/zend_gc.c:1.1.2.15 ZendEngine2/zend_gc.c:1.1.2.16 --- ZendEngine2/zend_gc.c:1.1.2.15 Tue Jul 8 08:16:08 2008 +++ ZendEngine2/zend_gc.c Fri Aug 15 19:47:24 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_gc.c,v 1.1.2.15 2008/07/08 08:16:08 dmitry Exp $ */ +/* $Id: zend_gc.c,v 1.1.2.16 2008/08/15 19:47:24 felipe Exp $ */ #include "zend.h" #include "zend_API.h" @@ -252,10 +252,9 @@ } } -ZEND_API void gc_remove_zval_from_buffer(zval *zv) +ZEND_API void gc_remove_zval_from_buffer(zval *zv TSRMLS_DC) { gc_root_buffer* root_buffer = GC_ADDRESS(((zval_gc_info*)zv)->u.buffered); - TSRMLS_FETCH(); if (UNEXPECTED(GC_G(free_list) != NULL && GC_ZVAL_GET_COLOR(zv) == GC_BLACK) && http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_gc.h?r1=1.1.2.7&r2=1.1.2.8&diff_format=u Index: ZendEngine2/zend_gc.h diff -u ZendEngine2/zend_gc.h:1.1.2.7 ZendEngine2/zend_gc.h:1.1.2.8 --- ZendEngine2/zend_gc.h:1.1.2.7 Fri Apr 11 17:31:53 2008 +++ ZendEngine2/zend_gc.h Fri Aug 15 19:47:24 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_gc.h,v 1.1.2.7 2008/04/11 17:31:53 dmitry Exp $ */ +/* $Id: zend_gc.h,v 1.1.2.8 2008/08/15 19:47:24 felipe Exp $ */ #ifndef ZEND_GC_H #define ZEND_GC_H @@ -142,7 +142,7 @@ ZEND_API int gc_collect_cycles(TSRMLS_D); ZEND_API void gc_zval_possible_root(zval *zv TSRMLS_DC); ZEND_API void gc_zobj_possible_root(zval *zv TSRMLS_DC); -ZEND_API void gc_remove_zval_from_buffer(zval *zv); +ZEND_API void gc_remove_zval_from_buffer(zval *zv TSRMLS_DC); ZEND_API void gc_globals_ctor(TSRMLS_D); ZEND_API void gc_globals_dtor(TSRMLS_D); ZEND_API void gc_init(TSRMLS_D); @@ -157,7 +157,7 @@ #define GC_REMOVE_ZVAL_FROM_BUFFER(z) \ if (GC_ADDRESS(((zval_gc_info*)z)->u.buffered)) { \ - gc_remove_zval_from_buffer(z); \ + gc_remove_zval_from_buffer(z TSRMLS_CC); \ } #define GC_ZOBJ_CHECK_POSSIBLE_ROOT(zobject) \ http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.c?r1=1.1.2.25&r2=1.1.2.26&diff_format=u Index: ZendEngine2/zend_language_scanner.c diff -u ZendEngine2/zend_language_scanner.c:1.1.2.25 ZendEngine2/zend_language_scanner.c:1.1.2.26 --- ZendEngine2/zend_language_scanner.c:1.1.2.25 Tue Aug 12 16:43:52 2008 +++ ZendEngine2/zend_language_scanner.c Fri Aug 15 19:47:24 2008 @@ -1,4 +1,4 @@ -/* Generated by re2c 0.13.5 on Tue Aug 12 20:38:47 2008 */ +/* Generated by re2c 0.13.5 on Fri Aug 15 14:25:23 2008 */ #line 1 "Zend/zend_language_scanner.l" /* +----------------------------------------------------------------------+ @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_scanner.c,v 1.1.2.25 2008/08/12 16:43:52 dmitry Exp $ */ +/* $Id: zend_language_scanner.c,v 1.1.2.26 2008/08/15 19:47:24 felipe Exp $ */ #if 0 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c) @@ -334,10 +334,10 @@ if (open_file_for_scanning(file_handle TSRMLS_CC)==FAILURE) { if (type==ZEND_REQUIRE) { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename TSRMLS_CC); zend_bailout(); } else { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename TSRMLS_CC); } compilation_successful=0; } else { @@ -548,7 +548,7 @@ file_handle.opened_path = NULL; zend_save_lexical_state(&original_lex_state TSRMLS_CC); if (open_file_for_scanning(&file_handle TSRMLS_CC)==FAILURE) { - zend_message_dispatcher(ZMSG_FAILED_HIGHLIGHT_FOPEN, filename); + zend_message_dispatcher(ZMSG_FAILED_HIGHLIGHT_FOPEN, filename TSRMLS_CC); return FAILURE; } zend_highlight(syntax_highlighter_ini TSRMLS_CC); http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.131.2.11.2.13.2.30&r2=1.131.2.11.2.13.2.31&diff_format=u Index: ZendEngine2/zend_language_scanner.l diff -u ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.30 ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.31 --- ZendEngine2/zend_language_scanner.l:1.131.2.11.2.13.2.30 Tue Aug 12 16:43:53 2008 +++ ZendEngine2/zend_language_scanner.l Fri Aug 15 19:47:28 2008 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.30 2008/08/12 16:43:53 dmitry Exp $ */ +/* $Id: zend_language_scanner.l,v 1.131.2.11.2.13.2.31 2008/08/15 19:47:28 felipe Exp $ */ #if 0 # define YYDEBUG(s, c) printf("state: %d char: %c\n", s, c) @@ -332,10 +332,10 @@ if (open_file_for_scanning(file_handle TSRMLS_CC)==FAILURE) { if (type==ZEND_REQUIRE) { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename TSRMLS_CC); zend_bailout(); } else { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename TSRMLS_CC); } compilation_successful=0; } else { @@ -546,7 +546,7 @@ file_handle.opened_path = NULL; zend_save_lexical_state(&original_lex_state TSRMLS_CC); if (open_file_for_scanning(&file_handle TSRMLS_CC)==FAILURE) { - zend_message_dispatcher(ZMSG_FAILED_HIGHLIGHT_FOPEN, filename); + zend_message_dispatcher(ZMSG_FAILED_HIGHLIGHT_FOPEN, filename TSRMLS_CC); return FAILURE; } zend_highlight(syntax_highlighter_ini TSRMLS_CC); http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_operators.c?r1=1.208.2.4.2.23.2.14&r2=1.208.2.4.2.23.2.15&diff_format=u Index: ZendEngine2/zend_operators.c diff -u ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.14 ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.15 --- ZendEngine2/zend_operators.c:1.208.2.4.2.23.2.14 Tue Aug 12 17:20:24 2008 +++ ZendEngine2/zend_operators.c Fri Aug 15 19:47:28 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.14 2008/08/12 17:20:24 felipe Exp $ */ +/* $Id: zend_operators.c,v 1.208.2.4.2.23.2.15 2008/08/15 19:47:28 felipe Exp $ */ #include <ctype.h> @@ -1358,7 +1358,7 @@ } -static inline void zend_free_obj_get_result(zval *op) +static inline void zend_free_obj_get_result(zval *op TSRMLS_DC) { if (Z_REFCOUNT_P(op) == 0) { GC_REMOVE_ZVAL_FROM_BUFFER(op); @@ -1455,18 +1455,18 @@ if (Z_OBJ_HT_P(op1)->get) { op_free = Z_OBJ_HT_P(op1)->get(op1 TSRMLS_CC); ret = compare_function(result, op_free, op2 TSRMLS_CC); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return ret; } else if (Z_TYPE_P(op2) != IS_OBJECT && Z_OBJ_HT_P(op1)->cast_object) { ALLOC_INIT_ZVAL(op_free); if (Z_OBJ_HT_P(op1)->cast_object(op1, op_free, Z_TYPE_P(op2) TSRMLS_CC) == FAILURE) { ZVAL_LONG(result, 1); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return SUCCESS; } ret = compare_function(result, op_free, op2 TSRMLS_CC); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return ret; } } @@ -1474,18 +1474,18 @@ if (Z_OBJ_HT_P(op2)->get) { op_free = Z_OBJ_HT_P(op2)->get(op2 TSRMLS_CC); ret = compare_function(result, op1, op_free TSRMLS_CC); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return ret; } else if (Z_TYPE_P(op1) != IS_OBJECT && Z_OBJ_HT_P(op2)->cast_object) { ALLOC_INIT_ZVAL(op_free); if (Z_OBJ_HT_P(op2)->cast_object(op2, op_free, Z_TYPE_P(op1) TSRMLS_CC) == FAILURE) { ZVAL_LONG(result, -1); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return SUCCESS; } ret = compare_function(result, op1, op_free TSRMLS_CC); - zend_free_obj_get_result(op_free); + zend_free_obj_get_result(op_free TSRMLS_CC); return ret; } } http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_stream.c?r1=1.13.2.1.2.1.2.5&r2=1.13.2.1.2.1.2.6&diff_format=u Index: ZendEngine2/zend_stream.c diff -u ZendEngine2/zend_stream.c:1.13.2.1.2.1.2.5 ZendEngine2/zend_stream.c:1.13.2.1.2.1.2.6 --- ZendEngine2/zend_stream.c:1.13.2.1.2.1.2.5 Tue Apr 29 08:08:21 2008 +++ ZendEngine2/zend_stream.c Fri Aug 15 19:47:28 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_stream.c,v 1.13.2.1.2.1.2.5 2008/04/29 08:08:21 tony2001 Exp $ */ +/* $Id: zend_stream.c,v 1.13.2.1.2.1.2.6 2008/08/15 19:47:28 felipe Exp $ */ #include "zend.h" @@ -106,7 +106,7 @@ } handle->type = ZEND_HANDLE_FP; handle->opened_path = NULL; - handle->handle.fp = zend_fopen(filename, &handle->opened_path); + handle->handle.fp = zend_fopen(filename, &handle->opened_path TSRMLS_CC); handle->filename = (char *)filename; handle->free_filename = 0; memset(&handle->handle.stream.mmap, 0, sizeof(zend_mmap)); http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.59.2.29.2.48.2.69&r2=1.59.2.29.2.48.2.70&diff_format=u Index: ZendEngine2/zend_vm_def.h diff -u ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.69 ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.70 --- ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.69 Thu Aug 14 21:36:56 2008 +++ ZendEngine2/zend_vm_def.h Fri Aug 15 19:47:28 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.69 2008/08/14 21:36:56 colder Exp $ */ +/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.70 2008/08/15 19:47:28 felipe Exp $ */ /* If you change this file, please regenerate the zend_vm_execute.h and * zend_vm_opcodes.h files by running: @@ -3244,9 +3244,9 @@ } } else { if (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE) { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } else { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } } if (resolved_path != Z_STRVAL_P(inc_filename)) { http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.62.2.30.2.49.2.69&r2=1.62.2.30.2.49.2.70&diff_format=u Index: ZendEngine2/zend_vm_execute.h diff -u ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.69 ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.70 --- ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.69 Thu Aug 14 21:36:56 2008 +++ ZendEngine2/zend_vm_execute.h Fri Aug 15 19:47:28 2008 @@ -1876,9 +1876,9 @@ } } else { if (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE) { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } else { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } } if (resolved_path != Z_STRVAL_P(inc_filename)) { @@ -5160,9 +5160,9 @@ } } else { if (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE) { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } else { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } } if (resolved_path != Z_STRVAL_P(inc_filename)) { @@ -8460,9 +8460,9 @@ } } else { if (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE) { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } else { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } } if (resolved_path != Z_STRVAL_P(inc_filename)) { @@ -22524,9 +22524,9 @@ } } else { if (Z_LVAL(opline->op2.u.constant)==ZEND_INCLUDE_ONCE) { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } else { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename)); + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC); } } if (resolved_path != Z_STRVAL_P(inc_filename)) { http://cvs.php.net/viewvc.cgi/php-src/main/main.c?r1=1.640.2.23.2.57.2.28&r2=1.640.2.23.2.57.2.29&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.640.2.23.2.57.2.28 php-src/main/main.c:1.640.2.23.2.57.2.29 --- php-src/main/main.c:1.640.2.23.2.57.2.28 Fri Aug 8 17:47:24 2008 +++ php-src/main/main.c Fri Aug 15 19:47:33 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.640.2.23.2.57.2.28 2008/08/08 17:47:24 helly Exp $ */ +/* $Id: main.c,v 1.640.2.23.2.57.2.29 2008/08/15 19:47:33 felipe Exp $ */ /* {{{ includes */ @@ -1039,10 +1039,8 @@ /* {{{ php_fopen_wrapper_for_zend */ -static FILE *php_fopen_wrapper_for_zend(const char *filename, char **opened_path) +static FILE *php_fopen_wrapper_for_zend(const char *filename, char **opened_path TSRMLS_DC) { - TSRMLS_FETCH(); - return php_stream_open_wrapper_as_file((char *)filename, "rb", ENFORCE_SAFE_MODE|USE_PATH|IGNORE_URL_WIN|REPORT_ERRORS|STREAM_OPEN_FOR_INCLUDE, opened_path); } /* }}} */ @@ -1134,10 +1132,8 @@ /* {{{ php_message_handler_for_zend */ -static void php_message_handler_for_zend(long message, void *data) +static void php_message_handler_for_zend(long message, void *data TSRMLS_DC) { - TSRMLS_FETCH(); - switch (message) { case ZMSG_FAILED_INCLUDE_FOPEN: php_error_docref("function.include" TSRMLS_CC, E_WARNING, "Failed opening '%s' for inclusion (include_path='%s')", php_strip_url_passwd((char *) data), STR_PRINT(PG(include_path))); @@ -1723,7 +1719,7 @@ zuf.vspprintf_function = vspprintf; zuf.getenv_function = sapi_getenv; zuf.resolve_path_function = php_resolve_path_for_zend; - zend_startup(&zuf, NULL, 1); + zend_startup(&zuf, NULL, 1 TSRMLS_CC); #ifdef ZTS executor_globals = ts_resource(executor_globals_id);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php