johnson 2.0.0.pre1 → 2.0.0.pre2

data/ext/tracemonkey/runtime.cc

@@ -22,6 +22,17 @@ static VALUE global(VALUE self)
   return convert_to_ruby(runtime, OBJECT_TO_JSVAL(runtime->global));
 }
 
+static VALUE new_global(VALUE self)
+{
+  JohnsonRuntime* runtime;
+  Data_Get_Struct(self, JohnsonRuntime, runtime);
+  JSContext * context = johnson_get_current_context(runtime);
+
+  PREPARE_RUBY_JROOTS(context, 0);
+  JSObject* obj = johnson_create_global_object(context);
+  JRETURN_RUBY(convert_to_ruby(runtime, OBJECT_TO_JSVAL(obj)));
+}
+
 static VALUE new_split_global_outer(VALUE self)
 {
   JohnsonRuntime* runtime;
@@ -53,6 +64,24 @@ static VALUE new_split_global_inner(VALUE self, VALUE ruby_outer)
   JRETURN_RUBY(convert_to_ruby(runtime, OBJECT_TO_JSVAL(new_inner_object)));
 }
 
+static VALUE seal(VALUE self, VALUE ruby_object, VALUE deep)
+{
+  JohnsonRuntime* runtime;
+  Data_Get_Struct(self, JohnsonRuntime, runtime);
+  JSContext * context = johnson_get_current_context(runtime);
+
+  PREPARE_RUBY_JROOTS(context, 1);
+
+  jsval object;
+
+  JCHECK(convert_to_js(runtime,ruby_object,&object));
+  JROOT(object);
+
+  JSBool ok = JS_SealObject(context, JSVAL_TO_OBJECT(object), deep == Qfalse || deep == Qnil ? JS_FALSE : JS_TRUE);
+
+  JRETURN_RUBY(convert_to_ruby(runtime, ok ? JSVAL_TRUE : JSVAL_FALSE));
+}
+
 static JSTrapStatus trap_handler( JSContext *context,
                                   JSScript *UNUSED(script),
                                   jsbytecode *UNUSED(pc),
@@ -218,8 +247,10 @@ static VALUE evaluate_compiled_script(VALUE self, VALUE compiled_script, VALUE r
 
     if (johnson_context->ex) {
       RAISE_JS_ERROR(self, johnson_context->ex);
-      return Qnil;
+    } else {
+      rb_raise(rb_eNoMemError,"spidermonkey ran out of memory");
     }
+    return Qnil;
   }
 
   return convert_to_ruby(runtime, js);
@@ -250,6 +281,12 @@ set_gc_zeal(VALUE self, VALUE zeal)
 }
 #endif
 
+#ifdef DEBUG
+void* from = 0;
+void* thing = 0;
+unsigned depth = 0;
+#endif DEBUG
+
 /*
  * call-seq:
  *   gc()
@@ -266,6 +303,14 @@ gc(VALUE self)
 
   JS_GC(context);
 
+#ifdef DEBUG
+  if(depth){
+    fprintf(stderr,"dumping\n");
+    JS_DumpHeap(context, stderr, from, 0, thing, depth, 0);
+    fprintf(stderr,"done\n");
+  }
+#endif
+
   return Qnil;
 }
 
@@ -339,18 +384,23 @@ JSBool gc_callback(JSContext *context, JSGCStatus status)
 
 /**
  * call-seq:
- *   initialize_native(options)
+ *   initialize_native(size, options)
  *
  * Create the underlying TraceMonkey runtime. This must be called
  * first, and only once. Called by +initialize+ by default.
  */
 static VALUE
