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

make sure we still run events when waiting for ctdb_event_script()

Browse Source 
(This used to be ctdb commit 05efbfe9ff9691c1d7441e7b9855aed25791faf0)
This commit is contained in:
Andrew Tridgell 2007-07-19 13:36:00 +10:00
parent fb22d3bd2c
commit 689195b455
1 changed files with 72 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
ctdb/server/eventscript.c
View File

@ -58,22 +58,6 @@ static int ctdb_event_script_v(struct ctdb_context *ctdb, const char *fmt, va_li
return ret; return ret;
} }
/*
run the event script
*/
int ctdb_event_script(struct ctdb_context *ctdb, const char *fmt, ...)
{
va_list ap;
int ret;
va_start(ap, fmt);
ret = ctdb_event_script_v(ctdb, fmt, ap);
va_end(ap);
return ret;
}
struct ctdb_event_script_state { struct ctdb_event_script_state {
struct ctdb_context *ctdb; struct ctdb_context *ctdb;
pid_t child; pid_t child;
@ -131,15 +115,14 @@ static int event_script_destructor(struct ctdb_event_script_state *state)
run the event script in the background, calling the callback when run the event script in the background, calling the callback when
finished finished
*/ */
int ctdb_event_script_callback(struct ctdb_context *ctdb, static int ctdb_event_script_callback_v(struct ctdb_context *ctdb,
struct timeval timeout, struct timeval timeout,
TALLOC_CTX *mem_ctx, TALLOC_CTX *mem_ctx,
void (*callback)(struct ctdb_context *, int, void *), void (*callback)(struct ctdb_context *, int, void *),
void *private_data, void *private_data,
const char *fmt, ...) const char *fmt, va_list ap)
{ {
struct ctdb_event_script_state *state; struct ctdb_event_script_state *state;
va_list ap;
int ret; int ret;
state = talloc(mem_ctx, struct ctdb_event_script_state); state = talloc(mem_ctx, struct ctdb_event_script_state);
@ -170,9 +153,7 @@ int ctdb_event_script_callback(struct ctdb_context *ctdb,
ctdb_restore_scheduler(ctdb); ctdb_restore_scheduler(ctdb);
} }
set_close_on_exec(state->fd[1]); set_close_on_exec(state->fd[1]);
va_start(ap, fmt);
ret = ctdb_event_script_v(ctdb, fmt, ap); ret = ctdb_event_script_v(ctdb, fmt, ap);
va_end(ap);
_exit(ret); _exit(ret);
} }
@ -191,3 +172,69 @@ int ctdb_event_script_callback(struct ctdb_context *ctdb,
} }
/*
run the event script in the background, calling the callback when
finished
*/
int ctdb_event_script_callback(struct ctdb_context *ctdb,
struct timeval timeout,
TALLOC_CTX *mem_ctx,
void (*callback)(struct ctdb_context *, int, void *),
void *private_data,
const char *fmt, ...)
{
va_list ap;
int ret;
va_start(ap, fmt);
ret = ctdb_event_script_callback_v(ctdb, timeout, mem_ctx, callback, private_data, fmt, ap);
va_end(ap);
return ret;
}
struct callback_status {
bool done;
int status;
};
/*
called when ctdb_event_script() finishes
*/
static void event_script_callback(struct ctdb_context *ctdb, int status, void *private_data)
{
struct callback_status *s = (struct callback_status *)private_data;
s->done = true;
s->status = status;
}
/*
run the event script, waiting for it to complete. Used when the caller doesn't want to
continue till the event script has finished.
*/
int ctdb_event_script(struct ctdb_context *ctdb, const char *fmt, ...)
{
va_list ap;
int ret;
TALLOC_CTX *tmp_ctx = talloc_new(ctdb);
struct callback_status status;
va_start(ap, fmt);
ret = ctdb_event_script_callback_v(ctdb, timeval_zero(), tmp_ctx, event_script_callback, &status, fmt, ap);
va_end(ap);
if (ret != 0) {
talloc_free(tmp_ctx);
return ret;
}
status.status = -1;
status.done = false;
while (status.done == false && event_loop_once(ctdb->ev) == 0) /* noop */;
talloc_free(tmp_ctx);
return status.status;
}