debase 0.2.2.beta8 → 0.2.2.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a1e87cdd51f0c7a810d7a2b756db948a0bd13e5
-  data.tar.gz: 12f174215bb14d1f654c056dc6aa1a47398ebac2
+  metadata.gz: 72f6bca149dbf44230032e0bc5232ed4dfbf1790
+  data.tar.gz: 1e1d31d2b83bcbd464ea32d0ad46b1f0f5c276d3
 SHA512:
-  metadata.gz: 543fbe0eaf3d28f83c5c253c29e882aa8c18ab69af027ad7b221bd256c0399db06a3479ee3dcee45f8faf18946b4dc73a86ec88bae59bfb1bef19451c507cdd6
-  data.tar.gz: 543fae8f7f04950feb679caa18593da3f4bc94470b71ad7afcba979e6bab2aa0fac1b85cd8fe8e34d51cf26d189da0bc22db0881eb720e9dea2242a7cf60c6ba
+  metadata.gz: ef7fbb2819851e3fc04bda8532eb07a2da3c8be2c206dfdd0d8c056f4e19e376a48842b3f35ad350b2ffedc0e9aec4ec7b621bebd0a612cd830eedda45cb2f48
+  data.tar.gz: 7ca7fe17d565d711e67b6754fc04b04174bf8bad8a86fd4a0ed9d20905c42d4655eee94d8a1893674ac8713c4f6e3deebe381e8d135be6113c6d3f3978f46d74

data/Rakefile

@@ -13,6 +13,14 @@ task :clean do
     derived_files = Dir.glob(".o") + Dir.glob("*.so") + Dir.glob("*.bundle")
     rm derived_files unless derived_files.empty?
   end
+  cd "ext/attach" do
+    if File.exists?("Makefile")
+      sh "make clean"
+      rm  "Makefile"
+    end
+    derived_files = Dir.glob(".o") + Dir.glob("*.so") + Dir.glob("*.bundle")
+    rm derived_files unless derived_files.empty?
+  end
   if File.exists?('pkg')
     cd 'pkg' do
       derived_files = Dir.glob('*.gem')
@@ -27,6 +35,10 @@ task :lib => :clean do
     system("#{Gem.ruby} extconf.rb && make")
     exit $?.to_i if $?.to_i != 0
   end
+  Dir.chdir("ext/attach") do
+    system("#{Gem.ruby} extconf.rb && make")
+    exit $?.to_i if $?.to_i != 0
+  end
 end
 
 desc "Test debase."

data/debase.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.extensions = ["ext/extconf.rb"]
+  s.extensions = ["ext/extconf.rb", "ext/attach/extconf.rb"]
 
   s.add_dependency "debase-ruby_core_source"
   s.add_development_dependency "test-unit"

data/ext/attach/attach.c

@@ -0,0 +1,51 @@
+#include "attach.h"
+
+/*
+We need to prevent compiler from optimizing this function calls. For more details
+see "noinline" section here: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html
+*/
+static void
+__attribute__ ((noinline))
+__func_to_set_breakpoint_at()
+{
+    asm("");
+}
+
+static void
+__catch_line_event(rb_event_flag_t evflag, VALUE data, VALUE self, ID mid, VALUE klass)
+{
+    (void)sizeof(evflag);
+    (void)sizeof(self);
+    (void)sizeof(mid);
+    (void)sizeof(klass);
+
+    rb_remove_event_hook(__catch_line_event);
+    if (rb_during_gc())
+        return;
+    __func_to_set_breakpoint_at();
+}
+
+int
+debase_start_attach()
+{
+    if (rb_during_gc())
+        return 1;
+    rb_add_event_hook(__catch_line_event, RUBY_EVENT_LINE, (VALUE) NULL);
+    return 0;
+}
+
+void
+debase_rb_eval(const char *string_to_eval)
+{
+    rb_eval_string_protect(string_to_eval, NULL);
+}
+
+void
+Init_attach()
+{
+  /*
+  The only purpose of this library is to be dlopen'ed inside
+  gdb/lldb. So no initialization here, you should directly
+  call functions above.
+  */
+}

data/ext/attach/attach.h

@@ -0,0 +1,10 @@
+#ifndef __ATTACH_H__
+#define __ATTACH_H__
+
+#include <ruby.h>
+#include <ruby/debug.h>
+
+int debase_start_attach();
+void debase_rb_eval(const char *);
+
+#endif //__ATTACH_H__

data/ext/attach/extconf.rb

