summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/poll_funcs/poll_funcs.h131
-rw-r--r--lib/poll_funcs/poll_funcs_tevent.c684
-rw-r--r--lib/poll_funcs/poll_funcs_tevent.h38
-rw-r--r--lib/poll_funcs/wscript_build5
-rwxr-xr-xsource3/wscript_build1
-rw-r--r--wscript_build1
6 files changed, 0 insertions, 860 deletions
diff --git a/lib/poll_funcs/poll_funcs.h b/lib/poll_funcs/poll_funcs.h
deleted file mode 100644
index b16f07f6ff8..00000000000
--- a/lib/poll_funcs/poll_funcs.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Copyright (C) Volker Lendecke 2013
- *
- * 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file poll_funcs.h
- *
- * @brief event loop abstraction
- */
-
-/*
- * This is inspired by AvahiWatch, the avahi event loop abstraction.
- */
-
-#ifndef __POLL_FUNCS_H__
-#define __POLL_FUNCS_H__
-
-#include "replace.h"
-
-/**
- * poll_watch and poll_timeout are undefined here, every implementation can
- * implement its own structures.
- */
-
-struct poll_watch;
-struct poll_timeout;
-
-struct poll_funcs {
-
- /**
- * @brief Create a new file descriptor watch
- *
- * @param[in] funcs The callback array
- * @param[in] fd The fd to watch
- * @param[in] events POLLIN and POLLOUT or'ed together
- * @param[in] callback Function to call by the implementation
- * @param[in] private_data Pointer to give back to callback
- *
- * @return A new poll_watch struct
- */
-
- struct poll_watch *(*watch_new)(
- const struct poll_funcs *funcs, int fd, short events,
- void (*callback)(struct poll_watch *w, int fd,
- short events, void *private_data),
- void *private_data);
-
- /**
- * @brief Change the watched events for a struct poll_watch
- *
- * @param[in] w The poll_watch to change
- * @param[in] events new POLLIN and POLLOUT or'ed together
- */
-
- void (*watch_update)(struct poll_watch *w, short events);
-
- /**
- * @brief Read events currently watched
- *
- * @param[in] w The poll_watch to inspect
- *
- * @returns The events currently watched
- */
-
- short (*watch_get_events)(struct poll_watch *w);
-
- /**
- * @brief Free a struct poll_watch
- *
- * @param[in] w The poll_watch struct to free
- */
-
- void (*watch_free)(struct poll_watch *w);
-
-
- /**
- * @brief Create a new timeout watch
- *
- * @param[in] funcs The callback array
- * @param[in] tv The time when the timeout should trigger
- * @param[in] callback Function to call at time "tv"
- * @param[in] private_data Pointer to give back to callback
- *
- * @return A new poll_timeout struct
- */
-
- struct poll_timeout *(*timeout_new)(
- const struct poll_funcs *funcs, const struct timeval tv,
- void (*callback)(struct poll_timeout *t, void *private_data),
- void *private_data);
-
- /**
- * @brief Change the timeout of a watch
- *
- * @param[in] t The timeout watch to change
- * @param[in] tv The new trigger time
- */
-
- void (*timeout_update)(struct poll_timeout *t,
- const struct timeval tv);
-
- /**
- * @brief Free a poll_timeout
- *
- * @param[in] t The poll_timeout to free
- */
-
- void (*timeout_free)(struct poll_timeout *t);
-
- /**
- * @brief private data for use by the implementation
- */
-
- void *private_data;
-};
-
-#endif
diff --git a/lib/poll_funcs/poll_funcs_tevent.c b/lib/poll_funcs/poll_funcs_tevent.c
deleted file mode 100644
index 4dd09a23bda..00000000000
--- a/lib/poll_funcs/poll_funcs_tevent.c
+++ /dev/null
@@ -1,684 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Copyright (C) Volker Lendecke 2013,2014
- *
- * 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "poll_funcs_tevent.h"
-#include "tevent.h"
-#include "system/select.h"
-#include "lib/util/dlinklist.h"
-
-/*
- * A poll_watch is asked for by the engine using this library via
- * funcs->watch_new(). It represents interest in "fd" becoming readable or
- * writable.
- */
-
-struct poll_watch {
- struct poll_funcs_state *state;
- size_t slot; /* index into state->watches[] */
- int fd;
- int events;
- void (*callback)(struct poll_watch *w, int fd, short events,
- void *private_data);
- void *private_data;
-};
-
-struct poll_timeout {
- struct poll_funcs_state *state;
- size_t slot; /* index into state->timeouts[] */
- struct timeval tv;
- void (*callback)(struct poll_timeout *t, void *private_data);
- void *private_data;
-};
-
-struct poll_funcs_state {
- /*
- * "watches" is the array of all watches that we have handed out via
- * funcs->watch_new(). The "watches" array can contain NULL pointers.
- */
- struct poll_watch **watches;
-
- /*
- * Like "watches" for timeouts;
- */
- struct poll_timeout **timeouts;
-
- /*
- * "contexts is the array of tevent_contexts that serve
- * "watches". "contexts" can contain NULL pointers.
- */
- struct poll_funcs_tevent_context **contexts;
-};
-
-struct poll_funcs_tevent_context {
- struct poll_funcs_tevent_handle *handles;
- struct poll_funcs_state *state;
- unsigned slot; /* index into state->contexts[] */
- struct tevent_context *ev;
- struct tevent_fd **fdes; /* same indexes as state->watches[] */
- struct tevent_timer **timers; /* same indexes as state->timeouts[] */
-};
-
-/*
- * poll_funcs_tevent_register() hands out a struct poll_funcs_tevent_handle as
- * a void *. poll_funcs_tevent_register allows tevent_contexts to be
- * registered multiple times, and we can't add a tevent_fd for the same fd's
- * multiple times. So we have to share one poll_funcs_tevent_context.
- */
-struct poll_funcs_tevent_handle {
- struct poll_funcs_tevent_handle *prev, *next;
- struct poll_funcs_tevent_context *ctx;
-};
-
-static uint16_t poll_events_to_tevent(short events)
-{
- uint16_t ret = 0;
-
- if (events & POLLIN) {
- ret |= TEVENT_FD_READ;
- }
- if (events & POLLOUT) {
- ret |= TEVENT_FD_WRITE;
- }
- return ret;
-}
-
-static short tevent_to_poll_events(uint16_t flags)
-{
- short ret = 0;
-
- if (flags & TEVENT_FD_READ) {
- ret |= POLLIN;
- }
- if (flags & TEVENT_FD_WRITE) {
- ret |= POLLOUT;
- }
- return ret;
-}
-
-/*
- * Find or create a free slot in state->watches[]
- */
-static bool poll_funcs_watch_find_slot(struct poll_funcs_state *state,
- size_t *slot)
-{
- struct poll_watch **watches;
- size_t i, num_watches, num_contexts;
-
- num_watches = talloc_array_length(state->watches);
-
- for (i=0; i<num_watches; i++) {
- if (state->watches[i] == NULL) {
- *slot = i;
- return true;
- }
- }
-
- watches = talloc_realloc(state, state->watches, struct poll_watch *,
- num_watches + 1);
- if (watches == NULL) {
- return false;
- }
- watches[num_watches] = NULL;
- state->watches = watches;
-
- num_contexts = talloc_array_length(state->contexts);
-
- for (i=0; i<num_contexts; i++) {
- struct tevent_fd **fdes;
- struct poll_funcs_tevent_context *c = state->contexts[i];
- if (c == NULL) {
- continue;
- }
- fdes = talloc_realloc(c, c->fdes, struct tevent_fd *,
- num_watches + 1);
- if (fdes == NULL) {
- state->watches = talloc_realloc(
- state, state->watches, struct poll_watch *,
- num_watches);
- return false;
- }
- c->fdes = fdes;
-
- fdes[num_watches] = NULL;
- }
-
- *slot = num_watches;
-
- return true;
-}
-
-static void poll_funcs_fde_handler(struct tevent_context *ev,
- struct tevent_fd *fde, uint16_t flags,
- void *private_data);
-static int poll_watch_destructor(struct poll_watch *w);
-
-static struct poll_watch *tevent_watch_new(
- const struct poll_funcs *funcs, int fd, short events,
- void (*callback)(struct poll_watch *w, int fd, short events,
- void *private_data),
- void *private_data)
-{
- struct poll_funcs_state *state = talloc_get_type_abort(
- funcs->private_data, struct poll_funcs_state);
- struct poll_watch *w;
- size_t i, slot, num_contexts;
-
- if (!poll_funcs_watch_find_slot(state, &slot)) {
- return NULL;
- }
-
- w = talloc(state->watches, struct poll_watch);
- if (w == NULL) {
- return NULL;
- }
- w->state = state;
- w->slot = slot;
- w->fd = fd;
- w->events = poll_events_to_tevent(events);
- w->fd = fd;
- w->callback = callback;
- w->private_data = private_data;
- state->watches[slot] = w;
-
- talloc_set_destructor(w, poll_watch_destructor);
-
- num_contexts = talloc_array_length(state->contexts);
-
- for (i=0; i<num_contexts; i++) {
- struct poll_funcs_tevent_context *c = state->contexts[i];
- if (c == NULL) {
- continue;
- }
- c->fdes[slot] = tevent_add_fd(c->ev, c->fdes, w->fd, w->events,
- poll_funcs_fde_handler, w);
- if (c->fdes[slot] == NULL) {
- goto fail;
- }
- }
- return w;
-
-fail:
- TALLOC_FREE(w);
- return NULL;
-}
-
-static int poll_watch_destructor(struct poll_watch *w)
-{
- struct poll_funcs_state *state = w->state;
- size_t num_contexts = talloc_array_length(state->contexts);
- size_t slot = w->slot;
- size_t i;
-
- TALLOC_FREE(state->watches[slot]);
-
- for (i=0; i<num_contexts; i++) {
- struct poll_funcs_tevent_context *c = state->contexts[i];
- if (c == NULL) {
- continue;
- }
- TALLOC_FREE(c->fdes[slot]);
- }
-
- return 0;
-}
-
-static void tevent_watch_update(struct poll_watch *w, short events)
-{
- struct poll_funcs_state *state = w->state;
- size_t num_contexts = talloc_array_length(state->contexts);
- size_t slot = w->slot;
- size_t i;
-
- w->events = poll_events_to_tevent(events);
-
- for (i=0; i<num_contexts; i++) {
- struct poll_funcs_tevent_context *c = state->contexts[i];
- if (c == NULL) {
- continue;
- }
- tevent_fd_set_flags(c->fdes[slot], w->events);
- }
-}
-
-static short tevent_watch_get_events(struct poll_watch *w)
-{
- return tevent_to_poll_events(w->events);
-}
-
-static void tevent_watch_free(struct poll_watch *w)
-{
- TALLOC_FREE(w);
-}
-
-static bool poll_funcs_timeout_find_slot(struct poll_funcs_state *state,
- size_t *slot)
-{
- struct poll_timeout **timeouts;
- size_t i, num_timeouts, num_contexts;
-
- num_timeouts = talloc_array_length(state->timeouts);
-
- for (i=0; i<num_timeouts; i++) {
- if (state->timeouts[i] == NULL) {
- *slot = i;
- return true;
- }
- }
-
- timeouts = talloc_realloc(state, state->timeouts,
- struct poll_timeout *,
- num_timeouts + 1);
- if (timeouts == NULL) {
- return false;
- }
- timeouts[num_timeouts] = NULL;
- state->timeouts = timeouts;
-
- num_contexts = talloc_array_length(state->contexts);
-
- for (i=0; i<num_contexts; i++) {
- struct tevent_timer **timers;
- struct poll_funcs_tevent_context *c = state->contexts[i];
- if (c == NULL) {
- continue;
- }
- timers = talloc_realloc(c, c->timers, struct tevent_timer *,
- num_timeouts + 1);
- if (timers == NULL) {
- state->timeouts = talloc_realloc(
- state, state->timeouts, struct poll_timeout *,
- num_timeouts);
- return false;
- }
- c->timers = timers;
-
- timers[num_timeouts] = NULL;
- }
-
- *slot = num_timeouts;
-
- return true;
-}
-
-static void poll_funcs_timer_handler(struct tevent_context *ev,
- struct tevent_timer *te,
- struct timeval current_time,
- void *private_data);
-static int poll_timeout_destructor(struct poll_timeout *t);
-
-static struct poll_timeout *tevent_timeout_new(
- const struct poll_funcs *funcs, const struct timeval tv,
- void (*callback)(struct poll_timeout *t, void *private_data),
- void *private_data)
-{
- struct poll_funcs_state *state = talloc_get_type_abort(
- funcs->private_data, struct poll_funcs_state);
- struct poll_timeout *t;
- size_t i, slot, num_contexts;
-
- if (!poll_funcs_timeout_find_slot(state, &slot)) {
- return NULL;
- }
-
- t = talloc(state->timeouts, struct poll_timeout);
- if (t == NULL) {
- return NULL;
- }
- t->state = state;
- t->slot = slot;
- t->tv = tv;
- t->callback = callback;
- t->private_data = private_data;
-
- talloc_set_destructor(t, poll_timeout_destructor);
-
- num_contexts = talloc_array_length(state->contexts);
-
- for (i=0; i<num_contexts; i++) {
- struct poll_funcs_tevent_context *c = state->contexts[i];
- if (c == NULL) {
- continue;
- }
- c->timers[slot] = tevent_add_timer(
- c->ev, c->timers, tv, poll_funcs_timer_handler, t);
- if (c->timers[slot] == NULL) {
- goto fail;
- }
- }
- return t;
-
-fail:
- TALLOC_FREE(t);
- return NULL;
-}
-
-static int poll_timeout_destructor(struct poll_timeout *t)
-{
- struct poll_funcs_state *state = t->state;
- size_t num_contexts = talloc_array_length(state->contexts);
- size_t slot = t->slot;
- size_t i;
-
- TALLOC_FREE(state->timeouts[slot]);
-
- for (i=0; i<num_contexts; i++) {
- struct poll_funcs_tevent_context *c = state->contexts[i];
- if (c == NULL) {
- continue;
- }
- TALLOC_FREE(c->timers[slot]);
- }
-
- return 0;
-}
-
-static void poll_funcs_timer_handler(struct tevent_context *ev,
- struct tevent_timer *te,
- struct timeval current_time,
- void *private_data)
-{
- struct poll_timeout *t = talloc_get_type_abort(
- private_data, struct poll_timeout);
- struct poll_funcs_state *state = t->state;
- size_t slot = t->slot;
- size_t i, num_contexts;
-
- num_contexts = talloc_array_length(state->contexts);
-
- for (i=0; i<num_contexts; i++) {
- struct poll_funcs_tevent_context *c = state->contexts[i];
- if (c == NULL) {
- continue;
- }
- TALLOC_FREE(c->timers[slot]);
- }
-
- t->callback(t, t->private_data);
-}
-
-static void tevent_timeout_update(struct poll_timeout *t,
- const struct timeval tv)
-{
- struct poll_funcs_state *state = t->state;
- size_t num_contexts = talloc_array_length(state->contexts);
- size_t slot = t->slot;
- size_t i;
-
- for (i=0; i<num_contexts; i++) {
- struct poll_funcs_tevent_context *c = state->contexts[i];
- if (c == NULL) {
- continue;
- }
- TALLOC_FREE(c->timers[slot]);
-
- c->timers[slot] = tevent_add_timer(
- c->ev, c->timers, tv, poll_funcs_timer_handler, t);
- if (c->timers[slot] == NULL) {
- /*
- * We just free'ed the space, why did this fail??
- */
- abort();
- }
- }
-}
-
-static void tevent_timeout_free(struct poll_timeout *t)
-{
- TALLOC_FREE(t);
-}
-
-static int poll_funcs_state_destructor(struct poll_funcs_state *state);
-
-struct poll_funcs *poll_funcs_init_tevent(TALLOC_CTX *mem_ctx)
-{
- struct poll_funcs *f;
- struct poll_funcs_state *state;
-
- f = talloc(mem_ctx, struct poll_funcs);
- if (f == NULL) {
- return NULL;
- }
- state = talloc_zero(f, struct poll_funcs_state);
- if (state == NULL) {
- TALLOC_FREE(f);
- return NULL;
- }
- talloc_set_destructor(state, poll_funcs_state_destructor);
-
- f->watch_new = tevent_watch_new;
- f->watch_update = tevent_watch_update;
- f->watch_get_events = tevent_watch_get_events;
- f->watch_free = tevent_watch_free;
- f->timeout_new = tevent_timeout_new;
- f->timeout_update = tevent_timeout_update;
- f->timeout_free = tevent_timeout_free;
- f->private_data = state;
- return f;
-}
-
-static int poll_funcs_state_destructor(struct poll_funcs_state *state)
-{
- size_t num_watches = talloc_array_length(state->watches);
- size_t num_timeouts = talloc_array_length(state->timeouts);
- size_t num_contexts = talloc_array_length(state->contexts);
- size_t i;
- /*
- * Make sure the watches are cleared before the contexts. The watches
- * have destructors attached to them that clean up the fde's
- */
- for (i=0; i<num_watches; i++) {
- TALLOC_FREE(state->watches[i]);
- }
- for (i=0; i<num_timeouts; i++) {
- TALLOC_FREE(state->timeouts[i]);
- }
- for (i=0; i<num_contexts; i++) {
- TALLOC_FREE(state->contexts[i]);
- }
- return 0;
-}
-
-/*
- * Find or create a free slot in state->contexts[]
- */
-static bool poll_funcs_context_slot_find(struct poll_funcs_state *state,
- struct tevent_context *ev,
- size_t *slot)
-{
- struct poll_funcs_tevent_context **contexts;
- size_t num_contexts = talloc_array_length(state->contexts);
- size_t i;
-
- /* Look for an existing match first. */
- for (i=0; i<num_contexts; i++) {
- struct poll_funcs_tevent_context *ctx = state->contexts[i];
-
- if (ctx != NULL && ctx->ev == ev) {
- *slot = i;
- return true;
- }
- }
-
- /* Now look for a free slot. */
- for (i=0; i<num_contexts; i++) {
- struct poll_funcs_tevent_context *ctx = state->contexts[i];
-
- if (ctx == NULL) {
- *slot = i;
- return true;
- }
- }
-
- contexts = talloc_realloc(state, state->contexts,
- struct poll_funcs_tevent_context *,
- num_contexts + 1);
- if (contexts == NULL) {
- return false;
- }
- state->contexts = contexts;
- state->contexts[num_contexts] = NULL;
-
- *slot = num_contexts;
-
- return true;
-}
-
-static int poll_funcs_tevent_context_destructor(
- struct poll_funcs_tevent_context *ctx);
-
-static struct poll_funcs_tevent_context *poll_funcs_tevent_context_new(
- TALLOC_CTX *mem_ctx, struct poll_funcs_state *state,
- struct tevent_context *ev, unsigned slot)
-{
- struct poll_funcs_tevent_context *ctx;
- size_t num_watches = talloc_array_length(state->watches);
- size_t num_timeouts = talloc_array_length(state->timeouts);
- size_t i;
-
- ctx = talloc(mem_ctx, struct poll_funcs_tevent_context);
- if (ctx == NULL) {
- return NULL;
- }
-
- ctx->handles = NULL;
- ctx->state = state;
- ctx->ev = ev;
- ctx->slot = slot;
-
- ctx->fdes = talloc_array(ctx, struct tevent_fd *, num_watches);
- if (ctx->fdes == NULL) {
- goto fail;
- }
-
- for (i=0; i<num_watches; i++) {
- struct poll_watch *w = state->watches[i];
-
- if (w == NULL) {
- ctx->fdes[i] = NULL;
- continue;
- }
- ctx->fdes[i] = tevent_add_fd(ev, ctx->fdes, w->fd, w->events,
- poll_funcs_fde_handler, w);
- if (ctx->fdes[i] == NULL) {
- goto fail;
- }
- }
-
- ctx->timers = talloc_array(ctx, struct tevent_timer *, num_timeouts);
- if (ctx->timers == NULL) {
- goto fail;
- }
-
- for (i=0; i<num_timeouts; i++) {
- struct poll_timeout *t = state->timeouts[i];
-
- if (t == NULL) {
- ctx->timers[i] = NULL;
- continue;
- }
- ctx->timers[i] = tevent_add_timer(ctx->ev, ctx->timers, t->tv,
- poll_funcs_timer_handler, t);
- if (ctx->timers[i] == 0) {
- goto fail;
- }
- }
-
- talloc_set_destructor(ctx, poll_funcs_tevent_context_destructor);
- return ctx;
-fail:
- TALLOC_FREE(ctx);
- return NULL;
-}
-
-static int poll_funcs_tevent_context_destructor(
- struct poll_funcs_tevent_context *ctx)
-{
- struct poll_funcs_tevent_handle *h;
-
- ctx->state->contexts[ctx->slot] = NULL;
-
- for (h = ctx->handles; h != NULL; h = h->next) {
- h->ctx = NULL;
- }
-
- return 0;
-}
-
-static void poll_funcs_fde_handler(struct tevent_context *ev,
- struct tevent_fd *fde, uint16_t flags,
- void *private_data)
-{
- struct poll_watch *w = talloc_get_type_abort(
- private_data, struct poll_watch);
- short events = tevent_to_poll_events(flags);
- w->callback(w, w->fd, events, w->private_data);
-}
-
-static int poll_funcs_tevent_handle_destructor(
- struct poll_funcs_tevent_handle *handle);
-
-void *poll_funcs_tevent_register(TALLOC_CTX *mem_ctx, struct poll_funcs *f,
- struct tevent_context *ev)
-{
- struct poll_funcs_state *state = talloc_get_type_abort(
- f->private_data, struct poll_funcs_state);
- struct poll_funcs_tevent_handle *handle;
- size_t slot;
-
- handle = talloc(mem_ctx, struct poll_funcs_tevent_handle);
- if (handle == NULL) {
- return NULL;
- }
-
- if (!poll_funcs_context_slot_find(state, ev, &slot)) {
- goto fail;
- }
- if (state->contexts[slot] == NULL) {
- state->contexts[slot] = poll_funcs_tevent_context_new(
- state->contexts, state, ev, slot);
- if (state->contexts[slot] == NULL) {
- goto fail;
- }
- }
-
- handle->ctx = state->contexts[slot];
- DLIST_ADD(handle->ctx->handles, handle);
- talloc_set_destructor(handle, poll_funcs_tevent_handle_destructor);
- return handle;
-fail:
- TALLOC_FREE(handle);
- return NULL;
-}
-
-static int poll_funcs_tevent_handle_destructor(
- struct poll_funcs_tevent_handle *handle)
-{
- if (handle->ctx == NULL) {
- return 0;
- }
- if (handle->ctx->handles == NULL) {
- abort();
- }
-
- DLIST_REMOVE(handle->ctx->handles, handle);
-
- if (handle->ctx->handles == NULL) {
- TALLOC_FREE(handle->ctx);
- }
- return 0;
-}
diff --git a/lib/poll_funcs/poll_funcs_tevent.h b/lib/poll_funcs/poll_funcs_tevent.h
deleted file mode 100644
index 8b2964c230d..00000000000
--- a/lib/poll_funcs/poll_funcs_tevent.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Copyright (C) Volker Lendecke 2013,2014
- *
- * 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 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __POLL_FUNCS_TEVENT_H__
-#define __POLL_FUNCS_TEVENT_H__
-
-#include "poll_funcs.h"
-#include "tevent.h"
-
-/*
- * Create a new, empty instance of "struct poll_funcs" to be served by tevent.
- */
-struct poll_funcs *poll_funcs_init_tevent(TALLOC_CTX *mem_ctx);
-
-/*
- * Register a tevent_context to handle the watches that the user of
- * "poll_funcs" showed interest in. talloc_free() the returned pointer when
- * "ev" is not supposed to handle the events anymore.
- */
-void *poll_funcs_tevent_register(TALLOC_CTX *mem_ctx, struct poll_funcs *f,
- struct tevent_context *ev);
-
-#endif
diff --git a/lib/poll_funcs/wscript_build b/lib/poll_funcs/wscript_build
deleted file mode 100644
index df9a298e8d5..00000000000
--- a/lib/poll_funcs/wscript_build
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-
-bld.SAMBA_SUBSYSTEM('POLL_FUNCS_TEVENT',
- source='poll_funcs_tevent.c',
- deps='tevent')
diff --git a/source3/wscript_build b/source3/wscript_build
index 15985553536..66fcaac1b67 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -354,7 +354,6 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
UTIL_PW
SAMBA_VERSION
PTHREADPOOL
- POLL_FUNCS_TEVENT
interfaces
param
dbwrap
diff --git a/wscript_build b/wscript_build
index fa3aa60ed42..93b1832cf90 100644
--- a/wscript_build
+++ b/wscript_build
@@ -43,7 +43,6 @@ bld.RECURSE('lib/texpect')
bld.RECURSE('lib/addns')
bld.RECURSE('lib/ldb')
bld.RECURSE('lib/param')
-bld.RECURSE('lib/poll_funcs')
bld.RECURSE('dynconfig')
bld.RECURSE('lib/util/charset')
bld.RECURSE('python')