summaryrefslogtreecommitdiff
path: root/source4/torture/nbt
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2010-05-25 15:23:55 -0400
committerSimo Sorce <idra@samba.org>2011-08-13 09:54:15 -0400
commitb120c5f28876fd9efe032a6dbecebfaaff7dfd14 (patch)
treecca3a64d3d4a96d1e49450ebeff374659ed17d2b /source4/torture/nbt
parent813bdf466d1e0262c7b4bdf98343451db08c60f6 (diff)
downloadsamba-b120c5f28876fd9efe032a6dbecebfaaff7dfd14.tar.gz
samba-b120c5f28876fd9efe032a6dbecebfaaff7dfd14.tar.bz2
samba-b120c5f28876fd9efe032a6dbecebfaaff7dfd14.zip
torture: use tevent_ functions names instead of the legacy event_ ones
Diffstat (limited to 'source4/torture/nbt')
-rw-r--r--source4/torture/nbt/dgram.c20
-rw-r--r--source4/torture/nbt/query.c4
-rw-r--r--source4/torture/nbt/wins.c4
-rw-r--r--source4/torture/nbt/winsbench.c4
-rw-r--r--source4/torture/nbt/winsreplication.c12
5 files changed, 22 insertions, 22 deletions
diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index aa4759edaf..68d44ff774 100644
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -139,7 +139,7 @@ static bool nbt_test_netlogon(struct torture_context *tctx)
torture_assert_ntstatus_ok(tctx, status, "Failed to send netlogon request");
while (timeval_elapsed(&tv) < 5 && !dgmslot->private_data) {
- event_loop_once(dgmsock->event_ctx);
+ tevent_loop_once(dgmsock->event_ctx);
}
response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
@@ -235,7 +235,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
torture_assert_ntstatus_ok(tctx, status, "Failed to send netlogon request");
while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
- event_loop_once(dgmsock->event_ctx);
+ tevent_loop_once(dgmsock->event_ctx);
}
response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
@@ -275,7 +275,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
torture_assert_ntstatus_ok(tctx, status, "Failed to send netlogon request");
while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
- event_loop_once(dgmsock->event_ctx);
+ tevent_loop_once(dgmsock->event_ctx);
}
response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
@@ -327,7 +327,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
- event_loop_once(dgmsock->event_ctx);
+ tevent_loop_once(dgmsock->event_ctx);
}
response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
@@ -369,7 +369,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
- event_loop_once(dgmsock->event_ctx);
+ tevent_loop_once(dgmsock->event_ctx);
}
response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
@@ -408,7 +408,7 @@ static bool nbt_test_netlogon2(struct torture_context *tctx)
while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
- event_loop_once(dgmsock->event_ctx);
+ tevent_loop_once(dgmsock->event_ctx);
}
response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
@@ -517,7 +517,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
torture_assert_ntstatus_ok(tctx, status, "Failed to send ntlogon request");
while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
- event_loop_once(dgmsock->event_ctx);
+ tevent_loop_once(dgmsock->event_ctx);
}
response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
@@ -561,7 +561,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
torture_assert_ntstatus_ok(tctx, status, "Failed to send ntlogon request");
while (timeval_elapsed(&tv) < 5 && dgmslot->private_data == NULL) {
- event_loop_once(dgmsock->event_ctx);
+ tevent_loop_once(dgmsock->event_ctx);
}
response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
@@ -602,7 +602,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
torture_assert_ntstatus_ok(tctx, status, "Failed to send ntlogon request");
while (timeval_elapsed(&tv) < 5 && !dgmslot->private_data) {
- event_loop_once(dgmsock->event_ctx);
+ tevent_loop_once(dgmsock->event_ctx);
}
response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
@@ -640,7 +640,7 @@ static bool nbt_test_ntlogon(struct torture_context *tctx)
torture_assert_ntstatus_ok(tctx, status, "Failed to send ntlogon request");
while (timeval_elapsed(&tv) < 5 && !dgmslot->private_data) {
- event_loop_once(dgmsock->event_ctx);
+ tevent_loop_once(dgmsock->event_ctx);
}
response = talloc_get_type(dgmslot->private_data, struct nbt_netlogon_response);
diff --git a/source4/torture/nbt/query.c b/source4/torture/nbt/query.c
index d64683aa57..001ff19413 100644
--- a/source4/torture/nbt/query.c
+++ b/source4/torture/nbt/query.c
@@ -88,11 +88,11 @@ static bool bench_namequery(struct torture_context *tctx)
}
}
- event_loop_once(nbtsock->event_ctx);
+ tevent_loop_once(nbtsock->event_ctx);
}
while (num_sent != (result->num_pass + result->num_fail)) {
- event_loop_once(nbtsock->event_ctx);
+ tevent_loop_once(nbtsock->event_ctx);
}
torture_comment(tctx, "%.1f queries per second (%d failures) \n",
diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c
index 571249f562..bd023294cb 100644
--- a/source4/torture/nbt/wins.c
+++ b/source4/torture/nbt/wins.c
@@ -156,7 +156,7 @@ static bool nbt_test_wins_name(struct torture_context *tctx, const char *address
*/
req = nbt_name_register_send(nbtsock, &name_register);
while (true) {
- event_loop_once(nbtsock->event_ctx);
+ tevent_loop_once(nbtsock->event_ctx);
if (req->state != NBT_REQUEST_WAIT) {
break;
}
@@ -170,7 +170,7 @@ static bool nbt_test_wins_name(struct torture_context *tctx, const char *address
req->state = NBT_REQUEST_SEND;
DLIST_ADD_END(nbtsock->send_queue, req,
struct nbt_name_request *);
- EVENT_FD_WRITEABLE(nbtsock->fde);
+ TEVENT_FD_WRITEABLE(nbtsock->fde);
break;
}
}
diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c
index cb71d8755d..3722202c6f 100644
--- a/source4/torture/nbt/winsbench.c
+++ b/source4/torture/nbt/winsbench.c
@@ -270,11 +270,11 @@ static bool bench_wins(struct torture_context *tctx)
}
}
- event_loop_once(nbtsock->event_ctx);
+ tevent_loop_once(nbtsock->event_ctx);
}
while (num_sent != (state->pass_count + state->fail_count)) {
- event_loop_once(nbtsock->event_ctx);
+ tevent_loop_once(nbtsock->event_ctx);
}
torture_comment(tctx, "%.1f queries per second (%d failures) \n",
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 7165f10dbb..56a1c09301 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -9378,7 +9378,7 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
req = nbt_name_register_send(ctx->nbtsock, name_register);
/* push the request on the wire */
- event_loop_once(ctx->nbtsock->event_ctx);
+ tevent_loop_once(ctx->nbtsock->event_ctx);
/*
* if we register multiple addresses,
@@ -9389,7 +9389,7 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
end = timeval_current_ofs(records[i].defend.timeout,0);
records[i].defend.ret = true;
while (records[i].defend.timeout > 0) {
- event_loop_once(ctx->nbtsock_srv->event_ctx);
+ tevent_loop_once(ctx->nbtsock_srv->event_ctx);
if (timeval_expired(&end)) break;
}
ret &= records[i].defend.ret;
@@ -9451,7 +9451,7 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
end = timeval_current_ofs(records[i].defend.timeout,0);
records[i].defend.ret = true;
while (records[i].defend.timeout > 0) {
- event_loop_once(ctx->nbtsock_srv->event_ctx);
+ tevent_loop_once(ctx->nbtsock_srv->event_ctx);
if (timeval_expired(&end)) break;
}
ret &= records[i].defend.ret;
@@ -9466,7 +9466,7 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
end = timeval_current_ofs(records[i].defend.timeout,0);
records[i].defend.ret = true;
while (records[i].defend.timeout > 0) {
- event_loop_once(ctx->nbtsock_srv->event_ctx);
+ tevent_loop_once(ctx->nbtsock_srv->event_ctx);
if (timeval_expired(&end)) break;
}
ret &= records[i].defend.ret;
@@ -9693,7 +9693,7 @@ static void test_conflict_owned_active_vs_replica_handler_query(struct nbt_name_
/* make sure we push the reply to the wire */
while (nbtsock->send_queue) {
- event_loop_once(nbtsock->event_ctx);
+ tevent_loop_once(nbtsock->event_ctx);
}
smb_msleep(1000);
@@ -9750,7 +9750,7 @@ static void test_conflict_owned_active_vs_replica_handler_release(
/* make sure we push the reply to the wire */
while (nbtsock->send_queue) {
- event_loop_once(nbtsock->event_ctx);
+ tevent_loop_once(nbtsock->event_ctx);
}
smb_msleep(1000);