Changeset a01ed7c for owl.h

Timestamp:

Oct 27, 2009, 2:15:08 PM (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:

7ca5d3e

Parents:

e7f5970 (diff), f1a2736 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'io_dispatch_rewrite'

File:

• owl.h (modified) (4 diffs)

owl.h

@@ -107 +107 @@
 #define OWL_MESSAGE_DIRECTION_OUT   2
 
-#define OWL_MUX_READ   1
-#define OWL_MUX_WRITE  2
-#define OWL_MUX_EXCEPT 4
+#define OWL_IO_READ   1
+#define OWL_IO_WRITE  2
+#define OWL_IO_EXCEPT 4
 
 #define OWL_DIRECTION_NONE      0
@@ -503 +503 @@
 } owl_obarray;
 
-typedef struct _owl_dispatch {
-  int fd;                                 /* FD to watch for dispatch. */
+typedef struct _owl_io_dispatch {
+  int fd;                                     /* FD to watch for dispatch. */
+  int mode;
   int needs_gc;
-  void (*cfunc)(struct _owl_dispatch*);   /* C function to dispatch to. */
-  void (*destroy)(struct _owl_dispatch*); /* Destructor */
+  void (*callback)(const struct _owl_io_dispatch *, void *); /* C function to dispatch to. */
+  void (*destroy)(const struct _owl_io_dispatch *);  /* Destructor */
   void *data;
-} owl_dispatch;
+} owl_io_dispatch;
 
 typedef struct _owl_ps_action {
@@ -523 +524 @@
   int winactive;
   pid_t pid;                    /* or 0 if it has terminated */
-  owl_dispatch dispatch;
+  const owl_io_dispatch *dispatch;
 } owl_popexec;
 
@@ -596 +597 @@
   struct termios startup_tio;
   owl_obarray obarray;
-  owl_list dispatchlist;
+  owl_list io_dispatch_list;
   owl_list psa_list;
   GList *timerlist;