ruby-dtrace 0.0.6 → 0.2.8

data/History.txt

@@ -1,3 +1,24 @@
+== 0.2.8 / 2009-07-23
+
+ * Replace string-eval provider class creation 
+ * Fix GC bug with DOF data on Mac OSX (reported by ecin@copypastel.com)
+ * Add each_probe_prog method to list probes enabled by a program
+ * Fix conversion of 64 bit values in probe data (reported by ecin@copypastel.com)
+ * Add support for SPARC/Solaris and PowerPC/OSX architectures
+
+== 0.2.7 / 2008-08-01
+
+ * Fix probes not firing when multiple providers are used.
+
+== 0.2.6 / 2008-06-17
+
+ * Fix aggregate value conversion bug
+
+== 0.2.5 / 2008-06-14
+
+ * Rework Dtrace::Provider to directly create USDT providers by 
+   generating DOF and stub functions.
+
 == 0.0.6 / 2008-02-17
 
  * Add Dtrace::Provider, which allows creation of USDT providers from

data/Manifest.txt

@@ -1,8 +1,18 @@
-History.txt
-Manifest.txt
-README.txt
-Rakefile
 examples/scsi.rb
+ext/dof
+ext/dof/constants.c
+ext/dof/dof.h
+ext/dof/dof_api.c
+ext/dof/dof_helper.c
+ext/dof/extconf.rb
+ext/dof/file.c
+ext/dof/generator.c
+ext/dof/header.c
+ext/dof/Makefile
+ext/dof/mkmf.log
+ext/dof/parser.c
+ext/dof/parser.h
+ext/dof/section.c
 ext/dtrace_aggdata.c
 ext/dtrace_api.c
 ext/dtrace_api.h
@@ -10,49 +20,106 @@ ext/dtrace_bufdata.c
 ext/dtrace_dropdata.c
 ext/dtrace_errdata.c
 ext/dtrace_hdl.c
-ext/dtrace_probe.c
 ext/dtrace_probedata.c
+ext/dtrace_probedesc.c
 ext/dtrace_process.c
 ext/dtrace_program.c
 ext/dtrace_programinfo.c
 ext/dtrace_recdesc.c
 ext/dtrace_util.c
 ext/extconf.rb
-lib/dtrace.rb
+ext/i386-solaris
+ext/i386-solaris/dtrace_probe.c
+ext/i386-darwin
+ext/i386-darwin/dtrace_probe.c
+ext/stubs.txt
+lib/dtrace
+lib/dtrace/aggregate.rb
+lib/dtrace/aggregateset.rb
+lib/dtrace/consumer.rb
+lib/dtrace/data.rb
+lib/dtrace/dof
+lib/dtrace/dof/file.rb
+lib/dtrace/dof/section
+lib/dtrace/dof/section/strtab.rb
+lib/dtrace/dof/section.rb
+lib/dtrace/dof.rb
+lib/dtrace/printfrecord.rb
 lib/dtrace/probe.rb
+lib/dtrace/probedata.rb
+lib/dtrace/probedesc.rb
+lib/dtrace/provider
+lib/dtrace/provider/probedef.rb
 lib/dtrace/provider.rb
-lib/dtrace/provider/osx.rb
-lib/dtrace/provider/solaris.rb
+lib/dtrace/record.rb
+lib/dtrace/stackrecord.rb
 lib/dtrace/tracer.rb
-lib/dtraceaggregate.rb
-lib/dtraceaggregateset.rb
+lib/dtrace/version.rb
+lib/dtrace.rb
 lib/dtraceconsumer.rb
-lib/dtracedata.rb
-lib/dtraceprintfrecord.rb
-lib/dtraceprobe.rb
-lib/dtraceprobedata.rb
-lib/dtracerecord.rb
-lib/dtracestackrecord.rb
-plugin/dtrace/README
-plugin/dtrace/Rakefile
+plugin/dtrace
+plugin/dtrace/bin
 plugin/dtrace/bin/dtracer.rb
 plugin/dtrace/init.rb
+plugin/dtrace/lib
 plugin/dtrace/lib/dtrace_helper.rb
 plugin/dtrace/lib/dtrace_report.rb
 plugin/dtrace/lib/dtracer.rb
 plugin/dtrace/lib/dtracer_client.rb
+plugin/dtrace/public
+plugin/dtrace/public/stylesheets
 plugin/dtrace/public/stylesheets/dtrace.css
+plugin/dtrace/Rakefile
+plugin/dtrace/README
+plugin/dtrace/scripts
 plugin/dtrace/scripts/default.d
 plugin/dtrace/scripts/rails_mysql.d
