[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-4792-gff8ff53
Jeremy Allison
jra at samba.org
Tue Jan 6 05:07:17 GMT 2009
The branch, v3-3-test has been updated
via ff8ff5379455eafdd11fbd45d31602cf2a5fb57d (commit)
via 57b419fac63baa6a2b14e8800e04af75b0a6b7cc (commit)
via 0add7303ea7cb71c070814306c7d6fc97c7c04c2 (commit)
from 550e0e499a44218694e56243a4898ba7d460314d (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit ff8ff5379455eafdd11fbd45d31602cf2a5fb57d
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jan 5 21:06:25 2009 -0800
s3:events: get rid of the stupid set_event_dispatch_time() function
metze
commit 57b419fac63baa6a2b14e8800e04af75b0a6b7cc
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jan 5 21:05:48 2009 -0800
s3:events: get rid of the stupid cancel_named_event() function
metze
commit 0add7303ea7cb71c070814306c7d6fc97c7c04c2
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Jan 5 21:05:20 2009 -0800
s3:events: move prototypes to event.h
metze
-----------------------------------------------------------------------
Summary of changes:
source/include/event.h | 40 ++++++++++++++++++++++++++++++++++++++++
source/include/includes.h | 2 +-
source/include/proto.h | 40 ----------------------------------------
source/include/smb.h | 3 ---
source/lib/events.c | 32 --------------------------------
5 files changed, 41 insertions(+), 76 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/event.h b/source/include/event.h
index 0465fae..0d5e559 100644
--- a/source/include/event.h
+++ b/source/include/event.h
@@ -18,7 +18,47 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+struct event_context;
+struct fd_event;
+struct timed_event;
+
/* bits for file descriptor event flags */
#define EVENT_FD_READ 1
#define EVENT_FD_WRITE 2
+/* The following definitions come from lib/events.c */
+
+struct timed_event *event_add_timed(struct event_context *event_ctx,
+ TALLOC_CTX *mem_ctx,
+ struct timeval when,
+ const char *event_name,
+ void (*handler)(struct event_context *event_ctx,
+ struct timed_event *te,
+ const struct timeval *now,
+ void *private_data),
+ void *private_data);
+struct fd_event *event_add_fd(struct event_context *event_ctx,
+ TALLOC_CTX *mem_ctx,
+ int fd, uint16_t flags,
+ void (*handler)(struct event_context *event_ctx,
+ struct fd_event *event,
+ uint16 flags,
+ void *private_data),
+ void *private_data);
+void event_fd_set_writeable(struct fd_event *fde);
+void event_fd_set_not_writeable(struct fd_event *fde);
+void event_fd_set_readable(struct fd_event *fde);
+void event_fd_set_not_readable(struct fd_event *fde);
+bool 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);
+bool run_events(struct event_context *event_ctx,
+ int selrtn, fd_set *read_fds, fd_set *write_fds);
+struct timeval *get_timed_events_timeout(struct event_context *event_ctx,
+ struct timeval *to_ret);
+int event_loop_once(struct event_context *ev);
+void event_context_reinit(struct event_context *ev);
+struct event_context *event_context_init(TALLOC_CTX *mem_ctx);
+void dump_event_list(struct event_context *event_ctx);
+
diff --git a/source/include/includes.h b/source/include/includes.h
index b90f12a..d130171 100644
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -657,6 +657,7 @@ typedef char fstring[FSTRING_LEN];
#define talloc_get_type_abort(ptr, type) \
(type *)talloc_check_name_abort(ptr, #type)
+#include "event.h"
#include "nt_status.h"
#include "ads.h"
#include "ads_dns.h"
@@ -717,7 +718,6 @@ typedef char fstring[FSTRING_LEN];
#include "nsswitch/winbind_client.h"
#include "spnego.h"
#include "rpc_client.h"
-#include "event.h"
#include "dbwrap.h"
#include "packet.h"
#include "ctdbd_conn.h"
diff --git a/source/include/proto.h b/source/include/proto.h
index 3ddeddf..6b7291f 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -519,46 +519,6 @@ void display_set_stderr(void);
NTSTATUS map_nt_error_from_unix(int unix_error);
int map_errno_from_nt_status(NTSTATUS status);
-/* The following definitions come from lib/events.c */
-
-struct timed_event *event_add_timed(struct event_context *event_ctx,
- TALLOC_CTX *mem_ctx,
- struct timeval when,
- const char *event_name,
- void (*handler)(struct event_context *event_ctx,
- struct timed_event *te,
- const struct timeval *now,
- void *private_data),
- void *private_data);
-struct fd_event *event_add_fd(struct event_context *event_ctx,
- TALLOC_CTX *mem_ctx,
- int fd, uint16_t flags,
- void (*handler)(struct event_context *event_ctx,
- struct fd_event *event,
- uint16 flags,
- void *private_data),
- void *private_data);
-void event_fd_set_writeable(struct fd_event *fde);
-void event_fd_set_not_writeable(struct fd_event *fde);
-void event_fd_set_readable(struct fd_event *fde);
-void event_fd_set_not_readable(struct fd_event *fde);
-bool 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);
-bool run_events(struct event_context *event_ctx,
- int selrtn, fd_set *read_fds, fd_set *write_fds);
-struct timeval *get_timed_events_timeout(struct event_context *event_ctx,
- struct timeval *to_ret);
-int event_loop_once(struct event_context *ev);
-void event_context_reinit(struct event_context *ev);
-struct event_context *event_context_init(TALLOC_CTX *mem_ctx);
-int set_event_dispatch_time(struct event_context *event_ctx,
- const char *event_name, struct timeval when);
-int cancel_named_event(struct event_context *event_ctx,
- const char *event_name);
-void dump_event_list(struct event_context *event_ctx);
-
/* The following definitions come from lib/fault.c */
void fault_setup(void (*fn)(void *));
diff --git a/source/include/smb.h b/source/include/smb.h
index cea4fe5..e7f08a3 100644
--- a/source/include/smb.h
+++ b/source/include/smb.h
@@ -384,9 +384,6 @@ struct fd_handle {
unsigned long gen_id;
};
-struct event_context;
-struct fd_event;
-struct timed_event;
struct idle_event;
struct share_mode_entry;
struct uuid;
diff --git a/source/lib/events.c b/source/lib/events.c
index 31c5127..d4b9648 100644
--- a/source/lib/events.c
+++ b/source/lib/events.c
@@ -363,38 +363,6 @@ struct event_context *event_context_init(TALLOC_CTX *mem_ctx)
return result;
}
-int set_event_dispatch_time(struct event_context *event_ctx,
- const char *event_name, struct timeval when)
-{
- struct timed_event *te;
-
- for (te = event_ctx->timed_events; te; te = te->next) {
- if (strcmp(event_name, te->event_name) == 0) {
- DLIST_REMOVE(event_ctx->timed_events, te);
- te->when = when;
- add_event_by_time(te);
- return 1;
- }
- }
- return 0;
-}
-
-/* Returns 1 if event was found and cancelled, 0 otherwise. */
-
-int cancel_named_event(struct event_context *event_ctx,
- const char *event_name)
-{
- struct timed_event *te;
-
- for (te = event_ctx->timed_events; te; te = te->next) {
- if (strcmp(event_name, te->event_name) == 0) {
- TALLOC_FREE(te);
- return 1;
- }
- }
- return 0;
-}
-
void dump_event_list(struct event_context *event_ctx)
{
struct timed_event *te;
--
Samba Shared Repository
More information about the samba-cvs
mailing list