Changeset f36cd97

Timestamp:

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

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, debian, release-1.10, 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.

Files:

• owl.c (modified) (4 diffs)
• owl.h (modified) (1 diff)
• perlconfig.c (modified) (2 diffs)
• select.c (modified) (5 diffs)
• zephyr.c (modified) (2 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;

owl.h

@@ -526 +526 @@
 
 typedef struct _owl_dispatch {
-  int fd;           /* FD to watch for dispatch. */
-  void (*cfunc)();  /* C function to dispatch to. */
-  SV *pfunc;        /* Perl function to dispatch to. */
+  int fd;                                 /* FD to watch for dispatch. */
+  void (*cfunc)(struct _owl_dispatch*);   /* C function to dispatch to. */
+  void (*destroy)(struct _owl_dispatch*); /* Destructor */
+  void *data;
 } owl_dispatch;
 

perlconfig.c

@@ -446 +446 @@
 void owl_perlconfig_dispatch_free(owl_dispatch *d)
 {
-  SvREFCNT_dec(d->pfunc);
+  SvREFCNT_dec(d->data);
 }
 
@@ -494 +494 @@
 }
 
-void owl_perlconfig_do_dispatch(owl_dispatch *d)
-{
-  SV *cb = d->pfunc;
+void owl_perlconfig_dispatch(owl_dispatch *d)
+{
+  SV *cb = d->data;
   dSP;
   if(cb == NULL) {
     owl_function_error("Perl callback is NULL!");
+    return;
   }
 

select.c

@@ -133 +133 @@
     d = (owl_dispatch*)owl_list_get_element(dl, elt);
     owl_list_remove_element(dl, elt);
-    if (d->pfunc) {
-      owl_perlconfig_dispatch_free(d);
+    if (d->destroy) {
+      d->destroy(d);
     }
     owl_free(d);
@@ -152 +152 @@
   if (elt != -1) {
     d = (owl_dispatch*)owl_list_get_element(owl_global_get_dispatchlist(&g), elt);
-    if (d->pfunc == NULL) {
+    if (d->cfunc != owl_perlconfig_dispatch) {
       /* don't mess with non-perl dispatch functions from here. */
       return 1;
@@ -160 +160 @@
   d = malloc(sizeof(owl_dispatch));
   d->fd = fd;
-  d->cfunc = NULL;
-  d->pfunc = cb;
+  d->cfunc = owl_perlconfig_dispatch;
+  d->destroy = owl_perlconfig_dispatch_free;
+  d->data = cb;
   owl_select_add_dispatch(d);
   return 0;
@@ -174 +175 @@
   if (elt != -1) {
     d = (owl_dispatch*)owl_list_get_element(owl_global_get_dispatchlist(&g), elt);
-    if (d->pfunc != NULL) {
+    if (d->cfunc == owl_perlconfig_dispatch) {
       owl_select_remove_dispatch(fd);
       return 0;
@@ -216 +217 @@
     if (d != NULL && FD_ISSET(d->fd, fds)) {
       if (d->cfunc != NULL) {
-        (d->cfunc)();
-      }
-      else if (d->pfunc != NULL) {
-        owl_perlconfig_do_dispatch(d);
+        d->cfunc(d);
       }
     }

zephyr.c

@@ -1203 +1203 @@
 
 #ifdef HAVE_LIBZEPHYR
-void owl_zephyr_process_events() {
+void owl_zephyr_process_events(owl_dispatch *d) {
   int zpendcount=0;
   ZNotice_t notice;
@@ -1235 +1235 @@
 
 #else
-void owl_zephyr_process_events() {
-  
-}
-#endif
+void owl_zephyr_process_events(owl_dispatch *d) {
+  
+}
+#endif