Changeset 18fdd5f9 for zephyr.c

Timestamp:

Oct 27, 2009, 12:41:17 AM (15 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

6fc40a7

Parents:

ffc4df6

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> (10/24/09 17:31:48)

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> (10/27/09 00:41:17)

Message:

Switch C to the new I/O Dispatch API.

Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu>

File:

• zephyr.c (modified) (4 diffs)

zephyr.c

@@ -36 +36 @@
   ZNotice_t req;
   Code_t code;
-  owl_dispatch *dispatch;
 
   /*
@@ -80 +79 @@
   }
 
-  dispatch = owl_malloc(sizeof(*dispatch));
-  dispatch->fd = ZGetFD();
-  dispatch->cfunc = owl_zephyr_finish_initialization;
-  dispatch->destroy = (void(*)(owl_dispatch*))owl_free;
-
-  owl_select_add_dispatch(dispatch);
-}
-
-void owl_zephyr_finish_initialization(owl_dispatch *d) {
+  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) {
   Code_t code;
   char *perl;
 
-  owl_select_remove_dispatch(d->fd);
+  owl_select_remove_io_dispatch(d);
 
   ZClosePort();
@@ -106 +100 @@
   }
 
-  d = owl_malloc(sizeof(owl_dispatch));
-  d->fd = ZGetFD();
-  d->cfunc = &owl_zephyr_process_events;
-  d->destroy = NULL;
-  owl_select_add_dispatch(d);
+  owl_select_add_io_dispatch(ZGetFD(), OWL_IO_READ|OWL_IO_EXCEPT, &owl_zephyr_process_events, NULL, NULL);
+
   owl_global_set_havezephyr(&g);
 
@@ -1350 +1341 @@
 }
 
-void owl_zephyr_process_events(owl_dispatch *d)
+void owl_zephyr_process_events(const owl_io_dispatch *d, void *data)
 {
   _owl_zephyr_process_events();