Changeset 36

Timestamp:

03/29/07 03:30:54 (22 months ago)

Author:

scott

Message:

Fixed SIGSEGV 1

• Turns out that g_source_set_callback takes a different function spec, rather than having a void pointer as an argument it is intended to have a GIOChannel, condition, and then the void pointer. This actually makes a fair amount of sense, and sort of makes the API better. I do however wish that was correctly documented, as it doesn't seem to be mentioned in the glib documentation.

There are still more SIGSEGVs

closes #50

Note: All this code should be refactored, to provide private
objects to represent each of these items - as opposed to simply a wrapper
around each glib type. Reason being that I'm finding myself having to be far
too creative in finding places to store my data. Also the glib queue item(s)
should be refactored to use only a single source for creation, and keep their
own jsval array for argument lists, store the function being called and context
object locally. Factoring out the code that parses the arguments to the JS
wrapper functions wont actually be possible, but atleast we could make it
so the creation/allocation is handled in a uniform way.

This would make the dispatching also have less stuff to do.

    struct queue_item {
        int *esid;
        JSObject *args;
        uintN argc;
        JSContext *cx;
    };

would instead become

    struct queue_item {
        int         *esid;
        JSObject    *args;
        uintN       argc;
        JSContext   *cx;
        JSFunction  *callback;
        JSObject    *this;
    };

Location:

trunk/sagot/src

Files:

• Makefile.am (modified) (1 diff)
• sagot_glib_eventloop.c (modified) (6 diffs)

trunk/sagot/src/Makefile.am

@@ -3 +3 @@
                 sagot_glib_iochannel.c sagot_glib_filechannel.c
 sagot_LDADD = $(DEPS_LIBS)
-AM_CFLAGS = -std=c99 -pedantic -Wall -W -O2 $(DEPS_CFLAGS)
+AM_CFLAGS = -ggdb -std=c99 -pedantic -Wall -W -O2 $(DEPS_CFLAGS)

trunk/sagot/src/sagot_glib_eventloop.c

@@ -80 +80 @@
 };
 
+gboolean sagot_eventloop_io_dispatch ( GIOChannel *source, GIOCondition
+        condition, void *data) {
+    return sagot_eventloop_dispatch(data);
+}
+
 /**
  * Dispatch an event from glib to javascript
  */
 gboolean sagot_eventloop_dispatch (void *data) {
+    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[qitem->argc];
+    jsval argv[argc];
 
     for (int i = 0; i < argc; i++) {
@@ -101 +107 @@
      * interfaces just because you're in spidermonkey unless you hack things up
      * a bit ;-) */
-    JSObject *parent = NULL;
+    JSObject *parent;
     
     if (JSVAL_IS_OBJECT(argv[0])) {
@@ -175 +181 @@
              * to...funky I know.  Later, we'll even store data using this id, then
              * fetch it when the event is invoked */
+            fprintf(stderr, "put %X\n", qitem);
             g_idle_add_full(0, sagot_eventloop_dispatch, qitem,
                     sagot_eventloop_dispatch_cleanup);
@@ -240 +247 @@
         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
          */
@@ -255 +264 @@
             .cx   = cx,
         };
+
+        fprintf(stderr, "qitem post initialization is %X\n", qitem);
 
         /* Move the first two items over, creating an empty spot for the
@@ -264 +275 @@
         */
         
+        fprintf(stderr, "watch put %X\n", qitem);
+
         /* Set the callback for this source, storing session data */
-        g_source_set_callback(source, sagot_eventloop_dispatch, qitem,
-                sagot_eventloop_dispatch_cleanup);
+        g_source_set_callback(source, sagot_eventloop_io_dispatch, qitem, NULL);
 
         /* Attach our event source to the context for the loop given to us */