sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r24019: merge from http://people.samba.org/bzr/metze/samba/3_2-ctdb-metze/:

Browse Source 
use a timed event to make sure the timelimit is correctly
handled in smbcontrol when waiting for messages

metze
(This used to be commit 68c786dafa)
This commit is contained in:
Stefan Metzmacher 2007-07-24 09:20:23 +00:00 committed by Gerald (Jerry) Carter
parent c8a07d8431
commit efddd9c753
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source3/utils/smbcontrol.c
View File

@ -65,23 +65,38 @@ static BOOL send_message(struct messaging_context *msg_ctx,
return ret;
}
static void timeout_handler(struct event_context *event_ctx,
struct timed_event *te,
const struct timeval *now,
void *private_data)
{
BOOL *timed_out = (BOOL *)private_data;
TALLOC_FREE(te);
*timed_out = True;
}
/* Wait for one or more reply messages */
static void wait_replies(struct messaging_context *msg_ctx,
BOOL multiple_replies)
{
time_t start_time = time(NULL);
struct timed_event *te;
BOOL timed_out = False;
/* Wait around a bit. This is pretty disgusting - we have to
busy-wait here as there is no nicer way to do it. */
if (!(te = event_add_timed(messaging_event_context(msg_ctx), NULL,
timeval_current_ofs(timeout, 0),
"smbcontrol_timeout",
timeout_handler, (void *)&timed_out))) {
DEBUG(0, ("event_add_timed failed\n"));
return;
}
do {
while (!timed_out) {
message_dispatch(msg_ctx);
event_loop_once(messaging_event_context(msg_ctx));
if (num_replies > 0 && !multiple_replies)
break;
sleep(1);
} while (timeout - (time(NULL) - start_time) > 0);
event_loop_once(messaging_event_context(msg_ctx));
}
}
/* Message handler callback that displays the PID and a string on stdout */