X-Git-Url: https://git.distorted.org.uk/~mdw/mLib/blobdiff_plain/1101f87ace7e0b3be886220d4faa13954fd35c6b..df852be063ccaffc5f94728db7a3597ced2d375f:/sel.h diff --git a/sel.h b/sel.h index 391fe29..bd767d6 100644 --- a/sel.h +++ b/sel.h @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: sel.h,v 1.6 1999/08/31 17:42:22 mdw Exp $ + * $Id: sel.h,v 1.9 2003/05/17 10:34:04 mdw Exp $ * * I/O multiplexing support * @@ -30,6 +30,15 @@ /*----- Revision history --------------------------------------------------* * * $Log: sel.h,v $ + * Revision 1.9 2003/05/17 10:34:04 mdw + * Tidying and bugfixing. + * + * Revision 1.8 2001/06/22 19:35:58 mdw + * Fix a large number of bugs. + * + * Revision 1.7 1999/12/10 23:42:04 mdw + * Change header file guard names. + * * Revision 1.6 1999/08/31 17:42:22 mdw * New function `sel_force' to force a descriptor to be `selected'. * @@ -52,8 +61,8 @@ * */ -#ifndef SEL_H -#define SEL_H +#ifndef MLIB_SEL_H +#define MLIB_SEL_H #ifdef __cplusplus extern "C" { @@ -128,22 +137,24 @@ typedef struct sel_state { typedef struct sel_file { struct sel_file *next; /* Next file in the list */ - struct sel_file *prev; /* Previous file in the list */ + struct sel_file **prev; /* Previous file in the list */ struct sel_state *s; /* Pointer to select multiplexor */ int fd; /* File descriptor */ unsigned mode; /* Interesting event for file */ void (*func)(int /*fd*/, unsigned /*mode*/, void */*p*/); /* Handler */ void *p; /* Argument for the handler */ + struct sel_pendfile *pend; /* Pending file information */ } sel_file; /* --- Waiting for a timeout --- */ typedef struct sel_timer { struct sel_timer *next; /* Next timer in the list */ - struct sel_timer *prev; /* Previous timer in the list */ + struct sel_timer **prev; /* Previous timer in the list */ struct timeval tv; /* Real time when timer should go */ void (*func)(struct timeval */*tv*/, void */*p*/); /* Handler function */ void *p; /* Argument for the handler */ + struct sel_pendtimer *pend; /* Pending timer information */ } sel_timer; /* --- A select argument block --- */ @@ -166,7 +177,7 @@ typedef void (*sel_hookfn)(sel_state */*s*/, typedef struct sel_hook { struct sel_hook *next; /* Next hook in the list */ - struct sel_hook *prev; /* Previous hook in the list */ + struct sel_hook **prev; /* Previous hook in the list */ sel_hookfn before, after; /* Hook functions */ void *p; /* Argument for the hook functions */ } sel_hook;