From ea031e54e6a68d0fad01f365ce9e0f0e83f21bd9 Mon Sep 17 00:00:00 2001 From: Olaf Rempel Date: Fri, 1 May 2009 21:29:17 +0200 Subject: [PATCH] update lib functions --- configfile.c | 5 ++- event.c | 90 +++++++++++++++++++++++++--------------------------- logging.c | 15 ++++++--- 3 files changed, 56 insertions(+), 54 deletions(-) diff --git a/configfile.c b/configfile.c index 1314bb3..8219f21 100644 --- a/configfile.c +++ b/configfile.c @@ -1,11 +1,10 @@ /*************************************************************************** - * Copyright (C) 06/2006 by Olaf Rempel * + * Copyright (C) 07/2007 by Olaf Rempel * * razzor@kopf-tisch.de * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * the Free Software Foundation; version 2 of the License * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * diff --git a/event.c b/event.c index 8e307e7..2f255c7 100644 --- a/event.c +++ b/event.c @@ -1,11 +1,10 @@ /*************************************************************************** - * Copyright (C) 10/2006 by Olaf Rempel * + * Copyright (C) 07/2007 by Olaf Rempel * * razzor@kopf-tisch.de * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * the Free Software Foundation; version 2 of the License * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -79,6 +78,7 @@ struct event_fd * event_add_fd( } memset(entry, 0, sizeof(struct event_fd)); + entry->flags |= EVENT_NEW; entry->fd = fd; /* put it on the list */ @@ -86,17 +86,16 @@ struct event_fd * event_add_fd( } if (type & FD_READ) { - entry->flags = (callback != NULL) ? (entry->flags | FD_READ) : (entry->flags & ~FD_READ); + entry->flags = (callback != NULL) ? (entry->flags | FD_READ | EVENT_NEW) : (entry->flags & ~FD_READ); entry->read_cb = callback; entry->read_priv = privdata; } else if (type & FD_WRITE) { - entry->flags = (callback != NULL) ? (entry->flags | FD_WRITE) : (entry->flags & ~FD_WRITE); + entry->flags = (callback != NULL) ? (entry->flags | FD_WRITE | EVENT_NEW) : (entry->flags & ~FD_WRITE); entry->write_cb = callback; entry->write_priv = privdata; } - entry->flags |= EVENT_NEW; return entry; } @@ -208,32 +207,6 @@ int event_loop(void) } while (1) { - fd_set *readfds = NULL, *writefds = NULL; - struct event_fd *entry, *tmp; - - list_for_each_entry_safe(entry, tmp, &event_fd_list, list) { - entry->flags &= ~EVENT_NEW; - - if (entry->flags & EVENT_DELETE) { - list_del(&entry->list); - free(entry); - - } else if (entry->flags & FD_READ) { - if (readfds == NULL) { - readfds = &fdsets[0]; - FD_ZERO(readfds); - } - FD_SET(entry->fd, readfds); - - } else if (entry->flags & FD_WRITE) { - if (writefds == NULL) { - writefds = &fdsets[1]; - FD_ZERO(writefds); - } - FD_SET(entry->fd, writefds); - } - } - struct timeval timeout, *timeout_p = NULL; if (!list_empty(&event_timeout_list)) { struct timeval now; @@ -247,7 +220,7 @@ int event_loop(void) continue; } - /* timeout not elapsed, exit search (since list is sorted) */ + /* first timeout not elapsed, exit search (since list is sorted) */ if (cmp_timeval(&entry->nextrun, &now) == -1) break; @@ -272,6 +245,35 @@ int event_loop(void) } } + fd_set *readfds = NULL, *writefds = NULL; + struct event_fd *entry, *tmp; + + list_for_each_entry_safe(entry, tmp, &event_fd_list, list) { + entry->flags &= ~EVENT_NEW; + + if (entry->flags & EVENT_DELETE) { + list_del(&entry->list); + free(entry); + continue; + } + + if (entry->flags & FD_READ) { + if (readfds == NULL) { + readfds = &fdsets[0]; + FD_ZERO(readfds); + } + FD_SET(entry->fd, readfds); + } + + if (entry->flags & FD_WRITE) { + if (writefds == NULL) { + writefds = &fdsets[1]; + FD_ZERO(writefds); + } + FD_SET(entry->fd, writefds); + } + } + int i = select(FD_SETSIZE, readfds, writefds, NULL, timeout_p); if (i <= 0) { /* On error, -1 is returned, and errno is set @@ -280,22 +282,16 @@ int event_loop(void) * after an error. */ continue; + } - } else { - list_for_each_entry(entry, &event_fd_list, list) { - if ((entry->flags & EVENT_NEW) != 0) { - /* entry has just been added, execute it next round */ - continue; - } + list_for_each_entry(entry, &event_fd_list, list) { + if (((entry->flags & (FD_READ | EVENT_NEW)) == FD_READ) && FD_ISSET(entry->fd, readfds)) + if (entry->read_cb(entry->fd, entry->read_priv) != 0) + entry->flags |= EVENT_DELETE; - if ((entry->flags & FD_READ) && FD_ISSET(entry->fd, readfds)) - if (entry->read_cb(entry->fd, entry->read_priv) != 0) - entry->flags |= EVENT_DELETE; - - if ((entry->flags & FD_WRITE) && FD_ISSET(entry->fd, writefds)) - if (entry->write_cb(entry->fd, entry->write_priv) != 0) - entry->flags |= EVENT_DELETE; - } + if (((entry->flags & (FD_WRITE | EVENT_NEW)) == FD_WRITE) && FD_ISSET(entry->fd, writefds)) + if (entry->write_cb(entry->fd, entry->write_priv) != 0) + entry->flags |= EVENT_DELETE; } } free(fdsets); diff --git a/logging.c b/logging.c index 61dcfcf..7d7bb14 100644 --- a/logging.c +++ b/logging.c @@ -1,11 +1,10 @@ /*************************************************************************** - * Copyright (C) 06/2006 by Olaf Rempel * + * Copyright (C) 07/2007 by Olaf Rempel * * razzor@kopf-tisch.de * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * the Free Software Foundation; version 2 of the License * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -19,10 +18,12 @@ ***************************************************************************/ #include #include +#include + #include #include #include -#include +#include #include "logging.h" @@ -93,6 +94,12 @@ int log_init(const char *logfile) fprintf(stderr, "log_init(): can not open logfile"); return -1; } + + if (fcntl(fileno(log_fd), F_SETFD, FD_CLOEXEC) < 0) { + fprintf(stderr, "log_init(): fcntl(FD_CLOEXEC)"); + return -1; + } + return 0; }