summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-12-23 19:28:22 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-12-23 19:28:22 +0100
commit465f78021e609719bf25b7d2933c47b7ab1b6940 (patch)
tree43c0f2ac491a152bc6c18d31ccfbb5c6000f7267 /source4
parent227c8000dfee4248fc2d13104382542e449a1897 (diff)
downloadsamba-465f78021e609719bf25b7d2933c47b7ab1b6940.tar.gz
samba-465f78021e609719bf25b7d2933c47b7ab1b6940.tar.bz2
samba-465f78021e609719bf25b7d2933c47b7ab1b6940.zip
Move Samba4-specific file out of common libtevent.
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/basic.mk1
-rw-r--r--source4/lib/events/config.mk2
-rw-r--r--source4/lib/events/events_dummy.c4
-rw-r--r--source4/lib/events/tevent_s4.c72
4 files changed, 74 insertions, 5 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 4d076684cd..4b40ed41d4 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -23,3 +23,4 @@ TDB_WRAP_OBJ_FILES = $(libsrcdir)/tdb_wrap.o
PUBLIC_HEADERS += $(libsrcdir)/tdb_wrap.h
SMBREADLINE_OBJ_LIST = $(SMBREADLINE_OBJ_FILES)
+
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index b9d6879b3c..a1b2cd218a 100644
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -2,6 +2,6 @@
PUBLIC_DEPENDENCIES = LIBTEVENT
CFLAGS = -Ilib/events
-LIBEVENTS_OBJ_FILES = $(addprefix $(libeventssrcdir)/, events_dummy.o)
+LIBEVENTS_OBJ_FILES = $(addprefix $(libeventssrcdir)/, tevent_s4.o)
PUBLIC_HEADERS += $(addprefix $(libeventssrcdir)/, events.h events_internal.h)
diff --git a/source4/lib/events/events_dummy.c b/source4/lib/events/events_dummy.c
deleted file mode 100644
index 15bb25e953..0000000000
--- a/source4/lib/events/events_dummy.c
+++ /dev/null
@@ -1,4 +0,0 @@
-void __events_dummy(void)
-{
-}
-
diff --git a/source4/lib/events/tevent_s4.c b/source4/lib/events/tevent_s4.c
new file mode 100644
index 0000000000..80267fdd22
--- /dev/null
+++ b/source4/lib/events/tevent_s4.c
@@ -0,0 +1,72 @@
+/*
+ Unix SMB/CIFS implementation.
+ Copyright (C) Andrew Tridgell 2003
+
+ 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 "includes.h"
+#include "tevent.h"
+#include "tevent_internal.h"
+
+/*
+ this is used to catch debug messages from events
+*/
+static void ev_wrap_debug(void *context, enum ev_debug_level level,
+ const char *fmt, va_list ap) PRINTF_ATTRIBUTE(3,0);
+
+static void ev_wrap_debug(void *context, enum ev_debug_level level,
+ const char *fmt, va_list ap)
+{
+ int samba_level = -1;
+ char *s = NULL;
+ switch (level) {
+ case EV_DEBUG_FATAL:
+ samba_level = 0;
+ break;
+ case EV_DEBUG_ERROR:
+ samba_level = 1;
+ break;
+ case EV_DEBUG_WARNING:
+ samba_level = 2;
+ break;
+ case EV_DEBUG_TRACE:
+ samba_level = 5;
+ break;
+
+ };
+ vasprintf(&s, fmt, ap);
+ if (!s) return;
+ DEBUG(samba_level, ("events: %s\n", s));
+ free(s);
+}
+
+/*
+ create a event_context structure. This must be the first events
+ call, and all subsequent calls pass this event_context as the first
+ element. Event handlers also receive this as their first argument.
+
+ This samba4 specific call sets the samba4 debug handler.
+*/
+struct event_context *s4_event_context_init(TALLOC_CTX *mem_ctx)
+{
+ struct event_context *ev;
+
+ ev = event_context_init_byname(mem_ctx, NULL);
+ if (ev) {
+ ev_set_debug(ev, ev_wrap_debug, NULL);
+ }
+ return ev;
+}
+