jbarnette-johnson 1.0.0.20090326161333 → 1.0.0.20090402144841

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
-=== 1.0.0 / 2008-03-11
+=== 1.1.0 (pending)
 
-* 1 major enhancement
-  * Birthday!
+* First real/RubyForge release!
+* Cleaned up the build.
+* Updated to a more recent SpiderMonkey.
+* Fixed allocation-during-GC bugs.
 
+=== 1.0.0 (2008-03-11)
+
+* Birthday!

data/Rakefile

@@ -21,6 +21,7 @@ HOE = Hoe.new "johnson", Johnson::VERSION do |p|
   p.clean_globs     << "lib/johnson/spidermonkey.bundle"
   p.clean_globs     << "tmp"
   p.clean_globs     << "vendor/spidermonkey/**/*.OBJ"
+  p.clean_globs     << "ext/**/*.{o,so,bundle,a,log}"
 
   p.extra_deps      << "rake"
   p.extra_dev_deps  << "rake-compiler"

data/ext/spidermonkey/runtime.c

@@ -30,6 +30,30 @@ static JSTrapStatus trap_handler( JSContext *UNUSED(context),
   return JSTRAP_CONTINUE;
 }
 
+/*
+ * call-seq:
+ *   clear_trap(script, line_num)
+ *
+ * Set the trap at +script+ and +line_num+ to +block+
+ */
+static VALUE clear_trap(VALUE self, VALUE script, VALUE linenum)
+{
+  JohnsonRuntime* runtime;
+  Data_Get_Struct(self, JohnsonRuntime, runtime);
+
+  JSContext * context = johnson_get_current_context(runtime);
+  jsval compiled_js;
+  if(!convert_to_js(runtime, script, &compiled_js))
+    rb_raise(rb_eRuntimeError, "Couldn't get compiled script.");
+
+  JSScript * js_script = (JSScript *)JS_GetPrivate(context, JSVAL_TO_OBJECT(compiled_js));
+
+  jsbytecode * pc = JS_LineNumberToPC(context, js_script, (uintN)NUM2INT(linenum));
+  JS_ClearTrap(context, js_script, pc, NULL, NULL);
+
+  return self;
+}
+
 /*
  * call-seq:
  *   set_trap(script, parsecode, block)
@@ -228,24 +252,21 @@ initialize_native(VALUE self, VALUE UNUSED(options))
 {
   JohnsonRuntime* runtime;
   Data_Get_Struct(self, JohnsonRuntime, runtime);
-  
+
   if ((runtime->js = JS_NewRuntime(0x100000))
     && (runtime->jsids = create_id_hash())
-    && (runtime->rbids = create_id_hash())
-  )
+    && (runtime->rbids = create_id_hash()))
   {
     JS_SetRuntimePrivate(runtime->js, (void *)self);
     JS_SetGCCallbackRT(runtime->js, gc_callback);
 
     JSContext* context = johnson_get_current_context(runtime);
-    if(
-        (runtime->global = JS_GetGlobalObject(context))
-        && (JS_AddNamedRoot(context, &(runtime->global), "runtime->global"))
-    ) {
+
+    if (runtime->global = JS_GetGlobalObject(context))
       return self;
-    }
   }
 
+  // clean up after an initialization failure
 
   if (runtime->rbids)
     JS_HashTableDestroy(runtime->rbids);
@@ -270,16 +291,18 @@ JSContext* johnson_get_current_context(JohnsonRuntime * runtime)
 
 static void deallocate(JohnsonRuntime* runtime)
 {
-  JS_RemoveRoot(johnson_get_current_context(runtime), &(runtime->global));
-  
-  JSContext *context = NULL;
+  // our gc callback can create ruby objects, so disable it
+  JS_SetGCCallbackRT(runtime->js, NULL);
+
+  JSContext *context  = NULL;
   JSContext *iterator = NULL;
 
   while ((context = JS_ContextIterator(runtime->js, &iterator)) != NULL) {
+    JS_SetContextPrivate(iterator, NULL);
     JS_DestroyContext(iterator);
     iterator = NULL;
   }
-  
+
   JS_DestroyRuntime(runtime->js);
   free(runtime);
 }
@@ -303,4 +326,5 @@ void init_Johnson_SpiderMonkey_Runtime(VALUE spidermonkey)
   rb_define_method(klass, "evaluate_compiled_script", evaluate_compiled_script, 1);
   rb_define_private_method(klass, "native_compile", native_compile, 3);
   rb_define_private_method(klass, "set_trap", set_trap, 3);
+  rb_define_private_method(klass, "clear_trap", clear_trap, 2);
 }

data/johnson.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{johnson}
-  s.version = "1.0.0.20090326161333"
+  s.version = "1.0.0.20090402144841"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Barnette", "Aaron Patterson", "Yehuda Katz", "Matthew Draper"]
-  s.date = %q{2009-03-26}
+  s.date = %q{2009-04-02}
   s.default_executable = %q{johnson}
   s.description = %q{}
   s.email = ["jbarnette@rubyforge.org", "aaron.patterson@gmail.com", "wycats@gmail.com", "matthew@trebex.net"]
@@ -30,15 +30,15 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rake-compiler>, [">= 0"])
-      s.add_development_dependency(%q<hoe>, [">= 1.11.0"])
+      s.add_development_dependency(%q<hoe>, [">= 1.12.1"])
     else
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rake-compiler>, [">= 0"])
-      s.add_dependency(%q<hoe>, [">= 1.11.0"])
+      s.add_dependency(%q<hoe>, [">= 1.12.1"])
     end
   else
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rake-compiler>, [">= 0"])
-    s.add_dependency(%q<hoe>, [">= 1.11.0"])
+    s.add_dependency(%q<hoe>, [">= 1.12.1"])
   end
 end

data/lib/johnson/runtime.rb

@@ -50,7 +50,7 @@ module Johnson
     end
 
     def evaluate_compiled_script(script)
-      delegate.evaluate_compiled_script(script)
+      delegate.evaluate_compiled(script)
     end
 
     private

data/lib/johnson/spidermonkey/runtime.rb

@@ -7,6 +7,7 @@ module Johnson #:nodoc:
         @debugger = nil
         @compiled_scripts = {}
         @gcthings = {}
+        @traps = []
         initialize_native(options)
         self["Ruby"] = Object
       end
@@ -42,6 +43,13 @@ module Johnson #:nodoc:
         evaluate_compiled_script(compiled_script)
       end
 
+      def evaluate_compiled script
+        evaluate_compiled_script(script)
+        @traps.each do |trap_tuple|
+          clear_trap(*trap_tuple)
+        end
+      end
+
       ###
       # Compile +script+ with +filename+ and +linenum+
       def compile(script, filename=nil, linenum=nil)
@@ -57,6 +65,7 @@ module Johnson #:nodoc:
 
         compiled_script = @compiled_scripts[filename]
         set_trap(compiled_script, linenum, block)
+        @traps << [compiled_script, linenum]
       end
 
       class << self

data/lib/tasks/testing.rake

@@ -5,31 +5,31 @@ namespace :test do
   VALGRIND_BASIC_OPTS = "--num-callers=50 --error-limit=no --partial-loads-ok=yes --undef-value-errors=no"
 
   desc "run test suite under valgrind with basic ruby options"
-  task :valgrind => :build do
-    cmdline = "valgrind #{VALGRIND_BASIC_OPTS} #{test_suite_cmdline}"
+  task :valgrind => :compile do
+    cmdline = "valgrind #{VALGRIND_BASIC_OPTS} ruby #{HOE.make_test_cmd}"
     puts cmdline
     system cmdline
   end
 
   desc "run test suite under valgrind with memory-fill ruby options"
-  task :valgrind_mem => :build do
+  task :valgrind_mem => :compile do
     # fill malloced memory with "m" and freed memory with "f"
-    cmdline = "valgrind #{VALGRIND_BASIC_OPTS} --freelist-vol=100000000 --malloc-fill=6D --free-fill=66 #{test_suite_cmdline}"
+    cmdline = "valgrind #{VALGRIND_BASIC_OPTS} --freelist-vol=100000000 --malloc-fill=6D --free-fill=66 ruby #{HOE.make_test_cmd}"
     puts cmdline
     system cmdline
   end
 
   desc "run test suite under valgrind with memory-zero ruby options"
-  task :valgrind_mem0 => :build do
+  task :valgrind_mem0 => :compile do
     # fill malloced and freed memory with 0
-    cmdline = "valgrind #{VALGRIND_BASIC_OPTS} --freelist-vol=100000000 --malloc-fill=00 --free-fill=00 #{test_suite_cmdline}"
+    cmdline = "valgrind #{VALGRIND_BASIC_OPTS} --freelist-vol=100000000 --malloc-fill=00 --free-fill=00 ruby #{HOE.make_test_cmd}"
     puts cmdline
     system cmdline
   end
 
   desc "run test suite under gdb"
-  task :gdb => :build do
-    cmdline = "gdb --args #{test_suite_cmdline}"
+  task :gdb => :compile do
+    cmdline = "gdb --args ruby #{HOE.make_test_cmd}"
     puts cmdline
     system cmdline
   end

data/vendor/spidermonkey/Makefile.in

@@ -411,19 +411,6 @@ endif
 ifdef CROSS_COMPILE
 # jscpucfg needs to know when it's supposed to produce a config for the target
 JSCPUCFG_DEFINES = $(ACDEFINES)
-
-# This is incredibly hacky.  Darwin NSPR uses the same MDCPUCFG for multiple
-# processors, and determines which processor to configure for based on
-# #ifdef i386.  This macro is among the NSPR defines, but is also automatically
-# defined by the compiler when building for i386.  It therefore needs to be
-# defined here if targeting i386, and explicitly undefined otherwise.
-ifeq ($(OS_ARCH),Darwin)
-ifeq ($(TARGET_CPU),powerpc)
-JSCPUCFG_DEFINES += -Ui386
-else
-JSCPUCFG_DEFINES += -Di386=1
-endif
-endif
 endif
 
 ifeq ($(OS_ARCH),QNX)

data/vendor/spidermonkey/Makefile.ref

@@ -174,6 +174,7 @@ JS_HFILES =		\
 	jsscope.h	\
 	jsscript.h	\
 	jsstr.h		\
+	jsutil.h        \
 	jsxdrapi.h	\
 	jsxml.h		\
 	$(NULL)

data/vendor/spidermonkey/config.mk

@@ -94,9 +94,6 @@ endif
 ifeq ($(OS_ARCH),Linux)
 OS_CONFIG      := Linux_All
 else
-ifeq ($(OS_ARCH),FreeBSD)
-OS_CONFIG      := FreeBSD
-else
 ifeq ($(OS_ARCH),dgux)
 OS_CONFIG      := dgux
 else
@@ -107,7 +104,6 @@ OS_CONFIG       := $(OS_ARCH)$(OS_OBJTYPE)$(OS_RELEASE)
 endif
 endif
 endif
-endif
 
 ASFLAGS         =
 DEFINES         =