Changeset 24

Timestamp:

05/31/06 05:38:41 (3 years ago)

Author:

scott

Message:

IOChannel Integration

• Made first steps toward integrating IOChannel with the event framework
• Added constants to IOChannel for watch types
  • IOChannel.READ for read-ready events
  • IOChannel.WRITE for write-ready events
  • IOChannel.READ_PRIORITY for read-now (buffer full type) high proprity events
  • IOChannel.ERROR for read/write error events
  • IOChannel.HANGUP for sig-hup and disconnect events
  • IOChannel.INVALID for other error types (closed filehandle, etc)
• Added close method to IOChannel objects
• Added watch method (currently non-functional)
• Fixed error handling
  • undefined references to sagot_iochannel_error
  • sagot_iochannel_error and GError object dereferencing problems
• Fixed read, readline, getc methods
  • Problem with return value assignments
  • Buffer lengths were using JSVAL_TO_DOUBLE which gives us poor behavior

Still lots of warnings at compile time

refs #45, #46

Location:

trunk/sagot/src

Files:

• sagot_glib_filechannel.c (modified) (1 diff)
• sagot_glib_iochannel.c (modified) (9 diffs)
• sagot_glib_iochannel.h (modified) (2 diffs)

trunk/sagot/src/sagot_glib_filechannel.c

@@ -26 +26 @@
     {"read",           sagot_iochannel_read,          1,0,0 },
     {"getc",           sagot_iochannel_getc,          0,0,0 },
+    {"close",          sagot_iochannel_close,         0,0,0 },
 };
 

trunk/sagot/src/sagot_glib_iochannel.c

@@ -27 +27 @@
     {"read",           sagot_iochannel_read,          1,0,0 },
     {"getc",           sagot_iochannel_getc,          0,0,0 },
+    {"close",          sagot_iochannel_close,         0,0,0 },
+    {"watch",          sagot_iochannel_watch,         1,0,0 },
 };
 
@@ -35 +37 @@
 JSFunctionSpec iochannel_methods_static[] = {
 };
+
+
+JSPropertySpec iochannel_properties_static[] = {
+    {"READ", G_IO_IN, JSPROP_READONLY | JSPROP_PERMANENT, 
+        sagot_iochannel_gettype, NULL },
+    {"WRITE", G_IO_OUT, JSPROP_READONLY | JSPROP_PERMANENT, 
+        sagot_iochannel_gettype, NULL },
+    {"READ_PRIORTY", G_IO_PRI, JSPROP_READONLY | JSPROP_PERMANENT, 
+        sagot_iochannel_gettype, NULL },
+    {"ERROR", G_IO_ERR, JSPROP_READONLY | JSPROP_PERMANENT, 
+        sagot_iochannel_gettype, NULL },
+    {"HANGUP", G_IO_HUP, JSPROP_READONLY | JSPROP_PERMANENT, 
+        sagot_iochannel_gettype, NULL },
+    {"INVALID", G_IO_NVAL, JSPROP_READONLY | JSPROP_PERMANENT, 
+        sagot_iochannel_gettype, NULL },
+};
+
 /**
  * Create a glib unix channel.
@@ -67 +86 @@
 }
 
+void sagot_iochannel_error (JSContext *cx, char *function, GError **error) {
+    char *pf = "%s unable to read stream: %s";
+    size_t msglen = strlen(function) + strlen(pf) + strlen(error[0]->message);
+    char *message = g_malloc(msglen);
+
+    snprintf(message, msglen, pf, function, error[0]->message);
+    JS_ReportError(cx, message);
+    g_free(message);
+}
+
 bool sagot_iochannel_fd_get (JSContext *cx, JSObject *object, jsval id,
         jsval *vp) {
@@ -72 +101 @@
      * and returning the already stored version. But I don't expect it to be
      * called often. */
-    return JS_NewNumberValue(cx, 
+    *vp = JS_NewNumberValue(cx, 
             g_io_channel_unix_get_fd( JS_GetPrivate(cx, object) ), vp);
+
+    return true;
+}
+
+bool sagot_iochannel_gettype (JSContext *cx, JSObject *object, jsval id,
+        jsval *vp) {
+    /* This is kind of a hack...but it works... ehh ;-) */
+    *vp = id;
+    return true;
 }
 