@@ -0,0 +1,54 @@
+if defined?(RUBY_ENGINE) && 'rbx' == RUBY_ENGINE
+  # create dummy Makefile to indicate success
+  f = File.open(File.join(File.dirname(__FILE__), "Makefile"), "w")
+  f.write("all:\n\techo all\ninstall:\n\techo installed\n")
+  f.close
+  return
+end
+
+# autodetect ruby headers
+unless ARGV.any? {|arg| arg.include?('--with-ruby-include') }
+  require 'rbconfig'
+  bindir = RbConfig::CONFIG['bindir']
+  if bindir =~ %r{(^.*/\.rbenv/versions)/([^/]+)/bin$}
+    ruby_include = "#{$1}/#{$2}/include/ruby-1.9.1/ruby-#{$2}"
+    ruby_include = "#{ENV['RBENV_ROOT']}/sources/#{$2}/ruby-#{$2}" unless File.exist?(ruby_include)
+    ARGV << "--with-ruby-include=#{ruby_include}"
+  elsif bindir =~ %r{(^.*/\.rvm/rubies)/([^/]+)/bin$}
+    ruby_include = "#{$1}/#{$2}/include/ruby-1.9.1/#{$2}"
+    ruby_include = "#{ENV['rvm_path']}/src/#{$2}" unless File.exist?(ruby_include)
+    ARGV << "--with-ruby-include=#{ruby_include}"
+  end
+end
+
+require "mkmf"
+
+RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+
+require "debase/ruby_core_source"
+
+hdrs = proc {
+  have_header("vm_core.h")
+}
+
+# Allow use customization of compile options. For example, the
+# following lines could be put in config_options to to turn off
+# optimization:
+#   $CFLAGS='-fPIC -fno-strict-aliasing -g3 -ggdb -O2 -fPIC'
+config_file = File.join(File.dirname(__FILE__), 'config_options.rb')
+load config_file if File.exist?(config_file)
+
+if ENV['debase_debug']
+  $CFLAGS+=' -Wall -Werror' 
+  $CFLAGS+=' -g3'
+end
+
+dir_config("ruby")
+if !Debase::RubyCoreSource.create_makefile_with_core(hdrs, "attach")
+  STDERR.print("Makefile creation failed\n")
+  STDERR.print("*************************************************************\n\n")
+  STDERR.print("  NOTE: If your headers were not found, try passing\n")
+  STDERR.print("        --with-ruby-include=PATH_TO_HEADERS      \n\n")
+  STDERR.print("*************************************************************\n\n")
+  exit(1)
+end

data/ext/breakpoint.c

@@ -219,9 +219,15 @@ breakpoint_find(VALUE breakpoints, VALUE source, VALUE pos)
 }
 
 extern void
-Init_breakpoint(VALUE mDebase)
+breakpoint_init_variables()
 {
   breakpoint_max = 0;
+}
+
+extern void
+Init_breakpoint(VALUE mDebase)
+{
+  breakpoint_init_variables();
   cBreakpoint = rb_define_class_under(mDebase, "Breakpoint", rb_cObject);
   rb_define_singleton_method(cBreakpoint, "find", Breakpoint_find, 3);
   rb_define_singleton_method(cBreakpoint, "remove", Breakpoint_remove, 2);

data/ext/context.c

@@ -345,6 +345,12 @@ Context_stop_frame(VALUE self, VALUE frame)
   return frame;
 }
 
