Add tsrm update in MINIT insteadof GINIT

crazywhalecc · web-flow · commit 53b7cede5cdd · 2025-02-07T15:37:49.000+08:00
Reference: https://www.zend.com/sites/zend/files/pdfs/whitepaper-zend-php-extensions.pdf
diff --git a/ext/opentelemetry.c b/ext/opentelemetry.c
@@ -138,6 +138,10 @@ PHP_RSHUTDOWN_FUNCTION(opentelemetry) {
 }
 
 PHP_MINIT_FUNCTION(opentelemetry) {
+#if defined(ZTS) && defined(COMPILE_DL_OPENTELEMETRY)
+    ZEND_TSRMLS_CACHE_UPDATE();
+#endif
+
     REGISTER_INI_ENTRIES();
 
     check_conflicts();
@@ -166,9 +170,6 @@ PHP_MINFO_FUNCTION(opentelemetry) {
 }
 
 PHP_GINIT_FUNCTION(opentelemetry) {
-#if defined(ZTS) && defined(COMPILE_DL_OPENTELEMETRY)
-    ZEND_TSRMLS_CACHE_UPDATE();
-#endif
     ZEND_SECURE_ZERO(opentelemetry_globals, sizeof(*opentelemetry_globals));
 }
 

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,10 @@ PHP_RSHUTDOWN_FUNCTION(opentelemetry) {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`PHP_MINIT_FUNCTION(opentelemetry) {`
	`141`	`+#if defined(ZTS) && defined(COMPILE_DL_OPENTELEMETRY)`
	`142`	`+ ZEND_TSRMLS_CACHE_UPDATE();`
	`143`	`+#endif`
	`144`	`+`
`141`	`145`	`REGISTER_INI_ENTRIES();`
`142`	`146`
`143`	`147`	`check_conflicts();`
`@@ -166,9 +170,6 @@ PHP_MINFO_FUNCTION(opentelemetry) {`
`166`	`170`	`}`
`167`	`171`
`168`	`172`	`PHP_GINIT_FUNCTION(opentelemetry) {`
`169`		`-#if defined(ZTS) && defined(COMPILE_DL_OPENTELEMETRY)`
`170`		`- ZEND_TSRMLS_CACHE_UPDATE();`
`171`		`-#endif`
`172`	`173`	`ZEND_SECURE_ZERO(opentelemetry_globals, sizeof(*opentelemetry_globals));`
`173`	`174`	`}`
`174`	`175`