From: Simo Sorce <ssorce@redhat.com>
Date: Tue, 25 May 2010 19:25:26 +0000 (-0400)
Subject: s4:messaging: use tevent_ function names instead of legacy event_ ones
X-Git-Tag: samba-4.0.0alpha17~576
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=47b64573c0d41d418d441ffc40325b822bfadb26

s4:messaging: use tevent_ function names instead of legacy event_ ones
---

diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index ccc60032a6a..31440db4685 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -273,7 +273,7 @@ static void imessaging_send_handler(struct imessaging_context *msg)
 					      struct imessaging_rec *);
 				if (msg->retry_te == NULL) {
 					msg->retry_te = 
-						event_add_timed(msg->event.ev, msg, 
+						tevent_add_timer(msg->event.ev, msg,
 								timeval_current_ofs(1, 0), 
 								msg_retry_timer, msg);
 				}
@@ -625,7 +625,7 @@ struct imessaging_context *imessaging_init(TALLOC_CTX *mem_ctx,
 	set_blocking(socket_get_fd(msg->sock), false);
 
 	msg->event.ev   = ev;
-	msg->event.fde	= event_add_fd(ev, msg, socket_get_fd(msg->sock), 
+	msg->event.fde	= tevent_add_fd(ev, msg, socket_get_fd(msg->sock),
 				       EVENT_FD_READ, imessaging_handler, msg);
 	tevent_fd_set_auto_close(msg->event.fde);
 
diff --git a/source4/lib/messaging/tests/irpc.c b/source4/lib/messaging/tests/irpc.c
index 554a7efa997..c94765a1677 100644
--- a/source4/lib/messaging/tests/irpc.c
+++ b/source4/lib/messaging/tests/irpc.c
@@ -74,7 +74,7 @@ static void deferred_echodata(struct tevent_context *ev, struct tevent_timer *te
 static NTSTATUS irpc_EchoData(struct irpc_message *irpc, struct echo_EchoData *r)
 {
 	irpc->defer_reply = true;
-	event_add_timed(irpc->ev, irpc, timeval_zero(), deferred_echodata, irpc);
+	tevent_add_timer(irpc->ev, irpc, timeval_zero(), deferred_echodata, irpc);
 	return NT_STATUS_OK;
 }
 
@@ -218,14 +218,14 @@ static bool test_speed(struct torture_context *tctx,
 		ping_count++;
 
 		while (ping_count > pong_count + 20) {
-			event_loop_once(data->ev);
+			tevent_loop_once(data->ev);
 		}
 	}
 
 	torture_comment(tctx, "waiting for %d remaining replies (done %d)\n", 
 	       ping_count - pong_count, pong_count);
 	while (timeval_elapsed(&tv) < 30 && pong_count < ping_count) {
-		event_loop_once(data->ev);
+		tevent_loop_once(data->ev);
 	}
 
 	torture_assert_int_equal(tctx, ping_count, pong_count, "ping test failed");
diff --git a/source4/lib/messaging/tests/messaging.c b/source4/lib/messaging/tests/messaging.c
index c5d37953d05..c17b95e9c4c 100644
--- a/source4/lib/messaging/tests/messaging.c
+++ b/source4/lib/messaging/tests/messaging.c
@@ -110,14 +110,14 @@ static bool test_ping_speed(struct torture_context *tctx)
 		ping_count++;
 
 		while (ping_count > pong_count + 20) {
-			event_loop_once(ev);
+			tevent_loop_once(ev);
 		}
 	}
 
 	torture_comment(tctx, "waiting for %d remaining replies (done %d)\n", 
 	       ping_count - pong_count, pong_count);
 	while (timeval_elapsed(&tv) < 30 && pong_count < ping_count) {
-		event_loop_once(ev);
+		tevent_loop_once(ev);
 	}
 
 	torture_comment(tctx, "sending exit\n");