From 7bf5768a523082d5d47140155824f24689009e55 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 24 Dec 2008 13:52:57 +0100 Subject: lib/tevent: rename event_* => tevent_* in the header file We have compat macros to keep the callers happy. metze --- lib/tevent/tevent.h | 176 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 127 insertions(+), 49 deletions(-) (limited to 'lib/tevent/tevent.h') diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h index 1857f9bb10..002edd1836 100644 --- a/lib/tevent/tevent.h +++ b/lib/tevent/tevent.h @@ -26,73 +26,151 @@ #include struct event_context; -struct event_ops; +struct tevent_ops; struct fd_event; -struct timed_event; -struct aio_event; -struct signal_event; +struct tevent_timer; +struct tevent_aio; +struct tevent_signal; + +#define tevent_context event_context +#define tevent_fd fd_event /* event handler types */ -typedef void (*event_fd_handler_t)(struct event_context *, struct fd_event *, - uint16_t , void *); -typedef void (*event_timed_handler_t)(struct event_context *, struct timed_event *, - struct timeval , void *); -typedef void (*event_signal_handler_t)(struct event_context *, struct signal_event *, - int , int, void *, void *); -typedef void (*event_aio_handler_t)(struct event_context *, struct aio_event *, - int, void *); - -#ifdef _SAMBA_BUILD_ -struct event_context *s4_event_context_init(TALLOC_CTX *mem_ctx); +typedef void (*tevent_fd_handler_t)(struct tevent_context *, + struct tevent_fd *, + uint16_t , void *); +typedef void (*tevent_timer_handler_t)(struct tevent_context *, + struct tevent_timer *, + struct timeval , void *); +typedef void (*tevent_signal_handler_t)(struct tevent_context *, + struct tevent_signal *, + int , int, void *, void *); +typedef void (*tevent_aio_handler_t)(struct tevent_context *, + struct tevent_aio *, + int, void *); + +struct tevent_context *tevent_context_init(TALLOC_CTX *mem_ctx); +struct tevent_context *tevent_context_init_byname(TALLOC_CTX *mem_ctx, const char *name); +const char **tevent_backend_list(TALLOC_CTX *mem_ctx); +void tevent_set_default_backend(const char *backend); + +struct tevent_fd *tevent_add_fd(struct tevent_context *ev, + TALLOC_CTX *mem_ctx, + int fd, uint16_t flags, + tevent_fd_handler_t handler, + void *private_data); + +struct tevent_timer *tevent_add_timer(struct tevent_context *ev, + TALLOC_CTX *mem_ctx, + struct timeval next_event, + tevent_timer_handler_t handler, + void *private_data); + +struct tevent_signal *tevent_add_signal(struct tevent_context *ev, + TALLOC_CTX *mem_ctx, + int signum, int sa_flags, + tevent_signal_handler_t handler, + void *private_data); + +struct iocb; +struct tevent_aio *tevent_add_aio(struct tevent_context *ev, + TALLOC_CTX *mem_ctx, + struct iocb *iocb, + tevent_aio_handler_t handler, + void *private_data); + +int tevent_loop_once(struct tevent_context *ev); +int tevent_loop_wait(struct tevent_context *ev); + +uint16_t tevent_fd_get_flags(struct tevent_fd *fde); +void tevent_fd_set_flags(struct tevent_fd *fde, uint16_t flags); + +/* bits for file descriptor event flags */ +#define TEVENT_FD_READ 1 +#define TEVENT_FD_WRITE 2 +#define TEVENT_FD_AUTOCLOSE 4 + +#define TEVENT_FD_WRITEABLE(fde) \ + tevent_fd_set_flags(fde, tevent_fd_get_flags(fde) | TEVENT_FD_WRITE) +#define TEVENT_FD_READABLE(fde) \ + tevent_fd_set_flags(fde, tevent_fd_get_flags(fde) | TEVENT_FD_READ) + +#define TEVENT_FD_NOT_WRITEABLE(fde) \ + tevent_fd_set_flags(fde, tevent_fd_get_flags(fde) & ~TEVENT_FD_WRITE) +#define TEVENT_FD_NOT_READABLE(fde) \ + tevent_fd_set_flags(fde, tevent_fd_get_flags(fde) & ~TEVENT_FD_READ) + +/* for now always define the compat symbols */ +#ifndef TEVENT_COMPAT_DEFINES +#define TEVENT_COMPAT_DEFINES 1 #endif -struct event_context *event_context_init(TALLOC_CTX *mem_ctx); -struct event_context *event_context_init_byname(TALLOC_CTX *mem_ctx, const char *name); -const char **event_backend_list(TALLOC_CTX *mem_ctx); -void event_set_default_backend(const char *backend); +#ifdef TEVENT_COMPAT_DEFINES -struct fd_event *event_add_fd(struct event_context *ev, TALLOC_CTX *mem_ctx, - int fd, uint16_t flags, event_fd_handler_t handler, - void *private_data); +/*TODO:#define event_context tevent_context*/ +#define event_ops tevent_ops +/*TODO:#define fd_event tevent_fd*/ +#define timed_event tevent_timer +#define aio_event tevent_aio +#define signal_event tevent_signal -struct timed_event *event_add_timed(struct event_context *ev, TALLOC_CTX *mem_ctx, - struct timeval next_event, - event_timed_handler_t handler, - void *private_data); +#define event_fd_handler_t tevent_fd_handler_t +#define event_timed_handler_t tevent_timer_handler_t +#define event_aio_handler_t tevent_aio_handler_t +#define event_signal_handler_t tevent_signal_handler_t -struct signal_event *event_add_signal(struct event_context *ev, TALLOC_CTX *mem_ctx, - int signum, int sa_flags, - event_signal_handler_t handler, - void *private_data); +#define event_context_init(mem_ctx) \ + tevent_context_init(mem_ctx) -struct iocb; -struct aio_event *event_add_aio(struct event_context *ev, - TALLOC_CTX *mem_ctx, - struct iocb *iocb, - event_aio_handler_t handler, - void *private_data); +#define event_context_init_byname(mem_ctx, name) \ + tevent_context_init_byname(mem_ctx, name) -int event_loop_once(struct event_context *ev); -int event_loop_wait(struct event_context *ev); +#define event_backend_list(mem_ctx) \ + tevent_backend_list(mem_ctx) -uint16_t event_get_fd_flags(struct fd_event *fde); -void event_set_fd_flags(struct fd_event *fde, uint16_t flags); +#define event_set_default_backend(backend) \ + tevent_set_default_backend(backend) -struct event_context *event_context_find(TALLOC_CTX *mem_ctx); +#define event_add_fd(ev, mem_ctx, fd, flags, handler, private_data) \ + tevent_add_fd(ev, mem_ctx, fd, flags, handler, private_data) -/* bits for file descriptor event flags */ -#define EVENT_FD_READ 1 -#define EVENT_FD_WRITE 2 -#define EVENT_FD_AUTOCLOSE 4 +#define event_add_timed(ev, mem_ctx, next_event, handler, private_data) \ + tevent_add_timer(ev, mem_ctx, next_event, handler, private_data) + +#define event_add_signal(ev, mem_ctx, signum, sa_flags, handler, private_data) \ + tevent_add_signal(ev, mem_ctx, signum, sa_flags, handler, private_data) + +#define event_add_aio(ev, mem_ctx, iocb, handler, private_data) \ + tevent_add_aio(ev, mem_ctx, iocb, handler, private_data) + +#define event_loop_once(ev) \ + tevent_loop_once(ev) + +#define event_loop_wait(ev) \ + tevent_loop_wait(ev) + +#define event_get_fd_flags(fde) \ + tevent_fd_get_flags(fde) + +#define event_set_fd_flags(fde, flags) \ + tevent_fd_set_flags(fde, flags) + +#define EVENT_FD_READ TEVENT_FD_READ +#define EVENT_FD_WRITE TEVENT_FD_WRITE +#define EVENT_FD_AUTOCLOSE TEVENT_FD_AUTOCLOSE #define EVENT_FD_WRITEABLE(fde) \ - event_set_fd_flags(fde, event_get_fd_flags(fde) | EVENT_FD_WRITE) + TEVENT_FD_WRITEABLE(fde) + #define EVENT_FD_READABLE(fde) \ - event_set_fd_flags(fde, event_get_fd_flags(fde) | EVENT_FD_READ) + TEVENT_FD_READABLE(fde) #define EVENT_FD_NOT_WRITEABLE(fde) \ - event_set_fd_flags(fde, event_get_fd_flags(fde) & ~EVENT_FD_WRITE) + TEVENT_FD_NOT_WRITEABLE(fde) + #define EVENT_FD_NOT_READABLE(fde) \ - event_set_fd_flags(fde, event_get_fd_flags(fde) & ~EVENT_FD_READ) + TEVENT_FD_NOT_READABLE(fde) + +#endif /* TEVENT_COMPAT_DEFINES */ #endif /* __TEVENT_H__ */ -- cgit