0
@@ -114,7 +114,7 @@ static bool const_p(VALUE self, char* name)
0
 
0
 static bool global_p(char* name)
0
 {
0
-  return rb_ary_includes(rb_f_global_variables(), rb_str_new2(name));
0
+  return *name == '$' && rb_ary_includes(rb_f_global_variables(), rb_str_new2(name));
0
 }
0
 
0
 static bool method_p(VALUE self, char* name)
0
@@ -549,7 +549,7 @@ static void finalize(JSContext* js_context, JSObject* obj)
0
             JS_GET_CLASS(context->js, obj), NULL);
0
     
0
     // remove the proxy OID from the id map
0
-    JS_HashTableRemove(runtime->rbids, (void *)rb_obj_id(self));
0
+    JS_HashTableRemove(runtime->rbids, (void *)self);
0
     
0
     // free up the ruby value for GC
0
     call_ruby_from_js(runtime, NULL, ruby_context, rb_intern("remove_gcthing"), 1, self);
0
@@ -558,15 +558,15 @@ static void finalize(JSContext* js_context, JSObject* obj)
0
 
0
 JSBool make_js_land_proxy(JohnsonRuntime* runtime, VALUE value, jsval* retval)
0
 {
0
-  JSContext * context = johnson_get_current_context(runtime);
0
-  jsid id = (jsid)JS_HashTableLookup(runtime->rbids, (void *)rb_obj_id(value));
0
+  *retval = (jsval)JS_HashTableLookup(runtime->rbids, (void *)value);
0
   
0
-  if (id)
0
+  if (*retval)
0
   {
0
-    return JS_IdToValue(context, id, retval);
0
+    return JS_TRUE;
0
   }
0
   else
0
   {
0
+    JSContext * context = johnson_get_current_context(runtime);
0
     PREPARE_JROOTS(context, 1);
0
 
0
     JSObject *jsobj;
0
@@ -597,11 +597,8 @@ JSBool make_js_land_proxy(JohnsonRuntime* runtime, VALUE value, jsval* retval)
0
 
0
     *retval = OBJECT_TO_JSVAL(jsobj);
0
 
0
-    jsval newid;
0
-    JCHECK(JS_ValueToId(context, *retval, &newid));
0
-  
0
     // put the proxy OID in the id map
0
-    JCHECK(JS_HashTableAdd(runtime->rbids, (void *)rb_obj_id(value), (void *)newid));
0
+    JCHECK(JS_HashTableAdd(runtime->rbids, (void *)value, (void *)(*retval)));
0
     
0
     // root the ruby value for GC
0
     VALUE ruby_context = (VALUE)JS_GetContextPrivate(context);

0
@@ -9,23 +9,10 @@ DEFINE_RUBY_WRAPPER(rb_yield, rb_yield, ARGLIST1(v))
0
 
0
 static VALUE proxy_class = Qnil;
0
 
0
-static JSBool get_jsval_for_proxy(RubyLandProxy* proxy, jsval* jv)
0
+static inline JSBool get_jsval_for_proxy(RubyLandProxy* proxy, jsval* jv)
0
 {
0
-  JSContext * context = johnson_get_current_context(proxy->runtime);
0
-  PREPARE_JROOTS(context, 0);
0
-
0
-  // FIXME: this is totally lame
0
-  char global_key[10];
0
-  sprintf(global_key, "%x", (int)proxy->runtime->global);
0
-  
0
-  if (0 == strcmp(global_key, proxy->key))
0
-  {
0
-    *jv = OBJECT_TO_JSVAL(proxy->runtime->global);
0
-    JRETURN;
0
-  }
0
-  
0
-  JCHECK(JS_GetProperty(context, proxy->runtime->gcthings, proxy->key, jv));
0
-  JRETURN;
0
+  *jv = (jsval)(proxy->key);
0
+  return JS_TRUE;
0
 }
0
 
0
 static VALUE call_js_function_value(JohnsonRuntime* runtime, jsval target, jsval function, int argc, VALUE* argv)
0
@@ -454,23 +441,21 @@ static VALUE to_s(VALUE self)
0
 
0
 static void finalize(RubyLandProxy* proxy)
0
 {
0
-  JSContext * context = johnson_get_current_context(proxy->runtime);
0
-  PREPARE_RUBY_JROOTS(context, 0);
0
-  jsval proxy_value;
0
-  JCHECK_RUBY(get_jsval_for_proxy(proxy, &proxy_value));
0
-  
0
   // could get finalized after the context has been freed
0
   if (proxy->runtime && proxy->runtime->jsids)
0
   {
0
     // remove this proxy from the OID map
0
+    jsval proxy_value;
0
+    get_jsval_for_proxy(proxy, &proxy_value);
0
     JS_HashTableRemove(proxy->runtime->jsids, (void *)proxy_value);
0
-  
0
+  }
0
+
0
+  if (proxy->runtime)
0
+  {
0
     // remove our GC handle on the JS value
0
-    JS_DeleteProperty(context, proxy->runtime->gcthings, proxy->key);
0
-    
0
-    proxy->runtime = 0;
0
+    JS_RemoveRootRT(proxy->runtime->js, &(proxy->key));
0
   }
0
-  
0
+
0
   free(proxy);
0
 }
0
 
0
@@ -496,13 +481,11 @@ JSBool unwrap_ruby_land_proxy(JohnsonRuntime* runtime, VALUE wrapped, jsval* ret
0
 VALUE make_ruby_land_proxy(JohnsonRuntime* runtime, jsval value)
0
 {
0
   VALUE id = (VALUE)JS_HashTableLookup(runtime->jsids, (void *)value);
0
-  JSContext * context = johnson_get_current_context(runtime);
0
   
0
   if (id)
0
   {
0
     // if we already have a proxy, return it
0
-    return rb_funcall(rb_const_get(rb_cObject,
0
-      rb_intern("ObjectSpace")), rb_intern("_id2ref"), 1, id);
0
+    return id;
0
   }
0
   else
0
   {    
0
@@ -510,18 +493,19 @@ VALUE make_ruby_land_proxy(JohnsonRuntime* runtime, jsval value)
0
     RubyLandProxy* our_proxy; 
0
     VALUE proxy = Data_Make_Struct(proxy_class, RubyLandProxy, 0, finalize, our_proxy);
0
 
0
+    JSContext * context = johnson_get_current_context(runtime);
0
+
0
     PREPARE_RUBY_JROOTS(context, 1);
0
     JROOT(value);
0
 
0
-    // root the value for JS GC and lookups
0
-    sprintf(our_proxy->key, "%x", (int)value);
0
-    
0
-    JCHECK(JS_SetProperty(context, runtime->gcthings, our_proxy->key, &value));
0
-
0
     our_proxy->runtime = runtime;
0
+    our_proxy->key = (void *)value;
0
+
0
+    // root the value for JS GC and lookups
0
+    JCHECK(JS_AddNamedRootRT(runtime->js, &(our_proxy->key), "RubyLandProxy"));
0
 
0
     // put the proxy OID in the id map
0
-    JCHECK(JS_HashTableAdd(runtime->jsids, (void *)value, (void *)rb_obj_id(proxy)));
0
+    JCHECK(JS_HashTableAdd(runtime->jsids, (void *)value, (void *)proxy));
0
     
0
     JRETURN_RUBY(proxy);
0
   }

0
@@ -5,7 +5,7 @@
0
 #include "runtime.h"
0
 
0
 typedef struct {
0
-  char key[10];
0
+  void* key;
0
   JohnsonRuntime* runtime;
0
 } RubyLandProxy;
0
 

0
@@ -134,9 +134,6 @@ initialize_native(VALUE self, VALUE UNUSED(options))
0
   JohnsonRuntime* runtime;
0
   Data_Get_Struct(self, JohnsonRuntime, runtime);
0
   
0
-  bool global_rooted_p = false;
0
-  bool gcthings_rooted_p = false;
0
-
0
   if ((runtime->js = JS_NewRuntime(0x100000))
0
     && (runtime->jsids = create_id_hash())
0
     && (runtime->rbids = create_id_hash())
0
@@ -147,17 +144,11 @@ initialize_native(VALUE self, VALUE UNUSED(options))
0
 
0
     JSContext* context = johnson_get_current_context(runtime);
0
     if(
0
-        (runtime->gcthings = JS_NewObject(context, NULL, 0, 0))
0
-        &&(gcthings_rooted_p = JS_AddNamedRoot(context, &(runtime->gcthings), "runtime->gcthings"))
0
-        &&(runtime->global = JS_GetGlobalObject(context))
0
-        &&(global_rooted_p = JS_AddNamedRoot(context, &(runtime->global), "runtime->global"))
0
+        (runtime->global = JS_GetGlobalObject(context))
0
+        && (JS_AddNamedRoot(context, &(runtime->global), "runtime->global"))
0
     ) {
0
       return self;
0
     }
0
-    if (global_rooted_p)
0
-      JS_RemoveRoot(context, &(runtime->global));
0
-    if (gcthings_rooted_p)
0
-      JS_RemoveRoot(context, &(runtime->gcthings));
0
   }
0
 
0
 

0
@@ -17,7 +17,6 @@ typedef struct {
0
 
0
   JSHashTable *jsids; // jsid -> rbid
0
   JSHashTable *rbids; // rbid -> jsid
0
-  JSObject *gcthings;
0
 } JohnsonRuntime;
0
 
0
 JSContext* johnson_get_current_context(JohnsonRuntime* runtime);