Changeset 2d04312 for zephyr.c

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:

aa69c1e

Parents:

a6a9ddb

git-author:

David Benjamin <davidben@mit.edu> (05/24/11 02:09:29)

git-committer:

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

Message:

Use g_io_add_watch in zephyr initialization

Which removes the final use of owl_io_dispatch.

File:

• zephyr.c (modified) (3 diffs)

zephyr.c

@@ -48 +48 @@
   struct sockaddr_in sin;
   ZNotice_t req;
+  GIOChannel *channel;
 
   /*
@@ -91 +92 @@
   }
 
-  owl_select_add_io_dispatch(ZGetFD(), OWL_IO_READ|OWL_IO_EXCEPT, &owl_zephyr_finish_initialization, NULL, NULL);
-}
-
-void owl_zephyr_finish_initialization(const owl_io_dispatch *d, void *data) {
+  channel = g_io_channel_unix_new(ZGetFD());
+  g_io_add_watch(channel, G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP,
+                 &owl_zephyr_finish_initialization, NULL);
+  g_io_channel_unref(channel);
+}
+
+gboolean owl_zephyr_finish_initialization(GIOChannel *source, GIOCondition condition, void *data) {
   Code_t code;
   char *perl;
   GSource *event_source;
 
-  owl_select_remove_io_dispatch(d);
-
   ZClosePort();
 
   if ((code = ZInitialize()) != ZERR_NONE) {
     owl_function_error("Initializing Zephyr: %s", error_message(code));
-    return;
+    return FALSE;
   }
 
   if ((code = ZOpenPort(NULL)) != ZERR_NONE) {
     owl_function_error("Initializing Zephyr: %s", error_message(code));
-    return;
+    return FALSE;
   }
 
@@ -143 +145 @@
   perl = owl_perlconfig_execute("BarnOwl::Zephyr::_zephyr_startup()");
   g_free(perl);
+  return FALSE;
 }