This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

tracing: add systemtap support

  • Loading branch information...
1 parent ab1e66d commit 06810b29fae7c549c3a016f2faa3cf6b444a1149 Jan Wynholds committed with bnoordhuis Oct 9, 2012
Showing with 168 additions and 21 deletions.
  1. +5 −1 configure
  2. +31 −2 node.gyp
  3. +5 −2 src/node.cc
  4. +76 −16 src/node_dtrace.cc
  5. +51 −0 src/node_systemtap.d
View
@@ -377,8 +377,12 @@ def configure_node(o):
# SunOS, and we haven't implemented it.)
if sys.platform.startswith('sunos'):
o['variables']['node_use_dtrace'] = b(not options.without_dtrace)
+ elif sys.platform.startswith('linux'):
+ o['variables']['node_use_dtrace'] = 'false'
+ o['variables']['node_use_systemtap'] = b(not options.without_dtrace)
elif b(options.with_dtrace) == 'true':
- raise Exception('DTrace is currently only supported on SunOS systems.')
+ raise Exception(
+ 'DTrace is currently only supported on SunOS or Linux systems.')
else:
o['variables']['node_use_dtrace'] = 'false'
View
@@ -9,6 +9,7 @@
'node_shared_v8%': 'false',
'node_shared_zlib%': 'false',
'node_use_openssl%': 'true',
+ 'node_use_systemtap%': 'false',
'node_shared_openssl%': 'false',
'library_files': [
'src/node.js',
@@ -146,7 +147,6 @@
}, {
'defines': [ 'HAVE_OPENSSL=0' ]
}],
-
[ 'node_use_dtrace=="true"', {
'defines': [ 'HAVE_DTRACE=1' ],
'dependencies': [ 'node_dtrace_header' ],
@@ -168,6 +168,15 @@
}
] ],
} ],
+ [ 'node_use_systemtap=="true"', {
+ 'defines': [ 'HAVE_SYSTEMTAP=1', 'STAP_SDT_V1=1' ],
+ 'dependencies': [ 'node_systemtap_header' ],
+ 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)' ],
+ 'sources': [
+ 'src/node_dtrace.cc',
+ '<(SHARED_INTERMEDIATE_DIR)/node_systemtap.h',
+ ],
+ } ],
[ 'node_use_etw=="true"', {
'defines': [ 'HAVE_ETW=1' ],
'dependencies': [ 'node_etw' ],
@@ -285,7 +294,10 @@
# action?
'conditions': [
- [ 'node_use_dtrace=="true" or node_use_etw=="true"', {
+ [ 'node_use_dtrace=="true"'
+ ' or node_use_etw=="true"'
+ ' or node_use_systemtap=="true"',
+ {
'action': [
'python',
'tools/js2c.py',
@@ -322,6 +334,23 @@
} ]
]
},
+ {
+ 'target_name': 'node_systemtap_header',
+ 'type': 'none',
+ 'conditions': [
+ [ 'node_use_systemtap=="true"', {
+ 'actions': [
+ {
+ 'action_name': 'node_systemtap_header',
+ 'inputs': [ 'src/node_systemtap.d' ],
+ 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/node_systemtap.h' ],
@ryanstevens

ryanstevens Nov 11, 2012

Does this action imply to build node_systemtap.h you have to us dtrace? I'm trying to compile this on fedora its complaining dtrace is not installed (which is the whole point of this pull request). I feel I'm missing something here.

@bnoordhuis

bnoordhuis Nov 11, 2012

Member

Yes. It's in the systemtap-sdt-devel package.

+ 'action': [ 'dtrace', '-h', '-C', '-s', '<@(_inputs)',
+ '-o', '<@(_outputs)' ]
+ }
+ ]
+ } ]
+ ]
+ },
{
'target_name': 'node_dtrace_provider',
'type': 'none',
View
@@ -27,7 +27,7 @@
#include "uv.h"
#include "v8-debug.h"
-#if defined HAVE_DTRACE || defined HAVE_ETW
+#if defined HAVE_DTRACE || defined HAVE_ETW || defined HAVE_SYSTEMTAP
# include "node_dtrace.h"
#endif
@@ -72,6 +72,9 @@ typedef int mode_t;
#if HAVE_OPENSSL
# include "node_crypto.h"
#endif
+#if HAVE_SYSTEMTAP
+#include "node_systemtap.h"
+#endif
#include "node_script.h"
#include "v8_typed_array.h"
@@ -2307,7 +2310,7 @@ void Load(Handle<Object> process_l) {
Local<Object> global = v8::Context::GetCurrent()->Global();
Local<Value> args[1] = { Local<Value>::New(process_l) };
-#if defined HAVE_DTRACE || defined HAVE_ETW
+#if defined HAVE_DTRACE || defined HAVE_ETW || defined HAVE_SYSTEMTAP
InitDTrace(global);
#endif
View
@@ -19,14 +19,23 @@
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
-#include "node_dtrace.h"
-#include <string.h>
#ifdef HAVE_DTRACE
+#include "node_dtrace.h"
+#include <string.h>
#include "node_provider.h"
#elif HAVE_ETW
+#include "node_dtrace.h"
+#include <string.h>
#include "node_win32_etw_provider.h"
#include "node_win32_etw_provider-inl.h"
+#elif HAVE_SYSTEMTAP
+#include <string.h>
+#include <node.h>
+#include <v8.h>
+#include <sys/sdt.h>
+#include "node_systemtap.h"
+#include "node_dtrace.h"
#else
#define NODE_HTTP_SERVER_REQUEST(arg0, arg1)
#define NODE_HTTP_SERVER_REQUEST_ENABLED() (0)
@@ -118,76 +127,97 @@ using namespace v8;
Handle<Value> DTRACE_NET_SERVER_CONNECTION(const Arguments& args) {
+#ifndef HAVE_SYSTEMTAP
if (!NODE_NET_SERVER_CONNECTION_ENABLED())
return Undefined();
+#endif
HandleScope scope;
SLURP_CONNECTION(args[0], conn);
+#ifdef HAVE_SYSTEMTAP
+ NODE_NET_SERVER_CONNECTION(conn.fd, conn.remote, conn.port, \
+ conn.buffered);
+#else
NODE_NET_SERVER_CONNECTION(&conn);
+#endif
return Undefined();
}
Handle<Value> DTRACE_NET_STREAM_END(const Arguments& args) {
+#ifndef HAVE_SYSTEMTAP
if (!NODE_NET_STREAM_END_ENABLED())
return Undefined();
+#endif
HandleScope scope;
SLURP_CONNECTION(args[0], conn);
+#ifdef HAVE_SYSTEMTAP
+ NODE_NET_STREAM_END(conn.fd, conn.remote, conn.port, conn.buffered);
+#else
NODE_NET_STREAM_END(&conn);
+#endif
return Undefined();
}
Handle<Value> DTRACE_NET_SOCKET_READ(const Arguments& args) {
+#ifndef HAVE_SYSTEMTAP
if (!NODE_NET_SOCKET_READ_ENABLED())
return Undefined();
+#endif
HandleScope scope;
- int nbytes;
SLURP_CONNECTION(args[0], conn);
+#ifdef HAVE_SYSTEMTAP
+ NODE_NET_SOCKET_READ(conn.fd, conn.remote, conn.port, conn.buffered);
+#else
if (!args[1]->IsNumber()) {
return (ThrowException(Exception::Error(String::New("expected "
"argument 1 to be number of bytes"))));
}
-
- nbytes = args[1]->Int32Value();
-
+ int nbytes = args[1]->Int32Value();
NODE_NET_SOCKET_READ(&conn, nbytes);
+#endif
return Undefined();
}
Handle<Value> DTRACE_NET_SOCKET_WRITE(const Arguments& args) {
+#ifndef HAVE_SYSTEMTAP
if (!NODE_NET_SOCKET_WRITE_ENABLED())
return Undefined();
+#endif
HandleScope scope;
- int nbytes;
SLURP_CONNECTION(args[0], conn);
+#ifdef HAVE_SYSTEMTAP
+ NODE_NET_SOCKET_WRITE(conn.fd, conn.remote, conn.port, conn.buffered);
+#else
if (!args[1]->IsNumber()) {
return (ThrowException(Exception::Error(String::New("expected "
"argument 1 to be number of bytes"))));
}
-
- nbytes = args[1]->Int32Value();
-
+ int nbytes = args[1]->Int32Value();
NODE_NET_SOCKET_WRITE(&conn, nbytes);
+#endif
return Undefined();
}
Handle<Value> DTRACE_HTTP_SERVER_REQUEST(const Arguments& args) {
node_dtrace_http_server_request_t req;
+#ifndef HAVE_SYSTEMTAP
if (!NODE_HTTP_SERVER_REQUEST_ENABLED())
return Undefined();
+#endif
HandleScope scope;
@@ -213,18 +243,29 @@ Handle<Value> DTRACE_HTTP_SERVER_REQUEST(const Arguments& args) {
SLURP_CONNECTION(args[1], conn);
+#ifdef HAVE_SYSTEMTAP
+ NODE_HTTP_SERVER_REQUEST(&req, conn.fd, conn.remote, conn.port, \
+ conn.buffered);
+#else
NODE_HTTP_SERVER_REQUEST(&req, &conn);
+#endif
return Undefined();
}
Handle<Value> DTRACE_HTTP_SERVER_RESPONSE(const Arguments& args) {
+#ifndef HAVE_SYSTEMTAP
if (!NODE_HTTP_SERVER_RESPONSE_ENABLED())
return Undefined();
+#endif
HandleScope scope;
SLURP_CONNECTION(args[0], conn);
+#ifdef HAVE_SYSTEMTAP
+ NODE_HTTP_SERVER_RESPONSE(conn.fd, conn.remote, conn.port, conn.buffered);
+#else
NODE_HTTP_SERVER_RESPONSE(&conn);
+#endif
return Undefined();
}
@@ -233,8 +274,10 @@ Handle<Value> DTRACE_HTTP_CLIENT_REQUEST(const Arguments& args) {
node_dtrace_http_client_request_t req;
char *header;
+#ifndef HAVE_SYSTEMTAP
if (!NODE_HTTP_CLIENT_REQUEST_ENABLED())
return Undefined();
+#endif
HandleScope scope;
@@ -263,26 +306,40 @@ Handle<Value> DTRACE_HTTP_CLIENT_REQUEST(const Arguments& args) {
*header = '\0';
SLURP_CONNECTION_HTTP_CLIENT(args[1], conn);
+#ifdef HAVE_SYSTEMTAP
+ NODE_HTTP_CLIENT_REQUEST(&req, conn.fd, conn.remote, conn.port, \
+ conn.buffered);
+#else
NODE_HTTP_CLIENT_REQUEST(&req, &conn);
+#endif
return Undefined();
}
Handle<Value> DTRACE_HTTP_CLIENT_RESPONSE(const Arguments& args) {
+#ifndef HAVE_SYSTEMTAP
if (!NODE_HTTP_CLIENT_RESPONSE_ENABLED())
return Undefined();
-
+#endif
HandleScope scope;
SLURP_CONNECTION_HTTP_CLIENT_RESPONSE(args[0], args[1], conn);
+#ifdef HAVE_SYSTEMTAP
+ NODE_HTTP_CLIENT_RESPONSE(conn.fd, conn.remote, conn.port, conn.buffered);
+#else
NODE_HTTP_CLIENT_RESPONSE(&conn);
+#endif
return Undefined();
}
-#define NODE_PROBE(name) #name, name
+#define NODE_PROBE(name) #name, name, Persistent<FunctionTemplate>()
static int dtrace_gc_start(GCType type, GCCallbackFlags flags) {
+#ifdef HAVE_SYSTEMTAP
+ NODE_GC_START();
+#else
NODE_GC_START(type, flags);
+#endif
/*
* We avoid the tail-call elimination of the USDT probe (which screws up
* args) by forcing a return of 0.
@@ -291,7 +348,11 @@ static int dtrace_gc_start(GCType type, GCCallbackFlags flags) {
}
static int dtrace_gc_done(GCType type, GCCallbackFlags flags) {
+#ifdef HAVE_SYSTEMTAP
+ NODE_GC_DONE();
+#else
NODE_GC_DONE(type, flags);
+#endif
return 0;
}
@@ -308,11 +369,10 @@ void InitDTrace(Handle<Object> target) {
{ NODE_PROBE(DTRACE_HTTP_SERVER_REQUEST) },
{ NODE_PROBE(DTRACE_HTTP_SERVER_RESPONSE) },
{ NODE_PROBE(DTRACE_HTTP_CLIENT_REQUEST) },
- { NODE_PROBE(DTRACE_HTTP_CLIENT_RESPONSE) },
- { NULL }
+ { NODE_PROBE(DTRACE_HTTP_CLIENT_RESPONSE) }
};
- for (int i = 0; tab[i].name != NULL; i++) {
+ for (unsigned int i = 0; i < ARRAY_SIZE(tab); i++) {
tab[i].templ = Persistent<FunctionTemplate>::New(
FunctionTemplate::New(tab[i].func));
target->Set(String::NewSymbol(tab[i].name), tab[i].templ->GetFunction());
@@ -322,7 +382,7 @@ void InitDTrace(Handle<Object> target) {
init_etw();
#endif
-#if defined HAVE_DTRACE || defined HAVE_ETW
+#if defined HAVE_DTRACE || defined HAVE_ETW || defined HAVE_SYSTEMTAP
v8::V8::AddGCPrologueCallback((GCPrologueCallback)dtrace_gc_start);
v8::V8::AddGCEpilogueCallback((GCEpilogueCallback)dtrace_gc_done);
#endif
Oops, something went wrong.

0 comments on commit 06810b2

Please sign in to comment.