@@ -81 +119 @@
 
     if (JSVAL_IS_NUMBER(argv[0])) {
-        size_t buflen = (size_t) JSVAL_TO_DOUBLE(argv[0]);
+        size_t buflen = (size_t) JSVAL_TO_INT(argv[0]);
         size_t bytesread;
         char *buffer = g_malloc(buflen);
@@ -100 +138 @@
 
         JSString *rdata = JS_NewStringCopyN(cx, buffer, bytesread);
-        rval = STRING_TO_JSVAL(rdata);
+        *rval = STRING_TO_JSVAL(rdata);
         g_free(buffer);
 
@@ -112 +150 @@
 
     GError **error = NULL;
-    gchar *line;
-    g_io_channel_read_line(channel, &line, NULL, NULL, error);
+    size_t bytesread;
+    size_t tpos;
+    char *line;
+    g_io_channel_read_line(channel, &line, &bytesread, &tpos, error);
 
     if (!error) {
-        rval = STRING_TO_JSVAL( JS_NewString(cx, line, strlen(line)) );
+        *rval = STRING_TO_JSVAL( JS_NewStringCopyN(cx, line, tpos) );
         g_free(line);
         return true;
     }
     else {
-        sagot_iochannel_error("readline()", error);
+        sagot_iochannel_error(cx, "readline()", error);
         return false;
     }
@@ -135 +175 @@
     if (!error) {
         jschar jsunichars[] = { in, 0 };
-        rval = STRING_TO_JSVAL( JS_NewUCStringCopyN(cx, jsunichars, 1) );
+        *rval = STRING_TO_JSVAL( JS_NewUCStringCopyN(cx, jsunichars, 1) );
         return true;
     }
     else {
-        sagot_iochannel_error("getc()", error);
+        sagot_iochannel_error(cx, "getc()", error);
         return false;
+    }
+}
+
+bool sagot_iochannel_close (JSContext *cx, JSObject *self, uintN argc,
+        jsval *argv, jsval *rval) {
+    GIOChannel *channel = JS_GetPrivate(cx, self);
+    GError **error = NULL;
+    g_io_channel_shutdown(channel, true, error);
+
+    if (error) {
+        sagot_iochannel_error(cx, "close()", error);
+    }
+}
+
+bool sagot_iochannel_watch (JSContext *cx, JSObject *self, uintN argc,
+        jsval *argv, jsval *rval) {
+    GIOChannel *channel = JS_GetPrivate(cx, self);
+    GError **error = NULL;
+    g_io_channel_shutdown(channel, true, error);
+
+    if (error) {
+        sagot_iochannel_error(cx, "close()", error);
     }
 }
@@ -146 +208 @@
 JSObject * sagot_InitIOChannelClass (JSContext *cx, JSObject *object) {
     JSObject *proto = JS_InitClass(cx, object, NULL, &iochannel_class,
-            IOChannel, 2, NULL, iochannel_methods, NULL,
-            iochannel_methods_static);
+            IOChannel, 2, iochannel_properties, iochannel_methods,
+            iochannel_properties_static, iochannel_methods_static);
 
     return !proto ? NULL : proto;

trunk/sagot/src/sagot_glib_iochannel.h

@@ -26 +26 @@
         jsval *vp);
 
+extern bool sagot_iochannel_gettype (JSContext *cx, JSObject *object, jsval id,
+        jsval *vp);
+
 extern bool sagot_iochannel_read (JSContext *cx, JSObject *object, uintN argc, 
         jsval *argv, jsval *rval);
@@ -35 +38 @@
         jsval *argv, jsval *rval);
 
+extern bool sagot_iochannel_close (JSContext *cx, JSObject *self, uintN argc,
+        jsval *argv, jsval *rval);
+
+extern bool sagot_iochannel_watch (JSContext *cx, JSObject *self, uintN argc,
+        jsval *argv, jsval *rval);
+
 JSObject * sagot_InitIOChannelClass (JSContext *cx, JSObject *object);