Changeset 37

Timestamp:

04/01/07 19:58:22 (22 months ago)

Author:

scott

Message:

Minor Cleanup, Sorted out IO errors

• File.read() works, test passed.
• Slightly refactored allocation of queue items:
  • This code still needs some refactoring, and in fact should probably live in a different component.
• Fixed an unforeseen bug in Print() where data checking was inadequate.

This fixes #50.

Location:

trunk/sagot/src

Files:

• sagot.c (modified) (1 diff)
• sagot_glib_eventloop.c (modified) (9 diffs)

trunk/sagot/src/sagot.c

@@ -106 +106 @@
 
     for (i = n = 0; i < argc; i++) {
-        str = JS_ValueToString(cx, argv[i]);
-        if (!str)
+        if (!JSVAL_IS_NULL(argv[i]) && JSVAL_IS_STRING(argv[i])) {
+            str = JS_ValueToString(cx, argv[i]);
+        }
+        else {
             return JS_FALSE;
+        }
+
         fprintf(stdout, "%s%s", i ? " " : "", JS_GetStringBytes(str));
     }
+
     n++;
     if (n)
         fputc('\n', stdout);
+
     return JS_TRUE;
 }

trunk/sagot/src/sagot_glib_eventloop.c

@@ -74 +74 @@
 
 struct queue_item {
-    int *esid;
-    JSObject *args;
-    uintN argc;
-    JSContext *cx;
+    JSContext   *cx;
+
+    uintN       argc;
+    jsval       *argv;
+
+    JSObject    *parent;
+    JSFunction  *callback;
 };