+plugin/dtrace/tasks
 plugin/dtrace/tasks/dtrace.rake
+plugin/dtrace/test
 plugin/dtrace/test/dtrace_test.rb
+plugin/dtrace/views
+plugin/dtrace/views/dtrace
 plugin/dtrace/views/dtrace/_report.rhtml
+plugin/dtrace_probes
+plugin/dtrace_probes/init.rb
+plugin/dtrace_probes/install.rb
+plugin/dtrace_probes/lib
+plugin/dtrace_probes/lib/probes
+plugin/dtrace_probes/lib/probes/action_controller.rb
+plugin/dtrace_probes/lib/probes/active_record.rb
+plugin/dtrace_probes/lib/probes.rb
+plugin/dtrace_probes/MIT-LICENSE
+plugin/dtrace_probes/Rakefile
+plugin/dtrace_probes/README
+plugin/dtrace_probes/tasks
+plugin/dtrace_probes/tasks/dtrace_probes_tasks.rake
+plugin/dtrace_probes/test
+plugin/dtrace_probes/test/dtrace_probes_test.rb
+plugin/dtrace_probes/uninstall.rb
+test/apple-dof
+test/disabled_probe_effect.txt
+test/dof
+test/dof2
+test/test_disabled_probe_effect.rb
+test/test_dof_generator.rb
+test/test_dof_helper.rb
+test/test_dof_parser.rb
+test/test_dof_providers.rb
+test/test_dof_strtabs.rb
 test/test_dtrace.rb
 test/test_dtrace_aggregates.rb
 test/test_dtrace_drops_errors.rb
+test/test_dtrace_probe.rb
+test/test_dtrace_probes.rb
 test/test_dtrace_processes.rb
 test/test_dtrace_profile.rb
+test/test_dtrace_provider.rb
 test/test_dtrace_repeat.rb
 test/test_dtrace_rubyprobe.rb
 test/test_dtrace_typefilter.rb
-test/test_dynusdt.rb
+test/test_legacy_consumer.rb
+README.txt
+History.txt
+Manifest.txt
+Rakefile

data/README.txt

@@ -1,17 +1,34 @@
-ruby-dtrace is Ruby bindings for Dtrace, which lets you write D-based
-programs in Ruby. It doesn't provide D probes for Ruby, but you can
-use it with the probes found in the Joyent and Apple builds of Ruby.
+Ruby-DTrace is Ruby bindings for Dtrace, which allows you to add
+DTrace probes to your Ruby programs, and to write D-based programs
+with Ruby.
+
+== FEEDBACK
+
+Fork the repository on Github: http://github.com/chrisa/ruby-dtrace
+
+Rubyforge mailing list: http://rubyforge.org/mailman/listinfo/ruby-dtrace-users
 
 == FEATURES
   
+Consumer:
+
 * Access to the D API
 * Probe metadata
 * Run D programs
 * Access aggregates
 * Consume output from D programs
 
+Probes:
+
+* Create USDT providers from Ruby, at runtime.
+* No code-generation or gcc/linker dependency
+
 == SYNOPSIS
 
+Consumer: see Dtrace
+
+    require 'Dtrace'
+
     t = Dtrace.new 
     progtext = 'ruby$1:::function-entry{ @a[strjoin(strjoin(copyinstr(arg0),"."),copyinstr(arg1))] = count(); } END { printa(@a); }'
     prog = t.compile progtext
@@ -26,10 +43,35 @@ use it with the probes found in the Joyent and Apple builds of Ruby.
       # handle records
     end
 
+Probes: see Dtrace::Provider
+
+    require 'dtrace/provider'
+
+    Dtrace::Provider.create :rubyprog do |p|
+      p.probe :foo, :string, :string
+      p.probe :bar, :integer, :integer
+    end
+
+    Dtrace::Probe::Rubyprog.foo do |p|
+      p.fire('fired!', 'again')
+    end    
+
+    Dtrace::Probe::Rubyprog.bar do |p|
+      p.fire(42, 27)
+    end    
+
 == REQUIREMENTS
 
-* A platform with Dtrace support (OpenSolaris, Mac OS X 10.5 Leopard tested, possibly also FreeBSD).
-* root, or some/all of the dtrace privileges on Solaris: dtrace_user, dtrace_proc and dtrace_kernel.
+* For the consumer API, platform with DTrace support (OpenSolaris, Mac
+  OS X 10.5 Leopard tested, possibly also FreeBSD).
+
+* For the probe API, a platform with DTrace support (as for the
+  consumer API), with a 32 bit Ruby build - i386, PowerPC (for OS X)
+  and SPARC (for Solaris) are all supported. 64 bit builds are not,
+  yet.
+  
+* root, or some/all of the dtrace privileges on Solaris: dtrace_user,
+  dtrace_proc and dtrace_kernel.
 
 == INSTALL
 
