mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

feat: add serviceName to 'child-process-gone' / app.getAppMetrics() (#25975)

Browse source
This commit is contained in:
Milan Burda 2020-10-19 13:55:47 +02:00 • committed by GitHub
parent c27e5fdbb6
commit decb1eb87b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
shell/browser/api/electron_api_app.cc
View file

@ -837,7 +837,7 @@ void App::OnGpuProcessCrashed(base::TerminationStatus status) {
void App::BrowserChildProcessLaunchedAndConnected(
const content::ChildProcessData& data) {
ChildProcessLaunched(data.process_type, data.GetProcess().Handle(),
base::UTF16ToUTF8(data.name));
data.metrics_name, base::UTF16ToUTF8(data.name));
}
void App::BrowserChildProcessHostDisconnected(
@ -868,6 +868,7 @@ void App::BrowserChildProcessCrashedOrKilled(
details.Set("type", content::GetProcessTypeNameInEnglish(data.process_type));
details.Set("reason", info.status);
details.Set("exitCode", info.exit_code);
details.Set("serviceName", data.metrics_name);
if (!data.name.empty()) {
details.Set("name", data.name);
}
@ -896,6 +897,7 @@ void App::RenderProcessDisconnected(base::ProcessId host_pid) {
void App::ChildProcessLaunched(int process_type,
base::ProcessHandle handle,
const std::string& service_name,
const std::string& name) {
auto pid = base::GetProcId(handle);
@ -906,7 +908,7 @@ void App::ChildProcessLaunched(int process_type,
auto metrics = base::ProcessMetrics::CreateProcessMetrics(handle);
#endif
app_metrics_[pid] = std::make_unique<electron::ProcessMetric>(
process_type, handle, std::move(metrics), name);
process_type, handle, std::move(metrics), service_name, name);
}
void App::ChildProcessDisconnected(base::ProcessId pid) {
@ -1349,6 +1351,10 @@ std::vector<gin_helper::Dictionary> App::GetAppMetrics(v8::Isolate* isolate) {
pid_dict.Set("creationTime",
process_metric.second->process.CreationTime().ToJsTime());
if (!process_metric.second->service_name.empty()) {
pid_dict.Set("serviceName", process_metric.second->service_name);
}
if (!process_metric.second->name.empty()) {
pid_dict.Set("name", process_metric.second->name);
}

1
shell/browser/api/electron_api_app.h
View file

@ -168,6 +168,7 @@ class App : public ElectronBrowserClient::Delegate,
void SetAppPath(const base::FilePath& app_path);
void ChildProcessLaunched(int process_type,
base::ProcessHandle handle,
const std::string& service_name = std::string(),
const std::string& name = std::string());
void ChildProcessDisconnected(base::ProcessId pid);

2
shell/browser/api/process_metric.cc
View file

@ -53,9 +53,11 @@ namespace electron {
ProcessMetric::ProcessMetric(int type,
base::ProcessHandle handle,
std::unique_ptr<base::ProcessMetrics> metrics,
const std::string& service_name,
const std::string& name) {
this->type = type;
this->metrics = std::move(metrics);
this->service_name = service_name;
this->name = name;
#if defined(OS_WIN)

2
shell/browser/api/process_metric.h
View file

@ -38,11 +38,13 @@ struct ProcessMetric {
int type;
base::Process process;
std::unique_ptr<base::ProcessMetrics> metrics;
std::string service_name;
std::string name;
ProcessMetric(int type,
base::ProcessHandle handle,
std::unique_ptr<base::ProcessMetrics> metrics,
const std::string& service_name = std::string(),
const std::string& name = std::string());
~ProcessMetric();