* dcrt0.cc (__api_fatal): Simplify to just use strace mechamisms.

(do_exit): Move minimal_printf...
* pinfo.cc (pinfo::exit): ...into here.
* strace.cc (strace::vprntf): Guarantee output to the console when
system_printf/api_fatal.
* heap.cc (heap_init): Wait a second before issuing an error when
ERROR_INVALID_ADDRESS since this is probably due to a CTRL-C handler sneaking
in, using the memory that we want to use for the heap, and, eventually exiting.
This commit is contained in:
Christopher Faylor
2005-12-26 19:34:59 +00:00
parent c675040a06
commit a16b738dd5
5 changed files with 42 additions and 28 deletions

View File

@ -202,24 +202,35 @@ void
strace::vprntf (unsigned category, const char *func, const char *fmt, va_list ap)
{
DWORD err = GetLastError ();
int count;
int len;
char buf[10000];
PROTECT (buf);
SetLastError (err);
count = vsprntf (buf, func, fmt, ap);
len = vsprntf (buf, func, fmt, ap);
CHECK (buf);
if (category & _STRACE_SYSTEM)
{
DWORD done;
WriteFile (GetStdHandle (STD_ERROR_HANDLE), buf, count, &done, 0);
WriteFile (GetStdHandle (STD_ERROR_HANDLE), buf, len, &done, 0);
FlushFileBuffers (GetStdHandle (STD_ERROR_HANDLE));
/* Make sure that the message shows up on the screen, too, since this is
a serious error. */
if (GetFileType (GetStdHandle (STD_ERROR_HANDLE)) != FILE_TYPE_CHAR)
{
HANDLE h = CreateFile ("CONOUT$", GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_WRITE | FILE_SHARE_WRITE,
&sec_none, OPEN_EXISTING, 0, 0);
if (h != INVALID_HANDLE_VALUE)
WriteFile (h, buf, len, &done, 0);
CloseHandle (h);
}
}
#ifndef NOSTRACE
if (active)
write (category, buf, count);
write (category, buf, len);
#endif
SetLastError (err);
}