[Xenomai-git] Gilles Chanteperdrix : testsuite/latency: handle all SIGDEBUG cases
Module: xenomai-forge
Branch: master
Commit: e7d3ee0b69d1722a5a83dcdcd414c654f792a191
URL:
http://git.xenomai.org/?p=xenomai-forge.git;a=commit;h=e7d3ee0b69d1722a5a83dcdcd414c654f792a191
Author: Gilles Chanteperdrix
Date: Sun Sep 2 22:46:29 2012 +0200
testsuite/latency: handle all SIGDEBUG cases
and in particular SIGDEBUG_WATCHDOG, which can avoid lockups.
---
testsuite/latency/latency.c | 40
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/testsuite/latency/latency.c b/testsuite/latency/latency.c
index 4766488..77985c9 100644
--- a/testsuite/latency/latency.c
+++ b/testsuite/latency/latency.c
@@ -468,18 +468,46 @@ void faulthand(int sig)
kill(getpid(), sig);
}
-void mode_sw(int sig)
+static const char *reason_str[] = {
+ [SIGDEBUG_UNDEFINED] = "latency: received SIGXCPU for unknown reason",
+ [SIGDEBUG_MIGRATE_SIGNAL] = "received signal",
+ [SIGDEBUG_MIGRATE_SYSCALL] = "invoked syscall",
+ [SIGDEBUG_MIGRATE_FAULT] = "triggered fault",
+ [SIGDEBUG_MIGRATE_PRIOINV] = "affected by priority inversion",
+ [SIGDEBUG_NOMLOCK] = "Xenomai: process memory not locked "
+ "(missing mlockall?)",
+ [SIGDEBUG_WATCHDOG] = "Xenomai: watchdog triggered "
+ "(period too short?)",
+};
+
+void sigdebug(int sig, siginfo_t *si, void *context)
{
- const char buffer[] = "Spurious mode switch detected, aborting.\n"
+ const char fmt[] = "Mode switch detected (reason: %s), aborting.\n"
"Enable XENO_OPT_DEBUG_TRACE_RELAX to find the cause.\n";
+ unsigned int reason = si->si_value.sival_int;
int n __attribute__ ((unused));
+ static char buffer[256];
if (!stop_upon_switch) {
++sampling_relaxed;
return;
}
- n = write(STDERR_FILENO, buffer, sizeof(buffer));
+ if (reason > SIGDEBUG_WATCHDOG)
+ reason = SIGDEBUG_UNDEFINED;
+
+ switch(reason) {
+ case SIGDEBUG_UNDEFINED:
+ case SIGDEBUG_NOMLOCK:
+ case SIGDEBUG_WATCHDOG:
+ n = snprintf(buffer, sizeof(buffer), "%s\n",
+reason_str[reason]);
+ write(STDERR_FILENO, buffer, n);
+ exit(EXIT_FAILURE);
+ }
+
+ n = snprintf(buffer, sizeof(buffer), fmt, reason_str[reason]);
+ n = write(STDERR_FILENO, buffer, n);
signal(sig, SIG_DFL);
kill(getpid(), sig);
}
@@ -487,6 +515,7 @@ void mode_sw(int sig)
int main(int argc, char *const *argv)
{
int cpu = 0, c, err, sig;
+ struct sigaction sa;
char task_name[16];
sigset_t mask;
@@ -624,7 +653,10 @@ int main(int argc, char *const *argv)
sigaddset(&mask, SIGALRM);
pthread_sigmask(SIG_BLOCK, &mask, NULL);
- signal(SIGXCPU, mode_sw);
+ sigemptyset(&sa.sa_mask);
+ sa.sa_sigaction = sigdebug;
+ sa.sa_flags = SA_SIGINFO;
+ sigaction(SIGDEBUG, &sa, NULL);
if (freeze_max) {
/* If something goes wrong, we want to freeze the current
___
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
[Xenomai-git] Gilles Chanteperdrix : testsuite/latency: handle all SIGDEBUG cases
Module: xenomai-2.6
Branch: master
Commit: d8c2bccce5de41a4b183c9a140dc12b0a2606261
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=d8c2bccce5de41a4b183c9a140dc12b0a2606261
Author: Gilles Chanteperdrix
Date: Sun Sep 2 22:46:29 2012 +0200
testsuite/latency: handle all SIGDEBUG cases
and in particular SIGDEBUG_WATCHDOG, which can avoid lockups.
---
src/testsuite/latency/latency.c | 43 ++
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/src/testsuite/latency/latency.c b/src/testsuite/latency/latency.c
index b5da59c..c8913e1 100644
--- a/src/testsuite/latency/latency.c
+++ b/src/testsuite/latency/latency.c
@@ -474,23 +474,52 @@ void faulthand(int sig)
kill(getpid(), sig);
}
-void mode_sw(int sig)
+static const char *reason_str[] = {
+ [SIGDEBUG_UNDEFINED] = "latency: received SIGXCPU for unknown reason",
+ [SIGDEBUG_MIGRATE_SIGNAL] = "received signal",
+ [SIGDEBUG_MIGRATE_SYSCALL] = "invoked syscall",
+ [SIGDEBUG_MIGRATE_FAULT] = "triggered fault",
+ [SIGDEBUG_MIGRATE_PRIOINV] = "affected by priority inversion",
+ [SIGDEBUG_NOMLOCK] = "Xenomai: process memory not locked "
+ "(missing mlockall?)",
+ [SIGDEBUG_WATCHDOG] = "Xenomai: watchdog triggered "
+ "(period too short?)",
+};
+
+static char buffer[256];
+
+void sigdebug(int sig, siginfo_t *si, void *context)
{
#ifndef __UCLIBC__
- const char buffer[] = "Mode switch, aborting. Backtrace:\n";
+ const char fmt[] = "Mode switch (reason: %s), aborting. Backtrace:\n";
static void *bt[200];
#else /* __UCLIBC__ */
- const char buffer[] = "Mode switch, aborting."
+ const char fmt[] = "Mode switch (reason: %s), aborting."
" Backtrace unavailable with uclibc.\n";
#endif /* __UCLIBC__ */
+ unsigned int reason = si->si_value.sival_int;
unsigned n;
+ if (reason > SIGDEBUG_WATCHDOG)
+ reason = SIGDEBUG_UNDEFINED;
+
+ switch(reason) {
+ case SIGDEBUG_UNDEFINED:
+ case SIGDEBUG_NOMLOCK:
+ case SIGDEBUG_WATCHDOG:
+ n = snprintf(buffer, sizeof(buffer),
+"%s\n", reason_str[reason]);
+ write(STDERR_FILENO, buffer, n);
+ exit(EXIT_FAILURE);
+ }
+
if (!stop_upon_switch) {
++sampling_relaxed;
return;
}
- n = write(STDERR_FILENO, buffer, sizeof(buffer));
+ n = snprintf(buffer, sizeof(buffer), fmt, reason_str[reason]);
+ n = write(STDERR_FILENO, buffer, n);
#ifndef __UCLIBC__
n = backtrace(bt, sizeof(bt)/sizeof(bt[0]));
backtrace_symbols_fd(bt, n, STDERR_FILENO);
@@ -503,6 +532,7 @@ void mode_sw(int sig)
int main(int argc, char **argv)
{
int cpu = 0, c, err, sig;
+ struct sigaction sa;
char task_name[16];
sigset_t mask;
@@ -638,7 +668,10 @@ int main(int argc, char **argv)
sigaddset(&mask, SIGALRM);
pthread_sigmask(SIG_BLOCK, &mask, NULL);
- signal(SIGXCPU, mode_sw);
+ sigemptyset(&sa.sa_mask);
+ sa.sa_sigaction = sigdebug;
+ sa.sa_flags = SA_SIGINFO;
+ sigaction(SIGDEBUG, &sa, NULL);
if (freeze_max) {
/* If something goes wrong, we want to freeze the current
___
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
