Changeset 18fdd5f9 for popexec.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:

• popexec.c (modified) (6 diffs)

popexec.c

@@ -53 +53 @@
     pe->pid=pid;
     pe->winactive=1;
-    pe->dispatch.fd = parent_read_fd;
-    pe->dispatch.cfunc = owl_popexec_inputhandler;
-    pe->dispatch.destroy = owl_popexec_free_dispatch;
-    pe->dispatch.data = pe;
-    owl_select_add_dispatch(&pe->dispatch);
+    pe->dispatch = owl_select_add_io_dispatch(parent_read_fd, OWL_IO_READ|OWL_IO_EXCEPT, &owl_popexec_inputhandler, &owl_popexec_delete_dispatch, pe);
     pe->refcount++;
   } else {
@@ -78 +74 @@
 }
 
-void owl_popexec_inputhandler(owl_dispatch *d)
+void owl_popexec_inputhandler(const owl_io_dispatch *d, void *data)
 {
-  owl_popexec *pe = d->data;
+  owl_popexec *pe = data;
   int navail, bread, rv_navail;
   char *buf;
@@ -99 +95 @@
   /* the viewwin has closed */
   if (!pe->pid && !pe->winactive) {
-    owl_select_remove_dispatch(d->fd);
+    owl_select_remove_io_dispatch(d);
     return;
   }
@@ -116 +112 @@
       owl_viewwin_redisplay(pe->vwin, 1);
     }
-    owl_select_remove_dispatch(d->fd);
+    owl_select_remove_io_dispatch(d);
     return;
   }
@@ -146 +142 @@
 }
 
-void owl_popexec_free_dispatch(owl_dispatch *d)
+void owl_popexec_delete_dispatch(const owl_io_dispatch *d)
 {
   owl_popexec *pe = d->data;
@@ -159 +155 @@
 
   pe->winactive = 0;
-  if (pe->dispatch.fd>0) {
-    owl_select_remove_dispatch(pe->dispatch.fd);
+  if (pe->dispatch->fd > 0) {
+    owl_select_remove_io_dispatch(pe->dispatch);
   }
   if (pe->pid) {