Tmp observer support

Author: arnaud-lb

Zend/zend_observer.h

@@ -22,8 +22,11 @@
 #define ZEND_OBSERVER_H
 
 #include "zend.h"
+#include "zend_arena.h"
 #include "zend_compile.h"
 #include "zend_fibers.h"
+#include "zend_map_ptr.h"
+#include "zend_extensions.h"
 
 BEGIN_EXTERN_C()
 
@@ -105,6 +108,14 @@ static zend_always_inline bool zend_observer_fcall_has_no_observers(zend_execute
 		return true;
 	}
 
+	/* Internal function added at runtime and cached
+	   TODO: probably slow */
+	if (!ZEND_MAP_PTR_GET(runtime_cache)) {
+		ZEND_MAP_PTR_SET(function->common.run_time_cache,
+				zend_arena_calloc(&CG(arena), 1,
+					zend_internal_run_time_cache_reserved_size()));
+	}
+
 	*handler = (zend_observer_fcall_begin_handler *)ZEND_MAP_PTR_GET(runtime_cache) + ZEND_OBSERVER_HANDLE(function);
 	return zend_observer_handler_is_unobserved(*handler);
 }

ext/opcache/modules.c

@@ -1116,6 +1116,24 @@ static zend_result zum_load(zend_file_handle *desc_file_handle, zend_persistent_
 	}
 
 	/* Load into process tables */
+
+#if 0
+	if (zend_hash_num_elements(&pmodule->module.function_table) > 0) {
+		if (EXPECTED(!zend_observer_function_declared_observed)) {
+			zend_accel_function_hash_copy(CG(function_table), &pmodule->module.function_table);
+		} else {
+			zend_accel_function_hash_copy_notify(CG(function_table), &pmodule->module.function_table);
+		}
+	}
+
+	if (zend_hash_num_elements(&pmodule->module.class_table) > 0) {
+		if (EXPECTED(!zend_observer_class_linked_observed)) {
+			zend_accel_class_hash_copy(CG(class_table), &pmodule->module.class_table);
+		} else {
+			zend_accel_class_hash_copy_notify(CG(class_table), &pmodule->module.class_table);
+		}
+	}
+#else
 	if (zend_hash_num_elements(&pmodule->module.function_table)) {
 		Bucket *p = pmodule->module.function_table.arData;
 		Bucket *end = p + pmodule->module.function_table.nNumUsed;
@@ -1161,6 +1179,7 @@ static zend_result zum_load(zend_file_handle *desc_file_handle, zend_persistent_
 			_zend_hash_append_ex(EG(class_table), p->key, &p->val, 1);
 		}
 	}
+#endif
 
 	zend_hash_add_ptr(CG(module_table), pmodule->module.desc.lcname, &pmodule->module);
 

ext/opcache/zend_accelerator_util_funcs.c

@@ -187,12 +187,12 @@ static zend_always_inline void _zend_accel_function_hash_copy(HashTable *target,
 	}
 }
 
-static zend_always_inline void zend_accel_function_hash_copy(HashTable *target, HashTable *source)
+zend_always_inline void zend_accel_function_hash_copy(HashTable *target, HashTable *source)
 {
 	_zend_accel_function_hash_copy(target, source, 0);
 }
 
-static zend_never_inline void zend_accel_function_hash_copy_notify(HashTable *target, HashTable *source)
+zend_never_inline void zend_accel_function_hash_copy_notify(HashTable *target, HashTable *source)
 {
 	_zend_accel_function_hash_copy(target, source, 1);
 }
@@ -248,12 +248,12 @@ static zend_always_inline void _zend_accel_class_hash_copy(HashTable *target, Ha
 	target->nInternalPointer = 0;
 }
 
-static zend_always_inline void zend_accel_class_hash_copy(HashTable *target, HashTable *source)
+zend_always_inline void zend_accel_class_hash_copy(HashTable *target, HashTable *source)
 {
 	_zend_accel_class_hash_copy(target, source, 0);
 }
 
-static zend_never_inline void zend_accel_class_hash_copy_notify(HashTable *target, HashTable *source)
+zend_never_inline void zend_accel_class_hash_copy_notify(HashTable *target, HashTable *source)
 {
 	_zend_accel_class_hash_copy(target, source, 1);
 }

ext/opcache/zend_accelerator_util_funcs.h

@@ -44,6 +44,12 @@ unsigned int zend_adler32(unsigned int checksum, unsigned char *buf, uint32_t le
 
 unsigned int zend_accel_script_checksum(zend_persistent_script *persistent_script);
 
+void zend_accel_function_hash_copy(HashTable *target, HashTable *source);
+void zend_accel_function_hash_copy_notify(HashTable *target, HashTable *source);
+
+void zend_accel_class_hash_copy(HashTable *target, HashTable *source);
+void zend_accel_class_hash_copy_notify(HashTable *target, HashTable *source);
+
 END_EXTERN_C()
 
 #endif /* ZEND_ACCELERATOR_UTIL_FUNCS_H */