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

REVIEW: destroy process singleton on sequence where IO is allowed

Browse source
This commit is contained in:
deepak1556 2017-12-11 13:25:49 +05:30 • committed by Cheng Zhao
parent c3154d86e0
commit 88e53b1b5e
13 changed files with 90 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

35
atom/browser/api/atom_api_app.cc
View file

@ -529,6 +529,8 @@ void OnIconDataAvailable(v8::Isolate* isolate,
} // namespace
App::App(v8::Isolate* isolate) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
static_cast<AtomBrowserClient*>(AtomBrowserClient::Get())->set_delegate(this);
Browser::Get()->AddObserver(this);
content::GpuDataManager::GetInstance()->AddObserver(this);
@ -566,11 +568,6 @@ void App::OnWindowAllClosed() {
void App::OnQuit() {
int exitCode = AtomBrowserMainParts::Get()->GetExitCode();
Emit("quit", exitCode);
if (process_singleton_) {
process_singleton_->Cleanup();
process_singleton_.reset();
}
}
void App::OnOpenFile(bool* prevent_default, const std::string& file_path) {
@ -598,12 +595,6 @@ void App::OnFinishLaunching(const base::DictionaryValue& launch_info) {
Emit("ready", launch_info);
}
void App::OnPreMainMessageLoopRun() {
if (process_singleton_) {
process_singleton_->OnBrowserReady();
}
}
void App::OnAccessibilitySupportChanged() {
Emit("accessibility-support-changed", IsAccessibilitySupportEnabled());
}
@ -856,20 +847,20 @@ std::string App::GetLocale() {
bool App::MakeSingleInstance(
const ProcessSingleton::NotificationCallback& callback) {
if (process_singleton_)
auto process_singleton = AtomBrowserMainParts::Get()->process_singleton();
if (process_singleton_created_)
return false;
base::FilePath user_dir;
PathService::Get(brightray::DIR_USER_DATA, &user_dir);
process_singleton_.reset(new ProcessSingleton(
user_dir, base::Bind(NotificationCallbackWrapper, callback)));
process_singleton->RegisterSingletonNotificationCallback(
base::Bind(NotificationCallbackWrapper, callback));
switch (process_singleton_->NotifyOtherProcessOrCreate()) {
switch (process_singleton->NotifyOtherProcessOrCreate()) {
case ProcessSingleton::NotifyResult::LOCK_ERROR:
case ProcessSingleton::NotifyResult::PROFILE_IN_USE:
case ProcessSingleton::NotifyResult::PROCESS_NOTIFIED:
process_singleton_.reset();
case ProcessSingleton::NotifyResult::PROCESS_NOTIFIED: {
process_singleton_created_ = true;
return true;
}
case ProcessSingleton::NotifyResult::PROCESS_NONE:
default: // Shouldn't be needed, but VS warns if it is not there.
return false;
@ -877,9 +868,9 @@ bool App::MakeSingleInstance(
}
void App::ReleaseSingleInstance() {
if (process_singleton_) {
process_singleton_->Cleanup();
process_singleton_.reset();
auto process_singleton = AtomBrowserMainParts::Get()->process_singleton();
if (process_singleton) {
process_singleton->Cleanup();
}
}

5
atom/browser/api/atom_api_app.h
View file

@ -104,7 +104,6 @@ class App : public AtomBrowserClient::Delegate,
void OnLogin(LoginHandler* login_handler,
const base::DictionaryValue& request_details) override;
void OnAccessibilitySupportChanged() override;
void OnPreMainMessageLoopRun() override;
#if defined(OS_MACOSX)
void OnWillContinueUserActivity(
bool* prevent_default,
@ -218,8 +217,6 @@ class App : public AtomBrowserClient::Delegate,
JumpListResult SetJumpList(v8::Local<v8::Value> val, mate::Arguments* args);
#endif // defined(OS_WIN)
std::unique_ptr<ProcessSingleton> process_singleton_;
#if defined(USE_NSS_CERTS)
std::unique_ptr<CertificateManagerModel> certificate_manager_model_;
#endif
@ -234,6 +231,8 @@ class App : public AtomBrowserClient::Delegate,
std::unique_ptr<atom::ProcessMetric>>;
ProcessMetricMap app_metrics_;
bool process_singleton_created_ = false;
DISALLOW_COPY_AND_ASSIGN(App);
};