ruby-usdt 0.0.3 → 0.0.4

data/ext/libusdt/LICENCE

@@ -0,0 +1,21 @@
+Copyright 2012 Chris Andrews. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY CHRIS ANDREWS ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CHRIS ANDREWS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/ext/libusdt/{README → README.md}

@@ -1,3 +1,6 @@
+libusdt
+=======
+
 This is "libusdt", an extraction into a C library of the common parts
 of ruby-dtrace[1], perl-dtrace[2] and node-dtrace-provider[3].
 
@@ -19,7 +22,8 @@ the provider and indicating these stub functions as the tracepoints,
 then submitted to the kernel, creating the provider. The API then
 exposes the stubs, through which the probes may be fired.
 
-Status:
+Status
+------
 
 The implementation here works as shown in test_usdt.c on Mac OS X,
 i386 and x86_64, on Solaris-like systems, i386 and x86_64 and on
@@ -40,7 +44,22 @@ first four arguments work reliably. See:
 
   http://wiki.freebsd.org/DTraceTODO
 
-To do:
+See Also
+--------
+
+There are experimental Lua bindings available, which are a thin
+layer over this library, and should serve as an example of typical use
+as a dynamic language extension:
+
+  https://github.com/chrisa/lua-usdt
+
+There are also Ruby bindings by Kevin Chan, replacing the provider
+implementation in ruby-dtrace:
+
+  https://github.com/kevinykchan/ruby-usdt
+
+To Do
+-----
 
 Platform support:
 
@@ -53,7 +72,10 @@ Features:
  * add a "low level" API, allowing alternative provision of
    tracepoints for closer integration with language VMs. 
 
+ * support structured types, with close integration with the host
+   DTrace system.
+
+
 [1] https://github.com/chrisa/ruby-dtrace
 [2] https://github.com/chrisa/perl-dtrace
 [3] https://github.com/chrisa/node-dtrace-provider
-

data/ext/libusdt/test.pl

@@ -6,26 +6,36 @@ use Symbol 'gensym';
 use IO::Handle;
 use Test::More qw/ no_plan /;
 
+my $USDT_ARG_MAX = 32;
+
 my $arch;
 if (scalar @ARGV == 1) {
     $arch = $ARGV[0];
 }
 
