ruby-dtrace 0.0.6 → 0.2.8

data/ext/dtrace_aggdata.c

@@ -96,13 +96,13 @@ VALUE dtraceaggdata_value(VALUE self)
       case DTRACEAGG_COUNT:
 	if (value < 0)
 	  rb_raise(eDtraceException, "count value is negative");
-	v = INT2FIX(value);
+	v = LL2NUM(value);
 	break;
       case DTRACEAGG_AVG:
       case DTRACEAGG_MIN:
       case DTRACEAGG_MAX:
       case DTRACEAGG_SUM:
-	v = INT2FIX(value);
+	v = LL2NUM(value);
 	break;
       default:
 	v = Qnil;

data/ext/dtrace_api.c

@@ -5,7 +5,7 @@
 #include "dtrace_api.h"
 
 VALUE cDtrace;
-VALUE cDtraceProbe;
+VALUE cDtraceProbeDesc;
 VALUE cDtraceProgram;
 VALUE cDtraceProgramInfo;
 VALUE cDtraceAggData;
@@ -15,42 +15,45 @@ VALUE cDtraceBufData;
 VALUE cDtraceProcess;
 VALUE cDtraceDropData;
 VALUE cDtraceErrData;
+VALUE cDtraceProbe;
 
 VALUE eDtraceException;
 
 void Init_dtrace_api() {
 
-  cDtrace = rb_define_class("Dtrace",          rb_cObject);
-  rb_define_method(cDtrace, "initialize",      dtrace_init,                0); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "each_probe",      dtrace_each_probe,          0); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "compile",         dtrace_strcompile,         -1); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "stop",            dtrace_hdl_stop,            0); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "status",          dtrace_hdl_status,          0); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "go",              dtrace_hdl_go,              0); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "error",           dtrace_hdl_error,           0); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "setopt",          dtrace_hdl_setopt,          2); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "sleep",           dtrace_hdl_sleep,           0); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "work",            dtrace_hdl_work,           -1); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "buf_consumer",    dtrace_hdl_buf_consumer,    1); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "drop_consumer",   dtrace_hdl_drop_consumer,   1); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "err_consumer",    dtrace_hdl_err_consumer,    1); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "createprocess",   dtrace_hdl_createprocess,   1); // in dtrace_hdl.c
-  rb_define_method(cDtrace, "grabprocess",     dtrace_hdl_grabprocess,     1); // in dtrace_hdl.c
+  cDtrace = rb_define_class("Dtrace",           rb_cObject);
+  rb_define_method(cDtrace, "initialize",       dtrace_init,                0); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "each_probe_all",   dtrace_each_probe_all,      0); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "each_probe_match", dtrace_each_probe_match,    4); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "each_probe_prog",  dtrace_each_probe_prog,     1); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "compile",          dtrace_strcompile,         -1); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "stop",             dtrace_hdl_stop,            0); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "status",           dtrace_hdl_status,          0); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "go",               dtrace_hdl_go,              0); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "error",            dtrace_hdl_error,           0); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "setopt",           dtrace_hdl_setopt,          2); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "sleep",            dtrace_hdl_sleep,           0); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "work",             dtrace_hdl_work,           -1); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "buf_consumer",     dtrace_hdl_buf_consumer,    1); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "drop_consumer",    dtrace_hdl_drop_consumer,   1); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "err_consumer",     dtrace_hdl_err_consumer,    1); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "createprocess",    dtrace_hdl_createprocess,   1); // in dtrace_hdl.c
+  rb_define_method(cDtrace, "grabprocess",      dtrace_hdl_grabprocess,     1); // in dtrace_hdl.c
   rb_define_alloc_func(cDtrace, dtrace_hdl_alloc);
 
-  cDtraceProcess = rb_define_class("DtraceProcess", rb_cObject);
+  cDtraceProcess = rb_define_class_under(cDtrace, "Process", rb_cObject);
   rb_define_method(cDtraceProcess, "initialize",    dtrace_process_init,     0); // in dtrace_process.c
   rb_define_method(cDtraceProcess, "continue",      dtrace_process_continue, 0); // in dtrace_process.c
 