-initialize_native(VALUE self, VALUE UNUSED(options))
+initialize_native(VALUE self, VALUE size, VALUE UNUSED(options))
 {
   JohnsonRuntime* runtime;
   Data_Get_Struct(self, JohnsonRuntime, runtime);
 
-  if ((runtime->js = JS_NewRuntime(0x2000000))
+  size_t s = NUM2INT(size);
+  if (s == 0) {
+    s = 0x2000000;
+  }
+
+  if ((runtime->js = JS_NewRuntime(s))
     && (runtime->jsids = create_id_hash())
     && (runtime->rbids = create_id_hash()))
   {
@@ -396,8 +446,14 @@ static int proxy_cleanup_enumerator(JSHashEntry *entry, int /* i */, void* arg)
   return 0;
 }
 
-static void deallocate(JohnsonRuntime* runtime)
+/*
+static VALUE destroy(VALUE self)
 {
+  JohnsonRuntime* runtime;
+  Data_Get_Struct(self, JohnsonRuntime, runtime);
+
+  fprintf(stderr,"destroy SM RT\n");
+
   // our gc callback can create ruby objects, so disable it
   JS_SetGCCallbackRT(runtime->js, NULL);
 
@@ -415,6 +471,35 @@ static void deallocate(JohnsonRuntime* runtime)
   JS_DestroyContext(cleanup);
 
   JS_DestroyRuntime(runtime->js);
+
+  runtime->js = 0;
+
+  return Qnil;
+}
+*/
+
+static void deallocate(JohnsonRuntime* runtime)
+{
+  if (runtime->js) {
+    // 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;
+    }
+
+    JSContext* cleanup = JS_NewContext(runtime->js, 8192L);
+    JS_HashTableEnumerateEntries(runtime->jsids, proxy_cleanup_enumerator, runtime);
+    JS_DestroyContext(cleanup);
+
+    JS_DestroyRuntime(runtime->js);
+  }
+
   free(runtime);
 }
 
@@ -437,13 +522,16 @@ void init_Johnson_TraceMonkey_Runtime(VALUE tracemonkey)
   VALUE klass = rb_define_class_under(tracemonkey, "Runtime", johnson_runtime);
 
   rb_define_alloc_func(klass, allocate);
-  rb_define_private_method(klass, "initialize_native", (ruby_callback)initialize_native, 1);
+  rb_define_private_method(klass, "initialize_native", (ruby_callback)initialize_native, 2);
 
   rb_define_method(klass, "global", (ruby_callback)global, 0);
+  rb_define_method(klass, "new_global", (ruby_callback)global, 0);
 
   rb_define_method(klass, "new_split_global_outer", (ruby_callback)new_split_global_outer, 0);
   rb_define_method(klass, "new_split_global_inner", (ruby_callback)new_split_global_inner, 1);
 
+  rb_define_method(klass, "seal", (ruby_callback)seal, 2);
+
   rb_define_method(klass, "debugger=", (ruby_callback)set_debugger, 1);
   rb_define_method(klass, "gc", (ruby_callback)gc, 0);
 #ifdef JS_GC_ZEAL
@@ -453,4 +541,6 @@ void init_Johnson_TraceMonkey_Runtime(VALUE tracemonkey)
   rb_define_private_method(klass, "native_compile", (ruby_callback)native_compile, 4);
   rb_define_method(klass, "set_trap", (ruby_callback)set_trap, 3);
   rb_define_private_method(klass, "clear_trap", (ruby_callback)clear_trap, 2);
+
+  // rb_define_private_method(klass, "_destroy", (ruby_callback)destroy, 0);
 }

data/ext/tracemonkey/split_global.cc

@@ -3,17 +3,12 @@
 JSObject* johnson_create_split_global_outer_object(JSContext* cx)
 {
   JSObject* outer = split_create_outer(cx);
-  // fprintf(stderr,"outer %08x\n", outer);
   return outer;
 }
 
 JSObject* johnson_create_split_global_inner_object(JSContext* cx, JSObject* outer)
 {
-  // JSObject* current = JS_GetGlobalObject(cx);
-  // JS_SetGlobalObject(cx, outer);
   JSObject* inner = split_create_inner(cx, outer);
   JS_ClearScope(cx, outer);
-  // fprintf(stderr,"inner %08x outer %08x\n", inner, outer);
-  // JS_SetGlobalObject(cx, current);
   return inner;
 }

data/ext/tracemonkey/tracemonkey.h

@@ -1,5 +1,5 @@
-#ifndef JOHNSON_SPIDERMONKEY_H
-#define JOHNSON_SPIDERMONKEY_H
+#ifndef JOHNSON_TRACEMONKEY_H
+#define JOHNSON_TRACEMONKEY_H
 
 #include <assert.h>
 #include <stdarg.h>

data/lib/johnson.rb

@@ -1,5 +1,5 @@
 require "stackdeck"
-
+require 'date'
 require "generator"
 
 # the 'public' interface
@@ -16,7 +16,7 @@ require "johnson/visitors"
 require "johnson/nodes"
 
 module Johnson
-  VERSION = "2.0.0.pre1"
+  VERSION = "2.0.0.pre2"
 
   def self.version
     VERSION

data/lib/johnson/runtime.rb