-run_tests('c', 'a');
+my $user_t = ($^O eq 'solaris') ? 'uintptr_t' : 'user_addr_t';
+
+run_tests('c', 'A');
 run_tests('i', 1);
 
 sub run_tests {
     my ($type, $start_arg) = @_;
     
-    for my $i (0..6) {
-        my ($status, $output) = run_dtrace('func', 'name', split(//, $type x $i));
-        is($status, 0, 'dtrace exit status is 0');
+    for my $i (0..$USDT_ARG_MAX) {
+        my ($t_status, $d_status, $output) = run_dtrace('func', 'name', split(//, $type x $i));
+        is($t_status, 0, 'test exit status is 0');
+        is($d_status, 0, 'dtrace exit status is 0');
         like($output, qr/func:name/, 'function and name match');
-        
+
         my $arg = $start_arg;
         for my $j (0..$i - 1) {
-            like($output, qr/arg$j:'$arg'/, "type '$type' arg $j is $arg");
-            $arg++;
+            like($output, qr/arg$j:'\Q$arg\E'/, "type '$type' arg $j is $arg");
+            if ($type eq 'i') {
+                $arg++;
+            }
+            else {
+                $arg = chr(ord($arg) + 1);
+            }
         }
     }
 }
@@ -39,10 +49,10 @@ sub gen_d {
     my $i = 0;
     for my $type (@types) {
         if ($type eq 'i') {
-            $d .= "printf(\"arg$i:'%i' \", arg$i); ";
+            $d .= "printf(\"arg$i:'%i' \", args[$i]); ";
         }
         if ($type eq 'c') {
-            $d .= "printf(\"arg$i:'%s' \", copyinstr(arg$i)); ";
+            $d .= "printf(\"arg$i:'%s' \", copyinstr(($user_t)args[$i])); ";
         }
         $i++;
     }
@@ -55,29 +65,48 @@ sub run_dtrace {
     my ($func, $name, @types) = @_;
     my $d = gen_d(@types);
 
-    my $test;
+    my @t_cmd;
     if (defined $arch) {
-        $test = "./test_usdt$arch $func $name " . (join ' ', @types);
+        @t_cmd = ("./test_usdt$arch", $func, $name, @types);
     }
     else {
-        $test = "./test_usdt $func $name " . (join ' ', @types);
+        @t_cmd = ("./test_usdt", $func, $name, @types);
     }
 
-    my @cmd = ('dtrace', '-Zn', $d, '-c', $test);
+    my ($d_wtr, $d_rdr, $d_err);
+    my ($t_wtr, $t_rdr, $t_err);
 
-    my ($wtr, $rdr, $err);
-    $err = gensym;
-    my $pid = open3($wtr, $rdr, $err, @cmd);
+    $d_err = gensym;
+    $t_err = gensym;
 
-    waitpid( $pid, 0 );
-    my $status = $? >> 8;
+    #diag(join(' ', @t_cmd));
+    my $t_pid = open3($t_wtr, $t_rdr, $t_err, @t_cmd);
+    my $enabled = $t_rdr->getline;
 
-    if ($status > 0) {
-        while (!$err->eof) {
-            print STDERR $err->getline;
-        }
+    my @d_cmd = ('dtrace', '-p', $t_pid, '-n', $d);
+
+    #diag(join(' ', @d_cmd));
+    my $d_pid = open3($d_wtr, $d_rdr, $d_err, @d_cmd);
+    my $matched = $d_err->getline; # expect "matched 1 probe"
+
+    $t_wtr->print("go\n");
+    $t_wtr->flush;
+    waitpid( $t_pid, 0 );
+    my $t_status = $? >> 8;
+
+    my ($header, $output) = ($d_rdr->getline, $d_rdr->getline);
+    chomp $header;
+    chomp $output;
+    #diag("DTrace header: $header\n");
+    #diag("DTrace output: $output\n");
+    waitpid( $d_pid, 0 );
+
+    my $d_status = $? >> 8;
+    while (!$d_err->eof) {
+        my $error = $d_err->getline;
+        chomp $error;
+        #diag "DTrace error: $error";
     }
 
-    my ($header, $output) = ($rdr->getline, $rdr->getline);
-    return ($status, $output || '');
+    return ($t_status, $d_status, $output || '');
 }

data/ext/libusdt/test_usdt.c

@@ -1,16 +1,34 @@
+/*
+ * Copyright (c) 2012, Chris Andrews. All rights reserved.
+ */
+
 #include "usdt.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
+static void
+fire_probe(usdt_probedef_t *probedef, int argc, void **argv)
+{
+        if (usdt_is_enabled(probedef->probe)) {
+                usdt_fire_probe(probedef->probe, argc, argv);
+        }
+}
+
 int main(int argc, char **argv) {
         usdt_provider_t *provider;
         usdt_probedef_t *probedef;
-        char *char_argv[6] = { "a", "b", "c", "d", "e", "f" };
-        int int_argv[6] = { 1, 2, 3, 4, 5, 6 };
+        char char_argv[USDT_ARG_MAX];
+        int int_argv[USDT_ARG_MAX * 2];
         void **args;
         int i;
+        char buf[255];
+
+        for (i = 0; i < USDT_ARG_MAX; i++)
+                int_argv[i] = i + 1;
+        for (i = 0; i < USDT_ARG_MAX; i++)
+                char_argv[i] = (char) i + 65;
 
         if (argc < 3) {
                 fprintf(stderr, "usage: %s func name [types ...]\n", argv[0]);
@@ -21,10 +39,10 @@ int main(int argc, char **argv) {
                 args = malloc((argc-3) * sizeof(void *));
         }
 
-        for (i = 0; i < 6; i++) {
+        for (i = 0; i < USDT_ARG_MAX; i++) {
                 if (argv[i+3] != NULL && i+3 < argc) {
                         if (strncmp("c", argv[i+3], 1) == 0) {
-                                args[i] = (void *)char_argv[i];
+                                args[i] = (void *)strndup(&char_argv[i], 1);
                                 argv[i+3] = strdup("char *");
                         }
                         if (strncmp("i", argv[i+3], 1) == 0) {
@@ -52,9 +70,11 @@ int main(int argc, char **argv) {
                 exit (1);
         }
 
-        if (usdt_is_enabled(probedef->probe)) {
-                usdt_fire_probe(probedef->probe, (argc-3), (void **)args);
-        }
+        fprintf(stdout, "enabled\n");
+        fflush(stdout);
+        fgets(buf, 255, stdin);
+
+        fire_probe(probedef, (argc-3), (void **)args);
 
         return 0;
 }

data/ext/libusdt/usdt.c

@@ -1,13 +1,21 @@
+/*
+ * Copyright (c) 2012, Chris Andrews. All rights reserved.
+ */
+
 #include "usdt_internal.h"
 
 #include <stdlib.h>
 #include <stdarg.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
 
 char *usdt_errors[] = {
   "failed to allocate memory",
   "failed to allocate page-aligned memory",
   "no probes defined",
-  "failed to load DOF"
+  "failed to load DOF: %s",
+  "provider is already enabled"
 };
 
 usdt_provider_t *
@@ -21,66 +29,33 @@ usdt_create_provider(const char *name, const char *module)
         provider->name = strdup(name);
         provider->module = strdup(module);
         provider->probedefs = NULL;
+        provider->enabled = 0;
 
         return provider;
 }
 
-usdt_probedef_t *
-usdt_create_probe_varargs(const char *func, const char *name, ...)
-{
-        va_list ap;
-        int i;
-        const char *type;
-        usdt_probedef_t *p;
-
-        if ((p = malloc(sizeof *p)) == NULL)
-                return (NULL);
-
-        p->function = strdup(func);
-        p->name = strdup(name);
-
-        va_start(ap, name);
-
-        for (i = 0; i < 6; i++) {
-                if ((type = va_arg(ap, const char *)) != NULL) {
-                        if (strncmp("char *", type, 6)) {
-                                p->types[i] = USDT_ARGTYPE_STRING;
-                        }
-                        if (strncmp("int", type, 3)) {
-                                p->types[i] = USDT_ARGTYPE_INTEGER;
-                        }
-                }
-                else {
-                        p->types[i] = USDT_ARGTYPE_NONE;
-                }
-        }
-
-        return (p);
-}
-
 usdt_probedef_t *
 usdt_create_probe(const char *func, const char *name, size_t argc, const char **types)
 {
         int i;
         usdt_probedef_t *p;
 
+        if (argc > USDT_ARG_MAX)
+                argc = USDT_ARG_MAX;
+
         if ((p = malloc(sizeof *p)) == NULL)
                 return (NULL);
 
         p->function = strdup(func);
         p->name = strdup(name);
         p->argc = argc;
+        p->probe = NULL;
 
-        for (i = 0; i < 6; i++) {
-                if (i < argc && types[i] != NULL) {
-                        if (strncmp("char *", types[i], 6) == 0)
-                                p->types[i] = USDT_ARGTYPE_STRING;
-                        if (strncmp("int", types[i], 3) == 0)
-                                p->types[i] = USDT_ARGTYPE_INTEGER;
-                }
-                else {
-                        p->types[i] = USDT_ARGTYPE_NONE;
-                }
+        for (i = 0; i < argc; i++) {
+                if (strncmp("char *", types[i], 6) == 0)
+                        p->types[i] = USDT_ARGTYPE_STRING;
+                if (strncmp("int", types[i], 3) == 0)
+                        p->types[i] = USDT_ARGTYPE_INTEGER;
         }
 
         return (p);
@@ -100,18 +75,6 @@ usdt_provider_add_probe(usdt_provider_t *provider, usdt_probedef_t *probedef)
         }
 }
 
-uint8_t
-usdt_probedef_argc(usdt_probedef_t *probedef)
-{
-        uint8_t args = 0;
-        uint8_t i;
-
-        for (i = 0; probedef->types[i] != USDT_ARGTYPE_NONE && i < 6; i++)
-                args++;
-
-        return args;
-}
-
 int
 usdt_provider_enable(usdt_provider_t *provider)
 {
@@ -122,6 +85,11 @@ usdt_provider_enable(usdt_provider_t *provider)
         size_t size;
         usdt_dof_section_t sects[5];
 
+        if (provider->enabled == 1) {
+                usdt_error(provider, USDT_ERROR_ALREADYENABLED);
+                return (0); // not fatal
+        }
+
         if (provider->probedefs == NULL) {
                 usdt_error(provider, USDT_ERROR_NOPROBES);
                 return (-1);
@@ -166,29 +134,44 @@ usdt_provider_enable(usdt_provider_t *provider)
         usdt_dof_file_generate(file, &strtab);
 
         if ((usdt_dof_file_load(file, provider->module)) < 0) {
-                usdt_error(provider, USDT_ERROR_LOADDOF);
+                usdt_error(provider, USDT_ERROR_LOADDOF, strerror(errno));
                 return (-1);
         }
 
+        provider->enabled = 1;
         return (0);
 }
 
 int
 usdt_is_enabled(usdt_probe_t *probe)
 {
-        return (*probe->isenabled_addr)();
+        if (probe != NULL)
+                return (*probe->isenabled_addr)();
+        else
+                return 0;
 }
 
 void
 usdt_fire_probe(usdt_probe_t *probe, size_t argc, void **nargv)
 {
-        usdt_probe_args(probe->probe_addr, argc, nargv);
+        if (probe != NULL)
+                usdt_probe_args(probe->probe_addr, argc, nargv);
+}
+
+static void
+usdt_verror(usdt_provider_t *provider, usdt_error_t error, va_list argp)
+{
+        vasprintf(&provider->error, usdt_errors[error], argp);
 }
 
 void
-usdt_error(usdt_provider_t *provider, usdt_error_t error)
+usdt_error(usdt_provider_t *provider, usdt_error_t error, ...)
 {
-        provider->error = usdt_errors[error];
+        va_list argp;
+
+        va_start(argp, error);
+        usdt_verror(provider, error, argp);
+        va_end(argp);
 }
 
 char *

data/ext/libusdt/usdt.h

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2012, Chris Andrews. All rights reserved.
+ */
+
 #include <stdint.h>
 #include <unistd.h>
 
@@ -6,11 +10,14 @@ typedef uint8_t usdt_argtype_t;
 #define USDT_ARGTYPE_STRING  1
 #define USDT_ARGTYPE_INTEGER 2
 
+#define USDT_ARG_MAX 32
+
 typedef enum usdt_error {
         USDT_ERROR_MALLOC = 0,
         USDT_ERROR_VALLOC,
         USDT_ERROR_NOPROBES,
-        USDT_ERROR_LOADDOF
+        USDT_ERROR_LOADDOF,
+        USDT_ERROR_ALREADYENABLED
 } usdt_error_t;
 
 typedef struct usdt_probe {
@@ -25,12 +32,11 @@ typedef struct usdt_probedef {
         const char *name;
         const char *function;
         size_t argc;
-        usdt_argtype_t types[6];
+        usdt_argtype_t types[USDT_ARG_MAX];
         struct usdt_probe *probe;
         struct usdt_probedef *next;
 } usdt_probedef_t;
 
-usdt_probedef_t *usdt_create_probe_varargs(const char *func, const char *name, ...);
 usdt_probedef_t *usdt_create_probe(const char *func, const char *name,
                                    size_t argc, const char **types);
 
@@ -39,12 +45,13 @@ typedef struct usdt_provider {
         const char *module;
         usdt_probedef_t *probedefs;
         char *error;
+        int enabled;
 } usdt_provider_t;
 
 usdt_provider_t *usdt_create_provider(const char *name, const char *module);
 void usdt_provider_add_probe(usdt_provider_t *provider, usdt_probedef_t *probedef);
 int usdt_provider_enable(usdt_provider_t *provider);
 
-void usdt_error(usdt_provider_t *provider, usdt_error_t error);
+void usdt_error(usdt_provider_t *provider, usdt_error_t error, ...);
 char *usdt_errstr(usdt_provider_t *provider);
 

data/ext/libusdt/usdt_dof.c

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2012, Chris Andrews. All rights reserved.
+ */
+
 #include "usdt_internal.h"
 
 #include <stdlib.h>
@@ -26,7 +30,7 @@ usdt_provider_dof_size(usdt_provider_t *provider, usdt_strtab_t *strtab)
         size_t sections[8];
 
         for (pd = provider->probedefs; pd != NULL; pd = pd->next) {
-                args += usdt_probedef_argc(pd);
+                args += pd->argc;
                 probes++;
         }
 

data/ext/libusdt/usdt_dof_file.c

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2012, Chris Andrews. All rights reserved.
+ */
+
 #include "usdt_internal.h"
 
 #include <stdio.h>
@@ -154,6 +158,9 @@ usdt_dof_file_load(usdt_dof_file_t *file, const char *module)
         if ((close(fd)) < 0)
                 return (-1);
 
+        if (file->gen < 0)
+                return (-1);
+
         return (0);
 }
 

data/ext/libusdt/usdt_dof_sections.c

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2012, Chris Andrews. All rights reserved.
+ */
+
 #include "usdt_internal.h"
 
 int
@@ -17,7 +21,7 @@ usdt_dof_probes_sect(usdt_dof_section_t *probes,
                 argc = 0;
                 argv = 0;
 
-                for (i = 0; pd->types[i] != USDT_ARGTYPE_NONE && i < 6; i++) {
+                for (i = 0; i < pd->argc; i++) {
                         switch(pd->types[i]) {
                         case USDT_ARGTYPE_INTEGER:
                                 type = usdt_strtab_add(strtab, "int");
@@ -78,7 +82,7 @@ usdt_dof_prargs_sect(usdt_dof_section_t *prargs, usdt_provider_t *provider)
         prargs->entsize = 1;
 
         for (pd = provider->probedefs; pd != NULL; pd = pd->next) {
-                for (i = 0; pd->types[i] != USDT_ARGTYPE_NONE && i < 6; i++)
+                for (i = 0; i < pd->argc; i++)
                         usdt_dof_section_add_data(prargs, &i, 1);
         }
         if (prargs->size == 0) {
@@ -103,7 +107,7 @@ usdt_dof_proffs_sect(usdt_dof_section_t *proffs,
         proffs->entsize = 4;
 
         for (pd = provider->probedefs; pd != NULL; pd = pd->next) {
-                off = usdt_probe_offset(pd->probe, dof, usdt_probedef_argc(pd));
+                off = usdt_probe_offset(pd->probe, dof, pd->argc);
                 if (usdt_dof_section_add_data(proffs, &off, 4) < 0) {
                         usdt_error(provider, USDT_ERROR_MALLOC);
                         return (-1);
@@ -147,21 +151,32 @@ usdt_dof_provider_sect(usdt_dof_section_t *provider_s, usdt_provider_t *provider
         p.dofpv_proffs   = 3;
         p.dofpv_prenoffs = 4;
         p.dofpv_name     = 1; // provider name always first strtab entry.
-        p.dofpv_provattr = DOF_ATTR(DTRACE_STABILITY_EVOLVING,
-                                    DTRACE_STABILITY_EVOLVING,
-                                    DTRACE_STABILITY_EVOLVING);
-        p.dofpv_modattr  = DOF_ATTR(DTRACE_STABILITY_PRIVATE,
-                                    DTRACE_STABILITY_PRIVATE,
-                                    DTRACE_STABILITY_EVOLVING);
-        p.dofpv_funcattr = DOF_ATTR(DTRACE_STABILITY_PRIVATE,
-                                    DTRACE_STABILITY_PRIVATE,
-                                    DTRACE_STABILITY_EVOLVING);
-        p.dofpv_nameattr = DOF_ATTR(DTRACE_STABILITY_EVOLVING,
-                                    DTRACE_STABILITY_EVOLVING,
-                                    DTRACE_STABILITY_EVOLVING);
-        p.dofpv_argsattr = DOF_ATTR(DTRACE_STABILITY_EVOLVING,
-                                    DTRACE_STABILITY_EVOLVING,
-                                    DTRACE_STABILITY_EVOLVING);
+
+        /*
+         * Stability is something of a hack. Everything is marked *
+         * "stable" here to permit use of the "args" array, which is *
+         * needed to access arguments past "arg9".
+         *
+         * It should be up to the creator of the provider to decide
+         * this, though, and it should be possible to set the
+         * appropriate stability at creation time.
+         */
+
+        p.dofpv_provattr = DOF_ATTR(DTRACE_STABILITY_STABLE,
+                                    DTRACE_STABILITY_STABLE,
+                                    DTRACE_STABILITY_STABLE);
+        p.dofpv_modattr  = DOF_ATTR(DTRACE_STABILITY_STABLE,
+                                    DTRACE_STABILITY_STABLE,
+                                    DTRACE_STABILITY_STABLE);
+        p.dofpv_funcattr = DOF_ATTR(DTRACE_STABILITY_STABLE,
+                                    DTRACE_STABILITY_STABLE,
+                                    DTRACE_STABILITY_STABLE);
+        p.dofpv_nameattr = DOF_ATTR(DTRACE_STABILITY_STABLE,
+                                    DTRACE_STABILITY_STABLE,
+                                    DTRACE_STABILITY_STABLE);
+        p.dofpv_argsattr = DOF_ATTR(DTRACE_STABILITY_STABLE,
+                                    DTRACE_STABILITY_STABLE,
+                                    DTRACE_STABILITY_STABLE);
 
         if ((usdt_dof_section_add_data(provider_s, &p, sizeof(p))) < 0) {
                 usdt_error(provider, USDT_ERROR_MALLOC);

data/ext/libusdt/usdt_internal.h

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2012, Chris Andrews. All rights reserved.
+ */
+
 #include <sys/dtrace.h>
 #include <sys/types.h>
 #include <sys/mman.h>
@@ -23,20 +27,10 @@ extern void usdt_tracepoint_probe(void);
 extern void usdt_tracepoint_end(void);
 extern void usdt_probe_args(void *, int, void**);
 
-/*
-  typedef enum usdt_argtype {
-  USDT_ARGTYPE_NONE = 0,
-  USDT_ARGTYPE_STRING,
-  USDT_ARGTYPE_INTEGER
-  } usdt_argtype_t;
-*/
-
 uint32_t usdt_probe_offset(usdt_probe_t *probe, char *dof, uint8_t argc);
 uint32_t usdt_is_enabled_offset(usdt_probe_t *probe, char *dof);
 int usdt_create_tracepoints(usdt_probe_t *probe);
 
-uint8_t usdt_probedef_argc(usdt_probedef_t *probedef);
-
 typedef struct usdt_dof_section {
         dof_secidx_t index;
         uint32_t type;

data/ext/libusdt/usdt_probe.c

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2012, Chris Andrews. All rights reserved.
+ */
+
 #include "usdt_internal.h"
 
 #ifdef __APPLE__

data/ext/libusdt/usdt_tracepoints_i386.s

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2012, Chris Andrews. All rights reserved.
+ */
+
 /*
  * Stub functions containing DTrace tracepoints for probes and
  * is-enabled probes. These functions are copied for each probe
@@ -39,7 +43,7 @@ usdt_tracepoint_end:
 _usdt_tracepoint_end:
         ret
 
- /*
+/*
  * Probe argument marshalling, i386 style
  *
  */

data/ext/libusdt/usdt_tracepoints_x86_64.s

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2012, Chris Andrews. All rights reserved.
+ */
+
 /*
  * Stub functions containing DTrace tracepoints for probes and
  * is-enabled probes. These functions are copied for each probe
@@ -32,10 +36,11 @@ _usdt_tracepoint_probe:
         nop
         nop
         nop
-        popq %r11
-        popq %rbx
-        popq %r12
-        addq $0x18,%rsp
+        addq	%r14,%rsp
+        popq    %rbx
+        popq    %r14
+        popq    %r13
+        popq    %r12
         leave
 usdt_tracepoint_end:
 _usdt_tracepoint_end:
@@ -50,34 +55,68 @@ usdt_probe_args:
 _usdt_probe_args:
         pushq   %rbp
         movq    %rsp,%rbp
-        subq    $0x18,%rsp
         pushq   %r12
+        pushq   %r13
+        pushq   %r14
         pushq   %rbx
-        pushq   %r11
+
         movq    %rdi,%r12
         movq    %rsi,%rbx
         movq    %rdx,%r11
+        movq    $0,%r14
+
         test    %rbx,%rbx
         je      fire
         movq    (%r11),%rdi
         dec     %rbx
         test    %rbx,%rbx
         je      fire
-        movq    8(%r11),%rsi
+        addq    $8,%r11
+        movq    (%r11),%rsi
         dec     %rbx
         test    %rbx,%rbx
         je      fire
-        movq    16(%r11),%rdx
+        addq    $8,%r11
+        movq    (%r11),%rdx
         dec     %rbx
         test    %rbx,%rbx
         je      fire
-        movq    24(%r11),%rcx
+        addq    $8,%r11
+        movq    (%r11),%rcx
         dec     %rbx
         test    %rbx,%rbx
         je      fire
-        movq    32(%r11),%r8
+        addq    $8,%r11
+        movq    (%r11),%r8
         dec     %rbx
         test    %rbx,%rbx
         je      fire
-        movq    40(%r11),%r9
+        addq    $8,%r11
+        movq    (%r11),%r9
+
+        movq    %rbx,%r13
+morestack:
+        dec     %rbx
+        test    %rbx,%rbx
+        je      args
+        subq    $16,%rsp
+        addq    $16,%r14
+        dec     %rbx
+        test    %rbx,%rbx
+        je      args
+        jmp     morestack
+
+args:
+        movq    %r13,%rbx
+        movq    $0,%r13
+moreargs:
+        dec     %rbx
+        test    %rbx,%rbx
+        je      fire
+        addq    $8,%r11
+        movq    (%r11),%rax
+        movq    %rax,(%rsp,%r13)
+        addq    $8,%r13
+        jmp     moreargs
+
 fire:   jmp     *%r12

data/ext/usdt/Makefile

@@ -1,20 +1,30 @@
 
 SHELL = /bin/sh
 
+# V=0 quiet, V=1 verbose.  other values don't work.
+V = 0
+Q1 = $(V:1=)
+Q = $(Q1:0=@)
+n=$(NULLCMD)
+ECHO1 = $(V:1=@$n)
+ECHO = $(ECHO1:0=@echo)
+
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /Users/kevin/.rvm/rubies/ruby-1.9.1-p378/include/ruby-1.9.1
-hdrdir = /Users/kevin/.rvm/rubies/ruby-1.9.1-p378/include/ruby-1.9.1
-arch_hdrdir = /Users/kevin/.rvm/rubies/ruby-1.9.1-p378/include/ruby-1.9.1/$(arch)
+topdir = /Users/kevin/.rvm/rubies/ruby-1.9.3-p125/include/ruby-1.9.1
+hdrdir = /Users/kevin/.rvm/rubies/ruby-1.9.3-p125/include/ruby-1.9.1
+arch_hdrdir = /Users/kevin/.rvm/rubies/ruby-1.9.3-p125/include/ruby-1.9.1/$(arch)
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/Users/kevin/.rvm/rubies/ruby-1.9.1-p378
+prefix = $(DESTDIR)/Users/kevin/.rvm/rubies/ruby-1.9.3-p125
+rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)
 exec_prefix = $(prefix)
 vendorhdrdir = $(rubyhdrdir)/vendor_ruby
 sitehdrdir = $(rubyhdrdir)/site_ruby
-rubyhdrdir = $(includedir)/$(RUBY_INSTALL_NAME)-$(ruby_version)
-vendordir = $(libdir)/$(RUBY_INSTALL_NAME)/vendor_ruby
-sitedir = $(libdir)/$(RUBY_INSTALL_NAME)/site_ruby
+rubyhdrdir = $(includedir)/$(RUBY_BASE_NAME)-$(ruby_version)
+vendordir = $(rubylibprefix)/vendor_ruby
+sitedir = $(rubylibprefix)/site_ruby
+ridir = $(datarootdir)/$(RI_BASE_NAME)
 mandir = $(datarootdir)/man
 localedir = $(datarootdir)/locale
 libdir = $(exec_prefix)/lib
@@ -34,16 +44,18 @@ datarootdir = $(prefix)/share
 libexecdir = $(exec_prefix)/libexec
 sbindir = $(exec_prefix)/sbin
 bindir = $(exec_prefix)/bin
-rubylibdir = $(libdir)/$(ruby_install_name)/$(ruby_version)
+rubylibdir = $(rubylibprefix)/$(ruby_version)
 archdir = $(rubylibdir)/$(arch)
 sitelibdir = $(sitedir)/$(ruby_version)
 sitearchdir = $(sitelibdir)/$(sitearch)
 vendorlibdir = $(vendordir)/$(ruby_version)
 vendorarchdir = $(vendorlibdir)/$(sitearch)
 
-CC = gcc
-CXX = g++
-LIBRUBY = $(LIBRUBY_A)
+NULLCMD = :
+
+CC = /usr/bin/gcc-4.2
+CXX = g++-4.2
+LIBRUBY = $(LIBRUBY_SO)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
@@ -51,34 +63,35 @@ OUTFLAG = -o
 COUTFLAG = -o 
 
 RUBY_EXTCONF_H = 
-cflags   = $(optflags) $(debugflags) $(warnflags)
-optflags = -O2
-debugflags = -g
-warnflags = -Wall -Wno-parentheses
-CFLAGS   =  -fno-common  $(cflags) -pipe -fno-common 
+cflags   =  $(optflags) $(debugflags) $(warnflags)
+optflags = -O3
+debugflags = -ggdb
+warnflags = -Wextra -Wno-unused-parameter -Wno-parentheses -Wno-long-long -Wno-missing-field-initializers -Wpointer-arith -Wwrite-strings -Wdeclaration-after-statement -Wshorten-64-to-32 -Wimplicit-function-declaration
+CFLAGS   = -fno-common $(cflags)  -fno-common -pipe $(ARCH_FLAG)
 INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir)/ruby/backward -I$(hdrdir) -I$(srcdir)
 DEFS     = 
-CPPFLAGS = -DHAVE_USDT_H  -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
-CXXFLAGS = $(CFLAGS)  $(cxxflags)
-ldflags  = -L. 
-dldflags = 
-archflag = 
-DLDFLAGS = $(ldflags) $(dldflags) $(archflag)
-LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
-LDSHAREDXX = $(LDSHARED)
+CPPFLAGS = -DHAVE_USDT_H -I/Users/kevin/.rvm/usr/include -D_XOPEN_SOURCE -D_DARWIN_C_SOURCE $(DEFS) $(cppflags)
+CXXFLAGS = $(CFLAGS) $(cxxflags)
+ldflags  = -L. -L/usr/local/lib
+dldflags = -Wl,-undefined,dynamic_lookup -Wl,-multiply_defined,suppress -Wl,-flat_namespace
+ARCH_FLAG = 
+DLDFLAGS = $(ldflags) $(dldflags) $(ARCH_FLAG)
+LDSHARED = $(CC) -dynamic -bundle
+LDSHAREDXX = $(CXX) -dynamic -bundle
 AR = ar
 EXEEXT = 
 
+RUBY_BASE_NAME = ruby
 RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = i386-darwin10.3.0
-sitearch = i386-darwin10.3.0
+RUBY_SO_NAME = ruby.1.9.1
+arch = x86_64-darwin11.3.0
+sitearch = $(arch)
 ruby_version = 1.9.1
-ruby = /Users/kevin/.rvm/rubies/ruby-1.9.1-p378/bin/ruby
+ruby = /Users/kevin/.rvm/rubies/ruby-1.9.3-p125/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
 RM_RF = $(RUBY) -run -e rm -- -rf
-RMDIRS = $(RUBY) -run -e rmdir -- -p
+RMDIRS = rmdir -p
 MAKEDIRS = mkdir -p
 INSTALL = /usr/bin/install -c
 INSTALL_PROG = $(INSTALL) -m 0755
@@ -89,8 +102,8 @@ COPY = cp
 
 preload = 
 
-libpath = . $(libdir)
-LIBPATH =  -L. -L$(libdir)
+libpath = . $(libdir) /Users/kevin/.rvm/usr/lib
+LIBPATH =  -L. -L$(libdir) -L/Users/kevin/.rvm/usr/lib
 DEFFILE = 
 
 CLEANFILES = mkmf.log
@@ -101,7 +114,7 @@ extout =
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS =  -lusdt -ldtrace  -lpthread -ldl -lobjc  
+LIBS = $(LIBRUBYARG_SHARED) -lusdt -ldtrace  -lpthread -ldl -lobjc 
 SRCS = usdt.c
 OBJS = usdt.o
 TARGET = usdt
@@ -122,6 +135,8 @@ CLEANOBJS     = *.o  *.bak
 
 all:    $(DLLIB)
 static: $(STATIC_LIB)
+.PHONY: all install static install-so install-rb
+.PHONY: clean clean-so clean-rb
 
 clean-rb-default::
 clean-rb::
@@ -135,7 +150,7 @@ distclean-so::
 distclean: clean distclean-so distclean-rb-default distclean-rb
 		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
 		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-		@-$(RMDIRS) $(DISTCLEANDIRS)
+		@-$(RMDIRS) $(DISTCLEANDIRS) 2> /dev/null || true
 
 realclean: distclean
 install: install-so install-rb
@@ -143,38 +158,55 @@ install: install-so install-rb
 install-so: $(RUBYARCHDIR)
 install-so: $(RUBYARCHDIR)/$(DLLIB)
 $(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+	@-$(MAKEDIRS) $(@D)
+	$(INSTALL_PROG) $(DLLIB) $(@D)
 install-rb: pre-install-rb install-rb-default
 install-rb-default: pre-install-rb-default
 pre-install-rb: Makefile
 pre-install-rb-default: Makefile
+pre-install-rb-default:
+	$(ECHO) installing default usdt libraries
 $(RUBYARCHDIR):
-	$(MAKEDIRS) $@
+	$(Q) $(MAKEDIRS) $@
 
 site-install: site-install-so site-install-rb
 site-install-so: install-so
 site-install-rb: install-rb
 
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
+.SUFFIXES: .c .m .cc .mm .cxx .cpp .C .o
 
 .cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+
+.mm.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
+
+.m.o:
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
 
 $(DLLIB): $(OBJS) Makefile
+	$(ECHO) linking shared-object $(DLLIB)
 	@-$(RM) $(@)
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+	$(Q) $(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
 
 
 

data/ext/usdt/usdt.h

@@ -1,3 +1,7 @@
+/*
+ * Copyright (c) 2012, Chris Andrews. All rights reserved.
+ */
+
 #include <stdint.h>
 #include <unistd.h>
 
@@ -6,11 +10,14 @@ typedef uint8_t usdt_argtype_t;
 #define USDT_ARGTYPE_STRING  1
 #define USDT_ARGTYPE_INTEGER 2
 
+#define USDT_ARG_MAX 32
+
 typedef enum usdt_error {
         USDT_ERROR_MALLOC = 0,
         USDT_ERROR_VALLOC,
         USDT_ERROR_NOPROBES,
-        USDT_ERROR_LOADDOF
+        USDT_ERROR_LOADDOF,
+        USDT_ERROR_ALREADYENABLED
 } usdt_error_t;
 
 typedef struct usdt_probe {
@@ -25,12 +32,11 @@ typedef struct usdt_probedef {
         const char *name;
         const char *function;
         size_t argc;
-        usdt_argtype_t types[6];
+        usdt_argtype_t types[USDT_ARG_MAX];
         struct usdt_probe *probe;
         struct usdt_probedef *next;
 } usdt_probedef_t;
 
-usdt_probedef_t *usdt_create_probe_varargs(const char *func, const char *name, ...);
 usdt_probedef_t *usdt_create_probe(const char *func, const char *name,
                                    size_t argc, const char **types);
 
@@ -39,12 +45,13 @@ typedef struct usdt_provider {
         const char *module;
         usdt_probedef_t *probedefs;
         char *error;
+        int enabled;
 } usdt_provider_t;
 
 usdt_provider_t *usdt_create_provider(const char *name, const char *module);
 void usdt_provider_add_probe(usdt_provider_t *provider, usdt_probedef_t *probedef);
 int usdt_provider_enable(usdt_provider_t *provider);
 
-void usdt_error(usdt_provider_t *provider, usdt_error_t error);
+void usdt_error(usdt_provider_t *provider, usdt_error_t error, ...);
 char *usdt_errstr(usdt_provider_t *provider);
 

data/lib/usdt/version.rb

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

metadata

@@ -1,37 +1,29 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ruby-usdt
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Kevin Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-24 00:00:00 Z
+date: 2012-05-02 00:00:00.000000000 Z
 dependencies: []
-
 description: 
-email: 
+email:
 - kevin@yinkei.com
 executables: []
-
-extensions: 
+extensions:
 - ext/usdt/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/usdt/version.rb
 - lib/usdt.rb
+- ext/libusdt/LICENCE
 - ext/libusdt/Makefile
-- ext/libusdt/README
+- ext/libusdt/README.md
 - ext/libusdt/test.pl
 - ext/libusdt/test_usdt.c
 - ext/libusdt/usdt.c
@@ -52,37 +44,27 @@ files:
 - LICENSE.md
 homepage: http://github.com/kevinykchan/ruby-usdt
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Native DTrace probes for ruby.
 test_files: []
-