+
+struct queue_item * queue_item_new (JSContext *cx, uintN argc, jsval *argv,
+        JSObject *parent, JSFunction *callback) {
+
+    struct queue_item *qitem = g_malloc(sizeof *qitem);
+
+    /* Mad syntax errors ... why? 
+    *qitem = (struct queue_item *) {
+        .cx         = cx,
+        .argc       = argc,
+        .argv       = OBJECT_TO_JSVAL(JS_NewArrayObject(cx, argc, argv)),
+        .parent     = parent,
+        .callback   = callback
+    };
+    */
+
+    qitem->cx         = cx;
+    qitem->argc       = argc;
+    qitem->argv       = OBJECT_TO_JSVAL(JS_NewArrayObject(cx, argc, argv));
+    qitem->parent     = parent;
+    qitem->callback   = callback;
+
+    /* Make sure callback is protected */
+    JS_AddRoot(cx, parent);
+    JS_AddRoot(cx, callback);
+
+    /* Make sure arguments are protected */
+    JS_AddRoot(cx, qitem->argv);
+
+    return qitem;
+}
+
+void queue_item_destroy (struct queue_item *qitem) {
+    JS_RemoveRoot(qitem->cx, qitem->parent);
+    JS_RemoveRoot(qitem->cx, qitem->callback);
+
+    JS_RemoveRoot(qitem->cx, qitem->argv);
+
+    g_free(qitem);
+}
 
 gboolean sagot_eventloop_io_dispatch ( GIOChannel *source, GIOCondition
@@ -91 +134 @@
     fprintf(stderr, "got %X\n", data);
     struct queue_item *qitem = (struct queue_item *) data;
-    JSContext *cx = qitem->cx;
-    uintN argc = qitem->argc;
-    JSObject *arglist = qitem->args;
-    jsval argv[argc];
-
-    for (int i = 0; i < argc; i++) {
-        JS_GetElement(cx, arglist, i, &argv[i]);
-    }
-
-    /* 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;
-    
-    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[argc];
-
-    for (int i = 0; i < argc; i++) {
-        args[i] = argv[i + 2];
-    }
-
-    JS_CallFunction(cx, parent, function, argc, args, &rval); 
+
+    JS_CallFunction(qitem->cx, qitem->parent, qitem->callback, qitem->argc,
+            qitem->argv, &rval); 
 
     return FALSE;
@@ -136 +149 @@
     struct queue_item *qitem = (struct queue_item *) data;
 
-    JS_RemoveRoot(qitem->cx, &qitem->args);
-
-    g_free(qitem->esid);
-    g_free(qitem);
+    queue_item_destroy(qitem);
 }
 
@@ -146 +156 @@
     GMainLoop *mainloop = (GMainLoop *) JS_GetPrivate(cx, obj);
 
-    /* glib provides nice malloc/free warnings at runtime */
-    struct queue_item *qitem = g_malloc(sizeof *qitem);
-
     if (argc < 2) {
         JS_ReportError(cx, "EventLoop.yield() requires 2 arguments");
@@ -156 +163 @@
     if (JSVAL_IS_STRING(argv[1])) {
         jsval fun;
+        JSObject *parent = JSVAL_TO_OBJECT(argv[0]);
         
-        JS_GetProperty(cx, JSVAL_TO_OBJECT(argv[0]), 
+        JS_GetProperty(cx, parent, 
                 JS_GetStringBytes(JS_ValueToString(cx, argv[1])), &fun);
 
@@ -170 +178 @@
              */
 
-            argv[1] = fun;
-            *qitem = (struct queue_item) {
-                .esid = g_malloc(sizeof(int)),
-                .args = JS_NewArrayObject(cx, argc, argv),
-                .argc = argc,
-                .cx   = cx,
-            };
+            argv += 2;
+            argc -= 2;
+
+            struct queue_item *qitem = queue_item_new(cx, argc, argv, parent,
+                    JS_ValueToFunction(cx, fun));
+
+            if (qitem == NULL) {
+                JS_ReportError(cx, "Unable to allocate memory");
+            }
 
             /* Store the source at the location of the pointer we're pointing
@@ -184 +194 @@
             g_idle_add_full(0, sagot_eventloop_dispatch, qitem,
                     sagot_eventloop_dispatch_cleanup);
-
-            JS_AddRoot(cx, &qitem->args);
 
             return true;
@@ -243 +251 @@
          */
         GSource *source = g_io_create_watch(channel, JSVAL_TO_INT(argv[1]));
+
+        
+        JSFunction *function = JS_ValueToFunction(cx, fun);
+        JSObject   *parent   = JSVAL_TO_OBJECT(argv[2]);
+
+        argc -= 3;
+        *argv += 3;
         
         /* Create a new execution item... */
-        struct queue_item *qitem = g_malloc(sizeof *qitem);
-
-        fprintf(stderr, "qitem alloced as %X\n", qitem);
-
-        /* Now that we got what we wanted out of the argv...let's re-arrange it
-         */
-        argv[1] = fun;
-        argv[2] = argv[3];
-        argv[3] = argv[0];
-
-        argv++;
-        argc--;
-
-        *qitem = (struct queue_item) {
-            .esid = g_malloc(sizeof(int)),
-            .args = JS_NewArrayObject(cx, argc, argv),
-            .argc = argc,
-            .cx   = cx,
-        };
-
-        fprintf(stderr, "qitem post initialization is %X\n", qitem);
-
-        /* Move the first two items over, creating an empty spot for the
-         * channel as an argument...heh, this is a bunch of work just to reuse
-         * that dispatch code.
-        qitem->args[0] = qitem->args[1];
-        qitem->args[1] = qitem->args[2];
-        qitem->args[2] = argv[0];
-        */
-        
+        struct queue_item *qitem = queue_item_new(cx, argc, argv, parent,
+                function);
+
         fprintf(stderr, "watch put %X\n", qitem);
 
+        /* TODO Make detach/cleanup */
         /* Set the callback for this source, storing session data */
         g_source_set_callback(source, sagot_eventloop_io_dispatch, qitem, NULL);
@@ -282 +271 @@
         /* Attach our event source to the context for the loop given to us */
         g_source_attach( source, g_main_loop_get_context( mainloop ));
-
-        JS_AddRoot(cx, &qitem->args);
 
         return true;