From 53e385a0ad97050e530e1864f92a8ef5c5c27e64 Mon Sep 17 00:00:00 2001 From: xybingbing Date: Thu, 8 Jul 2021 18:22:04 +0800 Subject: [PATCH 1/3] Update php_skywalking.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加 Swoft 框架的支持 --- php_skywalking.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/php_skywalking.h b/php_skywalking.h index 2418f450..3859abae 100644 --- a/php_skywalking.h +++ b/php_skywalking.h @@ -69,9 +69,10 @@ extern zend_module_entry skywalking_module_entry; #define SKY_IS_SWOOLE(func_name) (SKY_STRCMP(func_name, "{closure}")) #define SKY_IS_HYPERF(class_name, func_name) (SKY_STRCMP(class_name, "Hyperf\\HttpServer\\Server") && SKY_STRCMP(func_name, "onRequest")) +#define SKY_IS_SWOFT(class_name, func_name) (SKY_STRCMP(class_name, "Swoft\\Http\\Server\\Swoole\\RequestListener") && SKY_STRCMP(func_name, "onRequest")) #define SKY_IS_TARS(class_name, func_name) (SKY_STRCMP(class_name, "Tars\\core\\Server") && SKY_STRCMP(func_name, "onRequest")) #define SKY_IS_LARAVELS(class_name, func_name) ((SKY_STRCMP(class_name, "Hhxsv\\LaravelS\\LaravelS") || SKY_STRCMP(class_name, "Hhxsv5\\LaravelS\\LaravelS")) && SKY_STRCMP(func_name, "onRequest")) -#define SKY_IS_SWOOLE_FRAMEWORK(class_name, func_name) SKY_IS_HYPERF(class_name, func_name) || SKY_IS_TARS(class_name, func_name) || SKY_IS_LARAVELS(class_name, func_name) +#define SKY_IS_SWOOLE_FRAMEWORK(class_name, func_name) SKY_IS_HYPERF(class_name, func_name) || SKY_IS_SWOFT(class_name, func_name) || SKY_IS_TARS(class_name, func_name) || SKY_IS_LARAVELS(class_name, func_name) #if PHP_VERSION_ID < 80000 #define SKY_ZEND_CALL_METHOD(obj, fn, func, ret, param, arg1, arg2) zend_call_method(obj, Z_OBJCE_P(obj), fn, ZEND_STRL(func), ret, param, arg1, arg2); From 0121bae96cf04d7622d774cb255e052fac98c8d0 Mon Sep 17 00:00:00 2001 From: xybingbing Date: Fri, 9 Jul 2021 10:53:10 +0800 Subject: [PATCH 2/3] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加 Swoft 框架仓库地址 --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 466aca79..f28efc6a 100644 --- a/README.md +++ b/README.md @@ -26,8 +26,9 @@ SkyAPM PHP 1. RabbitMQ 1. Swoole ([Swoole](https://github.com/swoole/swoole-src)) 1. Hyperf ([Hyperf](https://github.com/hyperf/hyperf)) -1. Tars-php ([Tars-php](https://github.com/TarsPHP/TarsPHP)) -1. LaravelS ([LaravelS](https://github.com/hhxsv5/laravel-s)) +1. Swoft ([Swoft](https://github.com/swoft-cloud/swoft)) +3. Tars-php ([Tars-php](https://github.com/TarsPHP/TarsPHP)) +4. LaravelS ([LaravelS](https://github.com/hhxsv5/laravel-s)) ## Documents * [Documents in English](docs/README.md) From 865ac5e8fb36ec712b210361a8cbf0d50871c072 Mon Sep 17 00:00:00 2001 From: xybingbing Date: Fri, 9 Jul 2021 10:55:05 +0800 Subject: [PATCH 3/3] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f28efc6a..b1f3583a 100644 --- a/README.md +++ b/README.md @@ -27,8 +27,8 @@ SkyAPM PHP 1. Swoole ([Swoole](https://github.com/swoole/swoole-src)) 1. Hyperf ([Hyperf](https://github.com/hyperf/hyperf)) 1. Swoft ([Swoft](https://github.com/swoft-cloud/swoft)) -3. Tars-php ([Tars-php](https://github.com/TarsPHP/TarsPHP)) -4. LaravelS ([LaravelS](https://github.com/hhxsv5/laravel-s)) +1. Tars-php ([Tars-php](https://github.com/TarsPHP/TarsPHP)) +1. LaravelS ([LaravelS](https://github.com/hhxsv5/laravel-s)) ## Documents * [Documents in English](docs/README.md)