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

Fix app.makeSingleInstance hanging on posix systems

Browse source 
Wait for the IO thread to be a thing before attempting to listen on the socket

Fixes #9880
This commit is contained in:
Samuel Attard 2017-09-14 22:33:13 +10:00 • committed by Cheng Zhao
parent fb6a4febb0
commit 28900a9b63
4 changed files with 35 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
chromium_src/chrome/browser/process_singleton_posix.cc
View file

@ -55,6 +55,7 @@
#include <stddef.h>
#include "atom/browser/browser.h"
#include "atom/common/atom_command_line.h"
#include "base/base_paths.h"
@ -881,6 +882,22 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessOrCreate() {
base::TimeDelta::FromSeconds(kTimeoutInSeconds));
}
void ProcessSingleton::StartListeningOnSocket() {
BrowserThread::PostTask(
BrowserThread::IO,
FROM_HERE,
base::Bind(&ProcessSingleton::LinuxWatcher::StartListening,
watcher_,
sock_));
}
void ProcessSingleton::OnBrowserReady() {
if (listen_on_ready_) {
StartListeningOnSocket();
listen_on_ready_ = false;
}
}
ProcessSingleton::NotifyResult
ProcessSingleton::NotifyOtherProcessWithTimeoutOrCreate(
const base::CommandLine& command_line,
@ -1032,12 +1049,13 @@ bool ProcessSingleton::Create() {
NOTREACHED() << "listen failed: " << base::safe_strerror(errno);
DCHECK(BrowserThread::IsMessageLoopValid(BrowserThread::IO));
BrowserThread::PostTask(
BrowserThread::IO,
FROM_HERE,
base::Bind(&ProcessSingleton::LinuxWatcher::StartListening,
watcher_,
sock));
sock_ = sock;
if (atom::Browser::Get()->is_ready()) {
StartListeningOnSocket();
} else {
listen_on_ready_ = true;
}
return true;
}