Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed Windows compile errors

This commit is contained in:
Jan Steemann 2015-02-24 15:32:04 +01:00
parent 597ce40879
commit 0ba8e6e626
2 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arangod/RestServer/arangod.cpp
View File

@ -100,26 +100,25 @@ void abortHandler(int signum) {
#ifdef _WIN32
#include <DbgHelp.h>
LONG CALLBACK unhandledExceptionHandler(EXCEPTION_POINTERS *e)
{
LONG CALLBACK unhandledExceptionHandler(EXCEPTION_POINTERS *e) {
#if HAVE_BACKTRACE
if ((e != nullptr) && (e->ExceptionRecord != nullptr)) {
LOG_FATAL("Unhandled exeption: %d", e->ExceptionRecord->ExceptionCode);
LOG_ERROR("Unhandled exception: %d", (int) e->ExceptionRecord->ExceptionCode);
}
else {
LOG_FATAL("Unhandled exeption witout ExceptionCode!");
LOG_ERROR("Unhandled exception witout ExceptionCode!");
}
std::string bt;
TRI_GetBacktrace(bt);
std::cout < bt;
LOG_FATAL(bt.c_str());
std::cout << bt << std::endl;
LOG_ERROR(bt.c_str());
std::string miniDumpFilename = TRI_GetTempPath();
miniDumpFilename += "\\minidump_" + std::to_string(GetCurrentProcessId()) + ".dmp";
LOG_FATAL("writing minidump: %s", miniDumpFilename.c_str());
LOG_ERROR("writing minidump: %s", miniDumpFilename.c_str());
HANDLE hFile = CreateFile(miniDumpFilename.c_str(),
GENERIC_WRITE,
FILE_SHARE_READ,
@ -127,7 +126,7 @@ LONG CALLBACK unhandledExceptionHandler(EXCEPTION_POINTERS *e)
FILE_ATTRIBUTE_NORMAL, 0);
if(hFile == INVALID_HANDLE_VALUE) {
LOG_FATAL("could not open minidump file : %ld", GetLastError());
LOG_ERROR("could not open minidump file : %lu", GetLastError());
return EXCEPTION_CONTINUE_SEARCH;
}
@ -146,16 +145,16 @@ LONG CALLBACK unhandledExceptionHandler(EXCEPTION_POINTERS *e)
NULL,
NULL);
if(hFile) {
CloseHandle(hFile);
hFile = NULL;
if (hFile) {
CloseHandle(hFile);
hFile = NULL;
}
#endif
if ((e != nullptr) && (e->ExceptionRecord != nullptr)) {
LOG_FATAL("Unhandled exeption: %d - will crash now.", e->ExceptionRecord->ExceptionCode);
LOG_ERROR("Unhandled exception: %d - will crash now.", (int) e->ExceptionRecord->ExceptionCode);
}
else {
LOG_FATAL("Unhandled exeption witout ExceptionCode - will crash now.!");
LOG_ERROR("Unhandled exception without ExceptionCode - will crash now.!");
}
return EXCEPTION_CONTINUE_SEARCH;
}
@ -175,7 +174,7 @@ static void TRI_GlobalEntryFunction () {
// Uncomment this to call this for extended debug information.
// If you familiar with valgrind ... then this is not like that, however
// If you familiar with Valgrind ... then this is not like that, however
// you do get some similar functionality.
// res = initialiseWindows(TRI_WIN_INITIAL_SET_DEBUG_FLAG, 0);
@ -217,14 +216,12 @@ static void TRI_GlobalEntryFunction() {
#ifdef _WIN32
static void TRI_GlobalExitFunction (int exitCode, void* data) {
int res = 0;
// ...........................................................................
// TODO: need a terminate function for windows to be called and cleanup
// any windows specific stuff.
// ...........................................................................
res = finaliseWindows(TRI_WIN_FINAL_WSASTARTUP_FUNCTION_CALL, 0);
int res = finaliseWindows(TRI_WIN_FINAL_WSASTARTUP_FUNCTION_CALL, 0);
if (res != 0) {
exit(EXIT_FAILURE);

3
lib/Basics/logging.h
View File

@ -318,9 +318,6 @@ void CLEANUP_LOGGING_AND_EXIT_ON_FATAL_ERROR (void);
CLEANUP_LOGGING_AND_EXIT_ON_FATAL_ERROR(); \
} while (0)
#define LOG_FATAL(...) while (0)
#endif
////////////////////////////////////////////////////////////////////////////////