Merge pull request #64 from Distributive-Network/caleb/perf/pyproxyhandler

Perf: return underlying dict during re-entrance rather than wrapping it with a JSObjectProxy

Author: Xmader

include/PyProxyHandler.hh

@@ -22,7 +22,7 @@
  */
 struct PyBaseProxyHandler : public js::BaseProxyHandler {
 public:
-  PyBaseProxyHandler(PyObject *pyObj) : js::BaseProxyHandler(NULL), pyObject(pyObj) {};
+  PyBaseProxyHandler(PyObject *pyObj, const void *family) : js::BaseProxyHandler(family), pyObject(pyObj) {};
   PyObject *pyObject; // @TODO (Caleb Aikens) Consider putting this in a private slot
 
   bool getPrototypeIfOrdinary(JSContext *cx, JS::HandleObject proxy, bool *isOrdinary, JS::MutableHandleObject protop) const override final;
@@ -36,7 +36,8 @@ public:
  */
 struct PyProxyHandler : public PyBaseProxyHandler {
 public:
-  PyProxyHandler(PyObject *pyObj) : PyBaseProxyHandler(pyObj) {};
+  PyProxyHandler(PyObject *pyObj) : PyBaseProxyHandler(pyObj, &family) {};
+  static const char family;
 
   /**
    * @brief [[OwnPropertyKeys]]
@@ -163,7 +164,8 @@ public:
  */
 struct PyListProxyHandler : public PyBaseProxyHandler {
 public:
-  PyListProxyHandler(PyObject *pyObj) : PyBaseProxyHandler(pyObj) {};
+  PyListProxyHandler(PyObject *pyObj) : PyBaseProxyHandler(pyObj, &family) {};
+  static const char family;
 
   bool getOwnPropertyDescriptor(
     JSContext *cx, JS::HandleObject proxy, JS::HandleId id,

src/PyProxyHandler.cc

@@ -45,6 +45,8 @@ bool idToIndex(JSContext *cx, JS::HandleId id, Py_ssize_t *index) {
   }
 }
 
+const char PyProxyHandler::family = 0;
+
 bool PyProxyHandler::ownPropertyKeys(JSContext *cx, JS::HandleObject proxy, JS::MutableHandleIdVector props) const {
   PyObject *keys = PyDict_Keys(pyObject);
   size_t length = PyList_Size(keys);
@@ -153,6 +155,8 @@ bool PyBaseProxyHandler::isExtensible(JSContext *cx, JS::HandleObject proxy,
   return true;
 }
 
+const char PyListProxyHandler::family = 0;
+
 bool PyListProxyHandler::getOwnPropertyDescriptor(
   JSContext *cx, JS::HandleObject proxy, JS::HandleId id,
   JS::MutableHandle<mozilla::Maybe<JS::PropertyDescriptor>> desc

src/pyTypeFactory.cc

@@ -24,6 +24,7 @@
 #include "include/NoneType.hh"
 #include "include/NullType.hh"
 #include "include/PromiseType.hh"
+#include "include/PyProxyHandler.hh"
 #include "include/PyType.hh"
 #include "include/setSpiderMonkeyException.hh"
 #include "include/StrType.hh"
@@ -95,8 +96,12 @@ PyType *pyTypeFactory(JSContext *cx, JS::Rooted<JSObject *> *thisObj, JS::Rooted
     JS::Rooted<JSObject *> obj(cx);
     JS_ValueToObject(cx, *rval, &obj);
     if (JS::GetClass(obj)->isProxyObject()) {
-      // @TODO (Caleb Aikens) need to determine if this is one of OUR ProxyObjects somehow
-      // consider putting a special value in one of the private slots when creating a PyProxyHandler
+      if (js::GetProxyHandler(obj)->family() == &PyProxyHandler::family) { // this is one of our proxies for python dicts
+        return new DictType(((PyProxyHandler *)js::GetProxyHandler(obj))->pyObject);
+      }
+      if (js::GetProxyHandler(obj)->family() == &PyListProxyHandler::family) { // this is one of our proxies for python lists
+        return new ListType(((PyListProxyHandler *)js::GetProxyHandler(obj))->pyObject);
+      }
     }
     js::ESClass cls;
     JS::GetBuiltinClass(cx, obj, &cls);

tests/python/test_dicts_lists.py

@@ -1,5 +1,25 @@
 import pythonmonkey as pm
 
+def test_eval_dicts():
+    d = {"a":1}
+    proxy_d = pm.eval("(dict) => { return dict; }")(d)
+    assert d is proxy_d
+
+def test_eval_dicts_subdicts():
+    d = {"a":1, "b":{"c": 2}}
+    
+    assert pm.eval("(dict) => { return dict.a; }")(d) == 1.0
+    assert pm.eval("(dict) => { return dict.b; }")(d) is d["b"]
+    assert pm.eval("(dict) => { return dict.b.c; }")(d) == 2.0
+
+def test_eval_dicts_cycle():
+    d: dict = {"a":1, "b":2}
+    d["recursive"] = d
+    
+    assert pm.eval("(dict) => { return dict.a; }")(d) == 1.0
+    assert pm.eval("(dict) => { return dict.b; }")(d) == 2.0
+    assert pm.eval("(dict) => { return dict.recursive; }")(d) is d["recursive"]
+
 def test_eval_objects():
     pyObj = pm.eval("Object({a:1.0})")
     assert pyObj == {'a':1.0}