The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxc/pull/1784
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) === Signed-off-by: Christian Brauner <[email protected]>
From 35a02107f2b7bbfd84a17499a4a67e29add9c459 Mon Sep 17 00:00:00 2001 From: Christian Brauner <[email protected]> Date: Tue, 5 Sep 2017 00:29:01 +0200 Subject: [PATCH] start: document all handler fields Signed-off-by: Christian Brauner <[email protected]> --- src/lxc/start.c | 2 ++ src/lxc/start.h | 85 +++++++++++++++++++++++++++++++++++++++++++-------------- src/lxc/sync.c | 28 +++++++++---------- 3 files changed, 80 insertions(+), 35 deletions(-) diff --git a/src/lxc/start.c b/src/lxc/start.c index d4759bf9f..1370d681c 100644 --- a/src/lxc/start.c +++ b/src/lxc/start.c @@ -5,6 +5,8 @@ * * Authors: * Daniel Lezcano <daniel.lezcano at free.fr> + * Serge Hallyn <[email protected]> + * Christian Brauner <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/src/lxc/start.h b/src/lxc/start.h index ca8e617ca..5955dfd79 100644 --- a/src/lxc/start.h +++ b/src/lxc/start.h @@ -5,6 +5,8 @@ * * Authors: * Daniel Lezcano <daniel.lezcano at free.fr> + * Serge Hallyn <[email protected]> + * Christian Brauner <[email protected]> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,45 +26,86 @@ #define __LXC_START_H #include <signal.h> +#include <stdbool.h> #include <sys/param.h> #include <sys/socket.h> #include <sys/un.h> -#include <stdbool.h> #include "conf.h" #include "config.h" -#include "state.h" #include "namespace.h" +#include "state.h" struct lxc_handler { - bool am_root; - pid_t pid; - char *name; - lxc_state_t state; + /* The clone flags that were requested. */ int clone_flags; - int sigfd; - sigset_t oldmask; - struct lxc_conf *conf; - struct lxc_operations *ops; - void *data; - int sv[2]; + + /* File descriptors referring to the network namespace of the container. */ + int netnsfd; + + /* File descriptor to pin the rootfs for privileged containers. */ int pinfd; - const char *lxcpath; - void *cgroup_data; + + /* Signal file descriptor. */ + int sigfd; + + /* List of file descriptors referring to the namespaces of the + * container. Note that these are not necessarily identical to + * the "clone_flags" handler field in case namespace inheritance is + * requested. + */ + int nsfd[LXC_NS_MAX]; /* Abstract unix domain SOCK_DGRAM socketpair to pass arbitrary data * between child and parent. */ int data_sock[2]; - /* indicates whether should we close std{in,out,err} on start */ - bool backgrounded; - int nsfd[LXC_NS_MAX]; - int netnsfd; - /* The socketpair() fds used to wait on successful daemonized startup. */ int state_socket_pair[2]; + + /* Socketpair to synchronize processes during container creation. */ + int sync_sock[2]; + + /* The name of the container. */ + char *name; + + /* The path the container is running in. */ + const char *lxcpath; + + /* Whether the container's startup process euid is 0. */ + bool am_root; + + /* Indicates whether should we close std{in,out,err} on start. */ + bool backgrounded; + + /* The child's pid. */ + pid_t pid; + + /* The signal mask prior to setting up the signal file descriptor. */ + sigset_t oldmask; + + /* The container's in-memory configuration. */ + struct lxc_conf *conf; + + /* A list of clients registered to be informed about a container state. */ struct lxc_list state_clients; + + /* A set of operations to be performed at various stages of the + * container's life. + */ + struct lxc_operations *ops; + + /* This holds the cgroup information. Note that the data here is + * specific to the cgroup driver used. + */ + void *cgroup_data; + + /* Data to be passed to handler ops. */ + void *data; + + /* Current state of the container. */ + lxc_state_t state; }; struct lxc_operations { @@ -95,8 +138,8 @@ extern void lxc_fini(const char *name, struct lxc_handler *handler); */ extern int lxc_check_inherited(struct lxc_conf *conf, bool closeall, int *fds_to_ignore, size_t len_fds); -int __lxc_start(const char *, struct lxc_handler *, struct lxc_operations *, - void *, const char *, bool); +extern int __lxc_start(const char *, struct lxc_handler *, + struct lxc_operations *, void *, const char *, bool); extern void resolve_clone_flags(struct lxc_handler *handler); #endif diff --git a/src/lxc/sync.c b/src/lxc/sync.c index 89cbf8a3b..9c20c1d69 100644 --- a/src/lxc/sync.c +++ b/src/lxc/sync.c @@ -86,63 +86,63 @@ static int __sync_barrier(int fd, int sequence) int lxc_sync_barrier_parent(struct lxc_handler *handler, int sequence) { - return __sync_barrier(handler->sv[0], sequence); + return __sync_barrier(handler->sync_sock[0], sequence); } int lxc_sync_barrier_child(struct lxc_handler *handler, int sequence) { - return __sync_barrier(handler->sv[1], sequence); + return __sync_barrier(handler->sync_sock[1], sequence); } int lxc_sync_wake_parent(struct lxc_handler *handler, int sequence) { - return __sync_wake(handler->sv[0], sequence); + return __sync_wake(handler->sync_sock[0], sequence); } int lxc_sync_wait_parent(struct lxc_handler *handler, int sequence) { - return __sync_wait(handler->sv[0], sequence); + return __sync_wait(handler->sync_sock[0], sequence); } int lxc_sync_wait_child(struct lxc_handler *handler, int sequence) { - return __sync_wait(handler->sv[1], sequence); + return __sync_wait(handler->sync_sock[1], sequence); } int lxc_sync_wake_child(struct lxc_handler *handler, int sequence) { - return __sync_wake(handler->sv[1], sequence); + return __sync_wake(handler->sync_sock[1], sequence); } int lxc_sync_init(struct lxc_handler *handler) { int ret; - ret = socketpair(AF_LOCAL, SOCK_STREAM, 0, handler->sv); + ret = socketpair(AF_LOCAL, SOCK_STREAM, 0, handler->sync_sock); if (ret) { SYSERROR("failed to create synchronization socketpair"); return -1; } /* Be sure we don't inherit this after the exec */ - fcntl(handler->sv[0], F_SETFD, FD_CLOEXEC); + fcntl(handler->sync_sock[0], F_SETFD, FD_CLOEXEC); return 0; } void lxc_sync_fini_child(struct lxc_handler *handler) { - if (handler->sv[0] != -1) { - close(handler->sv[0]); - handler->sv[0] = -1; + if (handler->sync_sock[0] != -1) { + close(handler->sync_sock[0]); + handler->sync_sock[0] = -1; } } void lxc_sync_fini_parent(struct lxc_handler *handler) { - if (handler->sv[1] != -1) { - close(handler->sv[1]); - handler->sv[1] = -1; + if (handler->sync_sock[1] != -1) { + close(handler->sync_sock[1]); + handler->sync_sock[1] = -1; } }
_______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
