sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-08 21:18:16 +03:00
Code

ctdb-daemon: Add ctdb_vfork_exec()

Browse Source 
This will replace ctdb_vfork_with_logging().

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Amitay Isaacs 2016-11-30 12:15:11 +11:00 committed by Martin Schwenke
parent ecf3f56138
commit c43856342f
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ctdb/include/ctdb_private.h
View File

@ -606,6 +606,9 @@ int switch_from_server_to_client(struct ctdb_context *ctdb);
void ctdb_track_child(struct ctdb_context *ctdb, pid_t pid);
pid_t ctdb_fork(struct ctdb_context *ctdb);
pid_t ctdb_vfork_exec(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
const char *helper, int helper_argc,
const char **helper_argv);
struct tevent_signal *ctdb_init_sigchld(struct ctdb_context *ctdb);

46
ctdb/server/ctdb_fork.c
View File

@ -102,6 +102,52 @@ pid_t ctdb_fork(struct ctdb_context *ctdb)
return pid;
}
/*
* vfork + exec
*/
pid_t ctdb_vfork_exec(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb,
const char *helper, int helper_argc,
const char **helper_argv)
{
pid_t pid;
struct timeval before;
double delta_t;
char **argv;
int i;
argv = talloc_array(mem_ctx, char *, helper_argc + 1);
if (argv == NULL) {
DEBUG(DEBUG_ERR, ("Memory allocation error\n"));
return -1;
}
argv[0] = discard_const(helper);
for (i=0; i<helper_argc; i++) {
argv[i+1] = discard_const(helper_argv[i]);
}
before = timeval_current();
pid = vfork();
if (pid == -1) {
DEBUG(DEBUG_ERR, ("vfork() failed (%s)\n", strerror(errno)));
return -1;
}
if (pid == 0) {
execv(helper, argv);
_exit(1);
}
delta_t = timeval_elapsed(&before);
if (delta_t > 3.0) {
DEBUG(DEBUG_WARNING, ("vfork() took %lf seconds\n", delta_t));
}
ctdb_track_child(ctdb, pid);
return pid;
}
static void ctdb_sigchld_handler(struct tevent_context *ev,
struct tevent_signal *te, int signum, int count,
void *dont_care,