From dc8370852f59f881a37161ea335573616dbd17b3 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Sat, 1 Nov 2003 10:59:06 -0800 Subject: [PATCH] Make error messages more informative on a non-full-system fault. base/misc.cc: Add curTick to panic and warn messages. Reformat fatal message a bit for consistency. --HG-- extra : convert_revision : 171da2fe6ca5e25982058ee1af67473292659103 --- base/misc.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/base/misc.cc b/base/misc.cc index e798dd656..8190caddd 100644 --- a/base/misc.cc +++ b/base/misc.cc @@ -42,7 +42,8 @@ void __panic(const string &format, cp::ArgList &args, const char *func, const char *file, int line) { - string fmt = "panic: " + format + " [%s:%s, line %d]\n"; + string fmt = "panic: " + format + " @ cycle %d\n[%s:%s, line %d]\n"; + args.append(curTick); args.append(func); args.append(file); args.append(line); @@ -62,13 +63,13 @@ void __fatal(const string &format, cp::ArgList &args, const char *func, const char *file, int line) { - string fmt = "fatal: " + format + " [%s:%s, line %d]\n" - "\n%d\nMemory Usage: %ld KBytes\n"; + string fmt = "fatal: " + format + " @ cycle %d\n[%s:%s, line %d]\n" + "Memory Usage: %ld KBytes\n"; + args.append(curTick); args.append(func); args.append(file); args.append(line); - args.append(curTick); args.append(memUsage()); args.dump(cerr, fmt); @@ -83,7 +84,8 @@ __warn(const string &format, cp::ArgList &args, const char *func, { string fmt = "warn: " + format; #ifdef VERBOSE_WARN - fmt += " [%s:%s, line %d]\n"; + fmt += " @ cycle %d\n[%s:%s, line %d]\n"; + args.append(curTick); args.append(func); args.append(file); args.append(line); -- 2.30.2