89117fdd99
* chore: bump chromium in DEPS to 118.0.5951.0 * chore: update printing.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4727894 No logic changes, but patch needed to be manually re-applied due to upstream code shear * chore: update port_autofill_colors_to_the_color_pipeline.patch No manual changes; patch applied with fuzz * chore: update patches * chore: bump chromium in DEPS to 118.0.5953.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5955.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5957.0 * chore: update patches * chore: include path of native_web_keyboard_event.h Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689 * chore: remove reference to eextensions/browser/notification-types.h Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4771627 * chore: update references to renamed upstream field NativeWebKeyboardEvent.skip_if_unhandled (formerly known as skip_in_browser Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4758689 Need a second pair of eyes on this commit. In particular the reference in content_converter.cc, skipInBrowser, seems to not be set or documented anywhere? Is this unused/vestigal code? * chore: sync signature of ElectronExtensionsBrowserClient::IsValidContext() to upstream change Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4784198 * chore: add auto_pip_setting_helper.[cc,h] to chromium_src build Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4688277 Exiting upstream code used by chromium_src now depends on this new upstream class * chore: bump chromium in DEPS to 118.0.5959.0 * chore: update add_maximized_parameter_to_linuxui_getwindowframeprovider.patch Xref: add_maximized_parameter_to_linuxui_getwindowframeprovider.patch manually adjust patch to minor upstream chagnes * chore: update patches * chore: bump chromium in DEPS to 118.0.5961.0 * chore: bump chromium in DEPS to 118.0.5963.0 * chore: update patches * 4780994: Rename various base files to "apple" since iOS uses them too https://chromium-review.googlesource.com/c/chromium/src/+/4780994 * Many files moved from `mac` -> `apple` This commit follows a handful of CLs that simply rename files/symbols to change `mac` to `apple` to signify their use across both macOS and iOS: - 4784010: Move scoped_nsautorelease_pool to base/apple, leave a forwarding header - 4790744: Move foundation_util to base/apple, leave a forwarding header - 4790741: Move scoped_cftypreref to base/apple, leave a forwarding header - 4787627: Move and rename macOS+iOS base/ files in PA to "apple" - 4780399: Move OSStatus logging to base/apple - 4787387: Remove forwarding headers - 4781113: Rename message_pump_mac to "apple" because iOS uses it too * fixup minor patch update error A function param got dropped from this patch somewhere earlier * chore: bump chromium in DEPS to 118.0.5965.2 * chore: update patches * 4799213: Move ScopedTypeRef and ScopedCFTypeRef into base:🍎: https://chromium-review.googlesource.com/c/chromium/src/+/4799213 * Fix removed include to BrowserContext In crrev.com/c/4767962 an include to BrowserContext was removed, which was necessary for compilation. This broke only for us because "chrome/browser/profiles/profile.h" includes that class, but we remove all references to profiles. * chore: bump chromium in DEPS to 118.0.5967.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5969.0 * chore: update patches * chore: bump chromium in DEPS to 118.0.5971.0 * chore: bump chromium in DEPS to 118.0.5973.0 * chore: update patches * 4772121: [OOPIF PDF] Replace PDFWebContentsHelper with PDFDocumentHelper https://chromium-review.googlesource.com/c/chromium/src/+/4772121 * 4811164: [Extensions] Do some cleanup in ChromeManagementAPIDelegate. https://chromium-review.googlesource.com/c/chromium/src/+/4811164 * 4809488: Remove duplicate dnd functionality between Web and Renderer prefs https://chromium-review.googlesource.com/c/chromium/src/+/4809488 Given that this is no longer an option of web preferences, we should consider deprecating this option and then removing it. * chore: bump chromium in DEPS to 118.0.5975.0 * chore: update patches * fixup! chore: add auto_pip_settings_helper.{cc|h} to chromium_src build * Reland "[windows] Remove RegKey::DeleteEmptyKey" Refs https://chromium-review.googlesource.com/c/chromium/src/+/4813255 * Ensure StrCat means StrCat Refs https://chromium-review.googlesource.com/c/chromium/src/+/1117180 * fixup! Remove RegKey::DeleteEmptyKey * Consistently reject large p and large q in DH Refs https://boringssl-review.googlesource.com/c/boringssl/+/62226 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: clavin <clavin@electronjs.org> Co-authored-by: deepak1556 <hop2deep@gmail.com>
92 lines
2.9 KiB
C++
92 lines
2.9 KiB
C++
// Copyright (c) 2016 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/browser/relauncher.h"
|
|
|
|
#include <sys/event.h>
|
|
#include <sys/time.h>
|
|
#include <sys/types.h>
|
|
#include <unistd.h>
|
|
|
|
#include "base/apple/osstatus_logging.h"
|
|
#include "base/files/file_util.h"
|
|
#include "base/logging.h"
|
|
#include "base/posix/eintr_wrapper.h"
|
|
#include "base/process/launch.h"
|
|
#include "base/strings/sys_string_conversions.h"
|
|
|
|
namespace relauncher::internal {
|
|
|
|
void RelauncherSynchronizeWithParent() {
|
|
base::ScopedFD relauncher_sync_fd(kRelauncherSyncFD);
|
|
|
|
int parent_pid = getppid();
|
|
|
|
// PID 1 identifies init. launchd, that is. launchd never starts the
|
|
// relauncher process directly, having this parent_pid means that the parent
|
|
// already exited and launchd "inherited" the relauncher as its child.
|
|
// There's no reason to synchronize with launchd.
|
|
if (parent_pid == 1) {
|
|
LOG(ERROR) << "unexpected parent_pid";
|
|
return;
|
|
}
|
|
|
|
// Set up a kqueue to monitor the parent process for exit.
|
|
base::ScopedFD kq(kqueue());
|
|
if (!kq.is_valid()) {
|
|
PLOG(ERROR) << "kqueue";
|
|
return;
|
|
}
|
|
|
|
struct kevent change = {0};
|
|
EV_SET(&change, parent_pid, EVFILT_PROC, EV_ADD, NOTE_EXIT, 0, NULL);
|
|
if (kevent(kq.get(), &change, 1, nullptr, 0, nullptr) == -1) {
|
|
PLOG(ERROR) << "kevent (add)";
|
|
return;
|
|
}
|
|
|
|
// Write a '\0' character to the pipe.
|
|
if (HANDLE_EINTR(write(relauncher_sync_fd.get(), "", 1)) != 1) {
|
|
PLOG(ERROR) << "write";
|
|
return;
|
|
}
|
|
|
|
// Up until now, the parent process was blocked in a read waiting for the
|
|
// write above to complete. The parent process is now free to exit. Wait for
|
|
// that to happen.
|
|
struct kevent event;
|
|
int events = kevent(kq.get(), nullptr, 0, &event, 1, nullptr);
|
|
if (events != 1) {
|
|
if (events < 0) {
|
|
PLOG(ERROR) << "kevent (monitor)";
|
|
} else {
|
|
LOG(ERROR) << "kevent (monitor): unexpected result " << events;
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (event.filter != EVFILT_PROC || event.fflags != NOTE_EXIT ||
|
|
event.ident != static_cast<uintptr_t>(parent_pid)) {
|
|
LOG(ERROR) << "kevent (monitor): unexpected event, filter " << event.filter
|
|
<< ", fflags " << event.fflags << ", ident " << event.ident;
|
|
return;
|
|
}
|
|
}
|
|
|
|
int LaunchProgram(const StringVector& relauncher_args,
|
|
const StringVector& argv) {
|
|
// Redirect the stdout of child process to /dev/null, otherwise after
|
|
// relaunch the child process will raise exception when writing to stdout.
|
|
base::ScopedFD devnull(HANDLE_EINTR(open("/dev/null", O_WRONLY)));
|
|
|
|
base::LaunchOptions options;
|
|
options.new_process_group = true; // detach
|
|
options.fds_to_remap.emplace_back(devnull.get(), STDERR_FILENO);
|
|
options.fds_to_remap.emplace_back(devnull.get(), STDOUT_FILENO);
|
|
|
|
base::Process process = base::LaunchProcess(argv, options);
|
|
return process.IsValid() ? 0 : 1;
|
|
}
|
|
|
|
} // namespace relauncher::internal
|