5:30 p.m.
Hi Dave,
I think we have an other small problem with sig :
crash> sig
PID: 14836 TASK: f7d89020 CPU: 1 COMMAND: "crash"
SIGPENDING: no
SIGNAL: 0000000000000000
BLOCKED: 0000000000000000
SIGNAL_STRUCT: c1e7ae00 COUNT: 1
SIG SIGACTION HANDLER MASK FLAGS [1] f5129804 817af58
0000000000000001 10000000 (SA_RESTART)
[...]
[63] f5129cdc SIG_DFL 0000000000000000 0 SIGQUEUE: (empty)
The last slot should be 64 ?
The patch is supposed to fix this problem.
I also indtroduce RT signals. I know this is trivial because the names
are SIGRTMIN+x (or SIGRTMAX-x). The motivation is the command sig -s.
By the way, there is a decision to enforce : do we leave the (null) to
remember that signals 32 and 33 don't exist (if i am correct) or do we
discard them ?
crash> sig -s ffffffffffffffff
SIGHUP SIGINT SIGQUIT SIGILL SIGTRAP SIGABRT SIGBUS SIGFPE SIGKILL SIGUSR1
SIGSEGV SIGUSR2 SIGPIPE SIGALRM SIGTERM SIGSTKFLT SIGCHLD SIGCONT SIGSTOP
SIGTSTP SIGTTIN SIGTTOU SIGURG SIGXCPU SIGXFSZ SIGVTALRM SIGPROF
SIGWINCH SIGIO
SIGPWR SIGSYS (null) (null) SIGRTMIN SIGRTMIN+1 SIGRTMIN+2 SIGRTMIN+3
SIGRTMIN+4
SIGRTMIN+5 SIGRTMIN+6 SIGRTMIN+7 SIGRTMIN+8 SIGRTMIN+9 SIGRTMIN+10 SIGRTMIN+11
SIGRTMIN+12 SIGRTMIN+13 SIGRTMIN+14 SIGRTMIN+15 SIGRTMAX-14 SIGRTMAX-13
SIGRTMAX-12 SIGRTMAX-11 SIGRTMAX-10 SIGRTMAX-9 SIGRTMAX-8 SIGRTMAX-7
SIGRTMAX-6
SIGRTMAX-5 SIGRTMAX-4 SIGRTMAX-3 SIGRTMAX-2 SIGRTMAX-1 SIGRTMAX
=================================================================
--- crash-4.0-3.2/task.c 2006-08-25 23:55:20.000000000 +0200
+++ crash-4.0-3.2-patch/task.c 2006-08-26 00:21:19.000000000 +0200
@@ -5522,7 +5522,6 @@
char *name;
char *altname;
} signame[_NSIG] = {
- /* 0 */ {NULL, NULL},
/* 1 */ {"SIGHUP", NULL},
/* 2 */ {"SIGINT", NULL},
/* 3 */ {"SIGQUIT", NULL},
@@ -5553,8 +5552,40 @@
/* 28 */ {"SIGWINCH", NULL},
/* 29 */ {"SIGIO", "SIGPOLL"},
/* 30 */ {"SIGPWR", NULL},
- /* 31 */ {"SIGSYS", NULL},
- {NULL, NULL}, /* Real time signals start here. */
+ /* 31 */ {"SIGSYS", "SIGUNUSED"},
+ /* 32 */ {NULL, NULL}, /* Real time signals start here. */
+ /* 33 */ {NULL, NULL},
+ /* 34 */ {"SIGRTMIN", NULL},
+ /* 35 */ {"SIGRTMIN+1", NULL},
+ /* 36 */ {"SIGRTMIN+2", NULL},
+ /* 37 */ {"SIGRTMIN+3", NULL},
+ /* 38 */ {"SIGRTMIN+4", NULL},
+ /* 39 */ {"SIGRTMIN+5", NULL},
+ /* 40 */ {"SIGRTMIN+6", NULL},
+ /* 41 */ {"SIGRTMIN+7", NULL},
+ /* 42 */ {"SIGRTMIN+8", NULL},
+ /* 43 */ {"SIGRTMIN+9", NULL},
+ /* 44 */ {"SIGRTMIN+10", NULL},
+ /* 45 */ {"SIGRTMIN+11", NULL},
+ /* 46 */ {"SIGRTMIN+12", NULL},
+ /* 47 */ {"SIGRTMIN+13", NULL},
+ /* 48 */ {"SIGRTMIN+14", NULL},
+ /* 49 */ {"SIGRTMIN+15", NULL},
+ /* 50 */ {"SIGRTMAX-14", NULL},
+ /* 51 */ {"SIGRTMAX-13", NULL},
+ /* 52 */ {"SIGRTMAX-12", NULL},
+ /* 53 */ {"SIGRTMAX-11", NULL},
+ /* 54 */ {"SIGRTMAX-10", NULL},
+ /* 55 */ {"SIGRTMAX-9", NULL},
+ /* 56 */ {"SIGRTMAX-8", NULL},
+ /* 57 */ {"SIGRTMAX-7", NULL},
+ /* 58 */ {"SIGRTMAX-6", NULL},
+ /* 59 */ {"SIGRTMAX-5", NULL},
+ /* 60 */ {"SIGRTMAX-4", NULL},
+ /* 61 */ {"SIGRTMAX-3", NULL},
+ /* 62 */ {"SIGRTMAX-2", NULL},
+ /* 63 */ {"SIGRTMAX-1", NULL},
+ /* 64 */ {"SIGRTMAX", NULL},
};
static void
@@ -5566,8 +5597,8 @@
if (!signame[i].name)
continue;
- fprintf(fp, "%s[%d] %s", i < 10 ? " " :
"", -
i, signame[i].name);
+ fprintf(fp, "%s[%d] %s", i+1 < 10 ? " " :
"", +
i+1, signame[i].name);
if (signame[i].altname)
fprintf(fp, "/%s", signame[i].altname);
fprintf(fp, "\n");
@@ -5591,12 +5622,12 @@
len = 0;
- for (i = c = 0; i < (_NSIG/2); i++) {
- mask = (ulong)(1) << i;
+ for (i = c = 0; i < (_NSIG); i++) {
+ mask = (ulonglong)(1) << i;
if ((sig = (sigset & mask))) {
- bit = ffs((int)sig);
+ /* bit = ffs((int)sig); */
sprintf(buf, "%s%s", c++ ? " " : "",
-
signame[bit].name);
+ signame[i].name);
if ((len + strlen(buf)) > 80) {
shift_string_left(buf, 1);
fprintf(fp, "\n");
@@ -5827,19 +5858,19 @@
} else
use_sighand = FALSE;
- for (i = 1; i < _NSIG; i++) {
- fprintf(fp, "%s[%d] ", i < 10 ? " " :
"", i);
+ for (i = 0; i < _NSIG; i++) {
+ fprintf(fp, "%s[%d] ", i+1 < 10 ? " " :
"", i+1);
if (use_sighand) {
kaddr = sighand_struct +
OFFSET(sighand_struct_action) +
- ((i-1) * SIZE(k_sigaction));
+ ((i) * SIZE(k_sigaction));
uaddr = signal_buf + OFFSET(sighand_struct_action) +
- ((i-1) * SIZE(k_sigaction));
+ ((i) * SIZE(k_sigaction));
} else {
kaddr = signal_struct + OFFSET(signal_struct_action) +
- ((i-1) * SIZE(k_sigaction));
+ ((i) * SIZE(k_sigaction));
uaddr = signal_buf + OFFSET(signal_struct_action) +
- ((i-1) * SIZE(k_sigaction));
+ ((i) * SIZE(k_sigaction));
}
handler = ULONG(uaddr + OFFSET(sigaction_sa_handler));
----------------------------------------------------------------
Ce message a ete envoye par IMP, grace a l'Universite Paris 10 Nanterre
8:36 a.m.
Olivier Daudel wrote:
Hi Dave,
I think we have an other small problem with sig :
crash> sig
PID: 14836 TASK: f7d89020 CPU: 1 COMMAND: "crash"
SIGPENDING: no
SIGNAL: 0000000000000000
BLOCKED: 0000000000000000
SIGNAL_STRUCT: c1e7ae00 COUNT: 1
SIG SIGACTION HANDLER MASK FLAGS [1] f5129804 817af58
0000000000000001 10000000 (SA_RESTART)
[...]
[63] f5129cdc SIG_DFL 0000000000000000 0 SIGQUEUE: (empty)
The last slot should be 64 ?
I might be missing something, as I'm not particularly clear on this one.
In 2.4 kernels, SIGRTMAX was:
#define SIGRTMAX (_NSIG-1)
and now in 2.6.17 I see this:
#define SIGRTMAX _NSIG
But SIGRTMAX is rarely used, and I don't see how a signal "64" can fit
into a sigset_t.
Dave
The patch is supposed to fix this problem.
I also indtroduce RT signals. I know this is trivial because the names
are SIGRTMIN+x (or SIGRTMAX-x). The motivation is the command sig -s.
By the way, there is a decision to enforce : do we leave the (null) to
remember that signals 32 and 33 don't exist (if i am correct) or do we
discard them ?
crash> sig -s ffffffffffffffff
SIGHUP SIGINT SIGQUIT SIGILL SIGTRAP SIGABRT SIGBUS SIGFPE SIGKILL SIGUSR1
SIGSEGV SIGUSR2 SIGPIPE SIGALRM SIGTERM SIGSTKFLT SIGCHLD SIGCONT SIGSTOP
SIGTSTP SIGTTIN SIGTTOU SIGURG SIGXCPU SIGXFSZ SIGVTALRM SIGPROF
SIGWINCH SIGIO
SIGPWR SIGSYS (null) (null) SIGRTMIN SIGRTMIN+1 SIGRTMIN+2 SIGRTMIN+3
SIGRTMIN+4
SIGRTMIN+5 SIGRTMIN+6 SIGRTMIN+7 SIGRTMIN+8 SIGRTMIN+9 SIGRTMIN+10 SIGRTMIN+11
SIGRTMIN+12 SIGRTMIN+13 SIGRTMIN+14 SIGRTMIN+15 SIGRTMAX-14 SIGRTMAX-13
SIGRTMAX-12 SIGRTMAX-11 SIGRTMAX-10 SIGRTMAX-9 SIGRTMAX-8 SIGRTMAX-7
SIGRTMAX-6
SIGRTMAX-5 SIGRTMAX-4 SIGRTMAX-3 SIGRTMAX-2 SIGRTMAX-1 SIGRTMAX
=================================================================
--- crash-4.0-3.2/task.c 2006-08-25 23:55:20.000000000 +0200
+++ crash-4.0-3.2-patch/task.c 2006-08-26 00:21:19.000000000 +0200
@@ -5522,7 +5522,6 @@
char *name;
char *altname;
} signame[_NSIG] = {
- /* 0 */ {NULL, NULL},
/* 1 */ {"SIGHUP", NULL},
/* 2 */ {"SIGINT", NULL},
/* 3 */ {"SIGQUIT", NULL},
@@ -5553,8 +5552,40 @@
/* 28 */ {"SIGWINCH", NULL},
/* 29 */ {"SIGIO", "SIGPOLL"},
/* 30 */ {"SIGPWR", NULL},
- /* 31 */ {"SIGSYS", NULL},
- {NULL, NULL}, /* Real time signals start here. */
+ /* 31 */ {"SIGSYS", "SIGUNUSED"},
+ /* 32 */ {NULL, NULL}, /* Real time signals start here. */
+ /* 33 */ {NULL, NULL},
+ /* 34 */ {"SIGRTMIN", NULL},
+ /* 35 */ {"SIGRTMIN+1", NULL},
+ /* 36 */ {"SIGRTMIN+2", NULL},
+ /* 37 */ {"SIGRTMIN+3", NULL},
+ /* 38 */ {"SIGRTMIN+4", NULL},
+ /* 39 */ {"SIGRTMIN+5", NULL},
+ /* 40 */ {"SIGRTMIN+6", NULL},
+ /* 41 */ {"SIGRTMIN+7", NULL},
+ /* 42 */ {"SIGRTMIN+8", NULL},
+ /* 43 */ {"SIGRTMIN+9", NULL},
+ /* 44 */ {"SIGRTMIN+10", NULL},
+ /* 45 */ {"SIGRTMIN+11", NULL},
+ /* 46 */ {"SIGRTMIN+12", NULL},
+ /* 47 */ {"SIGRTMIN+13", NULL},
+ /* 48 */ {"SIGRTMIN+14", NULL},
+ /* 49 */ {"SIGRTMIN+15", NULL},
+ /* 50 */ {"SIGRTMAX-14", NULL},
+ /* 51 */ {"SIGRTMAX-13", NULL},
+ /* 52 */ {"SIGRTMAX-12", NULL},
+ /* 53 */ {"SIGRTMAX-11", NULL},
+ /* 54 */ {"SIGRTMAX-10", NULL},
+ /* 55 */ {"SIGRTMAX-9", NULL},
+ /* 56 */ {"SIGRTMAX-8", NULL},
+ /* 57 */ {"SIGRTMAX-7", NULL},
+ /* 58 */ {"SIGRTMAX-6", NULL},
+ /* 59 */ {"SIGRTMAX-5", NULL},
+ /* 60 */ {"SIGRTMAX-4", NULL},
+ /* 61 */ {"SIGRTMAX-3", NULL},
+ /* 62 */ {"SIGRTMAX-2", NULL},
+ /* 63 */ {"SIGRTMAX-1", NULL},
+ /* 64 */ {"SIGRTMAX", NULL},
};
static void
@@ -5566,8 +5597,8 @@
if (!signame[i].name)
continue;
- fprintf(fp, "%s[%d] %s", i < 10 ? " " :
"", -
i, signame[i].name);
+ fprintf(fp, "%s[%d] %s", i+1 < 10 ? " " :
"", +
i+1, signame[i].name);
if (signame[i].altname)
fprintf(fp, "/%s", signame[i].altname);
fprintf(fp, "\n");
@@ -5591,12 +5622,12 @@
len = 0;
- for (i = c = 0; i < (_NSIG/2); i++) {
- mask = (ulong)(1) << i;
+ for (i = c = 0; i < (_NSIG); i++) {
+ mask = (ulonglong)(1) << i;
if ((sig = (sigset & mask))) {
- bit = ffs((int)sig);
+ /* bit = ffs((int)sig); */
sprintf(buf, "%s%s", c++ ? " " :
"", -
signame[bit].name);
+ signame[i].name);
if ((len + strlen(buf)) > 80) {
shift_string_left(buf, 1);
fprintf(fp, "\n");
@@ -5827,19 +5858,19 @@
} else
use_sighand = FALSE;
- for (i = 1; i < _NSIG; i++) {
- fprintf(fp, "%s[%d] ", i < 10 ? " " :
"", i);
+ for (i = 0; i < _NSIG; i++) {
+ fprintf(fp, "%s[%d] ", i+1 < 10 ? " " :
"", i+1);
if (use_sighand) {
kaddr = sighand_struct +
OFFSET(sighand_struct_action) +
- ((i-1) * SIZE(k_sigaction));
+ ((i) * SIZE(k_sigaction));
uaddr = signal_buf + OFFSET(sighand_struct_action) +
- ((i-1) * SIZE(k_sigaction));
+ ((i) * SIZE(k_sigaction));
} else {
kaddr = signal_struct + OFFSET(signal_struct_action) +
- ((i-1) * SIZE(k_sigaction));
+ ((i) * SIZE(k_sigaction));
uaddr = signal_buf + OFFSET(signal_struct_action) +
- ((i-1) * SIZE(k_sigaction));
+ ((i) * SIZE(k_sigaction));
}
handler = ULONG(uaddr + OFFSET(sigaction_sa_handler));
----------------------------------------------------------------
Ce message a ete envoye par IMP, grace a l'Universite Paris 10 Nanterre
--
Crash-utility mailing list
Crash-utility(a)redhat.com
https://www.redhat.com/mailman/listinfo/crash-utility
11:55 a.m.
I might be missing something, as I'm not particularly clear on
this one.
In 2.4 kernels, SIGRTMAX was:
#define SIGRTMAX (_NSIG-1)
and now in 2.6.17 I see this:
#define SIGRTMAX _NSIG
But SIGRTMAX is rarely used, and I don't see how a signal "64" can fit
into a sigset_t.
Dave
I think, there is no problem with sigset_t and signal 64 :
SIGHUP (signal 1) use bit 0, so SIGRTMAX (when it is _NSIG or 64) use bit
63.
A sample of the new result :
crash> sig -s 8000FFFF1111001F
SIGHUP SIGINT SIGQUIT SIGILL SIGTRAP SIGCHLD SIGTTIN SIGXFSZ SIGIO
SIGRTMIN+1
SIGRTMIN+2 SIGRTMIN+3 SIGRTMIN+4 SIGRTMIN+5 SIGRTMIN+6 SIGRTMIN+7 SIGRTMIN+8
SIGRTMIN+9 SIGRTMIN+10 SIGRTMIN+11 SIGRTMIN+12 SIGRTMIN+13 SIGRTMIN+14
SIGRTMIN+15 SIGRTMIN+16 SIGRTMAX
This new patch try to take care of 2.4 and 2.6
Olivier
======================================================================
--- crash-4.0-3.2/task.c 2006-08-25 23:55:20.000000000 +0200
+++ crash-4.0-3.2-patch/task.c 2006-09-01 18:46:02.000000000 +0200
@@ -50,6 +50,7 @@
static void task_struct_member(struct task_context *,ulong,struct reference
*);
static void signal_reference(struct task_context *, ulong, struct reference
*);
static void dump_signal_data(struct task_context *);
+static int sigrt_minmax(int *, int*);
static void signame_list(void);
static ulonglong task_signal(ulong);
static ulonglong task_blocked(ulong);
@@ -5518,6 +5519,9 @@
#define _NSIG_BPW machdep->bits
#define _NSIG_WORDS (_NSIG / _NSIG_BPW)
+#undef SIGRTMIN
+#define SIGRTMIN 32
+
static struct signame {
char *name;
char *altname;
@@ -5553,16 +5557,41 @@
/* 28 */ {"SIGWINCH", NULL},
/* 29 */ {"SIGIO", "SIGPOLL"},
/* 30 */ {"SIGPWR", NULL},
- /* 31 */ {"SIGSYS", NULL},
+ /* 31 */ {"SIGSYS", "SIGUNUSED"},
{NULL, NULL}, /* Real time signals start here. */
};
+static int
+sigrt_minmax(int *min, int*max) {
+ int sigrtmax,j;
+ sigrtmax= (kt->kernel_version[1] <5) ? _NSIG - 1 : _NSIG ;
+ if(min != NULL && max !=NULL) {
+ j=sigrtmax-SIGRTMIN-1;
+ *max=j / 2;
+ *min = j - *max;
+ }
+ return sigrtmax;
+}
+
static void
signame_list(void)
{
- int i;
+ int i,sigrtmax,j,min,max;
- for (i = 0; i < _NSIG; i++) {
+ sigrtmax = sigrt_minmax(&min, &max);
+ j=1;
+ for (i = 1; i <= sigrtmax; i++) {
+ if (i == SIGRTMIN || i == sigrtmax){
+ fprintf(fp, "[%d] %s", i , (i== SIGRTMIN) ?
"SIGRTMIN" : "SIGRTMAX");
+ } else if (i > SIGRTMIN) {
+ if( j<= min){
+ fprintf(fp, "[%d] %s%d", i ,
"SIGRTMIN+",j);
+ j++;
+ } else if (max >=1) {
+ fprintf(fp, "[%d] %s%d", i ,
"SIGRTMAX-",max);
+ max--;
+ }
+ } else {
if (!signame[i].name)
continue;
@@ -5570,6 +5599,7 @@
i, signame[i].name);
if (signame[i].altname)
fprintf(fp, "/%s", signame[i].altname);
+ }
fprintf(fp, "\n");
}
}
@@ -5580,7 +5610,7 @@
static void
translate_sigset(ulonglong sigset)
{
- int i, c, bit, len;
+ int sigrtmax, min, max, i, j, c, len;
ulonglong mask, sig;
char buf[BUFSIZE];
@@ -5590,13 +5620,21 @@
}
len = 0;
-
- for (i = c = 0; i < (_NSIG/2); i++) {
- mask = (ulong)(1) << i;
- if ((sig = (sigset & mask))) {
- bit = ffs((int)sig);
+ sigrtmax= sigrt_minmax(&min, &max);
+ j=1;
+ for (i =1, c = 0; i <= sigrtmax; i++) {
+ if (sigset & (ulonglong)1) {
+ if (i == SIGRTMIN || i == sigrtmax)
sprintf(buf, "%s%s", c++ ? " " :
"",
- signame[bit].name);
+ (i==SIGRTMIN) ? "SIGRTMIN" :
"SIGRTMAX");
+ else if (i > SIGRTMIN) {
+ if( j <= min)
+ sprintf(buf, "%s%s%d", c++ ? "
" :
"", "SIGRTMIN+",j);
+ else if (max >= 1)
+ sprintf(buf, "%s%s%d", c++ ? "
" :
"", "SIGRTMAX-",max);
+ } else
+ sprintf(buf, "%s%s", c++ ? " " :
"",
+ signame[i].name);
if ((len + strlen(buf)) > 80) {
shift_string_left(buf, 1);
fprintf(fp, "\n");
@@ -5605,6 +5643,13 @@
len += strlen(buf);
fprintf(fp, buf);
}
+ sigset>>=1;
+ if (i > SIGRTMIN ) {
+ if (j <= min)
+ j++;
+ else if (max >= 1)
+ max--;
+ }
}
fprintf(fp, "\n");
}
@@ -5747,7 +5792,7 @@
static void
dump_signal_data(struct task_context *tc)
{
- int i, others, use_sighand;
+ int i, sigrtmax, others, use_sighand;
int translate, sig, sigpending;
uint ti_flags;
ulonglong sigset, blocked, mask;
@@ -5826,8 +5871,8 @@
use_sighand = TRUE;
} else
use_sighand = FALSE;
-
- for (i = 1; i < _NSIG; i++) {
+ sigrtmax=sigrt_minmax(NULL,NULL);
+ for (i = 1; i <=sigrtmax; i++) {
fprintf(fp, "%s[%d] ", i < 10 ? " " :
"", i);
if (use_sighand) {
12:35 p.m.
Dave Anderson <anderson(a)redhat.com> a écrit :
Olivier Daudel wrote:
> Hi Dave,
> I think we have an other small problem with sig :
>
> crash> sig
> PID: 14836 TASK: f7d89020 CPU: 1 COMMAND: "crash"
> SIGPENDING: no
> SIGNAL: 0000000000000000
> BLOCKED: 0000000000000000
> SIGNAL_STRUCT: c1e7ae00 COUNT: 1
> SIG SIGACTION HANDLER MASK FLAGS [1] f5129804 817af58
> 0000000000000001 10000000 (SA_RESTART)
> [...]
> [63] f5129cdc SIG_DFL 0000000000000000 0 SIGQUEUE: (empty)
>
> The last slot should be 64 ?
>
I might be missing something, as I'm not particularly clear on this one.
In 2.4 kernels, SIGRTMAX was:
#define SIGRTMAX (_NSIG-1)
and now in 2.6.17 I see this:
#define SIGRTMAX _NSIG
But SIGRTMAX is rarely used, and I don't see how a signal "64" can fit
into a sigset_t.
Dave
I think there is no problem with signal 64 (SIGRTMAX with 2.6) and sigset_t.
SIGHUP (signal 1) use bit 0, so bit 63 is used by signal 64.
This new patch try to take care of 2.4 and 2.6.
A sample of the new service :
crash> sig -s 8000FFFF1111001F
SIGHUP SIGINT SIGQUIT SIGILL SIGTRAP SIGCHLD SIGTTIN SIGXFSZ SIGIO SIGRTMIN+1
SIGRTMIN+2 SIGRTMIN+3 SIGRTMIN+4 SIGRTMIN+5 SIGRTMIN+6 SIGRTMIN+7 SIGRTMIN+8
SIGRTMIN+9 SIGRTMIN+10 SIGRTMIN+11 SIGRTMIN+12 SIGRTMIN+13 SIGRTMIN+14
SIGRTMIN+15 SIGRTMIN+16 SIGRTMAX
Olivier
==================================================================
--- crash-4.0-3.2/task.c 2006-08-25 23:55:20.000000000 +0200
+++ crash-4.0-3.2-patch/task.c 2006-09-01 18:46:02.000000000 +0200
@@ -50,6 +50,7 @@
static void task_struct_member(struct task_context *,ulong,struct
reference *);
static void signal_reference(struct task_context *, ulong, struct
reference *);
static void dump_signal_data(struct task_context *);
+static int sigrt_minmax(int *, int*);
static void signame_list(void);
static ulonglong task_signal(ulong);
static ulonglong task_blocked(ulong);
@@ -5518,6 +5519,9 @@
#define _NSIG_BPW machdep->bits
#define _NSIG_WORDS (_NSIG / _NSIG_BPW)
+#undef SIGRTMIN
+#define SIGRTMIN 32
+
static struct signame {
char *name;
char *altname;
@@ -5553,16 +5557,41 @@
/* 28 */ {"SIGWINCH", NULL},
/* 29 */ {"SIGIO", "SIGPOLL"},
/* 30 */ {"SIGPWR", NULL},
- /* 31 */ {"SIGSYS", NULL},
+ /* 31 */ {"SIGSYS", "SIGUNUSED"},
{NULL, NULL}, /* Real time signals start here. */
};
+static int
+sigrt_minmax(int *min, int*max) {
+ int sigrtmax,j;
+ sigrtmax= (kt->kernel_version[1] <5) ? _NSIG - 1 : _NSIG ;
+ if(min != NULL && max !=NULL) {
+ j=sigrtmax-SIGRTMIN-1;
+ *max=j / 2;
+ *min = j - *max;
+ }
+ return sigrtmax;
+}
+
static void
signame_list(void)
{
- int i;
+ int i,sigrtmax,j,min,max;
- for (i = 0; i < _NSIG; i++) {
+ sigrtmax = sigrt_minmax(&min, &max);
+ j=1;
+ for (i = 1; i <= sigrtmax; i++) {
+ if (i == SIGRTMIN || i == sigrtmax){
+ fprintf(fp, "[%d] %s", i , (i== SIGRTMIN) ?
"SIGRTMIN" : "SIGRTMAX");
+ } else if (i > SIGRTMIN) {
+ if( j<= min){
+ fprintf(fp, "[%d] %s%d", i ,
"SIGRTMIN+",j);
+ j++;
+ } else if (max >=1) {
+ fprintf(fp, "[%d] %s%d", i ,
"SIGRTMAX-",max);
+ max--;
+ }
+ } else {
if (!signame[i].name)
continue;
@@ -5570,6 +5599,7 @@
i, signame[i].name);
if (signame[i].altname)
fprintf(fp, "/%s", signame[i].altname);
+ }
fprintf(fp, "\n");
}
}
@@ -5580,7 +5610,7 @@
static void translate_sigset(ulonglong sigset)
{
- int i, c, bit, len;
+ int sigrtmax, min, max, i, j, c, len;
ulonglong mask, sig;
char buf[BUFSIZE];
@@ -5590,13 +5620,21 @@
}
len = 0;
-
- for (i = c = 0; i < (_NSIG/2); i++) {
- mask = (ulong)(1) << i;
- if ((sig = (sigset & mask))) {
- bit = ffs((int)sig);
+ sigrtmax= sigrt_minmax(&min, &max);
+ j=1;
+ for (i =1, c = 0; i <= sigrtmax; i++) {
+ if (sigset & (ulonglong)1) {
+ if (i == SIGRTMIN || i == sigrtmax)
sprintf(buf, "%s%s", c++ ? " " : "",
-
signame[bit].name);
+ (i==SIGRTMIN) ? "SIGRTMIN" :
"SIGRTMAX");
+ else if (i > SIGRTMIN) {
+ if( j <= min)
+ sprintf(buf, "%s%s%d", c++ ? "
" : "", "SIGRTMIN+",j);
+ else if (max >= 1)
+ sprintf(buf, "%s%s%d", c++ ? "
" : "", "SIGRTMAX-",max);
+ } else
+ sprintf(buf, "%s%s", c++ ? " " :
"", +
signame[i].name);
if ((len + strlen(buf)) > 80) {
shift_string_left(buf, 1);
fprintf(fp, "\n");
@@ -5605,6 +5643,13 @@
len += strlen(buf);
fprintf(fp, buf);
}
+ sigset>>=1;
+ if (i > SIGRTMIN ) {
+ if (j <= min) + j++;
+ else if (max >= 1)
+ max--;
+ }
}
fprintf(fp, "\n");
}
@@ -5747,7 +5792,7 @@
static void
dump_signal_data(struct task_context *tc)
{
- int i, others, use_sighand;
+ int i, sigrtmax, others, use_sighand;
int translate, sig, sigpending;
uint ti_flags;
ulonglong sigset, blocked, mask;
@@ -5826,8 +5871,8 @@
use_sighand = TRUE;
} else
use_sighand = FALSE;
-
- for (i = 1; i < _NSIG; i++) {
+ sigrtmax=sigrt_minmax(NULL,NULL);
+ for (i = 1; i <=sigrtmax; i++) {
fprintf(fp, "%s[%d] ", i < 10 ? " " :
"", i);
if (use_sighand) {
----------------------------------------------------------------
Ce message a ete envoye par IMP, grace a l'Universite Paris 10 Nanterre
10:18 a.m.
Olivier Daudel wrote:
Dave Anderson <anderson(a)redhat.com> a écrit :
> Olivier Daudel wrote:
>
>> Hi Dave,
>> I think we have an other small problem with sig :
>>
>> crash> sig
>> PID: 14836 TASK: f7d89020 CPU: 1 COMMAND: "crash"
>> SIGPENDING: no
>> SIGNAL: 0000000000000000
>> BLOCKED: 0000000000000000
>> SIGNAL_STRUCT: c1e7ae00 COUNT: 1
>> SIG SIGACTION HANDLER MASK FLAGS [1] f5129804 817af58
>> 0000000000000001 10000000 (SA_RESTART)
>> [...]
>> [63] f5129cdc SIG_DFL 0000000000000000 0 SIGQUEUE: (empty)
>>
>> The last slot should be 64 ?
>>
>
> I might be missing something, as I'm not particularly clear on this one.
> In 2.4 kernels, SIGRTMAX was:
>
> #define SIGRTMAX (_NSIG-1)
>
> and now in 2.6.17 I see this:
>
> #define SIGRTMAX _NSIG
>
> But SIGRTMAX is rarely used, and I don't see how a signal "64" can
fit
> into a sigset_t.
>
> Dave
>
>
I think there is no problem with signal 64 (SIGRTMAX with 2.6) and sigset_t.
SIGHUP (signal 1) use bit 0, so bit 63 is used by signal 64.
This new patch try to take care of 2.4 and 2.6.
A sample of the new service :
crash> sig -s 8000FFFF1111001F
SIGHUP SIGINT SIGQUIT SIGILL SIGTRAP SIGCHLD SIGTTIN SIGXFSZ SIGIO SIGRTMIN+1
SIGRTMIN+2 SIGRTMIN+3 SIGRTMIN+4 SIGRTMIN+5 SIGRTMIN+6 SIGRTMIN+7 SIGRTMIN+8
SIGRTMIN+9 SIGRTMIN+10 SIGRTMIN+11 SIGRTMIN+12 SIGRTMIN+13 SIGRTMIN+14
SIGRTMIN+15 SIGRTMIN+16 SIGRTMAX
Olivier
==================================================================
--- crash-4.0-3.2/task.c 2006-08-25 23:55:20.000000000 +0200
+++ crash-4.0-3.2-patch/task.c 2006-09-01 18:46:02.000000000 +0200
@@ -50,6 +50,7 @@
static void task_struct_member(struct task_context *,ulong,struct
reference *);
static void signal_reference(struct task_context *, ulong, struct
reference *);
static void dump_signal_data(struct task_context *);
+static int sigrt_minmax(int *, int*);
static void signame_list(void);
static ulonglong task_signal(ulong);
static ulonglong task_blocked(ulong);
@@ -5518,6 +5519,9 @@
#define _NSIG_BPW machdep->bits
#define _NSIG_WORDS (_NSIG / _NSIG_BPW)
+#undef SIGRTMIN
+#define SIGRTMIN 32
+
static struct signame {
char *name;
char *altname;
@@ -5553,16 +5557,41 @@
/* 28 */ {"SIGWINCH", NULL},
/* 29 */ {"SIGIO", "SIGPOLL"},
/* 30 */ {"SIGPWR", NULL},
- /* 31 */ {"SIGSYS", NULL},
+ /* 31 */ {"SIGSYS", "SIGUNUSED"},
{NULL, NULL}, /* Real time signals start here. */
};
+static int
+sigrt_minmax(int *min, int*max) {
+ int sigrtmax,j;
+ sigrtmax= (kt->kernel_version[1] <5) ? _NSIG - 1 : _NSIG ;
+ if(min != NULL && max !=NULL) {
+ j=sigrtmax-SIGRTMIN-1;
+ *max=j / 2;
+ *min = j - *max;
+ }
+ return sigrtmax;
+}
+
static void
signame_list(void)
{
- int i;
+ int i,sigrtmax,j,min,max;
- for (i = 0; i < _NSIG; i++) {
+ sigrtmax = sigrt_minmax(&min, &max);
+ j=1;
+ for (i = 1; i <= sigrtmax; i++) {
+ if (i == SIGRTMIN || i == sigrtmax){
+ fprintf(fp, "[%d] %s", i , (i== SIGRTMIN) ?
"SIGRTMIN" : "SIGRTMAX");
+ } else if (i > SIGRTMIN) {
+ if( j<= min){
+ fprintf(fp, "[%d] %s%d", i ,
"SIGRTMIN+",j);
+ j++;
+ } else if (max >=1) {
+ fprintf(fp, "[%d] %s%d", i ,
"SIGRTMAX-",max);
+ max--;
+ }
+ } else {
if (!signame[i].name)
continue;
@@ -5570,6 +5599,7 @@
i, signame[i].name);
if (signame[i].altname)
fprintf(fp, "/%s", signame[i].altname);
+ }
fprintf(fp, "\n");
}
}
@@ -5580,7 +5610,7 @@
static void translate_sigset(ulonglong sigset)
{
- int i, c, bit, len;
+ int sigrtmax, min, max, i, j, c, len;
ulonglong mask, sig;
char buf[BUFSIZE];
@@ -5590,13 +5620,21 @@
}
len = 0;
-
- for (i = c = 0; i < (_NSIG/2); i++) {
- mask = (ulong)(1) << i;
- if ((sig = (sigset & mask))) {
- bit = ffs((int)sig);
+ sigrtmax= sigrt_minmax(&min, &max);
+ j=1;
+ for (i =1, c = 0; i <= sigrtmax; i++) {
+ if (sigset & (ulonglong)1) {
+ if (i == SIGRTMIN || i == sigrtmax)
sprintf(buf, "%s%s", c++ ? " " :
"", -
signame[bit].name);
+ (i==SIGRTMIN) ? "SIGRTMIN" :
"SIGRTMAX");
+ else if (i > SIGRTMIN) {
+ if( j <= min)
+ sprintf(buf, "%s%s%d", c++ ? "
" : "", "SIGRTMIN+",j);
+ else if (max >= 1)
+ sprintf(buf, "%s%s%d", c++ ? "
" : "", "SIGRTMAX-",max);
+ } else
+ sprintf(buf, "%s%s", c++ ? " " :
"", +
signame[i].name);
if ((len + strlen(buf)) > 80) {
shift_string_left(buf, 1);
fprintf(fp, "\n");
@@ -5605,6 +5643,13 @@
len += strlen(buf);
fprintf(fp, buf);
}
+ sigset>>=1;
+ if (i > SIGRTMIN ) {
+ if (j <= min) + j++;
+ else if (max >= 1)
+ max--;
+ }
}
fprintf(fp, "\n");
}
@@ -5747,7 +5792,7 @@
static void
dump_signal_data(struct task_context *tc)
{
- int i, others, use_sighand;
+ int i, sigrtmax, others, use_sighand;
int translate, sig, sigpending;
uint ti_flags;
ulonglong sigset, blocked, mask;
@@ -5826,8 +5871,8 @@
use_sighand = TRUE;
} else
use_sighand = FALSE;
-
- for (i = 1; i < _NSIG; i++) {
+ sigrtmax=sigrt_minmax(NULL,NULL);
+ for (i = 1; i <=sigrtmax; i++) {
fprintf(fp, "%s[%d] ", i < 10 ? " " :
"", i);
if (use_sighand) {
----------------------------------------------------------------
Ce message a ete envoye par IMP, grace a l'Universite Paris 10 Nanterre
--
Crash-utility mailing list
Crash-utility(a)redhat.com
https://www.redhat.com/mailman/listinfo/crash-utility
Olivier,
I believe both of your sig command patches are supposed to be
the same (?), but I cannot utilize either of them. I have unsuccessfully
tried to fix them, but for some reason, something in your mailer (or mine?)
is destroying parts of the patch. I don't usually see this type of problem
with other patch postings to the crash-utility list, but whenever you send
one, it typically needs fixing up.
Can you send the sig patch file as an attached file, directly to me?
Thanks,
Dave
10:30 a.m.
==> Regarding Re: [Crash-utility] An other patch for command sig; Dave Anderson
<anderson(a)redhat.com> adds:
anderson> Olivier,
anderson> I believe both of your sig command patches are supposed to be the
anderson> same (?), but I cannot utilize either of them. I have
anderson> unsuccessfully tried to fix them, but for some reason, something
anderson> in your mailer (or mine?) is destroying parts of the patch. I
anderson> don't usually see this type of problem with other patch postings
anderson> to the crash-utility list, but whenever you send one, it
anderson> typically needs fixing up.
anderson> Can you send the sig patch file as an attached file, directly to
anderson> me?
anderson> Thanks, Dave
From the mail headers:
Content-Type: text/plain;
charset=ISO-8859-1; format="flowed"
Turn off the "flowed" formatting, Olivier. That should resolve the
problem.
Thanks,
Jeff
6507
days inactive
6518
days old
devel@lists.crash-utility.osci.io
5 comments
3 participants
participants (3)
-
Dave Anderson -
Jeff Moyer -
Olivier Daudel