[GLUE] Rsync SAMBA_3_0 SVN r25598 in order to create the v3-0-test branch.

[gd/samba/.git] / source / lib / events.c

diff --git a/source/lib/events.c b/source/lib/events.c
index 314fa2d53861d8d59419f5d6ddb6425c76737384..a00db77b6bea3cd1fbaece208e5f9b3a3cd871d0 100644 (file)
--- a/source/lib/events.c
+++ b/source/lib/events.c
@@ -185,27 +185,20 @@ void event_fd_set_not_readable(struct fd_event *fde)
        fde->flags &= ~EVENT_FD_READ;
 }
 
-/*
- * Return if there's something in the queue
- */
-
-BOOL event_add_to_select_args(struct event_context *event_ctx,
+void event_add_to_select_args(struct event_context *event_ctx,
                              const struct timeval *now,
                              fd_set *read_fds, fd_set *write_fds,
                              struct timeval *timeout, int *maxfd)
 {
        struct fd_event *fde;
        struct timeval diff;
-       BOOL ret = False;
 
        for (fde = event_ctx->fd_events; fde; fde = fde->next) {
                if (fde->flags & EVENT_FD_READ) {
                        FD_SET(fde->fd, read_fds);
-                       ret = True;
                }
                if (fde->flags & EVENT_FD_WRITE) {
                        FD_SET(fde->fd, write_fds);
-                       ret = True;
                }
 
                if ((fde->flags & (EVENT_FD_READ|EVENT_FD_WRITE))
@@ -215,28 +208,11 @@ BOOL event_add_to_select_args(struct event_context *event_ctx,
        }
 
        if (event_ctx->timed_events == NULL) {
-               return ret;
+               return;
        }
 
        diff = timeval_until(now, &event_ctx->timed_events->when);
        *timeout = timeval_min(timeout, &diff);
-
-       return True;
-}
-
-BOOL events_pending(struct event_context *event_ctx)
-{
-       struct fd_event *fde;
-
-       if (event_ctx->timed_events != NULL) {
-               return True;
-       }
-       for (fde = event_ctx->fd_events; fde; fde = fde->next) {
-               if (fde->flags & (EVENT_FD_READ|EVENT_FD_WRITE)) {
-                       return True;
-               }
-       }
-       return False;
 }
 
 BOOL run_events(struct event_context *event_ctx,
@@ -321,40 +297,6 @@ struct timeval *get_timed_events_timeout(struct event_context *event_ctx,
        return to_ret;
 }
 
-int event_loop_once(struct event_context *ev)
-{
-       struct timeval now, to;
-       fd_set r_fds, w_fds;
-       int maxfd = 0;
-       int ret;
-
-       FD_ZERO(&r_fds);
-       FD_ZERO(&w_fds);
-
-       to.tv_sec = 9999;       /* Max timeout */
-       to.tv_usec = 0;
-
-       GetTimeOfDay(&now);
-
-       if (!event_add_to_select_args(ev, &now, &r_fds, &w_fds, &to, &maxfd)) {
-               return -1;
-       }
-
-       if (timeval_is_zero(&to)) {
-               run_events(ev, 0, NULL, NULL);
-               return 0;
-       }
-
-       ret = sys_select(maxfd, &r_fds, &w_fds, NULL, &to);
-
-       if (ret == -1 && errno != EINTR) {
-               return -1;
-       }
-
-       run_events(ev, ret, &r_fds, &w_fds);
-       return 0;
-}
-
 struct event_context *event_context_init(TALLOC_CTX *mem_ctx)
 {
        return TALLOC_ZERO_P(NULL, struct event_context);
@@ -391,36 +333,3 @@ int cancel_named_event(struct event_context *event_ctx,
        }
        return 0;
 }
-
-void dump_event_list(struct event_context *event_ctx)
-{
-       struct timed_event *te;
-       struct fd_event *fe;
-       struct timeval evt, now;
-
-       if (!event_ctx) {
-               return;
-       }
-
-       now = timeval_current();
-
-       DEBUG(10,("dump_event_list:\n"));
-
-       for (te = event_ctx->timed_events; te; te = te->next) {
-
-               evt = timeval_until(&now, &te->when);
-
-               DEBUGADD(10,("Timed Event \"%s\" %lx handled in %d seconds\n",
-                          te->event_name,
-                          (unsigned long)te,
-                          (int)evt.tv_sec));
-       }
-
-       for (fe = event_ctx->fd_events; fe; fe = fe->next) {
-
-               DEBUGADD(10,("FD Event %d %lx, flags: 0x%04x\n",
-                          fe->fd,
-                          (unsigned long)fe,
-                          fe->flags));
-       }
-}