@@ -37,7 +79,7 @@ use it with the probes found in the Joyent and Apple builds of Ruby.
 
 == LICENSE
 
-Copyright (c) 2007 Chris Andrews <chris@nodnol.org>
+Copyright (c) 2008, 2009 Chris Andrews <chris@nodnol.org>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,32 +1,73 @@
 # -*- ruby -*-
 
-require 'rubygems'
-require 'hoe'
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+require 'rake/packagetask'
+require 'rake/gempackagetask'
+require 'rake/contrib/rubyforgepublisher'
 
 $: << './lib'
-require 'dtrace'
-
-Hoe.new('ruby-dtrace', Dtrace::VERSION) do |p|
-  p.rubyforge_name = 'ruby-dtrace'
-  p.author = 'Chris Andrews'
-  p.email = 'chris@nodnol.org'
-  p.summary = 'Ruby bindings for libdtrace'
-  p.description = <<EOD
-ruby-dtrace is Ruby bindings for Dtrace, which lets you write D-based
-programs in Ruby. It doesn't provide D probes for Ruby, but you can
-use it with the probes found in the Joyent and Apple builds of Ruby.
-EOD
-  p.spec_extras = {:extensions => ['ext/extconf.rb']}
-  p.url = "http://ruby-dtrace.rubyforge.org/"
-  p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
-end
+require 'dtrace/version'
 
 desc "Uses extconf.rb and make to build the extension"
 task :extensions do
   Dir.chdir('ext')
   system("ruby extconf.rb")
   system("make")
-  Dir.chdir('..')
+  Dir.chdir('dof')
+  system("ruby extconf.rb")
+  system("make")  
+  Dir.chdir('../..')
 end
 
-# vim: syntax=Ruby
+desc "Clean all extensions"
+task :clean_extensions do
+  Dir.chdir('ext')
+  system("make clean")
+  Dir.chdir('dof')
+  system("make clean")  
+  Dir.chdir('../..')
+end
+ 
+PKG_NAME      = "ruby-dtrace"
+PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+PKG_VERSION   = Dtrace::VERSION + PKG_BUILD
+PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
+ 
+desc "Default task"
+task :default => [ :test ]
+ 
+desc "Build documentation"
+task :doc => [ :rdoc ]
+ 
+Rake::TestTask.new do |t|
+  t.libs << "ext:lib"
+  t.test_files = Dir["test/*.rb"]
+  t.verbose = true
+end
+ 
+desc "Run code-coverage analysis using rcov"
+task :coverage do
+  rm_rf "coverage"
+  files = Dir["test/*.rb"]
+  system "rcov --sort coverage -Iext:lib #{files.join(' ')}"
+end
+ 
+GEM_SPEC = eval(File.read("#{File.dirname(__FILE__)}/#{PKG_NAME}.gemspec"))
+ 
+Rake::GemPackageTask.new(GEM_SPEC) do |p|
+  p.gem_spec = GEM_SPEC
+  p.need_tar = true
+  p.need_zip = true
+end
+ 
+desc "Build the RDoc API documentation"
+Rake::RDocTask.new do |rdoc|
+  rdoc.rdoc_dir = "doc"
+  rdoc.title    = "Ruby-DTrace"
+  rdoc.options += %w(--line-numbers --inline-source --main README.txt)
+  rdoc.rdoc_files.include 'README.txt'
+  rdoc.rdoc_files.include 'ext/**/*.c'
+  rdoc.rdoc_files.include 'lib/**/*.rb'
+end

data/examples/scsi.rb

@@ -381,7 +381,7 @@ prog.execute
 t.go
 
 begin
-  c = DtraceConsumer.new(t)
+  c = Dtrace::Consumer.new(t)
   
   c.consume do |d|
     records = d.data

data/ext/dof/Makefile

