186526/openresty
1
0
Fork 0
mirror of https://github.com/openresty/openresty.git synced 2024-10-13 00:29:41 +00:00
Code Issues Projects Releases Wiki Activity

updated the dtrace patch to reflect recent changes.

Browse Source
This commit is contained in:
agentzh (Yichun Zhang)
2013-05-13 12:09:47 -07:00
parent 090060c907
commit ca9f8d0622
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
patches/nginx-1.2.8-dtrace.patch
View File

@ -1,13 +1,11 @@
diff --git a/README b/README diff --git a/README b/README
index 2f68e14..4f2c4a7 100644 index 2f68e14..262822a 100644
--- a/README --- a/README
+++ b/README +++ b/README
@@ -1,3 +1,40 @@ @@ -1,3 +1,38 @@
+This is an Nginx fork that adds dtrace USDT probes. +This is an Nginx fork that adds dtrace USDT probes.
-Documentation is available at http://nginx.org -Documentation is available at http://nginx.org
+This is still under development and not usable yet.
+
+Installation: +Installation:
+ +
+ ./configure --with-dtrace-probes \ + ./configure --with-dtrace-probes \
@ -454,10 +452,10 @@ index efbc244..8d81aab 100644
diff --git a/src/dtrace/nginx.stp b/src/dtrace/nginx.stp diff --git a/src/dtrace/nginx.stp b/src/dtrace/nginx.stp
new file mode 100644 new file mode 100644
index 0000000..4c228bd index 0000000..e824daf
--- /dev/null --- /dev/null
+++ b/src/dtrace/nginx.stp +++ b/src/dtrace/nginx.stp
@@ -0,0 +1,288 @@ @@ -0,0 +1,299 @@
+/* tapset for nginx */ +/* tapset for nginx */
+ +
+ +
@ -592,6 +590,12 @@ index 0000000..4c228bd
+} +}
+ +
+ +
+function ngx_buf_in_file(b)
+{
+ return @cast(b, "ngx_buf_t", "NGX_SBIN_PATH")->in_file
+}
+
+
+function ngx_buf_last_buf(b) +function ngx_buf_last_buf(b)
+{ +{
+ return @cast(b, "ngx_buf_t", "/home/agentzh/git/lua-nginx-module/work/nginx/sbin/nginx")->last_buf + return @cast(b, "ngx_buf_t", "/home/agentzh/git/lua-nginx-module/work/nginx/sbin/nginx")->last_buf
@ -656,6 +660,11 @@ index 0000000..4c228bd
+ out .= "\"\"" + out .= "\"\""
+ } + }
+ +
+ if (ngx_buf_in_file(buf)) {
+ out .= sprintf("<in_file:%d-%d>", ngx_buf_file_pos(buf),
+ ngx_buf_file_last(buf))
+ }
+
+ if (ngx_buf_last_buf(buf)) { + if (ngx_buf_last_buf(buf)) {
+ out .= "<last_buf>" + out .= "<last_buf>"
+ } + }