Changeset f36cd97 for owl.c

Timestamp:

Dec 17, 2008, 5:12:37 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, debian, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

1895c29

Parents:

1631825

git-author:

Nelson Elhage <nelhage@mit.edu> (12/17/08 15:44:15)

git-committer:

Nelson Elhage <nelhage@mit.edu> (12/17/08 17:12:37)

Message:

Add a void* data to owl_dispatch and pass it around.

Add a void* data field for the use of dispatches, and pass around the
owl_dispatch. This allows one dispatch function to be used for
multiple fd's, and lets us eliminate perl-specific code from the
dispatch loop. In addition, we need to add a destructor to
owl_dispatch so that perl dispatches can have their SV* decref'd on
destroy.

File:

• owl.c (modified) (4 diffs)

owl.c

@@ -190 +190 @@
     d->fd = STDIN;
     d->cfunc = &owl_process_input;
-    d->pfunc = NULL;
+    d->destroy = NULL;
     owl_select_add_dispatch(d);
   }
@@ -201 +201 @@
     d->fd = ZGetFD();
     d->cfunc = &owl_zephyr_process_events;
-    d->pfunc = NULL;
+    d->destroy = NULL;
     owl_select_add_dispatch(d);
     owl_global_set_havezephyr(&g);
@@ -401 +401 @@
 
 
-#ifdef HAVE_LIBZEPHYR
-  /* Check for any zephyrs that have come in while we've done init. */
-  owl_zephyr_process_events();
-#endif
-  
   owl_function_debugmsg("startup: entering main loop");
   /* main loop */
@@ -609 +604 @@
 }
 
-void owl_process_input()
+void owl_process_input(owl_dispatch *d)
 {
   int ret;