ruby-usdt 0.0.2 → 0.0.3

data/README.md

@@ -26,7 +26,7 @@ providers at runtime for instrumentation and analysis by the DTrace
     # args must be either :integer, or :string
     # max 6 args (dtrace provides this many), additional args will be ignored
     # returns USDT::Probe object
-    p = provider.probe("myfn", "probe", :string, :string, :integer)
+    p = provider.probe(:myfn, :probe, :string, :string, :integer)
 
     # Provider#enable
     # enables the probes defined with #probe

data/ext/usdt/Makefile

@@ -4,67 +4,81 @@ SHELL = /bin/sh
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /Users/kevin/.rvm/rubies/ruby-1.8.7-p358/lib/ruby/1.8/i686-darwin11.3.0
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/Users/kevin/.rvm/rubies/ruby-1.8.7-p358
+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)
+VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
+prefix = $(DESTDIR)/Users/kevin/.rvm/rubies/ruby-1.9.1-p378
 exec_prefix = $(prefix)
-htmldir = $(docdir)
-vendorarchdir = $(vendorlibdir)/$(sitearch)
-sitedir = $(libdir)/ruby/site_ruby
+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
+mandir = $(datarootdir)/man
+localedir = $(datarootdir)/locale
+libdir = $(exec_prefix)/lib
+psdir = $(docdir)
 pdfdir = $(docdir)
 dvidir = $(docdir)
+htmldir = $(docdir)
+infodir = $(datarootdir)/info
+docdir = $(datarootdir)/doc/$(PACKAGE)
+oldincludedir = $(DESTDIR)/usr/include
+includedir = $(prefix)/include
+localstatedir = $(prefix)/var
 sharedstatedir = $(prefix)/com
-vendordir = $(libdir)/ruby/vendor_ruby
-psdir = $(docdir)
-libexecdir = $(exec_prefix)/libexec
+sysconfdir = $(prefix)/etc
+datadir = $(datarootdir)
 datarootdir = $(prefix)/share
+libexecdir = $(exec_prefix)/libexec
+sbindir = $(exec_prefix)/sbin
 bindir = $(exec_prefix)/bin
-infodir = $(datarootdir)/info
-sitearchdir = $(sitelibdir)/$(sitearch)
-sysconfdir = $(prefix)/etc
+rubylibdir = $(libdir)/$(ruby_install_name)/$(ruby_version)
 archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
-includedir = $(prefix)/include
-mandir = $(datarootdir)/man
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-localstatedir = $(prefix)/var
-vendorlibdir = $(vendordir)/$(ruby_version)
 sitelibdir = $(sitedir)/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-datadir = $(datarootdir)
-localedir = $(datarootdir)/locale
-libdir = $(exec_prefix)/lib
-oldincludedir = $(DESTDIR)/usr/include
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorlibdir = $(vendordir)/$(ruby_version)
+vendorarchdir = $(vendorlibdir)/$(sitearch)
 
-CC = /usr/bin/gcc-4.2
-LIBRUBY = $(LIBRUBY_SO)
+CC = gcc
+CXX = g++
+LIBRUBY = $(LIBRUBY_A)
 LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
 LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
 LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+OUTFLAG = -o 
+COUTFLAG = -o 
 
 RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -g -O2  -fno-common -pipe -fno-common $(cflags) 
-INCFLAGS = -I. -I. -I/Users/kevin/.rvm/rubies/ruby-1.8.7-p358/lib/ruby/1.8/i686-darwin11.3.0 -I.
+cflags   = $(optflags) $(debugflags) $(warnflags)
+optflags = -O2
+debugflags = -g
+warnflags = -Wall -Wno-parentheses
+CFLAGS   =  -fno-common  $(cflags) -pipe -fno-common 
+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  
-CXXFLAGS = $(CFLAGS) 
+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)
 AR = ar
 EXEEXT = 
 
 RUBY_INSTALL_NAME = ruby
 RUBY_SO_NAME = ruby
-arch = i686-darwin11.3.0
-sitearch = i686-darwin11.3.0
-ruby_version = 1.8
-ruby = /Users/kevin/.rvm/rubies/ruby-1.8.7-p358/bin/ruby
+arch = i386-darwin10.3.0
+sitearch = i386-darwin10.3.0
+ruby_version = 1.9.1
+ruby = /Users/kevin/.rvm/rubies/ruby-1.9.1-p378/bin/ruby
 RUBY = $(ruby)
 RM = rm -f
+RM_RF = $(RUBY) -run -e rm -- -rf
+RMDIRS = $(RUBY) -run -e rmdir -- -p
 MAKEDIRS = mkdir -p
 INSTALL = /usr/bin/install -c
 INSTALL_PROG = $(INSTALL) -m 0755
@@ -81,12 +95,13 @@ DEFFILE =
 
 CLEANFILES = mkmf.log
 DISTCLEANFILES = 
+DISTCLEANDIRS = 
 
 extout = 
 extout_prefix = 
 target_prefix = 
 LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -lusdt -ldtrace  -ldl -lobjc  
