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:
@@ -60,7 +60,6 @@
|
||||
#define BYTE 0377 /* mask for 8 bits */
|
||||
#define READING 0 /* copy data to user */
|
||||
#define WRITING 1 /* copy data from user */
|
||||
#define NO_NUM 0x8000 /* used as numerical argument to panic() */
|
||||
#define NIL_PTR (char *) 0 /* generally useful expression */
|
||||
#define HAVE_SCATTERED_IO 1 /* scattered I/O is now standard */
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ typedef struct { u16_t port; u32_t value; } pvl_pair_t;
|
||||
printf("%s:%d: actual port: 0x%x != 0x%lx || " \
|
||||
"actual value: 0x%x != 0x%lx\n", \
|
||||
__FILE__, __LINE__, (pv).port, _p, (pv).value, _v); \
|
||||
panic(__FILE__, "pv_set(" #pv ", " #p ", " #v ")", NO_NUM); \
|
||||
panic("pv_set(" #pv ", " #p ", " #v ")"); \
|
||||
} \
|
||||
} while(0)
|
||||
|
||||
|
||||
@@ -44,8 +44,7 @@ _PROTOTYPE( int fkey_ctl, (int req, int *fkeys, int *sfkeys) );
|
||||
|
||||
_PROTOTYPE( int printf, (const char *fmt, ...));
|
||||
_PROTOTYPE( void kputc, (int c));
|
||||
_PROTOTYPE( void report, (char *who, char *mess, int num));
|
||||
_PROTOTYPE( void panic, (char *who, char *mess, int num));
|
||||
_PROTOTYPE( void panic, (const char *fmt, ...));
|
||||
_PROTOTYPE( int getuptime, (clock_t *ticks));
|
||||
_PROTOTYPE( int getuptime2, (clock_t *ticks, time_t *boottime));
|
||||
_PROTOTYPE( int tickdelay, (clock_t ticks));
|
||||
@@ -65,7 +64,7 @@ _PROTOTYPE( void get_randomness, (struct k_randomness *, int));
|
||||
#define asynsend(ep, msg) asynsend3(ep, msg, 0)
|
||||
_PROTOTYPE( int asynsend3, (endpoint_t ep, message *msg, int flags));
|
||||
|
||||
#define ASSERT(c) if(!(c)) { panic(__FILE__, "assert " #c " failed at line", __LINE__); }
|
||||
#define ASSERT(c) if(!(c)) { panic("%s:%d: assert %s failed", __FILE__, __LINE__, #c); }
|
||||
|
||||
/* timing library */
|
||||
#define TIMING_CATEGORIES 20
|
||||
|
||||
@@ -167,7 +167,7 @@ struct memory {
|
||||
#define STATICINIT(v, n) \
|
||||
if(!(v)) { \
|
||||
if(!((v) = alloc_contig(sizeof(*(v)) * (n), 0, NULL))) { \
|
||||
panic(__FILE__, "allocating " #v " failed", n); \
|
||||
panic("allocating " #v " failed: %d", n); \
|
||||
} \
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user