* Sebastian Hammer, Adam Dickmeiss
*
* $Log: eventl.c,v $
- * Revision 1.11 1995-06-19 12:39:09 quinn
+ * Revision 1.19 1995-12-05 11:17:30 quinn
+ * Moved some paranthesises around. Sigh.
+ *
+ * Revision 1.18 1995/11/13 09:27:41 quinn
+ * Fiddling with the variant stuff.
+ *
+ * Revision 1.17 1995/11/07 12:37:44 quinn
+ * Added support for forcing TIMEOUT event.
+ *
+ * Revision 1.16 1995/11/01 13:54:56 quinn
+ * Minor adjustments
+ *
+ * Revision 1.15 1995/09/15 14:44:15 quinn
+ * *** empty log message ***
+ *
+ * Revision 1.14 1995/08/29 14:44:50 quinn
+ * Reset timeouts.
+ *
+ * Revision 1.13 1995/08/29 11:17:56 quinn
+ * Added code to receive close
+ *
+ * Revision 1.12 1995/08/29 10:41:18 quinn
+ * Small.
+ *
+ * Revision 1.11 1995/06/19 12:39:09 quinn
* Fixed bug in timeout code. Added BER dumper.
*
* Revision 1.10 1995/06/16 10:31:33 quinn
*
*/
+#include <stdio.h>
#include <assert.h>
#include <sys/time.h>
#include <sys/types.h>
#include <eventl.h>
-#include <dmalloc.h>
+#include <xmalloc.h>
static IOCHAN iochans = 0;
{
IOCHAN new;
- if (!(new = malloc(sizeof(*new))))
+ if (!(new = xmalloc(sizeof(*new))))
return 0;
new->destroyed = 0;
new->fd = fd;
int event_loop()
{
- do
+ do /* loop as long as there are active associations to process */
{
IOCHAN p, nextp;
fd_set in, out, except;
p->last_event = now;
(*p->fun)(p, EVENT_EXCEPT);
}
- if (!p->destroyed && p->max_idle && now - p->last_event >
- p->max_idle)
+ if (!p->destroyed && ((p->max_idle && now - p->last_event >
+ p->max_idle) || force_event == EVENT_TIMEOUT))
+ {
+ p->last_event = now;
(*p->fun)(p, EVENT_TIMEOUT);
+ }
}
for (p = iochans; p; p = nextp)
{
}
if (nextp == p)
nextp = p->next;
- free(tmp);
+ xfree(tmp);
}
}
}