+LIBS =  -lusdt -ldtrace  -lpthread -ldl -lobjc  
 SRCS = usdt.c
 OBJS = usdt.o
 TARGET = usdt
@@ -98,22 +113,31 @@ BINDIR        = $(bindir)
 RUBYCOMMONDIR = $(sitedir)$(target_prefix)
 RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
 RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+HDRDIR        = $(rubyhdrdir)/ruby$(target_prefix)
+ARCHHDRDIR    = $(rubyhdrdir)/$(arch)/ruby$(target_prefix)
 
 TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+CLEANLIBS     = $(TARGET).bundle 
+CLEANOBJS     = *.o  *.bak
 
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
+all:    $(DLLIB)
+static: $(STATIC_LIB)
 
-clean:
+clean-rb-default::
+clean-rb::
+clean-so::
+clean: clean-so clean-rb-default clean-rb
 		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
 
-distclean:	clean
+distclean-rb-default::
+distclean-rb::
+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)
 
-realclean:	distclean
+realclean: distclean
 install: install-so install-rb
 
 install-so: $(RUBYARCHDIR)
@@ -134,24 +158,24 @@ site-install-rb: install-rb
 .SUFFIXES: .c .m .cc .cxx .cpp .C .o
 
 .cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) $(COUTFLAG)$@ -c $<
 
 .c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $<
 
 $(DLLIB): $(OBJS) Makefile
-	@-$(RM) $@
+	@-$(RM) $(@)
 	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
 
 
 
-$(OBJS): ruby.h defines.h
+$(OBJS): $(hdrdir)/ruby.h $(hdrdir)/ruby/defines.h $(arch_hdrdir)/ruby/config.h

data/ext/usdt/test.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__)) + '/usdt'
 
 provider = USDT::Provider.create :ruby, :test
 puts provider
-p = provider.probe("myfn", "probe",
+p = provider.probe(:myfn, :probe,
                    :string, :string, :integer)
 
 provider.enable

data/ext/usdt/usdt.c

@@ -34,8 +34,8 @@ static VALUE provider_create(VALUE self, VALUE name, VALUE mod) {
   Check_Type(name, T_SYMBOL);
   Check_Type(mod, T_SYMBOL);
 
-  char *namestr = rb_id2name(rb_to_id(name));
-  char *modstr = rb_id2name(rb_to_id(mod));
+  const char *namestr = rb_id2name(rb_to_id(name));
+  const char *modstr = rb_id2name(rb_to_id(mod));
 
   usdt_provider_t* p = usdt_create_provider(namestr, modstr);
 
@@ -52,8 +52,8 @@ static VALUE provider_create(VALUE self, VALUE name, VALUE mod) {
  * USDT::Provider#probe(func, name, pargs*)
  */
 static VALUE provider_probe(int argc, VALUE *argv, VALUE self) {
-  const char *func = RSTRING_PTR(argv[0]);
-  const char *name = RSTRING_PTR(argv[1]);
+  const char *func = rb_id2name(rb_to_id(argv[0]));
+  const char *name = rb_id2name(rb_to_id(argv[1]));
   const char *types[6];
   size_t i, pargc = 0;
   size_t t_int = rb_intern("integer");
@@ -118,6 +118,10 @@ static VALUE probe_enabled(VALUE self) {
  * USDT::Probe#fire *args
  */
 static VALUE probe_fire(int argc, VALUE *argv, VALUE self) {
+  if (probe_enabled(self) == Qfalse) {
+    return Qfalse;
+  }
+
   usdt_probedef_t **p = DATA_PTR(self);
   usdt_probedef_t *probedef = *p;
 

data/lib/usdt/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-usdt
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Kevin Chan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-21 00:00:00 Z
+date: 2012-04-24 00:00:00 Z
 dependencies: []
 
 description: 
@@ -43,8 +43,6 @@ files:
 - ext/libusdt/usdt_probe.c
 - ext/libusdt/usdt_tracepoints_i386.s
 - ext/libusdt/usdt_tracepoints_x86_64.s
-- ext/usdt/conftest.dSYM/Contents/Info.plist
-- ext/usdt/conftest.dSYM/Contents/Resources/DWARF/conftest
 - ext/usdt/extconf.rb
 - ext/usdt/Makefile
 - ext/usdt/test.rb
@@ -85,6 +83,6 @@ rubyforge_project:
 rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Native DTrace probes ruby apps
+summary: Native DTrace probes for ruby.
 test_files: []
 

data/ext/usdt/conftest.dSYM/Contents/Info.plist

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-	<dict>
-		<key>CFBundleDevelopmentRegion</key>
-		<string>English</string>
-		<key>CFBundleIdentifier</key>
-		<string>com.apple.xcode.dsym.conftest</string>
-		<key>CFBundleInfoDictionaryVersion</key>
-		<string>6.0</string>
-		<key>CFBundlePackageType</key>
-		<string>dSYM</string>
-		<key>CFBundleSignature</key>
-		<string>????</string>
-		<key>CFBundleShortVersionString</key>
-		<string>1.0</string>
-		<key>CFBundleVersion</key>
-		<string>1</string>
-	</dict>
-</plist>