Subject: [gjs/wip/ptomato/mozjs38: 14/17] WIP - object.cpp
weak pointer callback



commit 55a74df7f48a685653d32255ce342625c916199e
Author: Philip Chimento <[email protected]>
Date: Wed Jan 11 23:37:28 2017 -0800

WIP - object.cpp weak pointer callback

Weak pointers need callbacks now!

Also can get rid of gjs_runtime_is_sweeping()?

gi/object.cpp | 49 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 38 insertions(+), 11 deletions(-)
---
diff --git a/gi/object.cpp b/gi/object.cpp
index 781686e..ac8db9d 100644
--- a/gi/object.cpp
+++ b/gi/object.cpp
@@ -23,6 +23,7 @@

#include <config.h>

+#include <deque>
#include <memory>
#include <stack>
#include <string.h>
@@ -95,6 +96,11 @@ static GHashTable *class_init_properties;

static GjsKeepAlive keep_alive_list;

+static bool weak_pointer_callback = false;
+/* Use std::deque here instead of std::vector so that elements don't have to
+ * get moved around when the storage size changes */
+static std::deque<GObject *> weak_pointer_list;
+
extern struct JSClass gjs_object_instance_class;
static GThread *gjs_eval_thread;
static volatile gint pending_idle_toggles;
@@ -1203,16 +1209,7 @@ wrapped_gobj_toggle_notify(gpointer data,
g_error("toggling up object %s that's already queued to toggle
up\n",
G_OBJECT_TYPE_NAME(gobj));
}
- if (is_sweeping) {
- if (JS_IsAboutToBeFinalized(ensure_heap_wrapper(gobj))) {
- /* Ouch, the JS object is dead already. Disassociate the
GObject
- * and hope the GObject dies too.
- */
- disassociate_js_gobject(gobj);
- }
- } else {
- handle_toggle_up(gobj);
- }
+ handle_toggle_up(gobj);
} else {
queue_toggle_idle(gobj, TOGGLE_UP);
}
@@ -1281,6 +1278,34 @@ init_object_private (JSContext *context,
}

static void
+update_heap_wrapper_weak_pointers(JSRuntime *rt,
+ gpointer data)
+{
+ for (auto iter = weak_pointer_list.begin(); iter !=
weak_pointer_list.end();
+ iter++) {
+ GObject *gobj = *iter;
+ auto heap_wrapper = ensure_heap_wrapper(gobj);
+ JS_UpdateWeakPointerAfterGC(heap_wrapper);
+
+ if (heap_wrapper == NULL) {
+ /* Ouch, the JS object is dead already. Disassociate the GObject
+ * and hope the GObject dies too.
+ */
+ disassociate_js_gobject(gobj);
+ iter = weak_pointer_list.erase(iter);
+ }
+ }
+}
+
+static void
+ensure_weak_pointer_callback(JSContext *cx)
+{
+ if (!weak_pointer_callback)
+ JS_AddWeakPointerCallback(JS_GetRuntime(cx),
+ update_heap_wrapper_weak_pointers, NULL);
+}
+
+static void
associate_js_gobject (JSContext *context,
JS::HandleObject object,
GObject *gobj)
@@ -1290,6 +1315,8 @@ associate_js_gobject (JSContext *context,
priv = priv_from_js(context, object);
priv->gobj = gobj;

+ ensure_weak_pointer_callback(context);
+
g_assert(peek_js_obj(gobj) == NULL);
set_js_obj(gobj, object);

@@ -2125,7 +2152,7 @@ static void
set_js_obj(GObject *gobj,
JSObject *obj)
{
- ensure_heap_wrapper(gobj)->set(obj);
+ *ensure_heap_wrapper(gobj) = obj;
}

static void
_______________________________________________
commits-list mailing list (read only)
https://mail.gnome.org/mailman/listinfo/commits-list

Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.



Programming list archiving by: Enterprise Git Hosting