ruby-usdt 0.0.4 → 0.1.0

data/README.md

@@ -5,13 +5,18 @@ Native DTrace probes for ruby apps
 Ruby bindings for [libusdt](https://github.com/chrisa/libusdt).
 
 Applications, Libraries, and Frameworks can consume ruby-usdt to define USDT  
-providers at runtime for instrumentation and analysis by the DTrace
+providers at runtime for instrumentation and analysis by the 
 [DTrace](http://en.wikipedia.org/wiki/DTrace) framework.
 
 ### Install
 
     gem install ruby-usdt
 
+When using Bundler to integrate ruby-usdt into a Ruby or Rails project,
+you will need to specify that there are git submodule dependencies:
+
+    gem "ruby-usdt", :submodules => true
+
 ### Usage
 
     # Provider.create <provider>, <module>
@@ -33,7 +38,7 @@ providers at runtime for instrumentation and analysis by the DTrace
     provider.enable
 
     while true
-      if p.enabled
+      if p.enabled?
         p.fire("omg", "probe!!", 12345)
       end
       sleep 0.5
@@ -46,7 +51,7 @@ providers at runtime for instrumentation and analysis by the DTrace
       copyinstr(arg1),
       args[2])
     }'
-    
+
 ## Additional Resources
 
 - [User-Level-Statically Defined Tracing](http://www.solarisinternals.com/wiki/index.php/DTrace_Topics_USDT#USDT)

data/ext/usdt/usdt.c

@@ -8,7 +8,9 @@ VALUE USDT_Error;
 
 static VALUE provider_create(VALUE self, VALUE name, VALUE mod);
 static VALUE provider_probe(int argc, VALUE *argv, VALUE self);
+static VALUE provider_remove_probe(VALUE self, VALUE probe);
 static VALUE provider_enable(VALUE self);
+static VALUE provider_disable(VALUE self);
 static VALUE probe_enabled(VALUE self);
 static VALUE probe_fire(int argc, VALUE *argv, VALUE self);
 
@@ -20,7 +22,9 @@ void Init_usdt() {
   USDT_Provider = rb_define_class_under(USDT, "Provider", rb_cObject);
   rb_define_singleton_method(USDT_Provider, "create", provider_create, 2);
   rb_define_method(USDT_Provider, "probe", provider_probe, -1);
+  rb_define_method(USDT_Provider, "remove_probe", provider_remove_probe, 1);
   rb_define_method(USDT_Provider, "enable", provider_enable, 0);
+  rb_define_method(USDT_Provider, "disable", provider_disable, 0);
 
   USDT_Probe = rb_define_class_under(USDT, "Probe", rb_cObject);
   rb_define_method(USDT_Probe, "enabled?", probe_enabled, 0);
@@ -54,12 +58,12 @@ static VALUE provider_create(VALUE self, VALUE name, VALUE mod) {
 static VALUE provider_probe(int argc, VALUE *argv, VALUE self) {
   const char *func = rb_id2name(rb_to_id(argv[0]));
   const char *name = rb_id2name(rb_to_id(argv[1]));
-  const char *types[6];
+  const char *types[USDT_ARG_MAX];
   size_t i, pargc = 0;
   size_t t_int = rb_intern("integer");
   size_t t_str = rb_intern("string");
 
-  for (i = 0; i < 6; i++) {
+  for (i = 0; i < USDT_ARG_MAX; i++) {
     if (i < argc - 2) {
       Check_Type(argv[i+2], T_SYMBOL);
       if (t_int == rb_to_id(argv[i+2])) {
@@ -82,9 +86,26 @@ static VALUE provider_probe(int argc, VALUE *argv, VALUE self) {
   probe = ALLOC(usdt_probedef_t *);
   *probe = usdt_create_probe(func, name, pargc, types);
 
-  usdt_provider_add_probe(provider, *probe);
-  VALUE rbProbe = Data_Wrap_Struct(USDT_Probe, NULL, free, probe);
-  return rbProbe;
+  if ((usdt_provider_add_probe(provider, *probe) == 0)) {
+    VALUE rbProbe = Data_Wrap_Struct(USDT_Probe, NULL, free, probe);
+    return rbProbe;
+  }
+  else {
+    rb_raise(USDT_Error, "%s", usdt_errstr(provider));
+  }
+}
+
+/**
+ * USDT::Provider#remove_probe(probe)
+ */
+static VALUE provider_remove_probe(VALUE self, VALUE probe) {
+  usdt_provider_t *provider = DATA_PTR(self);
+  usdt_probedef_t **p = DATA_PTR(probe);
+  usdt_probedef_t *probedef = *p;
+
+  usdt_provider_remove_probe(provider, probedef);
+
+  return Qtrue;
 }
 
 /**
@@ -100,6 +121,19 @@ static VALUE provider_enable(VALUE self) {
   }
 }
 
+/**
+ * USDT::Provider#disable
+ */
+static VALUE provider_disable(VALUE self) {
+  usdt_provider_t *provider = DATA_PTR(self);
+  int status = usdt_provider_disable(provider);
+  if (status == 0) {
+    return Qtrue;
+  } else {
+    rb_raise(USDT_Error, "%s", usdt_errstr(provider));
+  }
+}
+
 /**
  * USDT::Probe#enabled?
  */
@@ -125,8 +159,8 @@ static VALUE probe_fire(int argc, VALUE *argv, VALUE self) {
   usdt_probedef_t **p = DATA_PTR(self);
   usdt_probedef_t *probedef = *p;
 
-  void *pargs[6];
-  int i;
+  void *pargs[USDT_ARG_MAX];
+  size_t i;
 
   for (i = 0; i < probedef->argc; i++) {
     if (probedef->types[i] == USDT_ARGTYPE_STRING) {

data/lib/usdt/version.rb

@@ -1,3 +1,3 @@
 module USDT
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-usdt
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: