X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsupport%2Fsyserror.cpp;h=1427f87b85f05a7a299c3e0c50146c1d59e67ecc;hp=e59449f0161c5695a4efa4b471f5af34acadbc12;hb=f7ee98f7d964ed361068179f0e7ea4475ed1abdf;hpb=1e88cf0f7fa4f690ea9f110e8ed3f2b5338d0a10 diff --git a/libctsupport/syserror.cpp b/libctsupport/syserror.cpp index e59449f..1427f87 100644 --- a/libctsupport/syserror.cpp +++ b/libctsupport/syserror.cpp @@ -1,8 +1,8 @@ /***************************************************************************** ** This is part of the CTSim program -** Copyright (C) 1983-2000 Kevin Rosenberg +** Copyright (c) 1983-2001 Kevin Rosenberg ** -** $Id: syserror.cpp,v 1.4 2000/08/25 15:59:13 kevin Exp $ +** $Id$ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -23,21 +23,25 @@ #include #include #include -#include "ctsupport.h" +#include +#include "ct.h" +#ifdef HAVE_WXWINDOWS +#include "../src/ctsim.h" +#include +#endif /* NAME - * sys_error System error handler - * - * SYNOPSIS - * sys_error (severity, msg, args . . .) - * int severity Severity of error - * char *msg Error message - * args Argument list, direct transfer to printf stack - * Can take 24 byte transfer - */ +* sys_error System error handler +* +* SYNOPSIS +* sys_error (severity, msg, args . . .) +* int severity Severity of error +* char *msg Error message +* args Argument list, direct transfer to printf stack +*/ -static int errorlevel = ERR_WARNING; /* Set error reporting level */ +static int s_reportErrorLevel = ERR_TRACE; // Set error reporting level void sys_error (int severity, const char *msg, ...) @@ -46,100 +50,143 @@ void sys_error (int severity, const char *msg, ...) va_start(arg, msg); - sys_verror (severity, msg, arg); + std::string strOutput; + sys_verror (strOutput, severity, msg, arg); + +#ifdef HAVE_WXWINDOWS + if (g_bRunningWXWindows) { + if (theApp) { + wxCommandEvent eventLog (wxEVT_COMMAND_MENU_SELECTED, MAINMENU_LOG_EVENT ); + wxString msg (wxConvCurrent->cMB2WX(strOutput.c_str())); + if (msg.length() > 0) { + msg += wxChar('\n'); + eventLog.SetString( msg ); + wxPostEvent( theApp->getMainFrame(), eventLog ); // send log event, thread safe + } + } else { + wxMutexGuiEnter(); + wxLog::OnLog (wxLOG_Message, wxConvCurrent->cMB2WX(strOutput.c_str()), time(NULL)); + wxMutexGuiLeave(); + } + } + else + std::cout << strOutput << "\n"; +#else + std::cout << strOutput << "\n"; +#endif va_end(arg); } -static int nErrorCount = 0; -const static int MAX_ERROR_COUNT = 20; +static unsigned long s_nErrorCount = 0; +unsigned long int g_lSysErrorMaxCount = 2000; -void sys_verror (int severity, const char *msg, va_list arg) +void sys_verror (std::string& strOutput, int severity, const char *msg, va_list arg) { - if (severity < errorlevel) - return; // ignore error if less than max level + if (severity < s_reportErrorLevel) + return; // ignore error if less than reporting level + + std::ostringstream os; + + if (severity > ERR_TRACE) + s_nErrorCount++; - nErrorCount++; if (severity != ERR_FATAL) { - if (nErrorCount > MAX_ERROR_COUNT) + if (s_nErrorCount > g_lSysErrorMaxCount) return; - else if (nErrorCount == MAX_ERROR_COUNT) { - cout << "*****************************************************************" << endl; - cout << "*** M A X I M U M E R R O R C O U N T R E A C H E D ***" << endl; - cout << "*** ***" << endl; - cout << "*** No further errors will be reported ***" << endl; - cout << "*****************************************************************" << endl; + else if (s_nErrorCount == g_lSysErrorMaxCount) { + os << "*****************************************************************\n"; + os << "*** M A X I M U M E R R O R C O U N T R E A C H E D ***\n"; + os << "*** ***\n"; + os << "*** No further errors will be reported ***\n"; + os << "*****************************************************************\n"; + strOutput = os.str(); return; } } - + switch (severity) { case ERR_FATAL: - cout << "FATAL ERROR: "; + os << "FATAL ERROR: "; break; case ERR_SEVERE: - cout << "SEVERE ERROR: "; + os << "SEVERE ERROR: "; break; case ERR_WARNING: - cout << "WARNING ERROR: "; + os << "WARNING ERROR: "; + break; + case ERR_TRACE: + os << "Trace: "; break; default: - sys_error (ERR_FATAL, "illegal error code #%d [sys_error]", severity); + os << "Illegal error severity #" << severity << ": "; } - - char errStr[512]; + + char errStr[2000]; + +#if HAVE_VSNPRINTF vsnprintf (errStr, sizeof(errStr), msg, arg); - cout << errStr << endl; - - if (severity == ERR_FATAL) - throw runtime_error (errStr); - +#elif HAVE_VSPRINTF + vsprintf (errStr, msg, arg); +#else + strncpy (errStr, sizeof(errStr), "Error message not available on this platform."); +#endif + + os << errStr; + strOutput = os.str(); + + if (severity == ERR_FATAL) { + std::cerr << strOutput << "\n"; + throw std::runtime_error (strOutput); + } + #if INTERACTIVE_ERROR_DISPLAY - cout << "A - Abort C - Continue W - Turn off warnings? "; + std::cout << "A - Abort C - Continue W - Turn off warnings? "; // fflush(stderr); - do - { - int c = cio_kb_waitc("AaBbCcWw", TRUE); /* get code from keyboard */ - c = tolower (c); - fputc (c, stderr); - fputc (NEWLINE, stderr); - - if (c == 'a') - exit (1); - else if (c == 'c') - return; - else if (c == 'w') - { - sys_error_level (ERR_SEVERE); /* report severe & fatal errors */ - break; - } - } while (TRUE); + do + { + int c = cio_kb_waitc("AaBbCcWw", TRUE); /* get code from keyboard */ + c = tolower (c); + fputc (c, stderr); + fputc (NEWLINE, stderr); + + if (c == 'a') + exit (1); + else if (c == 'c') + return; + else if (c == 'w') + { + sys_error_level (ERR_SEVERE); /* report severe & fatal errors */ + break; + } + } while (TRUE); #endif } /* NAME - * sys_error_level Set error reporting level - * - * SYNOPSIS - * sys_error_level (severity) - * int severity Report all error as serious as severity and beyond - * - * DESCRIPTION - * Causes the system to ignore all error below the level of severity - * For example, if severity == ERR_SEVERE, then report severe & fatal - * error and ignore warnings - */ - -void +* sys_error_level Set error reporting level +* +* SYNOPSIS +* sys_error_level (severity) +* int severity Report all error as serious as severity and beyond +* +* DESCRIPTION +* Causes the system to ignore all error below the level of severity +* For example, if severity == ERR_SEVERE, then report severe & fatal +* error and ignore warnings +*/ + +void sys_error_level (int severity) { if (severity == ERR_FATAL || - severity == ERR_SEVERE || - severity == ERR_WARNING) - errorlevel = severity; + severity == ERR_SEVERE || + severity == ERR_WARNING || + severity == ERR_TRACE) + s_reportErrorLevel = severity; else - errorlevel = ERR_WARNING; + s_reportErrorLevel = ERR_WARNING; }