From mboxrd@z Thu Jan 1 00:00:00 1970 From: Oren Laadan Subject: [PATCH 0/9] user-cr: support for pids as shared objects Date: Wed, 26 Jan 2011 11:24:20 -0500 Message-ID: <4D404AB4.2010208@cs.columbia.edu> References: <1296058748-21418-1-git-send-email-orenl@cs.columbia.edu> <1296058748-21418-2-git-send-email-orenl@cs.columbia.edu> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1296058748-21418-2-git-send-email-orenl-eQaUEPhvms7ENvBUuze7eA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Oren Laadan Cc: containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org List-Id: containers.vger.kernel.org [Hmm.. here too the cover was lost .. need to investigate] Hi, This patchset adds the necessary support in user-cr related to handling of pids as proper shared objets. You must use this if you use the corresponding kernel-cr patchset recetly posted. Thanks, Oren. On 01/26/2011 11:19 AM, Oren Laadan wrote: > The initialization belongs to the caller of the cr-library - i.e. > restart-main and checkpoint-main, and not in the cr-library. > > Signed-off-by: Oren Laadan > --- > checkpoint-main.c | 4 ++-- > checkpoint.c | 8 -------- > restart-main.c | 4 ++-- > 3 files changed, 4 insertions(+), 12 deletions(-) > > diff --git a/checkpoint-main.c b/checkpoint-main.c > index a2a7d94..b2ec9c8 100644 > --- a/checkpoint-main.c > +++ b/checkpoint-main.c > @@ -70,8 +70,8 @@ static void parse_args(struct cr_checkpoint_args *args, int argc, char *argv[]) > char *logfile; > > /* defaults */ > - args->outfd = -1; > - args->logfd = -1; > + args->outfd = fileno(stdout); > + args->logfd = CHECKPOINT_FD_NONE; > args->uerrfd = fileno(stderr); > output = NULL; > logfile = NULL; > diff --git a/checkpoint.c b/checkpoint.c > index cce3d9d..f9b0b3b 100644 > --- a/checkpoint.c > +++ b/checkpoint.c > @@ -37,14 +37,6 @@ int cr_checkpoint(int pid, struct cr_checkpoint_args *args) > > global_uerrfd = args->uerrfd; > > - /* output file descriptor (default: stdout) */ > - if (args->outfd < 0) > - args->outfd = STDOUT_FILENO; > - > - /* output file descriptor (default: none) */ > - if (args->logfd < 0) > - args->logfd = CHECKPOINT_FD_NONE; > - > if (!args->container) > args->flags |= CHECKPOINT_SUBTREE; > > diff --git a/restart-main.c b/restart-main.c > index 6eed101..efa6a8f 100644 > --- a/restart-main.c > +++ b/restart-main.c > @@ -146,10 +146,10 @@ static void parse_args(struct cr_restart_args *args, int argc, char *argv[]) > /* defaults */ > memset(args, 0, sizeof(*args)); > args->wait = 1; > - args->infd = -1; > - args->klogfd = -1; > + args->infd = fileno(stdin); > args->ulogfd = fileno(stdout); > args->uerrfd = fileno(stderr); > + args->klogfd = CHECKPOINT_FD_NONE; > args->warn = CKPT_COND_WARN; > args->fail = CKPT_COND_FAIL; > no_pidns = 0;