Changes after Niki review

Author: SammyK

Zend/zend_observer.c

@@ -38,19 +38,13 @@ typedef struct _zend_observer_fcall_data {
 	zend_observer_fcall_handlers handlers[1];
 } zend_observer_fcall_data;
 
-typedef struct _zend_observer_frame {
-	zend_execute_data *execute_data;
-	struct _zend_observer_frame *prev;
-} zend_observer_frame;
-
 zend_llist zend_observers_fcall_list;
 zend_llist zend_observer_error_callbacks;
 
 int zend_observer_fcall_op_array_extension = -1;
 
 ZEND_TLS zend_arena *fcall_handlers_arena = NULL;
-ZEND_TLS zend_arena *observed_stack_arena = NULL;
-ZEND_TLS zend_observer_frame *current_observed_frame = NULL;
+ZEND_TLS zend_execute_data *current_observed_frame = NULL;
 
 // Call during minit/startup ONLY
 ZEND_API void zend_observer_fcall_register(zend_observer_fcall_init init) {
@@ -82,15 +76,12 @@ ZEND_API void zend_observer_startup(void) {
 ZEND_API void zend_observer_activate(void) {
 	if (ZEND_OBSERVER_ENABLED) {
 		fcall_handlers_arena = zend_arena_create(4096);
-		// TODO: How big should the arena be?
-		observed_stack_arena = zend_arena_create(2048);
 	}
 }
 
 ZEND_API void zend_observer_deactivate(void) {
 	if (fcall_handlers_arena) {
 		zend_arena_destroy(fcall_handlers_arena);
-		zend_arena_destroy(observed_stack_arena);
 	}
 }
 
@@ -147,7 +138,6 @@ static void ZEND_FASTCALL _zend_observe_fcall_begin(zend_execute_data *execute_d
 	uint32_t fn_flags;
 	zend_observer_fcall_data *fcall_data;
 	zend_observer_fcall_handlers *handlers, *end;
-	zend_observer_frame *frame;
 
 	if (!ZEND_OBSERVER_ENABLED) {
 		return;
@@ -171,10 +161,7 @@ static void ZEND_FASTCALL _zend_observe_fcall_begin(zend_execute_data *execute_d
 		return;
 	}
 
-	frame = zend_arena_alloc(&observed_stack_arena, sizeof(zend_observer_frame));
-	frame->execute_data = execute_data;
-	frame->prev = current_observed_frame;
-	current_observed_frame = frame;
+	current_observed_frame = execute_data;
 
 	end = fcall_data->end;
 	for (handlers = fcall_data->handlers; handlers != end; ++handlers) {
@@ -204,7 +191,6 @@ ZEND_API void ZEND_FASTCALL zend_observer_fcall_end(
 	zend_function *func = execute_data->func;
 	zend_observer_fcall_data *fcall_data;
 	zend_observer_fcall_handlers *handlers, *end;
-	zend_observer_frame *frame;
 
 	if (!ZEND_OBSERVER_ENABLED
 	 || !ZEND_OBSERVABLE_FN(func->common.fn_flags)) {
@@ -226,16 +212,19 @@ ZEND_API void ZEND_FASTCALL zend_observer_fcall_end(
 		}
 	}
 
-	frame = current_observed_frame;
-	current_observed_frame = frame->prev;
-	zend_arena_release(&observed_stack_arena, frame);
+	current_observed_frame = execute_data->prev_execute_data;
 }
 
 ZEND_API void zend_observer_fcall_end_all(void)
 {
-	while (current_observed_frame != NULL) {
-		zend_observer_fcall_end(current_observed_frame->execute_data, NULL);
+	zend_execute_data *ex = current_observed_frame;
+	while (ex != NULL) {
+		if (ex->func->type != ZEND_INTERNAL_FUNCTION) {
+			zend_observer_fcall_end(ex, NULL);
+		}
+		ex = ex->prev_execute_data;
 	}
+	current_observed_frame = NULL;
 }
 
 ZEND_API void zend_observer_error_register(zend_observer_error_cb cb)

main/main.c

@@ -1747,16 +1747,16 @@ void php_request_shutdown(void *dummy)
 
 	php_deactivate_ticks();
 
+	/* 0. Call any open observer end handlers that are still open after a zend_bailout */
+	if (ZEND_OBSERVER_ENABLED) {
+		zend_observer_fcall_end_all();
+	}
+
 	/* 1. Call all possible shutdown functions registered with register_shutdown_function() */
 	if (PG(modules_activated)) {
 		php_call_shutdown_functions();
 	}
 
-	/* 1.5. Call any open end handlers that are still open after a zend_bailout */
-	if (ZEND_OBSERVER_ENABLED) {
-		zend_observer_fcall_end_all();
-	}
-
 	/* 2. Call all possible __destruct() functions */
 	zend_try {
 		zend_call_destructors();