@@ -26,8 +26,11 @@ module Johnson
      # this is deprecated; instead, just create an instance of that
      # engine's runtime directly.
      #
+     # options passed to the underlying runtime
+     #   Use size to specify heap limit
+     #
      # :call-seq:
-     #   new(runtime_class=nil)
+     #   new(runtime_class=nil, options)
      #
      def self.new(*args)
        return super if self < Johnson::Runtime
@@ -35,12 +38,10 @@ module Johnson
        delegate = args.first
        if delegate.is_a? Class
          delegate.new
-       elsif delegate
+       elsif !delegate.nil? && !delegate.is_a?( Hash )
          delegate
-       elsif
-         v = default.new( *args )
-         raise "hell" if !v
-         v
+       else
+         default.new( *args )
        end
      end
 
@@ -124,37 +125,46 @@ module Johnson
       global.Johnson.getStack
     end
 
-    def parse_js_stack(ex, full_stack)
+    def parse_js_stack(full_stack, jsex=nil)
       full_js_stack = full_stack.split(/\n/)
       short_js_stack = current_stack.split(/\n/)
 
       upper, lower = StackDeck.split_list(full_js_stack, short_js_stack)
-      upper.map {|s| StackDeck::Frame::JavaScript.parse(s) }
+      stack = upper.map {|s| StackDeck::Frame::JavaScript.parse(s) }
+
+      if jsex
+        top = StackDeck::Frame::JavaScript.new(nil, jsex['fileName'], jsex['lineNumber'])
+        stack.unshift top unless top.same_line?(stack.first)
+      end
+
+      stack
     end
     private :parse_js_stack
 
     def raise_js_exception(jsex)
+      exception_source = caller(2)
+
       case jsex
       when Exception
         if stack = jsex.send(:remove_instance_variable, :@js_stack)
-          jsex.higher_stack_deck.concat parse_js_stack(jsex, stack)
+          jsex.append_to_stack_deck parse_js_stack(stack)
         end
         raise jsex
       when String
         ex = Johnson::Error.new(jsex)
+        ex.set_backtrace exception_source
       when Johnson::RubyLandProxy
         ex = Johnson::Error.new(jsex['message'] || jsex.to_s, jsex)
+        ex.set_backtrace exception_source
+
         if stack = jsex['stack']
-          stack = parse_js_stack(ex, stack)
-          top = StackDeck::Frame::JavaScript.new(nil, jsex['fileName'], jsex['lineNumber'])
-          stack.unshift top unless top.same_line?(stack.first)
-          ex.higher_stack_deck.concat stack
+          ex.append_to_stack_deck parse_js_stack(stack, jsex)
         end
       else
         ex = Johnson::Error.new(jsex.inspect)
+        ex.set_backtrace exception_source
       end
 
-      ex.set_backtrace caller(2)
       raise ex
     end
 
@@ -168,7 +178,7 @@ module Johnson
 
       def default
         if @runtimes.empty?
-          require "johnson/spidermonkey"
+          require "johnson/tracemonkey"
         end
         @runtimes[0]
       end

data/lib/johnson/tracemonkey/runtime.rb

@@ -12,7 +12,9 @@ module Johnson #:nodoc:
         @debugger = nil
         @gcthings = {}
         @traps = []
-        initialize_native(options)
+        size = (options[:size] || options["size"] || ENV["JOHNSON_HEAP_SIZE"] || 0x2000000).to_i
+        options.delete(:size)
+        initialize_native(size, options)
         super()
       end
       
@@ -31,8 +33,9 @@ module Johnson #:nodoc:
       end
 
       def current_context
-        contexts = (Thread.current[CONTEXT_MAP_KEY] ||= {})
-        contexts[self.object_id] ||= Context.new(self)
+        @thread_id ||= Thread.current.object_id
+        raise RuntimeError, "Johnson is not thread safe" if @thread_id != Thread.current.object_id
+        return @context ||= Context.new(self)
       end
 
       def evaluate(script, filename = nil, linenum = nil, global=nil, scope=nil)

data/vendor/tracemonkey/config/system-headers

@@ -1012,10 +1012,8 @@ hunspell.hxx
 #if MOZ_NATIVE_BZ2==1
 bzlib.h
 #endif
-#ifdef MOZ_PLATFORM_HILDON
+#if MOZ_PLATFORM_MAEMO==5
 hildon-uri.h
 hildon-mime.h
-#endif
-#ifdef NS_OSSO
 libosso.h
 #endif

