From: Sukadev Bhattiprolu <sukadev-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
To: Oren Laadan <orenl-eQaUEPhvms7ENvBUuze7eA@public.gmane.org>
Cc: Containers
<containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org>
Subject: [PATCH 12/13][user-cr]: Define app_checkpoint()
Date: Wed, 3 Mar 2010 23:50:28 -0800 [thread overview]
Message-ID: <20100304075028.GM29320@us.ibm.com> (raw)
In-Reply-To: <20100304074354.GA29320-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
From: Sukadev Bhattiprolu <sukadev-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
Date: Wed, 3 Mar 2010 11:35:47 -0800
Subject: [PATCH 12/13][user-cr]: Define app_checkpoint()
Move the bulk of the code that implements application checkpoint into
a separate function, app_checkpoint() and make a main() a wrapper to
that function. This would help export the core checkpoint functionality
as a library interface in a future patch.
Signed-off-by: Sukadev Bhattiprolu <sukadev-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
---
checkpoint.c | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/checkpoint.c b/checkpoint.c
index d5fcfee..4044da8 100644
--- a/checkpoint.c
+++ b/checkpoint.c
@@ -160,12 +160,36 @@ static void parse_args(struct app_checkpoint_args *args, int argc, char *argv[])
}
}
+int app_checkpoint(int pid, unsigned long flags,
+ struct app_checkpoint_args *args)
+{
+ int ret;
+
+ /* 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;
+
+ ret = checkpoint(pid, args->outfd, flags, args->logfd);
+
+ if (ret < 0) {
+ perror("checkpoint");
+ fprintf(stderr, "(you may use 'ckptinfo -e' for more info)\n");
+ } else if (args->verbose) {
+ fprintf(stderr, "checkpoint id %d\n", ret);
+ }
+
+ return (ret > 0 ? 0 : 1);
+}
+
int main(int argc, char *argv[])
{
struct app_checkpoint_args args;
unsigned long flags = 0;
pid_t pid;
- int ret;
memset(&args, 0, sizeof(args));
parse_args(&args, argc, argv);
@@ -174,31 +198,15 @@ int main(int argc, char *argv[])
if (argc != 1)
usage(usage_str);
- if (!args.container)
- flags |= CHECKPOINT_SUBTREE;
-
pid = atoi(argv[optind]);
if (pid <= 0) {
printf("invalid pid\n");
exit(1);
}
- /* 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;
-
- ret = checkpoint(pid, args.outfd, flags, args.logfd);
-
- if (ret < 0) {
- perror("checkpoint");
- fprintf(stderr, "(you may use 'ckptinfo -e' for more info)\n");
- } else if (args.verbose) {
- fprintf(stderr, "checkpoint id %d\n", ret);
- }
+ if (!args.container)
+ flags |= CHECKPOINT_SUBTREE;
- return (ret > 0 ? 0 : 1);
+ return app_checkpoint(pid, flags, &args);
}
+
--
1.6.0.4
next prev parent reply other threads:[~2010-03-04 7:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-04 7:43 [PATCH 00/13][user-cr]: Cleanups checkpoint.c, restart.c Sukadev Bhattiprolu
[not found] ` <20100304074354.GA29320-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2010-03-04 7:46 ` Sukadev Bhattiprolu
2010-03-04 7:46 ` [PATCH 02/13][user-cr]: restart: Rename args->logfd Sukadev Bhattiprolu
2010-03-04 7:47 ` [PATCH 03/13][user-cr]: restart: Remove args->logfile Sukadev Bhattiprolu
2010-03-04 7:47 ` [PATCH 04/13][user-cr]: restart: Use ckpt_msg() to log Sukadev Bhattiprolu
2010-03-04 7:47 ` [PATCH 05/13][user-cr]: restart: Use ckpt_perror() Sukadev Bhattiprolu
2010-03-04 7:47 ` [PATCH 06/13][user-cr]: restart: Remove args->input Sukadev Bhattiprolu
2010-03-04 7:48 ` [PATCH 07/13][user-cr]: Define app_restart() Sukadev Bhattiprolu
2010-03-04 7:48 ` [PATCH 08/13][user-cr]: restart: Rename struct args Sukadev Bhattiprolu
2010-03-04 7:49 ` [PATCH 09/13][user-cr]: checkpoint: Remove args->output Sukadev Bhattiprolu
2010-03-04 7:49 ` [PATCH 10/13][user-cr]: checkpoint: Remove ->logfile Sukadev Bhattiprolu
2010-03-04 7:50 ` [PATCH 11/13][user-cr]: checkpoint: Rename struct args Sukadev Bhattiprolu
2010-03-04 7:50 ` Sukadev Bhattiprolu [this message]
2010-03-04 7:51 ` [PATCH 13/13][user-cr]: checkpoint: Use ckpt_perror() Sukadev Bhattiprolu
2010-03-05 21:51 ` [PATCH 00/13][user-cr]: Cleanups checkpoint.c, restart.c Serge E. Hallyn
2010-03-15 3:49 ` Oren Laadan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100304075028.GM29320@us.ibm.com \
--to=sukadev-23vcf4htsmix0ybbhkvfkdbpr1lh4cv8@public.gmane.org \
--cc=containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=orenl-eQaUEPhvms7ENvBUuze7eA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox