Changeset 2244836

Timestamp:

Jun 22, 2011, 12:37:22 AM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

a6a9ddb

Parents:

bbb7876

git-author:

David Benjamin <davidben@mit.edu> (05/24/11 01:42:07)

git-committer:

David Benjamin <davidben@mit.edu> (06/22/11 00:37:22)

Message:

Use g_io_add_watch in the stderr redirect

We may actually be able to put GIOChannel to good use here with
g_io_channel_read_line.

File:

• owl.c (modified) (4 diffs)

owl.c

@@ -450 +450 @@
 
 /* Sends stderr (read from rfd) messages to the error console */
-void stderr_redirect_handler(const owl_io_dispatch *d, void *data)
+gboolean stderr_redirect_handler(GIOChannel *source, GIOCondition condition, void *data)
 {
   int navail, bread;
   char buf[4096];
-  int rfd = d->fd;
+  int rfd = g_io_channel_unix_get_fd(source);
   char *err;
 
-  if (rfd<0) return;
+  /* TODO: Use g_io_channel_read_line? We'd have to be careful about
+   * blocking on the read. */
+
+  if (rfd<0) return TRUE;
   if (-1 == ioctl(rfd, FIONREAD, &navail)) {
-    return;
+    return TRUE;
   }
   /*owl_function_debugmsg("stderr_redirect: navail = %d\n", navail);*/
-  if (navail <= 0) return;
+  if (navail <= 0) return TRUE;
   if (navail > sizeof(buf)-1) {
     navail = sizeof(buf)-1;
@@ -468 +471 @@
   bread = read(rfd, buf, navail);
   if (bread == -1)
-    return;
+    return TRUE;
 
   err = g_strdup_printf("[stderr]\n%.*s", bread, buf);
@@ -474 +477 @@
   owl_function_log_err(err);
   g_free(err);
+  return TRUE;
 }
 
@@ -521 +525 @@
   /* Do this only after we've started curses up... */
   owl_function_debugmsg("startup: doing stderr redirection");
-  owl_select_add_io_dispatch(stderr_replace(), OWL_IO_READ, &stderr_redirect_handler, NULL, NULL);
+  channel = g_io_channel_unix_new(stderr_replace());
+  g_io_add_watch(channel, G_IO_IN | G_IO_HUP | G_IO_ERR, &stderr_redirect_handler, NULL);
+  g_io_channel_unref(channel);
 #endif