-  cDtraceProbe = rb_define_class("DtraceProbe", rb_cObject);
-  rb_define_method(cDtraceProbe, "initialize", dtraceprobe_init,     0); // in dtrace_probe.c
-  rb_define_method(cDtraceProbe, "probe_id",   dtraceprobe_probe_id, 0); // in dtrace_probe.c
-  rb_define_method(cDtraceProbe, "provider",   dtraceprobe_provider, 0); // in dtrace_probe.c
-  rb_define_method(cDtraceProbe, "mod",        dtraceprobe_mod,      0); // in dtrace_probe.c
-  rb_define_method(cDtraceProbe, "func",       dtraceprobe_func,     0); // in dtrace_probe.c
-  rb_define_method(cDtraceProbe, "name",       dtraceprobe_name,     0); // in dtrace_probe.c
+  cDtraceProbeDesc = rb_define_class_under(cDtrace, "ProbeDesc", rb_cObject);
+  rb_define_method(cDtraceProbeDesc, "initialize", dtraceprobedesc_init,     0); // in dtrace_probedesc.c
+  rb_define_method(cDtraceProbeDesc, "probe_id",   dtraceprobedesc_probe_id, 0); // in dtrace_probedesc.c
+  rb_define_method(cDtraceProbeDesc, "provider",   dtraceprobedesc_provider, 0); // in dtrace_probedesc.c
+  rb_define_method(cDtraceProbeDesc, "mod",        dtraceprobedesc_mod,      0); // in dtrace_probedesc.c
+  rb_define_method(cDtraceProbeDesc, "func",       dtraceprobedesc_func,     0); // in dtrace_probedesc.c
+  rb_define_method(cDtraceProbeDesc, "name",       dtraceprobedesc_name,     0); // in dtrace_probedesc.c
 
-  cDtraceProbeData = rb_define_class("DtraceProbeData", rb_cObject);
+  cDtraceProbeData = rb_define_class_under(cDtrace, "ProbeData", rb_cObject);
   rb_define_method(cDtraceProbeData, "initialize",  dtraceprobedata_init,        0); // in dtrace_probedata.c
   rb_define_method(cDtraceProbeData, "epid",        dtraceprobedata_epid,        0); // in dtrace_probedata.c
   rb_define_method(cDtraceProbeData, "probe",       dtraceprobedata_probe,       0); // in dtrace_probedata.c
