database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Fix sig handler for ExeMgr

Browse Source 
A bad merge for in MCOL-1085 means that ExeMgr is missing the crash
handler. This adds it.
This commit is contained in:
Andrew Hutchings
2018-02-12 23:17:41 +00:00
parent d45dc5f33e
commit 24f12dcf58
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
exemgr/main.cpp
View File

@ -1168,10 +1168,12 @@ public:
} }
}; };
#ifdef _MSC_VER
void exit_(int) void exit_(int)
{ {
exit(0); exit(0);
} }
#endif
void added_a_pm(int) void added_a_pm(int)
{ {
@ -1216,7 +1218,6 @@ void printTotalUmMemory(int sig)
void setupSignalHandlers() void setupSignalHandlers()
{ {
#ifdef _MSC_VER #ifdef _MSC_VER
signal(SIGSEGV, exit_);
signal(SIGINT, exit_); signal(SIGINT, exit_);
signal(SIGTERM, exit_); signal(SIGTERM, exit_);
#else #else
@ -1232,6 +1233,11 @@ void setupSignalHandlers()
sigaction(SIGHUP, &ign, 0); sigaction(SIGHUP, &ign, 0);
ign.sa_handler = printTotalUmMemory; ign.sa_handler = printTotalUmMemory;
sigaction(SIGUSR1, &ign, 0); sigaction(SIGUSR1, &ign, 0);
memset(&ign, 0, sizeof(ign));
ign.sa_handler = fatalHandler;
sigaction(SIGSEGV, &ign, 0);
sigaction(SIGABRT, &ign, 0);
sigaction(SIGFPE, &ign, 0);
#endif #endif
} }
@ -1305,6 +1311,9 @@ int main(int argc, char* argv[])
string systemLang = "C"; string systemLang = "C";
systemLang = funcexp::utf8::idb_setlocale(); systemLang = funcexp::utf8::idb_setlocale();
// This is unset due to the way we start it
program_invocation_short_name = const_cast<char*>("ExeMgr");
gDebug = 0; gDebug = 0;
bool eFlg = false; bool eFlg = false;
int c; int c;