@@ -0,0 +1,154 @@
+
+SHELL = /bin/sh
+
+#### Start of system configuration section. ####
+
+srcdir = .
+topdir = /opt/local/lib/ruby/1.8/i686-darwin9.7.0
+hdrdir = $(topdir)
+VPATH = $(srcdir):$(topdir):$(hdrdir)
+prefix = $(DESTDIR)/opt/local
+exec_prefix = $(prefix)
+sitedir = $(prefix)/lib/ruby/site_ruby
+rubylibdir = $(libdir)/ruby/$(ruby_version)
+docdir = $(datarootdir)/doc/$(PACKAGE)
+dvidir = $(docdir)
+datarootdir = $(prefix)/share
+archdir = $(rubylibdir)/$(arch)
+sbindir = $(exec_prefix)/sbin
+psdir = $(docdir)
+vendordir = $(prefix)/lib/ruby/vendor_ruby
+localedir = $(datarootdir)/locale
+htmldir = $(docdir)
+datadir = $(datarootdir)
+includedir = $(prefix)/include
+infodir = $(datarootdir)/info
+sysconfdir = $(prefix)/etc
+libdir = $(exec_prefix)/lib
+mandir = $(DESTDIR)/opt/local/share/man
+sharedstatedir = $(prefix)/com
+oldincludedir = $(DESTDIR)/usr/include
+pdfdir = $(docdir)
+sitearchdir = $(sitelibdir)/$(sitearch)
+vendorarchdir = $(vendorlibdir)/$(vendorarch)
+localstatedir = $(prefix)/var
+bindir = $(exec_prefix)/bin
+vendorlibdir = $(vendordir)/$(ruby_version)
+sitelibdir = $(sitedir)/$(ruby_version)
+libexecdir = $(exec_prefix)/libexec
+
+CC = /usr/bin/gcc-4.0
+LIBRUBY = $(LIBRUBY_SO)
+LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
+LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
+LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
+
+RUBY_EXTCONF_H = 
+CFLAGS   =  -fno-common -O2  -fno-common -pipe -fno-common -D_LONGLONG_TYPE -g 
+INCFLAGS = -I. -I$(topdir) -I$(hdrdir) -I$(srcdir)
+DEFS     = 
+CPPFLAGS = -DHAVE_SYS_DTRACE_H -I/opt/local/include $(DEFS)
+CXXFLAGS = $(CFLAGS) 
+DLDFLAGS = -L. -L/opt/local/lib  
+LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
+AR = ar
+EXEEXT = 
+
+RUBY_INSTALL_NAME = ruby
+RUBY_SO_NAME = ruby
+arch = i686-darwin9.7.0
+sitearch = i686-darwin9.7.0
+vendorarch = i686-darwin9.7.0
+ruby_version = 1.8
+ruby = /opt/local/bin/ruby
+RUBY = $(ruby)
+RM = rm -f
+MAKEDIRS = mkdir -p
+INSTALL = /usr/bin/install -c
+INSTALL_PROG = $(INSTALL) -m 0755
+INSTALL_DATA = $(INSTALL) -m 644
+COPY = cp
+
+#### End of system configuration section. ####
+
+preload = 
+
+libpath = . $(libdir)
+LIBPATH =  -L. -L$(libdir)
+DEFFILE = 
+
+CLEANFILES = mkmf.log
+DISTCLEANFILES = 
+
+extout = 
+extout_prefix = 
+target_prefix = 
+LOCAL_LIBS = 
+LIBS = $(LIBRUBYARG_SHARED)  -lpthread -ldl -lobjc  
+SRCS = constants.c dof_api.c dof_helper.c file.c generator.c header.c parser.c section.c
+OBJS = constants.o dof_api.o dof_helper.o file.o generator.o header.o parser.o section.o
+TARGET = dof_api
+DLLIB = $(TARGET).bundle
+EXTSTATIC = 
+STATIC_LIB = 
+
+RUBYCOMMONDIR = $(sitedir)$(target_prefix)
+RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
+RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
+
+TARGET_SO     = $(DLLIB)
+CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
+CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
+
+all:		$(DLLIB)
+static:		$(STATIC_LIB)
+
+clean:
+		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
+
+distclean:	clean
+		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
+		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
+
+realclean:	distclean
+install: install-so install-rb
+
+install-so: $(RUBYARCHDIR)
+install-so: $(RUBYARCHDIR)/$(DLLIB)
+$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
+	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
+install-rb: pre-install-rb install-rb-default
+install-rb-default: pre-install-rb-default
+pre-install-rb: Makefile
+pre-install-rb-default: Makefile
+$(RUBYARCHDIR):
+	$(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
+
+.cc.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cxx.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.cpp.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.C.o:
+	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
+
+.c.o:
+	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
+
+$(DLLIB): $(OBJS) Makefile
+	@-$(RM) $@
+	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
+
+
+
+$(OBJS): ruby.h defines.h