@@ -60,34 +63,34 @@ void Init_dtrace_api() {
   rb_define_method(cDtraceProbeData, "flow",        dtraceprobedata_flow,        0); // in dtrace_probedata.c
   rb_define_method(cDtraceProbeData, "each_record", dtraceprobedata_each_record, 0); // in dtrace_probedata.c
 
-  cDtraceBufData = rb_define_class("DtraceBufData", rb_cObject);
+  cDtraceBufData = rb_define_class_under(cDtrace, "BufData", rb_cObject);
   rb_define_method(cDtraceBufData, "initialize",  dtracebufdata_init,   0); // in dtrace_bufdata.c
   rb_define_method(cDtraceBufData, "epid",        dtracebufdata_epid,   0); // in dtrace_bufdata.c
   rb_define_method(cDtraceBufData, "probe",       dtracebufdata_probe,  0); // in dtrace_bufdata.c
   rb_define_method(cDtraceBufData, "record",      dtracebufdata_record, 0); // in dtrace_bufdata.c
 
-  cDtraceProgram = rb_define_class("DtraceProgram", rb_cObject);
+  cDtraceProgram = rb_define_class_under(cDtrace, "Program", rb_cObject);
   rb_define_method(cDtraceProgram, "initialize",         dtraceprogram_init, 0); // in dtrace_program.c
   rb_define_method(cDtraceProgram, "execute",            dtraceprogram_exec, 0); // in dtrace_program.c
   rb_define_method(cDtraceProgram, "info",               dtraceprogram_info, 0); // in dtrace_program.c
 
-  cDtraceProgramInfo = rb_define_class("DtraceProgramInfo", rb_cObject);
+  cDtraceProgramInfo = rb_define_class_under(cDtrace, "ProgramInfo", rb_cObject);
   rb_define_method(cDtraceProgramInfo, "initialize",         dtraceprograminfo_init,               0); // in dtrace_programinfo.c 
   rb_define_method(cDtraceProgramInfo, "aggregates_count",   dtraceprograminfo_aggregates_count,   0); // in dtrace_programinfo.c
   rb_define_method(cDtraceProgramInfo, "recgens_count",      dtraceprograminfo_recgens_count,      0); // in dtrace_programinfo.c
   rb_define_method(cDtraceProgramInfo, "matches_count",      dtraceprograminfo_matches_count,      0); // in dtrace_programinfo.c
   rb_define_method(cDtraceProgramInfo, "speculations_count", dtraceprograminfo_speculations_count, 0); // in dtrace_programinfo.c
 
-  cDtraceAggData = rb_define_class("DtraceAggData", rb_cObject);
+  cDtraceAggData = rb_define_class_under(cDtrace, "AggData", rb_cObject);
   rb_define_method(cDtraceAggData, "initialize",         dtraceaggdata_init,    0); // in dtrace_aggdata.c 
   rb_define_method(cDtraceAggData, "value",              dtraceaggdata_value,   0); // in dtrace_aggdata.c
   rb_define_method(cDtraceAggData, "aggtype",            dtraceaggdata_aggtype, 0); // in dtrace_aggdata.c
 
-  cDtraceRecDesc = rb_define_class("DtraceRecDesc", rb_cObject);
+  cDtraceRecDesc = rb_define_class_under(cDtrace, "RecDesc", rb_cObject);
   rb_define_method(cDtraceRecDesc, "initialize",         dtracerecdesc_init,   0); // in dtrace_recdesc.c 
   rb_define_method(cDtraceRecDesc, "action",             dtracerecdesc_action, 0); // in dtrace_recdesc.c 
 
-  cDtraceDropData = rb_define_class("DtraceDropData", rb_cObject);
+  cDtraceDropData = rb_define_class_under(cDtrace, "DropData", rb_cObject);
   rb_define_method(cDtraceDropData, "initialize",  dtracedropdata_init,   0); // in dtrace_dropdata.c 
   rb_define_method(cDtraceDropData, "cpu",         dtracedropdata_cpu,    0); // in dtrace_dropdata.c 
   rb_define_method(cDtraceDropData, "drops",       dtracedropdata_drops,  0); // in dtrace_dropdata.c 
@@ -95,7 +98,7 @@ void Init_dtrace_api() {
   rb_define_method(cDtraceDropData, "msg",         dtracedropdata_msg,    0); // in dtrace_dropdata.c 
   rb_define_method(cDtraceDropData, "kind",        dtracedropdata_kind,   0); // in dtrace_dropdata.c 
 
-  cDtraceErrData = rb_define_class("DtraceErrData", rb_cObject);
+  cDtraceErrData = rb_define_class_under(cDtrace, "ErrData", rb_cObject);
   rb_define_method(cDtraceErrData, "initialize",  dtraceerrdata_init,    0); // in dtrace_errdata.c 
   rb_define_method(cDtraceErrData, "cpu",         dtraceerrdata_cpu,     0); // in dtrace_errdata.c 
   rb_define_method(cDtraceErrData, "action",      dtraceerrdata_action,  0); // in dtrace_errdata.c 
@@ -104,6 +107,15 @@ void Init_dtrace_api() {
   rb_define_method(cDtraceErrData, "addr",        dtraceerrdata_addr,    0); // in dtrace_errdata.c 
   rb_define_method(cDtraceErrData, "msg",         dtraceerrdata_msg,     0); // in dtrace_errdata.c 
 
-  eDtraceException = rb_define_class("DtraceException", rb_eStandardError);
+  cDtraceProbe = rb_define_class_under(cDtrace, "Probe", rb_cObject);
+  rb_define_method(cDtraceProbe, "initialize",        dtraceprobe_init,              1); // in dtrace_probe.c
+  rb_define_method(cDtraceProbe, "addr",              dtraceprobe_addr,              0); // in dtrace_probe.c
+  rb_define_method(cDtraceProbe, "fire",              dtraceprobe_fire,             -1); // in dtrace_probe.c
+  rb_define_method(cDtraceProbe, "is_enabled?",       dtraceprobe_is_enabled,        0); // in dtrace_probe.c
+  rb_define_method(cDtraceProbe, "probe_offset",      dtraceprobe_probe_offset,      2); // in dtrace_probe.c
+  rb_define_method(cDtraceProbe, "is_enabled_offset", dtraceprobe_is_enabled_offset, 1); // in dtrace_probe.c
+  rb_define_alloc_func(cDtraceProbe, dtraceprobe_alloc);
+  
+  eDtraceException = rb_define_class_under(cDtrace, "Exception", rb_eStandardError);
 }
 

data/ext/dtrace_api.h

@@ -6,6 +6,10 @@
  * in the same directory as ruby.h, and we must avoid loading that...
  */
 #include "/usr/include/dtrace.h"
+
+/* undefine _FILE_OFFSET_BITS: we want the definition from ruby. */
+#undef _FILE_OFFSET_BITS
+
 #include "ruby.h"
 
 /* Used to pass three Ruby VALUEs as the void *arg of dtrace_work() to
@@ -38,6 +42,16 @@ typedef struct dtrace_handle {
   VALUE drop;
 } dtrace_handle_t;
 
+/* Struct wrapping a probe, a handcrafted function created to be a
+   probe trigger point, and its corresponding is_enabled tracepoint.
+
+   This is actually a pointer to the is_enabled function (the probe
+   function is after) so it's declared to take no args, and return
+   int. */
+typedef struct dtrace_probe {
+  int (*func)();
+} dtrace_probe_t;
+
 /* Handle missing RARRAY_LEN etc */
 #ifdef RARRAY_LEN
 static inline long   rb_str_len(VALUE s) {return RSTRING_LEN(s);}
@@ -63,7 +77,9 @@ VALUE dtraceaggdata_aggtype(VALUE self);
 
 VALUE dtrace_init(VALUE self);
 VALUE dtrace_hdl_alloc(VALUE klass);
-VALUE dtrace_each_probe(VALUE self);
+VALUE dtrace_each_probe_all(VALUE self);
+VALUE dtrace_each_probe_match(VALUE self, VALUE provider, VALUE mod, VALUE func, VALUE name);
+VALUE dtrace_each_probe_prog(VALUE self, VALUE program);
 VALUE dtrace_strcompile(int argc, VALUE *argv, VALUE self);
 VALUE dtrace_hdl_go(VALUE self);
 VALUE dtrace_hdl_status(VALUE self);
@@ -78,12 +94,12 @@ VALUE dtrace_hdl_err_consumer(VALUE self, VALUE err_consumer_proc);
 VALUE dtrace_hdl_createprocess(VALUE self, VALUE argv);
 VALUE dtrace_hdl_grabprocess(VALUE self, VALUE pid);
 
-VALUE dtraceprobe_init(VALUE self);
-VALUE dtraceprobe_probe_id(VALUE self);
-VALUE dtraceprobe_provider(VALUE self);
-VALUE dtraceprobe_mod(VALUE self);
-VALUE dtraceprobe_func(VALUE self);
-VALUE dtraceprobe_name(VALUE self);
+VALUE dtraceprobedesc_init(VALUE self);
+VALUE dtraceprobedesc_probe_id(VALUE self);
+VALUE dtraceprobedesc_provider(VALUE self);
+VALUE dtraceprobedesc_mod(VALUE self);
+VALUE dtraceprobedesc_func(VALUE self);
+VALUE dtraceprobedesc_name(VALUE self);
 
 VALUE dtraceprobedata_init(VALUE self);
 VALUE dtraceprobedata_epid(VALUE self);
@@ -126,3 +142,11 @@ VALUE dtraceerrdata_offset(VALUE self);
 VALUE dtraceerrdata_fault(VALUE self);
 VALUE dtraceerrdata_addr(VALUE self);
 VALUE dtraceerrdata_msg(VALUE self);
+
+VALUE dtraceprobe_alloc(VALUE klass);
+VALUE dtraceprobe_init(VALUE self, VALUE argc);
+VALUE dtraceprobe_addr(VALUE self);
+VALUE dtraceprobe_fire(int argc, VALUE *argv, VALUE self);
+VALUE dtraceprobe_is_enabled(VALUE self);
+VALUE dtraceprobe_probe_offset(VALUE self, VALUE rfile, VALUE argc);
+VALUE dtraceprobe_is_enabled_offset(VALUE self, VALUE rfile);

data/ext/dtrace_bufdata.c

@@ -93,7 +93,7 @@ VALUE dtracebufdata_record(VALUE self)
   case DTRACEACT_PRINTF:
     /* printf action, not available in probedata */
     v = rb_str_new2(s);
-    dtracerecord = rb_class_new_instance(0, NULL, rb_path2class("DtracePrintfRecord"));
+    dtracerecord = rb_class_new_instance(0, NULL, rb_path2class("Dtrace::PrintfRecord"));
     rb_iv_set(dtracerecord, "@from", rb_str_new2("bufdata"));
     rb_iv_set(dtracerecord, "@value", v);
     return (dtracerecord);
@@ -103,7 +103,7 @@ VALUE dtracebufdata_record(VALUE self)
   case DTRACEACT_JSTACK:
     /* stand-alone stack(), ustack(), or jstack() action */
     v = rb_str_new2(s);
-    dtracerecord = rb_class_new_instance(0, NULL, rb_path2class("DtraceStackRecord"));
+    dtracerecord = rb_class_new_instance(0, NULL, rb_path2class("Dtrace::StackRecord"));
     rb_iv_set(dtracerecord, "@from", rb_str_new2("bufdata"));
     rb_funcall(dtracerecord, rb_intern("parse"), 1, v);
     return (dtracerecord);
@@ -127,7 +127,7 @@ VALUE dtracebufdata_record(VALUE self)
   }
 
   if (!NIL_P(v)) {
-    dtracerecord = rb_class_new_instance(0, NULL, rb_path2class("DtraceRecord"));
+    dtracerecord = rb_class_new_instance(0, NULL, rb_path2class("Dtrace::Record"));
     rb_iv_set(dtracerecord, "@value", v);
     rb_iv_set(dtracerecord, "@action", INT2FIX(act));
     rb_iv_set(dtracerecord, "@from", rb_str_new2("bufdata"));

data/ext/dtrace_hdl.c

@@ -7,7 +7,7 @@
 RUBY_EXTERN VALUE eDtraceException;
 
 RUBY_EXTERN VALUE cDtrace;
-RUBY_EXTERN VALUE cDtraceProbe;
+RUBY_EXTERN VALUE cDtraceProbeDesc;
 RUBY_EXTERN VALUE cDtraceProgram;
 RUBY_EXTERN VALUE cDtraceRecDesc;
 RUBY_EXTERN VALUE cDtraceProbeData;
@@ -93,11 +93,12 @@ VALUE dtrace_init(VALUE self)
     return Qnil;
 }
 
+static
 int _dtrace_next_probe(dtrace_hdl_t *hdl, const dtrace_probedesc_t *pdp, void *arg)
 {
   VALUE probe;
 
-  probe = Data_Wrap_Struct(cDtraceProbe, 0, NULL, (dtrace_probedesc_t *)pdp);
+  probe = Data_Wrap_Struct(cDtraceProbeDesc, 0, NULL, (dtrace_probedesc_t *)pdp);
 
   rb_yield(probe);
   return 0;
@@ -109,7 +110,7 @@ int _dtrace_next_probe(dtrace_hdl_t *hdl, const dtrace_probedesc_t *pdp, void *a
  *
  * Each probe is represented by a DtraceProbe object
  */
-VALUE dtrace_each_probe(VALUE self)
+VALUE dtrace_each_probe_all(VALUE self)
 {
   dtrace_handle_t *handle;
 
@@ -119,6 +120,68 @@ VALUE dtrace_each_probe(VALUE self)
   return self;
 }
 
+/*
+ * Yields each probe found on the system, matching against a 
+ * partial name.
+ * (equivalent to dtrace -l -n 'probe:::spec')
+ *
+ * Each probe is represented by a DtraceProbe object
+ */
+VALUE dtrace_each_probe_match(VALUE self, VALUE provider, VALUE mod, VALUE func, VALUE name)
+{
+  dtrace_handle_t *handle;
+
+  dtrace_probedesc_t desc;
+  desc.dtpd_id = 0;
+  strcpy(desc.dtpd_provider, RSTRING(provider)->ptr);
+  strcpy(desc.dtpd_mod,      RSTRING(mod)->ptr);
+  strcpy(desc.dtpd_func,     RSTRING(func)->ptr);
+  strcpy(desc.dtpd_name,     RSTRING(name)->ptr);
+
+  Data_Get_Struct(self, dtrace_handle_t, handle);
+  (void) dtrace_probe_iter(handle->hdl, &desc, _dtrace_next_probe, NULL);
+
+  return self;
+}
+
+static int
+_dtrace_next_stmt(dtrace_hdl_t *hdl, dtrace_prog_t *program,
+		  dtrace_stmtdesc_t *stp, dtrace_ecbdesc_t **last)
+{
+  dtrace_ecbdesc_t *edp = stp->dtsd_ecbdesc;
+  
+  if (edp == *last)
+    return 0;
+
+  if (dtrace_probe_iter(hdl, &edp->dted_probe, _dtrace_next_probe, NULL) != 0) {
+    rb_raise(eDtraceException, "failed to match %s:%s:%s:%s: %s\n",
+	     edp->dted_probe.dtpd_provider, edp->dted_probe.dtpd_mod,
+	     edp->dted_probe.dtpd_func, edp->dted_probe.dtpd_name,
+	     dtrace_errmsg(hdl, dtrace_errno(hdl)));
+  
+  }
+  
+  *last = edp;
+  return 0;
+}
+ 
+/*
+ * Yields each probe enabled by the given D program.
+ * (equivalent to dtrace -n -s program.d)
+ */
+VALUE dtrace_each_probe_prog(VALUE self, VALUE program)
+{
+  dtrace_handle_t *handle;
+  dtrace_prog_t *prog;
+  dtrace_ecbdesc_t *last = NULL;
+  
+  Data_Get_Struct(self, dtrace_handle_t, handle);
+  Data_Get_Struct(program, dtrace_prog_t, prog);
+ 
+  (void) dtrace_stmt_iter(handle->hdl, prog, (dtrace_stmt_f *)_dtrace_next_stmt, &last);
+  return Qnil;
+} 
+
 /*
  * Compile a D program. 
  *

data/ext/dtrace_probedata.c

@@ -5,7 +5,7 @@
 #include "dtrace_api.h"
 
 RUBY_EXTERN VALUE eDtraceException;
-RUBY_EXTERN VALUE cDtraceProbe;
+RUBY_EXTERN VALUE cDtraceProbeDesc;
 
 /* :nodoc: */
 VALUE dtraceprobedata_init(VALUE self)
@@ -117,7 +117,7 @@ VALUE dtraceprobedata_probe(VALUE self)
   pd = data->dtpda_pdesc;
 
   if (pd) {
-    dtraceprobe = Data_Wrap_Struct(cDtraceProbe, 0, NULL, (dtrace_probedesc_t *)pd);
+    dtraceprobe = Data_Wrap_Struct(cDtraceProbeDesc, 0, NULL, (dtrace_probedesc_t *)pd);
     return dtraceprobe;
   }
 
@@ -246,7 +246,7 @@ VALUE dtraceprobedata_each_record(VALUE self)
 	  v = INT2FIX(*((int32_t *)addr));
 	  break;
 	case 8:
-	  v = INT2FIX(*((int64_t *)addr));
+	  v = LL2NUM(*((int64_t *)addr));
 	  break;
 	default:
 	  v = handle_bytedata(addr, rec->dtrd_size);
@@ -255,7 +255,7 @@ VALUE dtraceprobedata_each_record(VALUE self)
       }
 	
       if (v) {
-	dtracerecord = rb_class_new_instance(0, NULL, rb_path2class("DtraceRecord"));
+	dtracerecord = rb_class_new_instance(0, NULL, rb_path2class("Dtrace::Record"));
 	rb_iv_set(dtracerecord, "@value", v);
 	rb_iv_set(dtracerecord, "@from", rb_str_new2("probedata"));
 	rb_iv_set(dtracerecord, "@index", INT2FIX(i));

data/ext/{dtrace_probe.c → dtrace_probedesc.c}

@@ -5,7 +5,7 @@
 #include "dtrace_api.h"
 
 /* :nodoc: */
-VALUE dtraceprobe_init(VALUE self)
+VALUE dtraceprobedesc_init(VALUE self)
 {
   dtrace_probedesc_t *pdp;
 
@@ -14,10 +14,10 @@ VALUE dtraceprobe_init(VALUE self)
 }
 
 /*
- * Returns the id of the probe. Corresponds to the ID displayed by
+ * Returns the id of the probedesc. Corresponds to the ID displayed by
  * dtrace -l
  */
-VALUE dtraceprobe_probe_id(VALUE self)
+VALUE dtraceprobedesc_probe_id(VALUE self)
 {
   dtrace_probedesc_t *pdp;
 
@@ -28,7 +28,7 @@ VALUE dtraceprobe_probe_id(VALUE self)
 /*
  * Returns the name of the probe's provider.
  */
-VALUE dtraceprobe_provider(VALUE self)
+VALUE dtraceprobedesc_provider(VALUE self)
 {
   VALUE string;
   dtrace_probedesc_t *pdp;
@@ -41,7 +41,7 @@ VALUE dtraceprobe_provider(VALUE self)
 /*
  * Returns the name of the module where the probe is defined.
  */
-VALUE dtraceprobe_mod(VALUE self)
+VALUE dtraceprobedesc_mod(VALUE self)
 {
   VALUE string;
   dtrace_probedesc_t *pdp;
@@ -54,7 +54,7 @@ VALUE dtraceprobe_mod(VALUE self)
 /*
  * Returns the name of the function where the probe is defined.
  */
-VALUE dtraceprobe_func(VALUE self)
+VALUE dtraceprobedesc_func(VALUE self)
 {
   VALUE string;
   dtrace_probedesc_t *pdp;
@@ -67,7 +67,7 @@ VALUE dtraceprobe_func(VALUE self)
 /*
  * Returns the name of the probe.
  */
-VALUE dtraceprobe_name(VALUE self)
+VALUE dtraceprobedesc_name(VALUE self)
 {
   VALUE string;
   dtrace_probedesc_t *pdp;

data/ext/extconf.rb

@@ -1,4 +1,29 @@
 require 'mkmf'
+require 'rbconfig'
+
+def symlink(old, new)
+  begin
+    File.symlink(old, new)
+  rescue Errno::EEXIST
+    File.unlink(new)
+    retry
+  end
+end
+
 $CFLAGS += " -D_LONGLONG_TYPE -g"
 have_library("dtrace", "dtrace_open")
+
+# Update machine-dependent symlinks in the source, based on $Config::CONFIG and `uname -p`
+os  = Config::CONFIG['target_os']
+os.gsub!  /[0-9.]+$/, ''
+
+# On OSX, this is "powerpc", even on Intel...
+#cpu = Config::CONFIG['target_cpu']
+cpu = `uname -p`.chomp
+
+dir = "#{cpu}-#{os}"
+symlink "#{dir}/dtrace_probe.c", "dtrace_probe.c"
+
+# Create makefile in the usual way
 create_makefile("dtrace_api")
+