1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dtrace: pass more arguments to probes

Browse Source 
OSX and other DTrace implementations don't support dereferencing
structs in probes. To accomodate that pass members from the struct as
arguments so that DTrace is useful on those systems.
This commit is contained in:
Dave Pacheco 2013-03-28 13:52:43 -07:00 committed by Ben Noordhuis
parent fe7440ce19
commit 7634069614
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/node_dtrace.cc
View File

@ -139,7 +139,7 @@ Handle<Value> DTRACE_NET_SERVER_CONNECTION(const Arguments& args) {
NODE_NET_SERVER_CONNECTION(conn.fd, conn.remote, conn.port, \
conn.buffered);
#else
NODE_NET_SERVER_CONNECTION(&conn);
NODE_NET_SERVER_CONNECTION(&conn, conn.remote, conn.port);
#endif
return Undefined(node_isolate);
@ -157,7 +157,7 @@ Handle<Value> DTRACE_NET_STREAM_END(const Arguments& args) {
#ifdef HAVE_SYSTEMTAP
NODE_NET_STREAM_END(conn.fd, conn.remote, conn.port, conn.buffered);
#else
NODE_NET_STREAM_END(&conn);
NODE_NET_STREAM_END(&conn, conn.remote, conn.port);
#endif
return Undefined(node_isolate);
@ -181,7 +181,7 @@ Handle<Value> DTRACE_NET_SOCKET_READ(const Arguments& args) {
"argument 1 to be number of bytes"))));
}
int nbytes = args[1]->Int32Value();
NODE_NET_SOCKET_READ(&conn, nbytes);
NODE_NET_SOCKET_READ(&conn, nbytes, conn.remote, conn.port);
#endif
return Undefined(node_isolate);
@ -205,7 +205,7 @@ Handle<Value> DTRACE_NET_SOCKET_WRITE(const Arguments& args) {
"argument 1 to be number of bytes"))));
}
int nbytes = args[1]->Int32Value();
NODE_NET_SOCKET_WRITE(&conn, nbytes);
NODE_NET_SOCKET_WRITE(&conn, nbytes, conn.remote, conn.port);
#endif
return Undefined(node_isolate);
@ -247,7 +247,8 @@ Handle<Value> DTRACE_HTTP_SERVER_REQUEST(const Arguments& args) {
NODE_HTTP_SERVER_REQUEST(&req, conn.fd, conn.remote, conn.port, \
conn.buffered);
#else
NODE_HTTP_SERVER_REQUEST(&req, &conn);
NODE_HTTP_SERVER_REQUEST(&req, &conn, conn.remote, conn.port, req.method, \
req.url);
#endif
return Undefined(node_isolate);
}
@ -264,7 +265,7 @@ Handle<Value> DTRACE_HTTP_SERVER_RESPONSE(const Arguments& args) {
#ifdef HAVE_SYSTEMTAP
NODE_HTTP_SERVER_RESPONSE(conn.fd, conn.remote, conn.port, conn.buffered);
#else
NODE_HTTP_SERVER_RESPONSE(&conn);
NODE_HTTP_SERVER_RESPONSE(&conn, conn.remote, conn.port);
#endif
return Undefined(node_isolate);
@ -310,7 +311,8 @@ Handle<Value> DTRACE_HTTP_CLIENT_REQUEST(const Arguments& args) {
NODE_HTTP_CLIENT_REQUEST(&req, conn.fd, conn.remote, conn.port, \
conn.buffered);
#else
NODE_HTTP_CLIENT_REQUEST(&req, &conn);
NODE_HTTP_CLIENT_REQUEST(&req, &conn, conn.remote, conn.port, req.method, \
req.url);
#endif
return Undefined(node_isolate);
}
@ -326,7 +328,7 @@ Handle<Value> DTRACE_HTTP_CLIENT_RESPONSE(const Arguments& args) {
#ifdef HAVE_SYSTEMTAP
NODE_HTTP_CLIENT_RESPONSE(conn.fd, conn.remote, conn.port, conn.buffered);
#else
NODE_HTTP_CLIENT_RESPONSE(&conn);
NODE_HTTP_CLIENT_RESPONSE(&conn, conn.remote, conn.port);
#endif
return Undefined(node_isolate);

34
src/node_provider.d
View File

@ -52,24 +52,26 @@ typedef struct {
} node_http_request_t;
provider node {
probe net__server__connection(node_dtrace_connection_t *c) :
(node_connection_t *c);
probe net__stream__end(node_dtrace_connection_t *c) :
(node_connection_t *c);
probe net__socket__read(node_dtrace_connection_t *c, int b) :
(node_connection_t *c, int b);
probe net__socket__write(node_dtrace_connection_t *c, int b) :
(node_connection_t *c, int b);
probe net__server__connection(node_dtrace_connection_t *c,
const char *a, int p) : (node_connection_t *c, string a, int p);
probe net__stream__end(node_dtrace_connection_t *c, const char *a,
int p) : (node_connection_t *c, string a, int p);
probe net__socket__read(node_dtrace_connection_t *c, int b,
const char *a, int p) : (node_connection_t *c, int b, string a, int p);
probe net__socket__write(node_dtrace_connection_t *c, int b,
const char *a, int p) : (node_connection_t *c, int b, string a, int p);
probe http__server__request(node_dtrace_http_server_request_t *h,
node_dtrace_connection_t *c) :
(node_http_request_t *h, node_connection_t *c);
probe http__server__response(node_dtrace_connection_t *c) :
(node_connection_t *c);
node_dtrace_connection_t *c, const char *a, int p, const char *m,
const char *u) : (node_http_request_t *h, node_connection_t *c,
string a, int p, string m, string u);
probe http__server__response(node_dtrace_connection_t *c, const char *a,
int p) : (node_connection_t *c, string a, int p);
probe http__client__request(node_dtrace_http_client_request_t *h,
node_dtrace_connection_t *c) :
(node_http_request_t *h, node_connection_t *c);
probe http__client__response(node_dtrace_connection_t *c) :
(node_connection_t *c);
node_dtrace_connection_t *c, const char *a, int p, const char *m,
const char *u) : (node_http_request_t *h, node_connection_t *c, string a,
int p, string m, string u);
probe http__client__response(node_dtrace_connection_t *c, const char *a,
int p) : (node_connection_t *c, string a, int p);
probe gc__start(int t, int f);
probe gc__done(int t, int f);
};