fix #4837:

don't try to hide signalhandler from stacktrace / fix endless loop -> crashhandler should be as simple as possible
spring · Jun 30, 2015 · 81b537a · 81b537a · ashdnazg · Jun 30, 2015
1 parent 57347d9
commit 81b537a
Showing 1 changed file with 13 additions and 31 deletions.
diff --git a/rts/System/Platform/Linux/CrashHandler.cpp b/rts/System/Platform/Linux/CrashHandler.cpp
@@ -529,7 +529,7 @@ static void LogStacktrace(const int logLevel, StackTrace& stacktrace)
 	const std::string& exe_path = Platform::GetProcessExecutablePath();
 	const std::string& cwd_path = Platform::GetOrigCWD();
 	for (auto fit = stacktrace.begin(); fit != stacktrace.end(); fit++) {
-        for (auto eit = fit->entries.begin(); eit != fit->entries.end(); eit++) {
+		for (auto eit = fit->entries.begin(); eit != fit->entries.end(); eit++) {
 			eit->abbrev_funcname = eit->funcname;
 			std::string fileline = eit->fileline;
 			if (fileline[1] == '?') {  // case "??:?", ":?"
@@ -551,37 +551,19 @@ static void LogStacktrace(const int logLevel, StackTrace& stacktrace)
 			}
 
 			colFileline = std::max(colFileline, (int)eit->abbrev_fileline.length());
-        }
-    }
+		}
+	}
 
-    bool hideSignalHandler = true;
-
-    // Print out the translated StackTrace
-    unsigned numLine = 0;
-    unsigned hiddenLines = 0;
-    while (numLine == 0) { // outer loop at most twice -- tries to find the signal handler once and if that doesn't work, then just print every frame
-        for (auto fit = stacktrace.cbegin(); fit != stacktrace.cend(); fit++) {
-            for (auto eit = fit->entries.begin(); eit != fit->entries.end(); eit++) {
-
-                if (hideSignalHandler) {
-                    hiddenLines++;
-					if (eit->fileline.find("sigaction.c:?") == 0) {
-                        hideSignalHandler = false;
-                        LOG_I(logLevel, "(Signal handler calls suppressed [%d]. Inlined calls denoted by < > brackets.)", hiddenLines);
-                    }
-                    continue;
-                }
-
-                if (eit->inLine) {
-					LOG_I(logLevel, "  <%02u> %*s  %s", fit->level, colFileline, eit->abbrev_fileline.c_str(), eit->abbrev_funcname.c_str());
-                } else {
-					LOG_I(logLevel, "[%02u]   %*s  %s", fit->level, colFileline, eit->abbrev_fileline.c_str(), eit->abbrev_funcname.c_str());
-                }
-                numLine++;
-            }
-        }
-        hideSignalHandler = false;
-    }
+	// Print out the translated StackTrace
+	for (auto fit = stacktrace.cbegin(); fit != stacktrace.cend(); fit++) {
+		for (auto eit = fit->entries.begin(); eit != fit->entries.end(); eit++) {
+			if (eit->inLine) {
+				LOG_I(logLevel, "  <%02u> %*s  %s", fit->level, colFileline, eit->abbrev_fileline.c_str(), eit->abbrev_funcname.c_str());
+			} else {
+				LOG_I(logLevel, "[%02u]   %*s  %s", fit->level, colFileline, eit->abbrev_fileline.c_str(), eit->abbrev_funcname.c_str());
+			}
+		}
+	}
 }
 
 #endif  // !(__APPLE__)