+extern void
+context_init_variables()
+{
+  thnum_current = 0;
+}
+
 /*
  *   Document-class: Context
  *
@@ -373,6 +379,7 @@ Init_context(VALUE mDebase)
   rb_define_method(cContext, "pause", Context_pause, 0);
 
   idAlive = rb_intern("alive?");
+  context_init_variables();
 
   return cContext;
     // rb_define_method(cContext, "suspend", context_suspend, 0);

data/ext/debase_internals.c

@@ -24,6 +24,8 @@ static VALUE idAtCatchpoint;
 static VALUE idFileFilter;
 static VALUE idAccept;
 
+static int started = 0;
+
 static void
 print_debug(const char *message, ...)
 {
@@ -472,7 +474,9 @@ process_raise_event(VALUE trace_point, void *data)
 static VALUE
 Debase_setup_tracepoints(VALUE self)
 {
-  if (catchpoints != Qnil) return Qnil;
+  if (started) return Qnil;
+  started = 1;
+
   contexts = rb_hash_new();
   breakpoints = rb_ary_new();
   catchpoints = rb_hash_new();
@@ -496,19 +500,13 @@ Debase_setup_tracepoints(VALUE self)
 
 static VALUE
 Debase_remove_tracepoints(VALUE self)
-{ 
-  contexts = Qnil;
-  breakpoints = Qnil;
-  catchpoints = Qnil;
+{
+  started = 0;
 
   if (tpLine != Qnil) rb_tracepoint_disable(tpLine);
-  tpLine = Qnil;
   if (tpReturn != Qnil) rb_tracepoint_disable(tpReturn);
-  tpReturn = Qnil;
   if (tpCall != Qnil) rb_tracepoint_disable(tpCall);
-  tpCall = Qnil;
   if (tpRaise != Qnil) rb_tracepoint_disable(tpRaise);
-  tpRaise = Qnil;
 
   return Qnil;
 }
@@ -530,6 +528,14 @@ debase_prepare_context(VALUE self, VALUE file, VALUE stop)
   return self;
 }
 
+static VALUE
+Debase_prepare_context(VALUE self)
+{
+  Debase_current_context(self);
+
+  return self;
+}
+
 static VALUE
 Debase_debug_load(int argc, VALUE *argv, VALUE self)
 {
@@ -589,7 +595,7 @@ Debase_catchpoints(VALUE self)
 static VALUE
 Debase_started(VALUE self)
 {
-  return catchpoints != Qnil ? Qtrue : Qfalse; 
+  return started ? Qtrue : Qfalse;
 }
 
 /*
@@ -630,6 +636,23 @@ Debase_enable_file_filtering(VALUE self, VALUE value)
   return value;
 }
 
+static VALUE
+Debase_init_variables()
+{
+  started = 0;
+  verbose = Qfalse;
+  locker = Qnil;
+  file_filter_enabled = Qfalse;
+  contexts = Qnil;
+  catchpoints = Qnil;
+  breakpoints = Qnil;
+
+  context_init_variables();
+  breakpoint_init_variables();
+
+  return Qtrue;
+}
+
 /*
  *   Document-class: Debase
  *
@@ -654,6 +677,8 @@ Init_debase_internals()
   rb_define_module_function(mDebase, "verbose=", Debase_set_verbose, 1);
   rb_define_module_function(mDebase, "enable_file_filtering", Debase_enable_file_filtering, 1);
   rb_define_module_function(mDebase, "enable_trace_points", Debase_enable_trace_points, 0);
+  rb_define_module_function(mDebase, "prepare_context", Debase_prepare_context, 0);
+  rb_define_module_function(mDebase, "init_variables", Debase_init_variables, 0);
 
   idAlive = rb_intern("alive?");
   idAtLine = rb_intern("at_line");
@@ -665,9 +690,7 @@ Init_debase_internals()
   cContext = Init_context(mDebase);
   Init_breakpoint(mDebase);
   cDebugThread  = rb_define_class_under(mDebase, "DebugThread", rb_cThread);
-  contexts = Qnil;
-  catchpoints = Qnil;
-  breakpoints = Qnil;
+  Debase_init_variables();
 
   rb_global_variable(&locker);
   rb_global_variable(&breakpoints);

data/ext/debase_internals.h

@@ -105,4 +105,7 @@ typedef struct
 extern VALUE catchpoint_hit_count(VALUE catchpoints, VALUE exception, VALUE *exception_name);
 extern VALUE breakpoint_find(VALUE breakpoints, VALUE source, VALUE pos);
 extern void Init_breakpoint(VALUE mDebase);
+
+extern void breakpoint_init_variables();
+extern void context_init_variables();
 #endif

data/lib/debase/version.rb

@@ -1,3 +1,3 @@
 module Debase
-  VERSION = "0.2.2.beta8" unless defined? VERSION
+  VERSION = "0.2.2.beta9" unless defined? VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: debase
 version: !ruby/object:Gem::Version
-  version: 0.2.2.beta8
+  version: 0.2.2.beta9
 platform: ruby
 authors:
 - Dennis Ushakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase-ruby_core_source
@@ -62,6 +62,7 @@ email:
 executables: []
 extensions:
 - ext/extconf.rb
+- ext/attach/extconf.rb
 extra_rdoc_files: []
 files:
 - ".gitignore"
@@ -72,6 +73,9 @@ files:
 - README.md
 - Rakefile
 - debase.gemspec
+- ext/attach/attach.c
+- ext/attach/attach.h
+- ext/attach/extconf.rb
 - ext/breakpoint.c
 - ext/context.c
 - ext/debase_internals.c
@@ -131,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: debase
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: debase is a fast implementation of the standard Ruby debugger debug.rb for
@@ -161,3 +165,4 @@ test_files:
 - test/test_catchpoint.rb
 - test/test_load.rb
 - test/test_reload_bug.rb
+has_rdoc: