Commit 0579f42
report: use triggerReport() to handle signals
This commit uses the triggerReport() binding to handle
signals and removes the custom onUserSignal() function.
PR-URL: #26386
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent b216f44 commit 0579f42
3 files changed
Lines changed: 2 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -104,7 +104,7 @@ const report = { | |||
| 104 | 104 | function handleSignal(signo) { | |
| 105 | 105 | if (typeof signo !== 'string') | |
| 106 | 106 | signo = config.signal; | |
| 107 | - nr.onUserSignal(signo); | ||
| 107 | + nr.triggerReport(signo, 'Signal', null, ''); | ||
| 108 | 108 | } | |
| 109 | 109 | ||
| 110 | 110 | module.exports = { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -377,7 +377,7 @@ static void PrintJavaScriptStack(JSONWriter* writer, | |||
| 377 | 377 | ||
| 378 | 378 | std::string ss; | |
| 379 | 379 | if ((!strcmp(location, "OnFatalError")) || | |
| 380 | - (!strcmp(location, "OnUserSignal"))) { | ||
| 380 | + (!strcmp(location, "Signal"))) { | ||
| 381 | 381 | ss = "No stack.\nUnavailable.\n"; | |
| 382 | 382 | } else { | |
| 383 | 383 | String::Utf8Value sv(isolate, stackstr); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -75,18 +75,6 @@ void GetReport(const FunctionCallbackInfo<Value>& info) { | |||
| 75 | 75 | .ToLocalChecked()); | |
| 76 | 76 | } | |
| 77 | 77 | ||
| 78 | - // Signal handler for report action, called from JS land (util.js) | ||
| 79 | - void OnUserSignal(const FunctionCallbackInfo<Value>& info) { | ||
| 80 | - Environment* env = Environment::GetCurrent(info); | ||
| 81 | - Isolate* isolate = env->isolate(); | ||
| 82 | - CHECK(info[0]->IsString()); | ||
| 83 | - Local<String> str = info[0].As<String>(); | ||
| 84 | - String::Utf8Value value(isolate, str); | ||
| 85 | - std::string filename; | ||
| 86 | - TriggerNodeReport( | ||
| 87 | - isolate, env, *value, __func__, filename, info[0].As<String>()); | ||
| 88 | - } | ||
| 89 | - | ||
| 90 | 78 | // A method to sync up data elements in the JS land with its | |
| 91 | 79 | // corresponding elements in the C++ world. Required because | |
| 92 | 80 | // (i) the tunables are first intercepted through the CLI but | |
@@ -219,7 +207,6 @@ static void Initialize(Local<Object> exports, | |||
| 219 | 207 | std::shared_ptr<PerIsolateOptions> options = env->isolate_data()->options(); | |
| 220 | 208 | env->SetMethod(exports, "triggerReport", TriggerReport); | |
| 221 | 209 | env->SetMethod(exports, "getReport", GetReport); | |
| 222 | - env->SetMethod(exports, "onUserSignal", OnUserSignal); | ||
| 223 | 210 | env->SetMethod(exports, "syncConfig", SyncConfig); | |
| 224 | 211 | } | |
| 225 | 212 | ||
0 commit comments