|
7 | 7 | #include <ext/standard/file.h>
|
8 | 8 | #include <ext/standard/proc_open.h>
|
9 | 9 |
|
10 |
| -#include "compatibility.h" |
11 |
| -#include "ddtrace.h" |
12 |
| -#include "span.h" |
| 10 | +#include "../compatibility.h" |
| 11 | +#include "../ddtrace.h" |
| 12 | +#include "../span.h" |
| 13 | +#include "exec_integration_arginfo.h" |
13 | 14 |
|
14 | 15 | #define NS "DDTrace\\Integrations\\Exec\\"
|
15 | 16 |
|
@@ -262,33 +263,16 @@ static PHP_FUNCTION(DDTrace_integrations_exec_test_rshutdown) {
|
262 | 263 |
|
263 | 264 | ddtrace_exec_handlers_rshutdown();
|
264 | 265 | dd_exec_init_track_streams();
|
265 |
| - (void)return_value; |
| 266 | + RETURN_TRUE; |
266 | 267 | }
|
267 | 268 |
|
268 | 269 | // clang-format off
|
269 |
| -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(register_stream, 0, 2, _IS_BOOL, 0) |
270 |
| - ZEND_ARG_TYPE_INFO(0, stream, IS_RESOURCE, 0) |
271 |
| - ZEND_ARG_OBJ_INFO(0, span, DDTrace\\SpanData, 0) |
272 |
| -ZEND_END_ARG_INFO() |
273 |
| -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(proc_assoc_span, 0, 2, _IS_BOOL, 1) |
274 |
| - ZEND_ARG_TYPE_INFO(0, proc_res, IS_RESOURCE, 0) |
275 |
| - ZEND_ARG_OBJ_INFO(0, span, DDTrace\\SpanData, 0) |
276 |
| -ZEND_END_ARG_INFO() |
277 |
| -ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(proc_get_span, 0, 1, DDTrace\\SpanData, 0) |
278 |
| - ZEND_ARG_TYPE_INFO(0, proc_res, IS_RESOURCE, 0) |
279 |
| -ZEND_END_ARG_INFO() |
280 |
| -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(proc_get_pid, 0, 1, IS_LONG, 1) |
281 |
| - ZEND_ARG_TYPE_INFO(0, proc_res, IS_RESOURCE, 0) |
282 |
| -ZEND_END_ARG_INFO() |
283 |
| -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(test_rshutdown, 0, 0, IS_NULL, 1) |
284 |
| -ZEND_END_ARG_INFO() |
285 |
| - |
286 | 270 | static const zend_function_entry functions[] = {
|
287 |
| - ZEND_RAW_FENTRY(NS "register_stream", PHP_FN(DDTrace_integrations_exec_register_stream), register_stream, 0) |
288 |
| - ZEND_RAW_FENTRY(NS "proc_assoc_span", PHP_FN(DDTrace_integrations_exec_proc_assoc_span), proc_assoc_span, 0) |
289 |
| - ZEND_RAW_FENTRY(NS "proc_get_span", PHP_FN(DDTrace_integrations_exec_proc_get_span), proc_get_span, 0) |
290 |
| - ZEND_RAW_FENTRY(NS "proc_get_pid", PHP_FN(DDTrace_integrations_exec_proc_get_pid), proc_get_pid, 0) |
291 |
| - ZEND_RAW_FENTRY(NS "test_rshutdown", PHP_FN(DDTrace_integrations_exec_test_rshutdown), test_rshutdown, 0) |
| 271 | + ZEND_RAW_FENTRY(NS "register_stream", PHP_FN(DDTrace_integrations_exec_register_stream), arginfo_DDTrace_Integrations_Exec_register_stream, 0) |
| 272 | + ZEND_RAW_FENTRY(NS "proc_assoc_span", PHP_FN(DDTrace_integrations_exec_proc_assoc_span), arginfo_DDTrace_Integrations_Exec_proc_assoc_span, 0) |
| 273 | + ZEND_RAW_FENTRY(NS "proc_get_span", PHP_FN(DDTrace_integrations_exec_proc_get_span), arginfo_DDTrace_Integrations_Exec_proc_get_span, 0) |
| 274 | + ZEND_RAW_FENTRY(NS "proc_get_pid", PHP_FN(DDTrace_integrations_exec_proc_get_pid), arginfo_DDTrace_Integrations_Exec_proc_get_pid, 0) |
| 275 | + ZEND_RAW_FENTRY(NS "test_rshutdown", PHP_FN(DDTrace_integrations_exec_test_rshutdown), arginfo_DDTrace_Integrations_Exec_test_rshutdown, 0) |
292 | 276 | PHP_FE_END
|
293 | 277 | };
|
294 | 278 | // clang-format on
|
|
0 commit comments