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 07/12][user-cr] Define INIT_SIGNAL_ARRAY
Date: Fri, 5 Mar 2010 14:38:46 -0800 [thread overview]
Message-ID: <20100305223846.GG15939@us.ibm.com> (raw)
In-Reply-To: <20100305223439.GA15300-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
From: Sukadev Bhattiprolu <sukadev-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
Date: Thu, 4 Mar 2010 21:15:25 -0800
Subject: [PATCH 07/12][user-cr] Define INIT_SIGNAL_ARRAY
Code to initialize the signal_array[] table will need to be shared by more
than one file. To enable this sharing with, define INIT_SIGNAL_ARRAY which
can later be used in many places.
Signed-off-by: Sukadev Bhattiprolu <sukadev-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org>
---
restart.c | 76 ++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/restart.c b/restart.c
index d4a4000..b37bf81 100644
--- a/restart.c
+++ b/restart.c
@@ -157,46 +157,50 @@ static inline void ckpt_msg(int fd, char *format, ...)
ckpt_msg(global_ulogfd, __VA_ARGS__); \
} while(0)
-#define SIGNAL_ENTRY(signal) { SIG ## signal, #signal }
-
-struct {
+struct signal_array {
int signum;
char *sigstr;
-} signal_array[] = {
- { 0, "NONE" },
- SIGNAL_ENTRY(ALRM),
- SIGNAL_ENTRY(HUP),
- SIGNAL_ENTRY(INT),
- SIGNAL_ENTRY(KILL),
- SIGNAL_ENTRY(PIPE),
- SIGNAL_ENTRY(POLL),
- SIGNAL_ENTRY(PROF),
- SIGNAL_ENTRY(TERM),
- SIGNAL_ENTRY(USR1),
- SIGNAL_ENTRY(USR2),
- SIGNAL_ENTRY(VTALRM),
- SIGNAL_ENTRY(STKFLT),
- SIGNAL_ENTRY(PWR),
- SIGNAL_ENTRY(WINCH),
- SIGNAL_ENTRY(CHLD),
- SIGNAL_ENTRY(URG),
- SIGNAL_ENTRY(TTIN),
- SIGNAL_ENTRY(TTOU),
- SIGNAL_ENTRY(STOP),
- SIGNAL_ENTRY(CONT),
- SIGNAL_ENTRY(ABRT),
- SIGNAL_ENTRY(FPE),
- SIGNAL_ENTRY(ILL),
- SIGNAL_ENTRY(QUIT),
- SIGNAL_ENTRY(SEGV),
- SIGNAL_ENTRY(TRAP),
- SIGNAL_ENTRY(SYS),
- SIGNAL_ENTRY(BUS),
- SIGNAL_ENTRY(XCPU),
- SIGNAL_ENTRY(XFSZ),
- { -1, "LAST" },
};
+#define SIGNAL_ENTRY(signal) { SIG ## signal, #signal }
+
+#define INIT_SIGNAL_ARRAY { \
+ { 0, "NONE" }, \
+ SIGNAL_ENTRY(ALRM), \
+ SIGNAL_ENTRY(HUP), \
+ SIGNAL_ENTRY(INT), \
+ SIGNAL_ENTRY(KILL), \
+ SIGNAL_ENTRY(PIPE), \
+ SIGNAL_ENTRY(POLL), \
+ SIGNAL_ENTRY(PROF), \
+ SIGNAL_ENTRY(TERM), \
+ SIGNAL_ENTRY(USR1), \
+ SIGNAL_ENTRY(USR2), \
+ SIGNAL_ENTRY(VTALRM), \
+ SIGNAL_ENTRY(STKFLT), \
+ SIGNAL_ENTRY(PWR), \
+ SIGNAL_ENTRY(WINCH), \
+ SIGNAL_ENTRY(CHLD), \
+ SIGNAL_ENTRY(URG), \
+ SIGNAL_ENTRY(TTIN), \
+ SIGNAL_ENTRY(TTOU), \
+ SIGNAL_ENTRY(STOP), \
+ SIGNAL_ENTRY(CONT), \
+ SIGNAL_ENTRY(ABRT), \
+ SIGNAL_ENTRY(FPE), \
+ SIGNAL_ENTRY(ILL), \
+ SIGNAL_ENTRY(QUIT), \
+ SIGNAL_ENTRY(SEGV), \
+ SIGNAL_ENTRY(TRAP), \
+ SIGNAL_ENTRY(SYS), \
+ SIGNAL_ENTRY(BUS), \
+ SIGNAL_ENTRY(XCPU), \
+ SIGNAL_ENTRY(XFSZ), \
+ { -1, "LAST" }, \
+}
+
+static struct signal_array signal_array[] = INIT_SIGNAL_ARRAY;
+
static char *sig2str(int sig)
{
int i = 0;
--
1.6.0.4
next prev parent reply other threads:[~2010-03-05 22:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-05 22:34 [PATCH 0/12][user-cr]: Second set of cleanups Sukadev Bhattiprolu
[not found] ` <20100305223439.GA15300-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2010-03-05 22:36 ` [PATCH 01/12][user-cr] restart: Mark globals as static Sukadev Bhattiprolu
2010-03-05 22:36 ` [PATCH 02/12][user-cr] restart: Add args->send_sigint Sukadev Bhattiprolu
[not found] ` <20100305223658.GB15939-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2010-03-15 3:52 ` Oren Laadan
2010-03-05 22:37 ` [PATCH 03/12][user-cr] Add app_restart_args->debug Sukadev Bhattiprolu
[not found] ` <20100305223723.GC15939-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2010-03-08 19:39 ` Serge E. Hallyn
[not found] ` <20100308193929.GA20030-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2010-03-08 20:42 ` Sukadev Bhattiprolu
2010-03-05 22:37 ` [PATCH 04/12][user-cr] Add app_restart_args->verbose Sukadev Bhattiprolu
2010-03-05 22:38 ` [PATCH 05/12][user-cr] Add app_restart_args->ulogfd Sukadev Bhattiprolu
2010-03-05 22:38 ` [PATCH 06/12][user-cr] Add app_restart_args->uerrfd Sukadev Bhattiprolu
2010-03-05 22:38 ` Sukadev Bhattiprolu [this message]
2010-03-05 22:39 ` [PATCH 08/12][user-cr] Create common.h Sukadev Bhattiprolu
[not found] ` <20100305223907.GH15939-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2010-03-08 19:44 ` Serge E. Hallyn
[not found] ` <20100308194427.GB20030-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>
2010-03-08 20:22 ` Sukadev Bhattiprolu
2010-03-05 22:39 ` [PATCH 09/12][user-cr] Create app-checkpoint.h Sukadev Bhattiprolu
2010-03-05 22:39 ` [PATCH 10/12][user-cr] restart: Move main() to restart-main.c Sukadev Bhattiprolu
2010-03-05 22:40 ` [PATCH 11/12][user-cr] checkpoint: Move main() to checkpoint-main.c Sukadev Bhattiprolu
2010-03-05 22:40 ` [PATCH 12/12][user-cr] Have app_restart() return pid Sukadev Bhattiprolu
2010-03-08 19:49 ` [PATCH 0/12][user-cr]: Second set of cleanups Serge E. Hallyn
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=20100305223846.GG15939@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