[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-959-g975a881

[Stefan Metzmacher]

The branch, master has been updated
       via  975a881d54a4223fa616895778a69b08e9243aae (commit)
       via  7f6618a3deb77fc5c4724c598ecacdbf87c5e9c4 (commit)
      from  3f147cb7a3706d00a3cbac51013e09f93e9b7055 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 975a881d54a4223fa616895778a69b08e9243aae
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 17 10:22:33 2009 +0100

    tevent: add tevent_wakeup_send/recv()
    
    This can be used as tevent_req based timer event.
    
    metze

commit 7f6618a3deb77fc5c4724c598ecacdbf87c5e9c4
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Feb 17 10:15:18 2009 +0100

    tevent: rename tevent_req_set_timeout() => tevent_req_set_endtime()
    
    This makes more clear what the function does.
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 lib/tevent/libtevent.m4    |    3 +-
 lib/tevent/tevent.h        |    6 +++-
 lib/tevent/tevent_req.c    |    2 +-
 lib/tevent/tevent_wakeup.c |   70 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 lib/tevent/tevent_wakeup.c


Changeset truncated at 500 lines:

diff --git a/lib/tevent/libtevent.m4 b/lib/tevent/libtevent.m4
index cbfb981..29a64ae 100644
--- a/lib/tevent/libtevent.m4
+++ b/lib/tevent/libtevent.m4
@@ -26,7 +26,8 @@ AC_SUBST(TEVENT_LIBS)
 
 TEVENT_CFLAGS="-I$teventdir"
 
-TEVENT_OBJ="tevent.o tevent_fd.o tevent_timed.o tevent_signal.o tevent_req.o tevent_debug.o tevent_util.o"
+TEVENT_OBJ="tevent.o tevent_fd.o tevent_timed.o tevent_signal.o tevent_debug.o tevent_util.o"
+TEVENT_OBJ="$TEVENT_OBJ tevent_req.o tevent_wakeup.o"
 TEVENT_OBJ="$TEVENT_OBJ tevent_standard.o tevent_select.o"
 
 AC_CHECK_HEADERS(sys/epoll.h)
diff --git a/lib/tevent/tevent.h b/lib/tevent/tevent.h
index 8e3d097..16fac73 100644
--- a/lib/tevent/tevent.h
+++ b/lib/tevent/tevent.h
@@ -278,7 +278,7 @@ struct tevent_req *_tevent_req_create(TALLOC_CTX *mem_ctx,
 	_tevent_req_create((_mem_ctx), (_pstate), sizeof(_type), \
 			   #_type, __location__)
 
-bool tevent_req_set_timeout(struct tevent_req *req,
+bool tevent_req_set_endtime(struct tevent_req *req,
 			    struct tevent_context *ev,
 			    struct timeval endtime);
 
@@ -299,6 +299,10 @@ bool tevent_req_is_error(struct tevent_req *req,
 			 enum tevent_req_state *state,
 			 uint64_t *error);
 
+struct tevent_req *tevent_wakeup_send(TALLOC_CTX *mem_ctx,
+				      struct tevent_context *ev,
+				      struct timeval wakeup_time);
+bool tevent_wakeup_recv(struct tevent_req *req);
 
 int tevent_timeval_compare(const struct timeval *tv1,
 			   const struct timeval *tv2);
diff --git a/lib/tevent/tevent_req.c b/lib/tevent/tevent_req.c
index 0846413..800e385 100644
--- a/lib/tevent/tevent_req.c
+++ b/lib/tevent/tevent_req.c
@@ -262,7 +262,7 @@ static void tevent_req_timedout(struct tevent_context *ev,
 	tevent_req_finish(req, TEVENT_REQ_TIMED_OUT);
 }
 
-bool tevent_req_set_timeout(struct tevent_req *req,
+bool tevent_req_set_endtime(struct tevent_req *req,
 			    struct tevent_context *ev,
 			    struct timeval endtime)
 {
diff --git a/lib/tevent/tevent_wakeup.c b/lib/tevent/tevent_wakeup.c
new file mode 100644
index 0000000..82c3942
--- /dev/null
+++ b/lib/tevent/tevent_wakeup.c
@@ -0,0 +1,70 @@
+/*
+   Unix SMB/CIFS implementation.
+   Infrastructure for async requests
+   Copyright (C) Volker Lendecke 2008
+   Copyright (C) Stefan Metzmacher 2009
+
+     ** NOTE! The following LGPL license applies to the tevent
+     ** library. This does NOT imply that all of Samba is released
+     ** under the LGPL
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   This library 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
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "replace.h"
+#include "tevent.h"
+#include "tevent_internal.h"
+#include "tevent_util.h"
+
+struct tevent_wakeup_state {
+	struct timeval wakeup_time;
+};
+
+struct tevent_req *tevent_wakeup_send(TALLOC_CTX *mem_ctx,
+				      struct tevent_context *ev,
+				      struct timeval wakeup_time)
+{
+	struct tevent_req *req;
+	struct tevent_wakeup_state *state;
+
+	req = tevent_req_create(mem_ctx, &state,
+				struct tevent_wakeup_state);
+	if (!req) {
+		return NULL;
+	}
+	state->wakeup_time = wakeup_time;
+
+	if (!tevent_req_set_endtime(req, ev, wakeup_time)) {
+		goto post;
+	}
+
+	return req;
+post:
+	return tevent_req_post(req, ev);
+}
+
+bool tevent_wakeup_recv(struct tevent_req *req)
+{
+	enum tevent_req_state state;
+	uint64_t error;
+
+	if (tevent_req_is_error(req, &state, &error)) {
+		if (state == TEVENT_REQ_TIMED_OUT) {
+			return true;
+		}
+	}
+
+	return false;
+}
+


-- 
Samba Shared Repository