61374019c0
* chore: bump chromium in DEPS to 103.0.5020.0 * chore: bump chromium in DEPS to 103.0.5022.0 * chore: bump chromium in DEPS to 103.0.5024.0 * chore: update patches * 3587410: [Printing] Remove JobEventDetails Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587410 * chore: bump chromium in DEPS to 103.0.5026.0 * chore: update patches * 3577218: WebUI: Delete webui_resources.grd and related GN targets. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3577218 * chore: bump chromium in DEPS to 103.0.5028.0 * chore: update patches * 3579297: Convert UpdatePrintSettings() to use non-deprecated base::Value APIs. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3579297 * 3560622: serial: Add SerialPort.forget() method Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560622 * 3581708: Restore original display when moving from tab-fullscreen to browser-fullscreen. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3581708 * chore: fix authorization flags lint error * 3583363: Remove net wrappers around base/strings/escape.h Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3583363 * fixup! 3560622: serial: Add SerialPort.forget() method Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3560622 * 3587589: Reland "Propagate the MIME type from DownloadTargetDeterminer to DownloadItem" Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587589 * 3584006: Remove IsRenderViewLive from content public Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3584006 * 3596174: [api] Remove APIs for resurrecting finalizers Ref: https://chromium-review.googlesource.com/c/v8/v8/+/3596174 * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 * chore: bump chromium in DEPS to 103.0.5030.0 * chore: update patches * chore: bump chromium in DEPS to 103.0.5032.0 * chore: bump chromium in DEPS to 103.0.5034.0 * chore: bump chromium in DEPS to 103.0.5036.0 * chore: update patches * 3586363: Introduce PrintRenderFrame.PrintWithParams() for batch printing to PDF Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3586363 * 3593199: Remove content::PermissionType references and replace them with blink::PermissionType Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3593199 * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 * chore: lint * chore: bump chromium in DEPS to 103.0.5038.0 * chore: update patches * fixup! 3560622: serial: Add SerialPort.forget() method * 3606495: mac screen capture: add metric Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3606495 * chore: bump chromium in DEPS to 103.0.5040.0 * chore: update patches * 3590840: Add IPs to DnsOverHttpsServerConfig https://chromium-review.googlesource.com/c/chromium/src/+/3590840 * stub functions for ElectronSerialDelegate and SerialChooserController to fix link * 3566412: [base] Remove base/android dependency on post_task.h and officially remove post_task.h! Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * 3347944: [content] No longer hand-off whole MainFunctionParams to BrowserMainParts Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3347944 * fixup! 3566412: [base] Remove base/android dependency on post_task.h and off… e3ea3e1 …icially remove post_task.h! * chore: update process_singleton patches for content::GetIOThreadTaskRunner({}) Ref: 2015655: [BrowserThread] Migrate co/pub/br and co/br/scheduler to the new API | https://chromium-review.googlesource.com/c/chromium/src/+/2015655 * chore: migrate base::DeleteSoon to content::GetUIThreadTaskRunner({})->DeleteSoon Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * chore: remove duplicate functions for RevokePortPermissionWebInitiated & GetPortInfo * chore: migrate Linux/Windows methods off of post_task.h Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3566412 * 64908: Stop building legacy SwiftShader GL in Chromium https://swiftshader-review.googlesource.com/c/SwiftShader/+/64908 * 3573245: Added Themed versions of RoundedRectBackground and RoundedRectBorder. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3573245 * chore: bump chromium in DEPS to 103.0.5042.0 * chore: update patches * 3571804: [api] Advance API deprecation for V8 version v10.2 https://chromium-review.googlesource.com/c/v8/v8/+/3571804 * fixup! 3571804: [api] Advance API deprecation for V8 version v10.2 * build: fix run-clang-format extension matching * lint * fix windows build * how is clang-format still not working for me * chore: update patches * 3623985: Replace ad-hoc SetPublicFirstPartySets calls with method in ContentBrowserClient. https://chromium-review.googlesource.com/c/chromium/src/+/3623985 * no need to implement WillProvidePublicFirstPartySets; the default is false * 3601036: [QT] Introduce ui/views/linux_ui/linux_ui_factory.* https://chromium-review.googlesource.com/c/chromium/src/+/3601036 * 3583363: Remove net wrappers around base/strings/escape.h https://chromium-review.googlesource.com/c/chromium/src/+/3583363 * lint * chore: bump chromium in DEPS to 103.0.5044.0 * fix conflicts * chore: update patches * upgrade nan * pin version of nan in tests * replace my hacky deprecated override fix with the fix from upstream * revert runtime dcheck in v8 * pin nan version at root too * refactor: tell gyp to use c++17 when building with our node * Revert "refactor: tell gyp to use c++17 when building with our node" This reverts commit 41a03a5799a8f40f31555d73d20ea865acfcd192. * Undo the reversion of 41a03a5799a8f40f31555d73d20ea865acfcd192. This reverts commit 54440abc598153bd7e259be4a908f0ecc0b33348. * disable sequential/test-cpu-prof-kill for now * also sequential/test-diagnostic-dir-cpu-prof Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <japthorp@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Charles Kerr <charles@charleskerr.com>
242 lines
8.2 KiB
C++
242 lines
8.2 KiB
C++
// Copyright (c) 2015 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
// Most code came from: chrome/browser/chrome_browser_main_posix.cc.
|
|
|
|
#include "shell/browser/electron_browser_main_parts.h"
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <pthread.h>
|
|
#include <signal.h>
|
|
#include <sys/resource.h>
|
|
#include <unistd.h>
|
|
|
|
#include "base/debug/leak_annotations.h"
|
|
#include "base/posix/eintr_wrapper.h"
|
|
#include "base/threading/platform_thread.h"
|
|
#include "content/public/browser/browser_task_traits.h"
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "shell/browser/browser.h"
|
|
|
|
namespace electron {
|
|
|
|
namespace {
|
|
|
|
// See comment in |PreEarlyInitialization()|, where sigaction is called.
|
|
void SIGCHLDHandler(int signal) {}
|
|
|
|
// The OSX fork() implementation can crash in the child process before
|
|
// fork() returns. In that case, the shutdown pipe will still be
|
|
// shared with the parent process. To prevent child crashes from
|
|
// causing parent shutdowns, |g_pipe_pid| is the pid for the process
|
|
// which registered |g_shutdown_pipe_write_fd|.
|
|
// See <http://crbug.com/175341>.
|
|
pid_t g_pipe_pid = -1;
|
|
int g_shutdown_pipe_write_fd = -1;
|
|
int g_shutdown_pipe_read_fd = -1;
|
|
|
|
// Common code between SIG{HUP, INT, TERM}Handler.
|
|
void GracefulShutdownHandler(int signal) {
|
|
// Reinstall the default handler. We had one shot at graceful shutdown.
|
|
struct sigaction action;
|
|
memset(&action, 0, sizeof(action));
|
|
action.sa_handler = SIG_DFL;
|
|
RAW_CHECK(sigaction(signal, &action, nullptr) == 0);
|
|
|
|
RAW_CHECK(g_pipe_pid == getpid());
|
|
RAW_CHECK(g_shutdown_pipe_write_fd != -1);
|
|
RAW_CHECK(g_shutdown_pipe_read_fd != -1);
|
|
size_t bytes_written = 0;
|
|
do {
|
|
int rv = HANDLE_EINTR(
|
|
write(g_shutdown_pipe_write_fd,
|
|
reinterpret_cast<const char*>(&signal) + bytes_written,
|
|
sizeof(signal) - bytes_written));
|
|
RAW_CHECK(rv >= 0);
|
|
bytes_written += rv;
|
|
} while (bytes_written < sizeof(signal));
|
|
}
|
|
|
|
// See comment in |PostCreateMainMessageLoop()|, where sigaction is called.
|
|
void SIGHUPHandler(int signal) {
|
|
RAW_CHECK(signal == SIGHUP);
|
|
GracefulShutdownHandler(signal);
|
|
}
|
|
|
|
// See comment in |PostCreateMainMessageLoop()|, where sigaction is called.
|
|
void SIGINTHandler(int signal) {
|
|
RAW_CHECK(signal == SIGINT);
|
|
GracefulShutdownHandler(signal);
|
|
}
|
|
|
|
// See comment in |PostCreateMainMessageLoop()|, where sigaction is called.
|
|
void SIGTERMHandler(int signal) {
|
|
RAW_CHECK(signal == SIGTERM);
|
|
GracefulShutdownHandler(signal);
|
|
}
|
|
|
|
class ShutdownDetector : public base::PlatformThread::Delegate {
|
|
public:
|
|
explicit ShutdownDetector(
|
|
int shutdown_fd,
|
|
base::OnceCallback<void()> shutdown_callback,
|
|
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
|
|
|
|
// disable copy
|
|
ShutdownDetector(const ShutdownDetector&) = delete;
|
|
ShutdownDetector& operator=(const ShutdownDetector&) = delete;
|
|
|
|
// base::PlatformThread::Delegate:
|
|
void ThreadMain() override;
|
|
|
|
private:
|
|
const int shutdown_fd_;
|
|
base::OnceCallback<void()> shutdown_callback_;
|
|
const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
|
};
|
|
|
|
ShutdownDetector::ShutdownDetector(
|
|
int shutdown_fd,
|
|
base::OnceCallback<void()> shutdown_callback,
|
|
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner)
|
|
: shutdown_fd_(shutdown_fd),
|
|
shutdown_callback_(std::move(shutdown_callback)),
|
|
task_runner_(task_runner) {
|
|
CHECK_NE(shutdown_fd_, -1);
|
|
CHECK(!shutdown_callback_.is_null());
|
|
CHECK(task_runner_);
|
|
}
|
|
|
|
// These functions are used to help us diagnose crash dumps that happen
|
|
// during the shutdown process.
|
|
NOINLINE void ShutdownFDReadError() {
|
|
// Ensure function isn't optimized away.
|
|
asm("");
|
|
sleep(UINT_MAX);
|
|
}
|
|
|
|
NOINLINE void ShutdownFDClosedError() {
|
|
// Ensure function isn't optimized away.
|
|
asm("");
|
|
sleep(UINT_MAX);
|
|
}
|
|
|
|
NOINLINE void ExitPosted() {
|
|
// Ensure function isn't optimized away.
|
|
asm("");
|
|
sleep(UINT_MAX);
|
|
}
|
|
|
|
void ShutdownDetector::ThreadMain() {
|
|
base::PlatformThread::SetName("CrShutdownDetector");
|
|
|
|
int signal;
|
|
size_t bytes_read = 0;
|
|
do {
|
|
const ssize_t ret = HANDLE_EINTR(
|
|
read(shutdown_fd_, reinterpret_cast<char*>(&signal) + bytes_read,
|
|
sizeof(signal) - bytes_read));
|
|
if (ret < 0) {
|
|
NOTREACHED() << "Unexpected error: " << strerror(errno);
|
|
ShutdownFDReadError();
|
|
break;
|
|
} else if (ret == 0) {
|
|
NOTREACHED() << "Unexpected closure of shutdown pipe.";
|
|
ShutdownFDClosedError();
|
|
break;
|
|
}
|
|
bytes_read += ret;
|
|
} while (bytes_read < sizeof(signal));
|
|
VLOG(1) << "Handling shutdown for signal " << signal << ".";
|
|
|
|
if (!task_runner_->PostTask(FROM_HERE,
|
|
base::BindOnce(std::move(shutdown_callback_)))) {
|
|
// Without a valid task runner to post the exit task to, there aren't many
|
|
// options. Raise the signal again. The default handler will pick it up
|
|
// and cause an ungraceful exit.
|
|
RAW_LOG(WARNING, "No valid task runner, exiting ungracefully.");
|
|
kill(getpid(), signal);
|
|
|
|
// The signal may be handled on another thread. Give that a chance to
|
|
// happen.
|
|
sleep(3);
|
|
|
|
// We really should be dead by now. For whatever reason, we're not. Exit
|
|
// immediately, with the exit status set to the signal number with bit 8
|
|
// set. On the systems that we care about, this exit status is what is
|
|
// normally used to indicate an exit by this signal's default handler.
|
|
// This mechanism isn't a de jure standard, but even in the worst case, it
|
|
// should at least result in an immediate exit.
|
|
RAW_LOG(WARNING, "Still here, exiting really ungracefully.");
|
|
_exit(signal | (1 << 7));
|
|
}
|
|
ExitPosted();
|
|
}
|
|
|
|
} // namespace
|
|
|
|
void ElectronBrowserMainParts::HandleSIGCHLD() {
|
|
// We need to accept SIGCHLD, even though our handler is a no-op because
|
|
// otherwise we cannot wait on children. (According to POSIX 2001.)
|
|
struct sigaction action;
|
|
memset(&action, 0, sizeof(action));
|
|
action.sa_handler = SIGCHLDHandler;
|
|
CHECK_EQ(sigaction(SIGCHLD, &action, nullptr), 0);
|
|
}
|
|
|
|
void ElectronBrowserMainParts::InstallShutdownSignalHandlers(
|
|
base::OnceCallback<void()> shutdown_callback,
|
|
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
|
|
int pipefd[2];
|
|
int ret = pipe(pipefd);
|
|
if (ret < 0) {
|
|
PLOG(DFATAL) << "Failed to create pipe";
|
|
return;
|
|
}
|
|
g_pipe_pid = getpid();
|
|
g_shutdown_pipe_read_fd = pipefd[0];
|
|
g_shutdown_pipe_write_fd = pipefd[1];
|
|
#if !defined(ADDRESS_SANITIZER)
|
|
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
|
|
#else
|
|
// ASan instrumentation bloats the stack frames, so we need to increase the
|
|
// stack size to avoid hitting the guard page.
|
|
const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
|
|
#endif
|
|
ShutdownDetector* detector = new ShutdownDetector(
|
|
g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner);
|
|
|
|
// PlatformThread does not delete its delegate.
|
|
ANNOTATE_LEAKING_OBJECT_PTR(detector);
|
|
if (!base::PlatformThread::CreateNonJoinable(kShutdownDetectorThreadStackSize,
|
|
detector)) {
|
|
LOG(DFATAL) << "Failed to create shutdown detector task.";
|
|
}
|
|
// Setup signal handlers for shutdown AFTER shutdown pipe is setup because
|
|
// it may be called right away after handler is set.
|
|
|
|
// If adding to this list of signal handlers, note the new signal probably
|
|
// needs to be reset in child processes. See
|
|
// base/process_util_posix.cc:LaunchProcess.
|
|
|
|
// We need to handle SIGTERM, because that is how many POSIX-based distros
|
|
// ask processes to quit gracefully at shutdown time.
|
|
struct sigaction action;
|
|
memset(&action, 0, sizeof(action));
|
|
action.sa_handler = SIGTERMHandler;
|
|
CHECK_EQ(sigaction(SIGTERM, &action, nullptr), 0);
|
|
|
|
// Also handle SIGINT - when the user terminates the browser via Ctrl+C. If
|
|
// the browser process is being debugged, GDB will catch the SIGINT first.
|
|
action.sa_handler = SIGINTHandler;
|
|
CHECK_EQ(sigaction(SIGINT, &action, nullptr), 0);
|
|
|
|
// And SIGHUP, for when the terminal disappears. On shutdown, many Linux
|
|
// distros send SIGHUP, SIGTERM, and then SIGKILL.
|
|
action.sa_handler = SIGHUPHandler;
|
|
CHECK_EQ(sigaction(SIGHUP, &action, nullptr), 0);
|
|
}
|
|
|
|
} // namespace electron
|