Skip to content

Commit 232ed1f

Browse files
committed
dtrace just work on OSX box. Yay
1 parent 48dfbd4 commit 232ed1f

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

Makefile.frag

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
dtrace-fixup:
2-
if test -f $(builddir)/.libs/phpuv.o ; then \
3-
dtrace -h -C -s $(srcdir)/phpuv.d $(builddir)/.libs/phpuv.o ; \
4-
else \
5-
dtrace -h -C -s $(srcdir)/phpuv.d phpuv.lo ; \
6-
fi
2+
dtrace -h -s $(srcdir)/phpuv_dtrace.d; \
73

84
$(srcdir)/libuv/uv.a:
95
$(MAKE) -C $(srcdir)/libuv

config.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ fi
2626

2727
if test "$PHP_UV_DTRACE" != "no"; then
2828
UV_SHARED_DEPENDENCIES=dtrace-fixup
29-
UV_SHARED_LIBADD="phpuv.o -Wl,-M$srcdir/kludge.map"
3029

3130
PHP_ADD_LIBRARY(dtrace, UV_SHARED_LIBADD)
3231
PHP_SUBST(UV_SHARED_DEPENDENCIES)

php_uv.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919

2020
#include "php_uv.h"
2121
#include "ext/standard/info.h"
22+
#include "phpuv.h"
2223

2324
#ifndef PHP_UV_DEBUG
2425
#define PHP_UV_DEBUG 0
2526
#endif
2627

2728
#include <dtrace.h>
2829
#include <sys/sdt.h>
30+
#include "phpuv_dtrace.h"
2931

3032
#define PHP_UV_INIT_UV(uv, uv_type) \
3133
uv = (php_uv_t *)emalloc(sizeof(php_uv_t)); \
@@ -1711,7 +1713,7 @@ static void php_uv_udp_send(int type, INTERNAL_FUNCTION_PARAMETERS)
17111713

17121714
PHP_MINIT_FUNCTION(uv)
17131715
{
1714-
DTRACE_PROBE(phpuv, minit)
1716+
PHPUV_TRACE_MINIT();
17151717
php_uv_init(TSRMLS_C);
17161718

17171719
uv_resource_handle = zend_register_list_destructors_ex(destruct_uv, NULL, PHP_UV_RESOURCE_NAME, module_number);

phpuv.d

Lines changed: 0 additions & 3 deletions
This file was deleted.

phpuv_dtrace.d

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
provider phpuv {
2+
probe trace__minit();
3+
};

0 commit comments

Comments
 (0)