Skip to content

Commit 4ae7cd4

Browse files
authored
cpptools-srv2 crash handler. (#14449)
* cpptools-srv2 crash handler.
1 parent 8f0f27e commit 4ae7cd4

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

Extension/src/LanguageServer/extension.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ function handleMacCrashFileRead(err: NodeJS.ErrnoException | undefined | null, d
11951195
data = data.replace(/0x1........ \+ 0/g, "");
11961196

11971197
// Get rid of the process names on each line and just add it to the start.
1198-
const processNames: string[] = ["cpptools-srv", "cpptools-wordexp", "cpptools",
1198+
const processNames: string[] = ["cpptools-srv2", "cpptools-srv", "cpptools-wordexp", "cpptools",
11991199
// Since only crash logs that start with "cpptools" are reported, the cases below would only occur
12001200
// if the crash were to happen before the new process had fully started and renamed itself.
12011201
"clang-tidy", "clang-format", "clang", "gcc"];
@@ -1255,8 +1255,9 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
12551255

12561256
const lines: string[] = data.split("\n");
12571257
let addressData: string;
1258+
const isCppToolsSrv2: boolean = crashFile.startsWith("cpptools-srv2");
12581259
const isCppToolsSrv: boolean = crashFile.startsWith("cpptools-srv");
1259-
const telemetryHeader: string = (isCppToolsSrv ? "cpptools-srv.txt" : crashFile) + "\n";
1260+
const telemetryHeader: string = (isCppToolsSrv2 ? "cpptools-srv2.txt" : isCppToolsSrv ? "cpptools-srv.txt" : crashFile) + "\n";
12601261
const filtPath: string | null = which.sync("c++filt", { nothrow: true });
12611262
const isMac: boolean = process.platform === "darwin";
12621263
const startStr: string = isMac ? " _" : "<";
@@ -1405,7 +1406,7 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
14051406
prevCppCrashCallStackData = crashCallStack;
14061407

14071408
if (lines.length >= 6 && util.getLoggingLevel() >= 1) {
1408-
getCrashCallStacksChannel().appendLine(`\n${isCppToolsSrv ? "cpptools-srv" : "cpptools"}\n${crashDate.toLocaleString()}\n${signalType}${crashCallStack}${crashLog.length > 0 ? "\n\n" + crashLog : ""}`);
1409+
getCrashCallStacksChannel().appendLine(`\n${isCppToolsSrv2 ? "cpptools-srv2" : isCppToolsSrv ? "cpptools-srv" : "cpptools"}\n${crashDate.toLocaleString()}\n${signalType}${crashCallStack}${crashLog.length > 0 ? "\n\n" + crashLog : ""}`);
14091410
}
14101411
}
14111412

0 commit comments

Comments
 (0)