summaryrefslogtreecommitdiff
path: root/source4/torture/raw
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-12-29 20:24:57 +0100
committerStefan Metzmacher <metze@samba.org>2008-12-29 20:46:40 +0100
commit183c379fe58ca60f5ef2d1f2033d035d4117ac8f (patch)
treed68d3895f1e79b96c3af2c80cac6a403a1a180d4 /source4/torture/raw
parentaf29b82536ef678e6a1817aa11be8c363253b305 (diff)
downloadsamba-183c379fe58ca60f5ef2d1f2033d035d4117ac8f.tar.gz
samba-183c379fe58ca60f5ef2d1f2033d035d4117ac8f.tar.bz2
samba-183c379fe58ca60f5ef2d1f2033d035d4117ac8f.zip
s4:lib/tevent: rename structs
list="" list="$list event_context:tevent_context" list="$list fd_event:tevent_fd" list="$list timed_event:tevent_timer" for s in $list; do o=`echo $s | cut -d ':' -f1` n=`echo $s | cut -d ':' -f2` r=`git grep "struct $o" |cut -d ':' -f1 |sort -u` files=`echo "$r" | grep -v source3 | grep -v nsswitch | grep -v packaging4` for f in $files; do cat $f | sed -e "s/struct $o/struct $n/g" > $f.tmp mv $f.tmp $f done done metze
Diffstat (limited to 'source4/torture/raw')
-rw-r--r--source4/torture/raw/composite.c6
-rw-r--r--source4/torture/raw/lockbench.c12
-rw-r--r--source4/torture/raw/offline.c4
-rw-r--r--source4/torture/raw/openbench.c12
-rw-r--r--source4/torture/raw/oplock.c4
5 files changed, 19 insertions, 19 deletions
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index 79ae41dafb..49564dc1ad 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -133,7 +133,7 @@ static bool test_fetchfile(struct smbcli_state *cli, struct torture_context *tct
int i;
size_t len = random() % 10000;
extern int torture_numops;
- struct event_context *event_ctx;
+ struct tevent_context *event_ctx;
int *count = talloc_zero(tctx, int);
bool ret = true;
@@ -225,7 +225,7 @@ static bool test_appendacl(struct smbcli_state *cli, struct torture_context *tct
struct smb_composite_appendacl **io;
struct smb_composite_appendacl **io_orig;
struct composite_context **c;
- struct event_context *event_ctx;
+ struct tevent_context *event_ctx;
struct security_descriptor *test_sd;
struct security_ace *ace;
@@ -342,7 +342,7 @@ static bool test_fsinfo(struct smbcli_state *cli, struct torture_context *tctx)
int i;
extern int torture_numops;
- struct event_context *event_ctx;
+ struct tevent_context *event_ctx;
int *count = talloc_zero(tctx, int);
bool ret = true;
diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c
index dce21ebe71..4077ae97e6 100644
--- a/source4/torture/raw/lockbench.c
+++ b/source4/torture/raw/lockbench.c
@@ -45,7 +45,7 @@ enum lock_stage {LOCK_INITIAL, LOCK_LOCK, LOCK_UNLOCK};
struct benchlock_state {
struct torture_context *tctx;
- struct event_context *ev;
+ struct tevent_context *ev;
struct smbcli_tree *tree;
TALLOC_CTX *mem_ctx;
int client_num;
@@ -57,7 +57,7 @@ struct benchlock_state {
int lastcount;
struct smbcli_request *req;
struct smb_composite_connect reconnect;
- struct timed_event *te;
+ struct tevent_timer *te;
/* these are used for reconnections */
const char **dest_ports;
@@ -116,11 +116,11 @@ static void lock_send(struct benchlock_state *state)
state->req->async.fn = lock_completion;
}
-static void reopen_connection(struct event_context *ev, struct timed_event *te,
+static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te,
struct timeval t, void *private_data);
-static void reopen_file(struct event_context *ev, struct timed_event *te,
+static void reopen_file(struct tevent_context *ev, struct tevent_timer *te,
struct timeval t, void *private_data)
{
struct benchlock_state *state = (struct benchlock_state *)private_data;
@@ -171,7 +171,7 @@ static void reopen_connection_complete(struct composite_context *ctx)
/*
reopen a connection
*/
-static void reopen_connection(struct event_context *ev, struct timed_event *te,
+static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te,
struct timeval t, void *private_data)
{
struct benchlock_state *state = (struct benchlock_state *)private_data;
@@ -277,7 +277,7 @@ static void echo_completion(struct smbcli_request *req)
}
}
-static void report_rate(struct event_context *ev, struct timed_event *te,
+static void report_rate(struct tevent_context *ev, struct tevent_timer *te,
struct timeval t, void *private_data)
{
struct benchlock_state *state = talloc_get_type(private_data,
diff --git a/source4/torture/raw/offline.c b/source4/torture/raw/offline.c
index 34d87f1623..2d97efa049 100644
--- a/source4/torture/raw/offline.c
+++ b/source4/torture/raw/offline.c
@@ -54,7 +54,7 @@ static double worst_latencies[OP_ENDOFLIST];
struct offline_state {
struct torture_context *tctx;
- struct event_context *ev;
+ struct tevent_context *ev;
struct smbcli_tree *tree;
TALLOC_CTX *mem_ctx;
int client;
@@ -330,7 +330,7 @@ static void echo_completion(struct smbcli_request *req)
}
}
-static void report_rate(struct event_context *ev, struct timed_event *te,
+static void report_rate(struct tevent_context *ev, struct tevent_timer *te,
struct timeval t, void *private_data)
{
struct offline_state *state = talloc_get_type(private_data,
diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c
index 2440649e7f..a9ce4aec0d 100644
--- a/source4/torture/raw/openbench.c
+++ b/source4/torture/raw/openbench.c
@@ -41,12 +41,12 @@ static int open_failed;
static int close_failed;
static char **fnames;
static int num_connected;
-static struct timed_event *report_te;
+static struct tevent_timer *report_te;
struct benchopen_state {
struct torture_context *tctx;
TALLOC_CTX *mem_ctx;
- struct event_context *ev;
+ struct tevent_context *ev;
struct smbcli_state *cli;
struct smbcli_tree *tree;
int client_num;
@@ -64,7 +64,7 @@ struct benchopen_state {
struct smbcli_request *req_open;
struct smbcli_request *req_close;
struct smb_composite_connect reconnect;
- struct timed_event *te;
+ struct tevent_timer *te;
/* these are used for reconnections */
const char **dest_ports;
@@ -74,7 +74,7 @@ struct benchopen_state {
};
static void next_open(struct benchopen_state *state);
-static void reopen_connection(struct event_context *ev, struct timed_event *te,
+static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te,
struct timeval t, void *private_data);
@@ -113,7 +113,7 @@ static void reopen_connection_complete(struct composite_context *ctx)
/*
reopen a connection
*/
-static void reopen_connection(struct event_context *ev, struct timed_event *te,
+static void reopen_connection(struct tevent_context *ev, struct tevent_timer *te,
struct timeval t, void *private_data)
{
struct benchopen_state *state = (struct benchopen_state *)private_data;
@@ -328,7 +328,7 @@ static void echo_completion(struct smbcli_request *req)
}
}
-static void report_rate(struct event_context *ev, struct timed_event *te,
+static void report_rate(struct tevent_context *ev, struct tevent_timer *te,
struct timeval t, void *private_data)
{
struct benchopen_state *state = talloc_get_type(private_data,
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index f0afee26cc..d31d841e13 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -3036,8 +3036,8 @@ static bool oplock_handler_hold(struct smbcli_transport *transport,
bool torture_hold_oplock(struct torture_context *torture,
struct smbcli_state *cli)
{
- struct event_context *ev =
- (struct event_context *)cli->transport->socket->event.ctx;
+ struct tevent_context *ev =
+ (struct tevent_context *)cli->transport->socket->event.ctx;
int i;
printf("Setting up open files with oplocks in %s\n", BASEDIR);