data/vendor/tracemonkey/jscntxt.h

@@ -956,6 +956,8 @@ typedef struct JSLocalRootStack {
 
 #define JSRESOLVE_INFER         0xffff  /* infer bits from current bytecode */
 
+extern const JSDebugHooks js_NullDebugHooks;  /* defined in jsdbgapi.cpp */
+
 struct JSContext {
     /*
      * If this flag is set, we were asked to call back the operation callback
@@ -1152,8 +1154,9 @@ struct JSContext {
     void updateJITEnabled() {
 #ifdef JS_TRACER
         jitEnabled = ((options & JSOPTION_JIT) &&
-                      !runtime->debuggerInhibitsJIT() &&
-                      debugHooks == &runtime->globalDebugHooks);
+                      (debugHooks == &js_NullDebugHooks ||
+                       (debugHooks == &runtime->globalDebugHooks &&
+                        !runtime->debuggerInhibitsJIT())));
 #endif
     }
 

data/vendor/tracemonkey/jsdbgapi.cpp

@@ -1817,11 +1817,13 @@ JS_GetGlobalDebugHooks(JSRuntime *rt)
     return &rt->globalDebugHooks;
 }
 
+const JSDebugHooks js_NullDebugHooks = {};
+
 JS_PUBLIC_API(JSDebugHooks *)
 JS_SetContextDebugHooks(JSContext *cx, const JSDebugHooks *hooks)
 {
     JS_ASSERT(hooks);
-    if (hooks != &cx->runtime->globalDebugHooks)
+    if (hooks != &cx->runtime->globalDebugHooks && hooks != &js_NullDebugHooks)
         js_LeaveTrace(cx);
 
 #ifdef JS_TRACER
@@ -1836,6 +1838,12 @@ JS_SetContextDebugHooks(JSContext *cx, const JSDebugHooks *hooks)
     return old;
 }
 
+JS_PUBLIC_API(JSDebugHooks *)
+JS_ClearContextDebugHooks(JSContext *cx)
+{
+    return JS_SetContextDebugHooks(cx, &js_NullDebugHooks);
+}
+
 #ifdef MOZ_SHARK
 
 #include <CHUD/CHUD.h>

data/vendor/tracemonkey/jsdbgapi.h

@@ -427,6 +427,10 @@ JS_GetGlobalDebugHooks(JSRuntime *rt);
 extern JS_PUBLIC_API(JSDebugHooks *)
 JS_SetContextDebugHooks(JSContext *cx, const JSDebugHooks *hooks);
 
+/* Disable debug hooks for this context. */
+extern JS_PUBLIC_API(JSDebugHooks *)
+JS_ClearContextDebugHooks(JSContext *cx);
+
 #ifdef MOZ_SHARK
 
 extern JS_PUBLIC_API(JSBool)

data/vendor/tracemonkey/tests/ecma_3_1/Object/jstests.list

@@ -1,2 +1,2 @@
 url-prefix ../../jsreftest.html?test=ecma_3_1/Object/
-script regress-444787.js
+fails script regress-444787.js # bug 535393

data/vendor/tracemonkey/tests/js1_5/Regress/jstests.list

@@ -31,7 +31,7 @@ script regress-167658.js
 script regress-168347.js
 random script regress-169559.js
 script regress-170193.js
-script regress-172699.js
+fails script regress-172699.js # bug 535393
 skip script regress-173067.js # obsolete test
 script regress-174709.js
 script regress-176125.js
@@ -131,7 +131,7 @@ script regress-31255.js
 script regress-312588.js
 random script regress-313967-01.js # BigO
 random script regress-313967-02.js # BigO
-skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) script regress-314401.js # slow
+skip-if(!xulRuntime.shell) script regress-314401.js # bug 538159
 script regress-315974.js
 script regress-315990.js
 script regress-317476.js
@@ -170,7 +170,7 @@ skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) script regress-341360.js # slow
 script regress-343713.js
 script regress-343966.js
 script regress-344711-n.js
-script regress-344804.js
+skip-if(!xulRuntime.shell) script regress-344804.js # bug 547025
 script regress-344959.js
 script regress-346237.js
 script regress-346801.js
@@ -340,7 +340,7 @@ script regress-481436.js
 script regress-482421.js
 script regress-483103.js
 script regress-501124.js
-fails script regress-504078.js
+script regress-504078.js
 script regress-506567.js
 script regress-57043.js
 script regress-58116.js