Changeset 6 for trunk/sagot/src/sagot_glib_eventloop.c

Timestamp:

04/03/06 00:50:06 (3 years ago)

Author:

scottmc

Message:

Event loop functioning

Basic segfault when event loop returns and queue is empty, process should go
into idle at that state.

Files:

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

trunk/sagot/src/sagot_glib_eventloop.c

@@ -25 +25 @@
 
 static JSFunctionSpec eventloop_methods[] = {
-    {"run",         sagot_eventloop_run, 0,0,0 },
-    {"quit",        sagot_eventloop_quit, 0,0,0 },
+    {"run",         sagot_eventloop_run,        0,0,0 },
+    {"quit",        sagot_eventloop_quit,       0,0,0 },
+    {"yield",       sagot_eventloop_yield,      1,0,0 },
 };
 
@@ -82 +83 @@
     JSContext *cx = qitem->cx;
     jsval *argv = qitem->argv;
+    jsval argc = qitem->argc;
 
     JSObject *fobj = JSVAL_TO_OBJECT(argv[0]);
@@ -89 +91 @@
 
     jsval *rval;
-    JS_CallFunction(cx, parent, function, qitem->argc, argv, rval); 
+    jsval *args = g_malloc(sizeof(jsval *) * (argc - 1));
 
-    JS_RemoveRoot(cx, rval);
-    JS_RemoveRoot(cx, argv);
+    for (int i = 1; i < argc; i++) {
+        args[i - 1] = argv[i];
+    }
+
+    JS_CallFunction(cx, parent, function, qitem->argc, args, rval); 
+
+    return TRUE;
+}
+
+void sagot_eventloop_dispatch_cleanup (void *data) {
+    struct queue_item *qitem = (struct queue_item *) data;
+
+    JS_RemoveRoot(qitem->cx, qitem->argv);
 
     g_free(qitem);
 }
 
-void sagot_eventloop_dispatch_cleanup (void *data) {
-    JSObject *object = (JSObject *) data;
-}
-
-static JSBool sagot_eventloop_enqueue (JSContext *cx, JSObject *obj, uintN
+static JSBool sagot_eventloop_yield (JSContext *cx, JSObject *obj, uintN
         argc, jsval *argv, jsval *rval) {
     GMainLoop *mainloop = (GMainLoop *) JS_GetPrivate(cx, obj);
@@ -115 +124 @@
     if (argc < 1) {
         JS_ReportError(cx, "EventLoop.enqueue() requires arguments");
-        return JS_FALSE;
+        return false;
     }
 
@@ -126 +135 @@
         JS_AddRoot(cx, argv);
 
-        return JS_TRUE;
+        return true;
     }
 
     JS_ReportError(cx, "argument 1 to enqueue() must be a function");
 
-    return JS_FALSE;
+    return false;
 }