panic() cleanup.
this change
- makes panic() variadic, doing full printf() formatting -
no more NO_NUM, and no more separate printf() statements
needed to print extra info (or something in hex) before panicing
- unifies panic() - same panic() name and usage for everyone -
vm, kernel and rest have different names/syntax currently
in order to implement their own luxuries, but no longer
- throws out the 1st argument, to make source less noisy.
the panic() in syslib retrieves the server name from the kernel
so it should be clear enough who is panicing; e.g.
panic("sigaction failed: %d", errno);
looks like:
at_wini(73130): panic: sigaction failed: 0
syslib:panic.c: stacktrace: 0x74dc 0x2025 0x100a
- throws out report() - printf() is more convenient and powerful
- harmonizes/fixes the use of panic() - there were a few places
that used printf-style formatting (didn't work) and newlines
(messes up the formatting) in panic()
- throws out a few per-server panic() functions
- cleans up a tie-in of tty with panic()
merging printf() and panic() statements to be done incrementally.
This commit is contained in:
@@ -1,19 +1,15 @@
|
||||
#include <stdlib.h>
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
||||
#include <stdarg.h>
|
||||
#include <minix/sysutil.h>
|
||||
|
||||
#include "syslib.h"
|
||||
|
||||
int panicing= 0;
|
||||
|
||||
/*===========================================================================*
|
||||
* panic *
|
||||
* panic *
|
||||
*===========================================================================*/
|
||||
PUBLIC void panic(who, mess, num)
|
||||
char *who; /* server identification */
|
||||
char *mess; /* message format string */
|
||||
int num; /* number to go with format string */
|
||||
PUBLIC void panic(const char *fmt, ...)
|
||||
{
|
||||
/* Something awful has happened. Panics are caused when an internal
|
||||
* inconsistency is detected, e.g., a programming error or illegal
|
||||
@@ -23,24 +19,29 @@ int num; /* number to go with format string */
|
||||
endpoint_t me = NONE;
|
||||
char name[20];
|
||||
void (*suicide)(void);
|
||||
static int panicing= 0;
|
||||
va_list args;
|
||||
|
||||
if(panicing) return;
|
||||
panicing= 1;
|
||||
|
||||
if(sys_whoami(&me, name, sizeof(name)) == OK && me != NONE)
|
||||
printf("%s(%d): ", name, me);
|
||||
printf("%s(%d): panic: ", name, me);
|
||||
else
|
||||
printf("(sys_whoami failed): ");
|
||||
printf("(sys_whoami failed): panic: ");
|
||||
|
||||
if(fmt) {
|
||||
va_start(args, fmt);
|
||||
vprintf(fmt, args);
|
||||
va_end(fmt);
|
||||
} else {
|
||||
printf("no message\n");
|
||||
}
|
||||
printf("\n");
|
||||
|
||||
printf("syslib:panic.c: stacktrace: ");
|
||||
util_stacktrace();
|
||||
|
||||
if (NULL != who && NULL != mess) {
|
||||
if (num != NO_NUM) {
|
||||
printf("Panic in %s: %s: %d\n", who, mess, num);
|
||||
} else {
|
||||
printf("Panic in %s: %s\n", who, mess);
|
||||
}
|
||||
}
|
||||
|
||||
/* Try exit */
|
||||
_exit(1);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user