From 183c379fe58ca60f5ef2d1f2033d035d4117ac8f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 29 Dec 2008 20:24:57 +0100 Subject: 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 --- source4/torture/raw/lockbench.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/torture/raw/lockbench.c') 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, -- cgit