Changeset 16

Timestamp:

04/14/06 21:09:14 (3 years ago)

Author:

scottmc

Message:

Works precisely as desired

• Bugs worked out of event loop
• Arguments now rooted properly until the end of event execution
• Objects live as long as they're supposed to
• API Changes
  • .yield(object, "methodName", arguments ..)
  • This is fast!

Files:

• trunk/sagot/src/sagot_glib_eventloop.c (modified) (3 diffs)

trunk/sagot/src/sagot_glib_eventloop.c

@@ -74 +74 @@
 
 struct queue_item {
-    jsval *argv;
+    int *esid;
+    JSObject *args;
     uintN argc;
     JSContext *cx;
 };
 
+/**
+ * Dispatch an event from glib to javascript
+ */
 gboolean sagot_eventloop_dispatch (void *data) {
     struct queue_item *qitem = (struct queue_item *) data;
     JSContext *cx = qitem->cx;
-    jsval *argv = qitem->argv;
-    jsval argc = qitem->argc;
+    uintN argc = qitem->argc;
+    JSObject *arglist = qitem->args;
+    jsval argv[qitem->argc];
 
-    JSObject *fobj = JSVAL_TO_OBJECT(argv[0]);
-    JSObject *parent = JS_GetParent(cx, fobj);
+    for (int i = 0; i < argc; i++) {
+        JS_GetElement(cx, arglist, i, &argv[i]);
+    }
 
-    JSFunction *function = JS_ValueToFunction(cx, argv[0]);
+    /* We use the first two parameters, and we don't hand them off.. */
+    argc -= 2;
+
+    /* Used to try to use the parent of argv[0], which was a function. It never
+     * worked though, apparently you cannot bend the rules of ecmascript
+     * interfaces just because you're in spidermonkey unless you hack things up
+     * a bit ;-) */
+    JSObject *parent = NULL;
+    
+    if (JSVAL_IS_OBJECT(argv[0])) {
+        parent = JSVAL_TO_OBJECT(argv[0]);
+    }
+    else {
+        parent = JS_GetParent(cx, JSVAL_TO_OBJECT(argv[1]));
+    }
+
+    JSFunction *function = JS_ValueToFunction(cx, argv[1]);
 
     jsval *rval;
-    jsval *args = g_malloc(sizeof(jsval *) * (argc - 1));
+    jsval args[argc];
 
-    for (int i = 1; i < argc; i++) {
-        args[i - 1] = argv[i];
+    for (int i = 0; i < argc; i++) {
+        args[i] = argv[i + 2];
     }
 
-    JS_CallFunction(cx, parent, function, qitem->argc, args, rval); 
-
-    g_free(args);
+    JS_CallFunction(cx, parent, function, argc, args, rval); 
 
     return FALSE;
@@ -107 +127 @@
     struct queue_item *qitem = (struct queue_item *) data;
 
-    JS_RemoveRoot(qitem->cx, qitem->argv);
+    JS_RemoveRoot(qitem->cx, &qitem->args);
 
+    g_free(qitem->esid);
     g_free(qitem);
 }
@@ -119 +140 @@
     struct queue_item *qitem = g_malloc(sizeof(struct queue_item));
 
-    *qitem = (struct queue_item) {
-        .argv = argv,
-        .argc = argc,
-    };
-
-    if (argc < 1) {
-        JS_ReportError(cx, "EventLoop.enqueue() requires arguments");
+    if (argc < 2) {
+        JS_ReportError(cx, "EventLoop.yield() requires 2 arguments");
         return false;
     }
 
-    if (JS_ObjectIsFunction(cx, JSVAL_TO_OBJECT(qitem->argv[0]))) {
-        qitem->cx = cx;
+    if (JSVAL_IS_STRING(argv[1])) {
+        JS_GetProperty(cx, JSVAL_TO_OBJECT(argv[0]), 
+                JS_GetStringBytes(JS_ValueToString(cx, argv[1])), &argv[1]);
 
-        g_idle_add_full(0, sagot_eventloop_dispatch, qitem, 
-                sagot_eventloop_dispatch_cleanup);
+        if (JS_ObjectIsFunction(cx, JSVAL_TO_OBJECT(argv[1]))) {
+            /* This might be kind of slow, think about creating a source
+             * specifically for these vents, attaching the source to the loop, and
+             * creating new events from the source.  g_idle_add_* functions create
+             * a new source for each event.
+             */
 
-        JS_AddRoot(cx, argv);
+            *qitem = (struct queue_item) {
+                .esid = g_malloc(sizeof(int)),
+                .args = JS_NewArrayObject(cx, argc, argv),
+                .argc = argc,
+                .cx   = cx,
+            };
 
-        return true;
+            /* Store the source at the location of the pointer we're pointing
+             * to...funky I know.  Later, we'll even store data using this id, then
+             * fetch it when the event is invoked */
+            g_idle_add_full(0, sagot_eventloop_dispatch, qitem,
+                    sagot_eventloop_dispatch_cleanup);
+
+            JS_AddRoot(cx, &qitem->args);
+
+            return true;
+        }
     }
 
-    JS_ReportError(cx, "argument 1 to enqueue() must be a function");
+    JS_ReportError(cx, "argument 1 to enqueue() must be a string");
 
     return false;