mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-19 00:13:33 +00:00
devel/electron26: add port: Build cross-platform desktop apps with JavaScript, HTML, and CSS
Build cross platform desktop apps with JavaScript, HTML, and CSS. It's easier than you think. If you can build a website, you can build a desktop app. Electron is a framework for creating native applications with web technologies like JavaScript, HTML, and CSS. It takes care of the hard parts so you can focus on the core of your application. WWW: https://electronjs.org/
This commit is contained in:
parent
6e968aff79
commit
9ad5184453
@ -604,6 +604,7 @@
|
||||
SUBDIR += electron22
|
||||
SUBDIR += electron24
|
||||
SUBDIR += electron25
|
||||
SUBDIR += electron26
|
||||
SUBDIR += elf
|
||||
SUBDIR += elf-dissector
|
||||
SUBDIR += elfcat
|
||||
|
436
devel/electron26/Makefile
Normal file
436
devel/electron26/Makefile
Normal file
@ -0,0 +1,436 @@
|
||||
PORTNAME= electron
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= ${ELECTRON_VER:S/-beta./.b/}
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/:chromium \
|
||||
https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
|
||||
PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
|
||||
DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
|
||||
${CHROMIUM_TEST_FONTS_HASH}:chromium_testfonts \
|
||||
electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX}:prefetch
|
||||
DIST_SUBDIR= ${PORTNAME}
|
||||
|
||||
MAINTAINER= tagattie@FreeBSD.org
|
||||
COMMENT= Build cross-platform desktop apps with JavaScript, HTML, and CSS
|
||||
WWW= https://electronjs.org/
|
||||
|
||||
LICENSE= BSD3CLAUSE LGPL21 MPL11 MIT
|
||||
LICENSE_COMB= multi
|
||||
LICENSE_FILE= ${WRKSRC}/electron/LICENSE
|
||||
|
||||
ONLY_FOR_ARCHS= aarch64 amd64 i386
|
||||
|
||||
FETCH_DEPENDS= yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX}
|
||||
EXTRACT_DEPENDS=yarn${NODEJS_SUFFIX}>0:www/yarn${NODEJS_SUFFIX}
|
||||
PATCH_DEPENDS= git:devel/git
|
||||
BUILD_DEPENDS= gperf:devel/gperf \
|
||||
yasm:devel/yasm \
|
||||
${LOCALBASE}/libdata/pkgconfig/dri.pc:graphics/mesa-dri \
|
||||
${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
|
||||
node${NODEJS_VERSION}>0:www/node${NODEJS_VERSION} \
|
||||
npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
|
||||
LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \
|
||||
libatspi.so:accessibility/at-spi2-core \
|
||||
libsnappy.so:archivers/snappy \
|
||||
libFLAC.so:audio/flac \
|
||||
libopus.so:audio/opus \
|
||||
libdbus-1.so:devel/dbus \
|
||||
libicuuc.so:devel/icu \
|
||||
libepoll-shim.so:devel/libepoll-shim \
|
||||
libevent.so:devel/libevent \
|
||||
libffi.so:devel/libffi \
|
||||
libnotify.so:devel/libnotify \
|
||||
libpci.so:devel/libpci \
|
||||
libnspr4.so:devel/nspr \
|
||||
libre2.so:devel/re2 \
|
||||
libdrm.so:graphics/libdrm \
|
||||
libpng.so:graphics/png \
|
||||
libwayland-client.so:graphics/wayland \
|
||||
libwebp.so:graphics/webp \
|
||||
libdav1d.so:multimedia/dav1d \
|
||||
libva.so:multimedia/libva \
|
||||
libopenh264.so:multimedia/openh264 \
|
||||
libfreetype.so:print/freetype2 \
|
||||
libharfbuzz.so:print/harfbuzz \
|
||||
libsecret-1.so:security/libsecret \
|
||||
libnss3.so:security/nss \
|
||||
libexpat.so:textproc/expat2 \
|
||||
libxkbcommon.so:x11/libxkbcommon \
|
||||
libxshmfence.so:x11/libxshmfence \
|
||||
libfontconfig.so:x11-fonts/fontconfig
|
||||
RUN_DEPENDS= xdg-open:devel/xdg-utils
|
||||
TEST_DEPENDS= git:devel/git \
|
||||
${PYTHON_PKGNAMEPREFIX}python-dbusmock>0:devel/py-python-dbusmock@${PY_FLAVOR} \
|
||||
npm${NODEJS_SUFFIX}>0:www/npm${NODEJS_SUFFIX}
|
||||
|
||||
USES= bison compiler:c++17-lang cpe gettext-tools gl gmake gnome \
|
||||
iconv:wchar_t jpeg localbase:ldflags ninja nodejs:18,build \
|
||||
pkgconfig python:build,test shebangfix tar:xz xorg
|
||||
|
||||
CPE_VENDOR= electronjs
|
||||
USE_GITHUB= yes
|
||||
GH_TAGNAME= ${DISTVERSIONPREFIX}${ELECTRON_VER}
|
||||
GH_TUPLE= nodejs:node:v${NODE_VER}:node \
|
||||
nodejs:nan:${NAN_VER}:nan \
|
||||
Squirrel:Squirrel.Mac:${SQUIRREL_MAC_VER}:squirrel_mac \
|
||||
ReactiveCocoa:ReactiveObjC:${REACTIVEOBJC_VER}:reactiveobjc \
|
||||
Mantle:Mantle:${MANTLE_VER}:mantle
|
||||
USE_GL= gbm gl glesv2
|
||||
USE_GNOME= atk cairo gdkpixbuf2 gtk30 libxml2 libxslt pango
|
||||
USE_LDCONFIG= ${DATADIR}
|
||||
USE_XORG= x11 xcb xcomposite xcursor xdamage xext xfixes xi xrandr \
|
||||
xrender xscrnsaver xtst
|
||||
|
||||
SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper buildtools/linux64/clang-format
|
||||
|
||||
MAKE_ARGS= -C out/${BUILDTYPE}
|
||||
MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \
|
||||
CPLUS_INCLUDE_PATH=${LOCALBASE}/include
|
||||
ALL_TARGET= electron third_party/electron_node:headers
|
||||
POST_BUILD_TARGETS= licenses version
|
||||
POST_BUILD_DIST_TARGETS=electron_dist_zip electron_chromedriver_zip \
|
||||
electron_mksnapshot_zip
|
||||
|
||||
DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
|
||||
BINARY_ALIAS= python3=${PYTHON_CMD}
|
||||
|
||||
NO_WRKSUBDIR= yes
|
||||
WRKSRC_SUBDIR= src
|
||||
|
||||
GN_ARGS+= clang_use_chrome_plugins=false \
|
||||
enable_backup_ref_ptr_support=false \
|
||||
enable_hangout_services_extension=true \
|
||||
enable_nacl=false \
|
||||
enable_remoting=false \
|
||||
enable_rust=false \
|
||||
fatal_linker_warnings=false \
|
||||
icu_use_data_file=false \
|
||||
is_clang=true \
|
||||
optimize_webui=true \
|
||||
toolkit_views=true \
|
||||
treat_warnings_as_errors=false \
|
||||
use_allocator_shim=false \
|
||||
use_aura=true \
|
||||
use_custom_libcxx=false \
|
||||
use_lld=true \
|
||||
use_partition_alloc=true \
|
||||
use_partition_alloc_as_malloc=false \
|
||||
use_sysroot=false \
|
||||
use_system_freetype=false \
|
||||
use_system_harfbuzz=true \
|
||||
use_system_libffi=true \
|
||||
use_system_libjpeg=true \
|
||||
use_udev=false \
|
||||
chrome_pgo_phase=0 \
|
||||
extra_cflags="${CFLAGS}" \
|
||||
extra_cxxflags="${CXXFLAGS}" \
|
||||
extra_ldflags="${LDFLAGS}" \
|
||||
ffmpeg_branding="${FFMPEG_BRAND}"
|
||||
|
||||
# TODO: investigate building with these options:
|
||||
# use_system_minigbm
|
||||
GN_BOOTSTRAP_FLAGS= --no-clean --no-rebuild --skip-generate-buildfiles
|
||||
|
||||
PLIST_SUB= ELECTRON_VER=${ELECTRON_VER} \
|
||||
ELECTRON_VER_MAJOR=${ELECTRON_VER_MAJOR}
|
||||
|
||||
OPTIONS_DEFINE= CODECS CUPS DEBUG DIST DRIVER KERBEROS LTO PIPEWIRE
|
||||
OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS PIPEWIRE SNDIO
|
||||
OPTIONS_EXCLUDE_aarch64=LTO
|
||||
OPTIONS_GROUP= AUDIO
|
||||
OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO SNDIO
|
||||
OPTIONS_RADIO= KERBEROS
|
||||
OPTIONS_RADIO_KERBEROS= HEIMDAL HEIMDAL_BASE MIT
|
||||
OPTIONS_SUB= yes
|
||||
CODECS_DESC= Compile and enable patented codecs like H.264
|
||||
DIST_DESC= Build distribution zip files
|
||||
DRIVER_DESC= Install chromedriver
|
||||
HEIMDAL_BASE_DESC= Heimdal Kerberos (base)
|
||||
HEIMDAL_DESC= Heimdal Kerberos (security/heimdal)
|
||||
MIT_DESC= MIT Kerberos (security/krb5)
|
||||
PIPEWIRE_DESC= Screen capture via PipeWire
|
||||
|
||||
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
|
||||
ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
|
||||
alsa-lib>=1.1.1_1:audio/alsa-lib
|
||||
ALSA_VARS= GN_ARGS+=use_alsa=true
|
||||
ALSA_VARS_OFF= GN_ARGS+=use_alsa=false
|
||||
|
||||
CODECS_VARS= GN_ARGS+=proprietary_codecs=true \
|
||||
FFMPEG_BRAND="Chrome"
|
||||
CODECS_VARS_OFF= GN_ARGS+=proprietary_codecs=false \
|
||||
FFMPEG_BRAND="Chromium"
|
||||
|
||||
CUPS_LIB_DEPENDS= libcups.so:print/cups
|
||||
CUPS_VARS= GN_ARGS+=use_cups=true
|
||||
CUPS_VARS_OFF= GN_ARGS+=use_cups=false
|
||||
|
||||
DEBUG_BUILD_DEPENDS= esbuild:devel/esbuild
|
||||
DEBUG_VARS= BUILDTYPE=Debug \
|
||||
GN_FILE=testing.gn \
|
||||
GN_ARGS+=is_debug=true \
|
||||
GN_ARGS+=is_component_build=false \
|
||||
GN_ARGS+=symbol_level=1 \
|
||||
GN_BOOTSTRAP_FLAGS+=--debug \
|
||||
WANTSPACE="21 GB"
|
||||
DEBUG_VARS_OFF= BUILDTYPE=Release \
|
||||
GN_FILE=release.gn \
|
||||
GN_ARGS+=blink_symbol_level=0 \
|
||||
GN_ARGS+=is_debug=false \
|
||||
GN_ARGS+=is_official_build=true \
|
||||
GN_ARGS+=symbol_level=0 \
|
||||
WANTSPACE="14 GB"
|
||||
|
||||
DIST_IMPLIES= DRIVER
|
||||
DRIVER_MAKE_ARGS= chromedriver
|
||||
|
||||
HEIMDAL_LIB_DEPENDS= libkrb.so.26:security/heimdal
|
||||
KERBEROS_VARS= GN_ARGS+=use_kerberos=true
|
||||
KERBEROS_VARS_OFF= GN_ARGS+=use_kerberos=false
|
||||
|
||||
LTO_VARS= GN_ARGS+=use_thin_lto=true \
|
||||
GN_ARGS+=thin_lto_enable_optimizations=true \
|
||||
WANTSPACE="14 GB"
|
||||
LTO_VARS_OFF= GN_ARGS+=use_thin_lto=false
|
||||
|
||||
MIT_LIB_DEPENDS= libkrb.so.3:security/krb5
|
||||
|
||||
PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire
|
||||
PIPEWIRE_VARS= GN_ARGS+=rtc_use_pipewire=true \
|
||||
GN_ARGS+=rtc_link_pipewire=true
|
||||
PIPEWIRE_VARS_OFF= GN_ARGS+=rtc_use_pipewire=false \
|
||||
GN_ARGS+=rtc_link_pipewire=false
|
||||
|
||||
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
|
||||
PULSEAUDIO_VARS= GN_ARGS+=use_pulseaudio=true
|
||||
PULSEAUDIO_VARS_OFF= GN_ARGS+=use_pulseaudio=false
|
||||
|
||||
# With SNDIO=on we exclude audio_manager_linux from the build (see
|
||||
# media/audio/BUILD.gn) and use audio_manager_openbsd which does not
|
||||
# support falling back to ALSA or PulseAudio.
|
||||
SNDIO_PREVENTS= ALSA PULSEAUDIO
|
||||
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
|
||||
SNDIO_VARS= GN_ARGS+=use_sndio=true
|
||||
SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
|
||||
|
||||
# See ${WRKSRC}/electron/DEPS for CHROMIUM_VER
|
||||
CHROMIUM_VER= 116.0.5845.190
|
||||
# See ${WRKSRC}/third_party/test_fonts/test_fonts.tar.gz.sha1 for CHROMIUM_TEST_FONTS_HASH
|
||||
CHROMIUM_TEST_FONTS_HASH= 336e775eec536b2d785cc80eff6ac39051931286
|
||||
# See ${WRKSRC}/electron/DEPS for NODE_VER
|
||||
NODE_VER= 18.16.1
|
||||
# See ${WRKSRC}/electron/DEPS for NAN_VER
|
||||
NAN_VER= 16fa32231e2ccd89d2804b3f765319128b20c4ac
|
||||
# See ${WRKSRC}/electron/DEPS for SQUIRREL_MAC_VER
|
||||
SQUIRREL_MAC_VER= 0e5d146ba13101a1302d59ea6e6e0b3cace4ae38
|
||||
# See ${WRKSRC}/electron/DEPS for REACTIVEOBJC_VER
|
||||
REACTIVEOBJC_VER= 74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76
|
||||
# See ${WRKSRC}/electron/DEPS for MANTLE_VER
|
||||
MANTLE_VER= 78d3966b3c331292ea29ec38661b25df0a245948
|
||||
|
||||
YARN_TIMESTAMP= 1696290438
|
||||
|
||||
.include "Makefile.version"
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if ${PORT_OPTIONS:MHEIMDAL_BASE} && !exists(/usr/lib/libkrb5.so)
|
||||
IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base
|
||||
.endif
|
||||
|
||||
.if ${COMPILER_VERSION} < 160
|
||||
LLVM_DEFAULT= 16
|
||||
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
|
||||
BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
|
||||
cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
|
||||
c++=${LOCALBASE}/bin/clang++${LLVM_DEFAULT} \
|
||||
ar=${LOCALBASE}/bin/llvm-ar${LLVM_DEFAULT} \
|
||||
nm=${LOCALBASE}/bin/llvm-nm${LLVM_DEFAULT} \
|
||||
ld=${LOCALBASE}/bin/ld.lld${LLVM_DEFAULT}
|
||||
.else
|
||||
BINARY_ALIAS+= ar=/usr/bin/llvm-ar \
|
||||
nm=/usr/bin/llvm-nm
|
||||
.endif
|
||||
CFLAGS+= -Wno-error=implicit-function-declaration
|
||||
|
||||
.if ${ARCH} == "aarch64"
|
||||
PLIST_SUB+= AARCH64="" \
|
||||
AMD64="@comment " \
|
||||
I386="@comment " \
|
||||
NOT_AARCH64="@comment "
|
||||
FFMPEG_TARGET= arm64
|
||||
.elif ${ARCH} == "amd64"
|
||||
BUILD_DEPENDS+= nasm:devel/nasm
|
||||
PLIST_SUB+= AARCH64="@comment " \
|
||||
AMD64="" \
|
||||
I386="@comment " \
|
||||
NOT_AARCH64=""
|
||||
FFMPEG_TARGET= x64
|
||||
.elif ${ARCH} == "i386"
|
||||
BUILD_DEPENDS+= nasm:devel/nasm
|
||||
PLIST_SUB+= AARCH64="@comment " \
|
||||
AMD64="@comment " \
|
||||
I386="" \
|
||||
NOT_AARCH64=""
|
||||
FFMPEG_TARGET= ia32
|
||||
.endif
|
||||
|
||||
FFMPEG_BDIR= ${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
|
||||
FFMPEG_CDIR= ${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
|
||||
|
||||
# Allow relocations against read-only segments (override lld default)
|
||||
LDFLAGS_i386= -Wl,-znotext
|
||||
|
||||
# TODO: -isystem, would be just as ugly as this approach, but more reliably
|
||||
# build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set.
|
||||
MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \
|
||||
CPLUS_INCLUDE_PATH=${LOCALBASE}/include
|
||||
|
||||
pre-everything::
|
||||
@${ECHO_MSG}
|
||||
@${ECHO_MSG} "To build electron, you should have around 2GB of memory"
|
||||
@${ECHO_MSG} "and around ${WANTSPACE} of free disk space."
|
||||
@${ECHO_MSG}
|
||||
|
||||
pre-fetch:
|
||||
@${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
|
||||
if [ ! -f ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} ]; \
|
||||
then ${MKDIR} ${WRKDIR}; \
|
||||
${ECHO_CMD} 'yarn-offline-mirror "./yarn-offline-cache"' >> \
|
||||
${WRKDIR}/.yarnrc; \
|
||||
${CP} ${FILESDIR}/package.json ${FILESDIR}/yarn.lock ${WRKDIR}; \
|
||||
cd ${WRKDIR} && ${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache \
|
||||
yarn --frozen-lockfile --ignore-scripts; \
|
||||
${MTREE_CMD} -cbnSp yarn-offline-cache | ${MTREE_CMD} -C | ${SED} \
|
||||
-e 's:time=[0-9.]*:time=${YARN_TIMESTAMP}.000000000:' \
|
||||
-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
|
||||
-e 's:mode=\([0-9]\)7[0-9][0-9]:mode=\1755:' \
|
||||
-e 's:mode=\([0-9]\)6[0-9][0-9]:mode=\1644:' \
|
||||
-e 's:flags=.*:flags=none:' \
|
||||
-e 's:^\.:./yarn-offline-cache:' > yarn-offline-cache.mtree; \
|
||||
${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/electron-yarn-cache-${ELECTRON_VER}${EXTRACT_SUFX} \
|
||||
@yarn-offline-cache.mtree; \
|
||||
${RM} -r ${WRKDIR}; \
|
||||
fi
|
||||
|
||||
post-extract:
|
||||
# Move extracted sources to appropriate locations
|
||||
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/chromium-${CHROMIUM_VER} ${WRKSRC}
|
||||
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${PORTNAME}-${ELECTRON_VER} ${WRKSRC}/electron
|
||||
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_nan}-${NAN_VER} \
|
||||
${WRKSRC}/third_party/nan
|
||||
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_node}-${NODE_VER} \
|
||||
${WRKSRC}/third_party/electron_node
|
||||
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_squirrel_mac}-${SQUIRREL_MAC_VER} \
|
||||
${WRKSRC}/third_party/squirrel.mac
|
||||
${MKDIR} ${WRKSRC}/third_party/squirrel.mac/vendor
|
||||
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_reactiveobjc}-${REACTIVEOBJC_VER} \
|
||||
${WRKSRC}/third_party/squirrel.mac/vendor/ReactiveObjC
|
||||
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/${GH_PROJECT_mantle}-${MANTLE_VER} \
|
||||
${WRKSRC}/third_party/squirrel.mac/vendor/Mantle
|
||||
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/test_fonts ${WRKSRC}/third_party/test_fonts
|
||||
# Install node modules for electron
|
||||
${MV} ${WRKDIR}/${PORTNAME}-${ELECTRON_VER}/yarn-offline-cache ${WRKDIR}
|
||||
${ECHO_CMD} 'yarn-offline-mirror "../../../yarn-offline-cache"' >> ${WRKSRC}/electron/.yarnrc
|
||||
${MV} ${WRKSRC}/electron/package.json ${WRKSRC}/electron/package.json.bak
|
||||
${CP} ${FILESDIR}/package.json ${WRKSRC}/electron
|
||||
cd ${WRKSRC}/electron && \
|
||||
${SETENV} HOME=${WRKDIR} XDG_CACHE_HOME=${WRKDIR}/.cache yarn --frozen-lockfile --offline
|
||||
|
||||
pre-patch:
|
||||
${SH} ${FILESDIR}/apply-electron-patches.sh ${WRKSRC}
|
||||
# ${FIND} ${WRKSRC} -type f -name '*.orig' -print -delete
|
||||
# ${FIND} ${WRKSRC} -type f -name '*~' -print -delete
|
||||
|
||||
pre-configure:
|
||||
# We used to remove bundled libraries to be sure that chromium uses
|
||||
# system libraries and not shipped ones.
|
||||
# cd ${WRKSRC} && ${PYTHON_CMD} \
|
||||
#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
|
||||
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
|
||||
./build/linux/unbundle/replace_gn_files.py --system-libraries \
|
||||
dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent \
|
||||
libpng libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
|
||||
# Chromium uses an unreleased version of FFmpeg, so configure it
|
||||
cd ${WRKSRC}/third_party/ffmpeg && \
|
||||
${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
|
||||
--config-only --branding=${FFMPEG_BRAND}
|
||||
cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
|
||||
${MKDIR} ${FFMPEG_CDIR}
|
||||
.for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
|
||||
-${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
|
||||
.endfor
|
||||
|
||||
do-configure:
|
||||
# GN generator bootstrapping and generating ninja files
|
||||
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
|
||||
READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
|
||||
./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
|
||||
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn gen out/${BUILDTYPE} \
|
||||
--args='import("//electron/build/args/${GN_FILE}") ${GN_ARGS}'
|
||||
|
||||
# Setup nodejs dependency
|
||||
@${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin
|
||||
${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd/bin/node
|
||||
|
||||
# Setup buildtools/freebsd
|
||||
@${MKDIR} ${WRKSRC}/buildtools/freebsd
|
||||
${LN} -sf ${WRKSRC}/buildtools/linux64/clang-format ${WRKSRC}/buildtools/freebsd
|
||||
${LN} -sf ${WRKSRC}/out/${BUILDTYPE}/gn ${WRKSRC}/buildtools/freebsd
|
||||
${LN} -sf /usr/bin/strip ${WRKSRC}/buildtools/freebsd/strip
|
||||
|
||||
post-build:
|
||||
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
|
||||
${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_TARGETS}
|
||||
|
||||
post-build-DIST-on:
|
||||
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
|
||||
${MAKE_CMD} ${MAKE_ARGS} ${POST_BUILD_DIST_TARGETS}
|
||||
cd ${WRKSRC}/out/${BUILDTYPE} && \
|
||||
${CP} chromedriver.zip chromedriver-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
|
||||
${CP} dist.zip electron-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
|
||||
${CP} mksnapshot.zip mksnapshot-v${ELECTRON_VER}-freebsd-${ARCH:S/amd64/x64/:S/i386/ia32/}.zip && \
|
||||
${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | ${SED} -e 's/ / */' > SHASUMS256.txt
|
||||
|
||||
do-install:
|
||||
${MKDIR} ${STAGEDIR}${DATADIR}
|
||||
.for f in electron mksnapshot v8_context_snapshot_generator
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
|
||||
.endfor
|
||||
.for f in libEGL.so libGLESv2.so libffmpeg.so libvk_swiftshader.so
|
||||
${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
|
||||
.endfor
|
||||
${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvulkan.so.1 ${STAGEDIR}${DATADIR}/libvulkan.so
|
||||
.for f in LICENSE LICENSES.chromium.html snapshot_blob.bin v8_context_snapshot.bin version vk_swiftshader_icd.json
|
||||
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
|
||||
.endfor
|
||||
.for f in chrome_100_percent.pak chrome_200_percent.pak resources.pak
|
||||
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
|
||||
.endfor
|
||||
${MKDIR} ${STAGEDIR}${DATADIR}/locales
|
||||
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/locales/*.pak ${STAGEDIR}${DATADIR}/locales
|
||||
${MKDIR} ${STAGEDIR}${DATADIR}/resources
|
||||
.for f in default_app.asar
|
||||
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/resources/${f} ${STAGEDIR}${DATADIR}/resources
|
||||
.endfor
|
||||
cd ${WRKSRC}/out/${BUILDTYPE}/gen && ${COPYTREE_SHARE} node_headers ${STAGEDIR}${DATADIR}
|
||||
cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/electron/buildflags ${STAGEDIR}${DATADIR}
|
||||
cd ${WRKSRC}/out/${BUILDTYPE} && ${COPYTREE_SHARE} gen/v8/embedded.S ${STAGEDIR}${DATADIR}
|
||||
${RLN} ${STAGEDIR}${DATADIR}/electron ${STAGEDIR}${PREFIX}/bin/electron${PKGNAMESUFFIX}
|
||||
|
||||
post-install-DIST-on:
|
||||
${MKDIR} ${STAGEDIR}${DATADIR}/releases
|
||||
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/SHASUMS256.txt ${STAGEDIR}${DATADIR}/releases
|
||||
${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*-v${ELECTRON_VER}-freebsd-*.zip ${STAGEDIR}${DATADIR}/releases
|
||||
|
||||
post-install-DRIVER-on:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver.unstripped \
|
||||
${STAGEDIR}${DATADIR}/chromedriver
|
||||
|
||||
do-test:
|
||||
# Note 1: "npm install" will run before actual tests are executed
|
||||
# Note 2: Xvfb or something similar is necessary for headless testing
|
||||
cd ${WRKSRC}/electron && \
|
||||
${SETENV} ${TEST_ENV} ELECTRON_OUT_DIR=${BUILDTYPE} LOCAL_GIT_DIRECTORY=${LOCALBASE} \
|
||||
npm run test -- --ci
|
||||
|
||||
.include <bsd.port.post.mk>
|
2
devel/electron26/Makefile.version
Normal file
2
devel/electron26/Makefile.version
Normal file
@ -0,0 +1,2 @@
|
||||
ELECTRON_VER= 26.2.4
|
||||
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
|
19
devel/electron26/distinfo
Normal file
19
devel/electron26/distinfo
Normal file
@ -0,0 +1,19 @@
|
||||
TIMESTAMP = 1696291042
|
||||
SHA256 (electron/chromium-116.0.5845.190.tar.xz) = c92cca7e5e7bd031e48540d0774f363533eafb2528d95341d5708f20376061fa
|
||||
SIZE (electron/chromium-116.0.5845.190.tar.xz) = 1599750240
|
||||
SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
|
||||
SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
|
||||
SHA256 (electron/electron-yarn-cache-26.2.4.tar.xz) = fdffb0aa1d3052b170284c3b139fd8c60b94c078d321004e98d6b5c09ae515b2
|
||||
SIZE (electron/electron-yarn-cache-26.2.4.tar.xz) = 32344588
|
||||
SHA256 (electron/electron-electron-v26.2.4_GH0.tar.gz) = 918e3748d39e0bba12fcb44a99f703a4339485ca94c78b00e36118e953922778
|
||||
SIZE (electron/electron-electron-v26.2.4_GH0.tar.gz) = 11298804
|
||||
SHA256 (electron/nodejs-node-v18.16.1_GH0.tar.gz) = 750b09907a0b7054bda042bfc26879b9ccb84f9f436182a820ea188b654ce77b
|
||||
SIZE (electron/nodejs-node-v18.16.1_GH0.tar.gz) = 112039326
|
||||
SHA256 (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 3807ae6a1e451a29f068540472f100f9718d457c60ac62f2f8469d1d57475d39
|
||||
SIZE (electron/nodejs-nan-16fa32231e2ccd89d2804b3f765319128b20c4ac_GH0.tar.gz) = 179355
|
||||
SHA256 (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = f4ebb40a8d85dbb7ef02aa0571b2f8e22182c6d73b6992484a53c90047779d01
|
||||
SIZE (electron/Squirrel-Squirrel.Mac-0e5d146ba13101a1302d59ea6e6e0b3cace4ae38_GH0.tar.gz) = 2112918
|
||||
SHA256 (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 88e65f116c7a06fccedb43970fba63080a57a4e5dc29147d2cdfe1ee58dd0546
|
||||
SIZE (electron/ReactiveCocoa-ReactiveObjC-74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76_GH0.tar.gz) = 1136238
|
||||
SHA256 (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = a365df6d83e0be3cc000b70bd39734d80c28f0d9983ebe44698337a2ca464bb1
|
||||
SIZE (electron/Mantle-Mantle-78d3966b3c331292ea29ec38661b25df0a245948_GH0.tar.gz) = 62962
|
26
devel/electron26/files/apply-electron-patches.sh
Normal file
26
devel/electron26/files/apply-electron-patches.sh
Normal file
@ -0,0 +1,26 @@
|
||||
#! /bin/sh
|
||||
|
||||
PATH=/bin:/usr/bin:/usr/local/bin
|
||||
|
||||
GIT_CMD="git"
|
||||
PATCH_CMD="${GIT_CMD} apply"
|
||||
#PATCH_FLAGS="--numstat --check" # for debugging
|
||||
PATCH_FLAGS="--verbose --reject"
|
||||
|
||||
WRKSRC=$1
|
||||
PATCH_CONF=${WRKSRC}/electron/patches/config.json
|
||||
|
||||
${GIT_CMD} status "${WRKSRC}" > /dev/null 2>&1 && IS_GIT_REPO=1
|
||||
|
||||
PATCHD_REPOD_PAIRS=$(sed -e '1d; $d; /^$/d; s/[",]//g; s/: */:/' "${PATCH_CONF}")
|
||||
for prp in ${PATCHD_REPOD_PAIRS}; do
|
||||
pd=$(echo "${prp}" | awk -F: '{print $1}' | sed -e 's/src/./')
|
||||
rd=$(echo "${prp}" | awk -F: '{print $2}' | sed -e 's/src/./')
|
||||
(cd "${WRKSRC}/${rd}" && \
|
||||
if [ -n "${IS_GIT_REPO}" ]; then
|
||||
PATCH_FLAGS="${PATCH_FLAGS} --directory=$(${GIT_CMD} rev-parse --show-prefix)"
|
||||
fi && \
|
||||
while read -r p; do
|
||||
${PATCH_CMD} ${PATCH_FLAGS} "${WRKSRC}/${pd}/${p}"
|
||||
done < "${WRKSRC}/${pd}/.patches")
|
||||
done
|
155
devel/electron26/files/package.json
Normal file
155
devel/electron26/files/package.json
Normal file
@ -0,0 +1,155 @@
|
||||
{
|
||||
"name": "electron",
|
||||
"version": "0.0.0-development",
|
||||
"repository": "https://github.com/electron/electron",
|
||||
"description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
|
||||
"devDependencies": {
|
||||
"@azure/storage-blob": "^12.9.0",
|
||||
"@electron/asar": "^3.2.1",
|
||||
"@electron/docs-parser": "^1.1.1",
|
||||
"@electron/fiddle-core": "^1.0.4",
|
||||
"@electron/github-app-auth": "^2.0.0",
|
||||
"@electron/lint-roller": "^1.5.0",
|
||||
"@electron/typescript-definitions": "^8.14.5",
|
||||
"@octokit/rest": "^19.0.7",
|
||||
"@primer/octicons": "^10.0.0",
|
||||
"@types/basic-auth": "^1.1.3",
|
||||
"@types/busboy": "^1.5.0",
|
||||
"@types/chai": "^4.2.12",
|
||||
"@types/chai-as-promised": "^7.1.3",
|
||||
"@types/dirty-chai": "^2.0.2",
|
||||
"@types/express": "^4.17.13",
|
||||
"@types/fs-extra": "^9.0.1",
|
||||
"@types/klaw": "^3.0.1",
|
||||
"@types/minimist": "^1.2.0",
|
||||
"@types/mocha": "^7.0.2",
|
||||
"@types/node": "^18.11.18",
|
||||
"@types/semver": "^7.3.3",
|
||||
"@types/send": "^0.14.5",
|
||||
"@types/split": "^1.0.0",
|
||||
"@types/stream-json": "^1.5.1",
|
||||
"@types/temp": "^0.8.34",
|
||||
"@types/uuid": "^3.4.6",
|
||||
"@types/w3c-web-serial": "^1.0.3",
|
||||
"@types/webpack": "^5.28.0",
|
||||
"@types/webpack-env": "^1.17.0",
|
||||
"@typescript-eslint/eslint-plugin": "^5.59.7",
|
||||
"@typescript-eslint/parser": "^5.59.7",
|
||||
"buffer": "^6.0.3",
|
||||
"check-for-leaks": "^1.2.1",
|
||||
"colors": "1.4.0",
|
||||
"dotenv-safe": "^4.0.4",
|
||||
"dugite": "^2.3.0",
|
||||
"eslint": "^8.41.0",
|
||||
"eslint-config-standard": "^14.1.1",
|
||||
"eslint-plugin-import": "^2.26.0",
|
||||
"eslint-plugin-mocha": "^7.0.1",
|
||||
"eslint-plugin-node": "^11.1.0",
|
||||
"eslint-plugin-promise": "^4.2.1",
|
||||
"eslint-plugin-standard": "^4.0.1",
|
||||
"events": "^3.2.0",
|
||||
"express": "^4.16.4",
|
||||
"folder-hash": "^2.1.1",
|
||||
"fs-extra": "^9.0.1",
|
||||
"got": "^11.8.5",
|
||||
"husky": "^8.0.1",
|
||||
"klaw": "^3.0.0",
|
||||
"lint": "^1.1.2",
|
||||
"lint-staged": "^10.2.11",
|
||||
"minimist": "^1.2.6",
|
||||
"null-loader": "^4.0.0",
|
||||
"pre-flight": "^1.1.0",
|
||||
"process": "^0.11.10",
|
||||
"remark-cli": "^10.0.0",
|
||||
"remark-preset-lint-markdown-style-guide": "^4.0.0",
|
||||
"semver": "^5.6.0",
|
||||
"shx": "^0.3.2",
|
||||
"stream-json": "^1.7.1",
|
||||
"tap-xunit": "^2.4.1",
|
||||
"temp": "^0.8.3",
|
||||
"timers-browserify": "1.4.2",
|
||||
"ts-loader": "^8.0.2",
|
||||
"ts-node": "6.2.0",
|
||||
"typescript": "^4.5.5",
|
||||
"url": "^0.11.0",
|
||||
"webpack": "^5.76.0",
|
||||
"webpack-cli": "^4.10.0",
|
||||
"wrapper-webpack-plugin": "^2.2.0"
|
||||
},
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"asar": "asar",
|
||||
"generate-version-json": "node script/generate-version-json.js",
|
||||
"lint": "node ./script/lint.js && npm run lint:docs",
|
||||
"lint:js": "node ./script/lint.js --js",
|
||||
"lint:clang-format": "python3 script/run-clang-format.py -r -c shell/ || (echo \"\\nCode not formatted correctly.\" && exit 1)",
|
||||
"lint:clang-tidy": "ts-node ./script/run-clang-tidy.ts",
|
||||
"lint:cpp": "node ./script/lint.js --cc",
|
||||
"lint:objc": "node ./script/lint.js --objc",
|
||||
"lint:py": "node ./script/lint.js --py",
|
||||
"lint:gn": "node ./script/lint.js --gn",
|
||||
"lint:docs": "remark docs -qf && npm run lint:js-in-markdown && npm run create-typescript-definitions && npm run lint:ts-check-js-in-markdown && npm run lint:docs-fiddles && npm run lint:docs-relative-links && npm run lint:markdownlint",
|
||||
"lint:docs-fiddles": "standard \"docs/fiddles/**/*.js\"",
|
||||
"lint:docs-relative-links": "electron-lint-markdown-links --root docs \"**/*.md\"",
|
||||
"lint:markdownlint": "electron-markdownlint \"*.md\" \"docs/**/*.md\"",
|
||||
"lint:ts-check-js-in-markdown": "electron-lint-markdown-ts-check --root docs \"**/*.md\" --ignore \"breaking-changes.md\"",
|
||||
"lint:js-in-markdown": "electron-lint-markdown-standard --root docs \"**/*.md\"",
|
||||
"create-api-json": "node script/create-api-json.js",
|
||||
"create-typescript-definitions": "npm run create-api-json && electron-typescript-definitions --api=electron-api.json && node spec/ts-smoke/runner.js",
|
||||
"gn-typescript-definitions": "npm run create-typescript-definitions && shx cp electron.d.ts",
|
||||
"pre-flight": "pre-flight",
|
||||
"gn-check": "node ./script/gn-check.js",
|
||||
"gn-format": "python3 script/run-gn-format.py",
|
||||
"precommit": "lint-staged",
|
||||
"preinstall": "node -e 'process.exit(0)'",
|
||||
"pretest": "npm run create-typescript-definitions",
|
||||
"prepack": "check-for-leaks",
|
||||
"repl": "node ./script/start.js --interactive",
|
||||
"start": "node ./script/start.js",
|
||||
"test": "node ./script/spec-runner.js",
|
||||
"tsc": "tsc",
|
||||
"webpack": "webpack"
|
||||
},
|
||||
"license": "MIT",
|
||||
"author": "Electron Community",
|
||||
"keywords": [
|
||||
"electron"
|
||||
],
|
||||
"lint-staged": {
|
||||
"*.{js,ts}": [
|
||||
"node script/lint.js --js --fix --only --"
|
||||
],
|
||||
"*.{js,ts,d.ts}": [
|
||||
"ts-node script/gen-filenames.ts"
|
||||
],
|
||||
"*.{cc,mm,c,h}": [
|
||||
"python3 script/run-clang-format.py -r -c --fix"
|
||||
],
|
||||
"*.md": [
|
||||
"npm run lint:docs"
|
||||
],
|
||||
"*.{gn,gni}": [
|
||||
"npm run gn-check",
|
||||
"npm run gn-format"
|
||||
],
|
||||
"*.py": [
|
||||
"node script/lint.js --py --fix --only --"
|
||||
],
|
||||
"docs/api/**/*.md": [
|
||||
"ts-node script/gen-filenames.ts",
|
||||
"electron-markdownlint --config .markdownlint.autofix.json --fix",
|
||||
"git add filenames.auto.gni"
|
||||
],
|
||||
"{*.patch,.patches}": [
|
||||
"node script/lint.js --patches --only --",
|
||||
"ts-node script/check-patch-diff.ts"
|
||||
],
|
||||
"DEPS": [
|
||||
"node script/gen-hunspell-filenames.js",
|
||||
"node script/gen-libc++-filenames.js"
|
||||
]
|
||||
},
|
||||
"resolutions": {
|
||||
"nan": "nodejs/nan#16fa32231e2ccd89d2804b3f765319128b20c4ac"
|
||||
}
|
||||
}
|
89
devel/electron26/files/patch-BUILD.gn
Normal file
89
devel/electron26/files/patch-BUILD.gn
Normal file
@ -0,0 +1,89 @@
|
||||
--- BUILD.gn.orig 2023-08-20 00:00:05 UTC
|
||||
+++ BUILD.gn
|
||||
@@ -61,7 +61,7 @@ declare_args() {
|
||||
root_extra_deps = []
|
||||
}
|
||||
|
||||
-if (is_official_build) {
|
||||
+if (is_official_build && !is_bsd) {
|
||||
# An official (maximally optimized!) component (optimized for build times)
|
||||
# build doesn't make sense and usually doesn't work.
|
||||
assert(!is_component_build)
|
||||
@@ -95,7 +95,6 @@ group("gn_all") {
|
||||
"//codelabs",
|
||||
"//components:components_unittests",
|
||||
"//components/gwp_asan:gwp_asan_unittests",
|
||||
- "//infra/orchestrator:orchestrator_all",
|
||||
"//net:net_unittests",
|
||||
"//sandbox:sandbox_unittests",
|
||||
"//services:services_unittests",
|
||||
@@ -422,7 +421,7 @@ group("gn_all") {
|
||||
}
|
||||
}
|
||||
|
||||
- if (is_linux || is_chromeos || is_android) {
|
||||
+ if ((is_linux && !is_bsd) || is_chromeos || is_android) {
|
||||
deps += [
|
||||
"//third_party/breakpad:breakpad_unittests",
|
||||
"//third_party/breakpad:core-2-minidump",
|
||||
@@ -622,6 +621,15 @@ group("gn_all") {
|
||||
}
|
||||
}
|
||||
|
||||
+ if (is_bsd) {
|
||||
+ deps -= [
|
||||
+ "//third_party/breakpad:dump_syms($host_toolchain)",
|
||||
+ "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
|
||||
+ "//third_party/breakpad:minidump_dump($host_toolchain)",
|
||||
+ "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
|
||||
+ ]
|
||||
+ }
|
||||
+
|
||||
if (is_mac) {
|
||||
deps += [
|
||||
"//third_party/breakpad:dump_syms",
|
||||
@@ -668,7 +676,7 @@ group("gn_all") {
|
||||
host_os == "win") {
|
||||
deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
|
||||
}
|
||||
- } else if (!is_android && !is_ios && !is_fuchsia) {
|
||||
+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
|
||||
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -1095,7 +1103,7 @@ if (!is_ios && !is_cronet_build) {
|
||||
]
|
||||
}
|
||||
|
||||
- if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos) {
|
||||
+ if (!is_chromeos_ash && !is_ios && !is_fuchsia && !is_android && !is_castos && !is_bsd) {
|
||||
# WPT Webdriver tests runner
|
||||
# chrome/test/chromedriver/test/run_webdriver_tests.py
|
||||
script_test("webdriver_wpt_tests") {
|
||||
@@ -1199,7 +1207,7 @@ if (!is_ios && !is_cronet_build) {
|
||||
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
|
||||
}
|
||||
|
||||
- if (!is_win && !is_android) {
|
||||
+ if (!is_win && !is_android && !is_bsd) {
|
||||
data_deps +=
|
||||
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
|
||||
}
|
||||
@@ -1208,7 +1216,7 @@ if (!is_ios && !is_cronet_build) {
|
||||
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
- if (is_linux || is_chromeos) {
|
||||
+ if ((is_linux && !is_bsd) || is_chromeos) {
|
||||
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
|
||||
}
|
||||
|
||||
@@ -1682,7 +1690,7 @@ group("chromium_builder_perf") {
|
||||
data_deps += [ "//chrome/test:performance_browser_tests" ]
|
||||
}
|
||||
|
||||
- if (!is_win) {
|
||||
+ if (!is_win && !is_bsd) {
|
||||
data_deps +=
|
||||
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
|
||||
}
|
@ -0,0 +1,11 @@
|
||||
--- apps/ui/views/app_window_frame_view.cc.orig 2022-07-22 17:30:31 UTC
|
||||
+++ apps/ui/views/app_window_frame_view.cc
|
||||
@@ -137,7 +137,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
|
||||
gfx::Rect window_bounds = client_bounds;
|
||||
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
|
||||
// complete.
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
|
||||
// Get the difference between the widget's client area bounds and window
|
||||
// bounds, and grow |window_bounds| by that amount.
|
||||
gfx::Insets native_frame_insets =
|
@ -0,0 +1,14 @@
|
||||
--- ash/display/mirror_window_controller.cc.orig 2023-08-10 01:48:30 UTC
|
||||
+++ ash/display/mirror_window_controller.cc
|
||||
@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow(
|
||||
if (!base::Contains(display_info_list, iter->first,
|
||||
&display::ManagedDisplayInfo::id)) {
|
||||
CloseAndDeleteHost(iter->second, true);
|
||||
+#if defined(__llvm__)
|
||||
+ mirroring_host_info_map_.erase(iter++);
|
||||
+#else
|
||||
iter = mirroring_host_info_map_.erase(iter);
|
||||
+#endif
|
||||
} else {
|
||||
++iter;
|
||||
}
|
143
devel/electron26/files/patch-base_BUILD.gn
Normal file
143
devel/electron26/files/patch-base_BUILD.gn
Normal file
@ -0,0 +1,143 @@
|
||||
--- base/BUILD.gn.orig 2023-08-20 00:00:07 UTC
|
||||
+++ base/BUILD.gn
|
||||
@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") {
|
||||
flags = [ "CRONET_BUILD=$is_cronet_build" ]
|
||||
}
|
||||
|
||||
-enable_message_pump_epoll = is_linux || is_chromeos || is_android
|
||||
+enable_message_pump_epoll = (is_linux || is_chromeos || is_android) && !is_bsd
|
||||
buildflag_header("message_pump_buildflags") {
|
||||
header = "message_pump_buildflags.h"
|
||||
header_dir = "base/message_loop"
|
||||
@@ -1152,11 +1152,23 @@ component("base") {
|
||||
# Needed for <atomic> if using newer C++ library than sysroot, except if
|
||||
# building inside the cros_sdk environment - use host_toolchain as a
|
||||
# more robust check for this.
|
||||
- if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) &&
|
||||
+ if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos && !is_bsd)) &&
|
||||
host_toolchain != "//build/toolchain/cros:host") {
|
||||
libs += [ "atomic" ]
|
||||
}
|
||||
|
||||
+ # *BSD needs libkvm
|
||||
+ if (is_bsd) {
|
||||
+ libs += [ "kvm" ]
|
||||
+ }
|
||||
+
|
||||
+ if (is_freebsd) {
|
||||
+ libs += [
|
||||
+ "execinfo",
|
||||
+ "util",
|
||||
+ ]
|
||||
+ }
|
||||
+
|
||||
if (use_allocator_shim) {
|
||||
sources += [
|
||||
"allocator/partition_allocator/shim/allocator_shim.cc",
|
||||
@@ -1187,7 +1199,7 @@ component("base") {
|
||||
]
|
||||
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
|
||||
}
|
||||
- if (is_chromeos || is_linux) {
|
||||
+ if (is_chromeos || (is_linux && !is_bsd)) {
|
||||
sources += [
|
||||
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
|
||||
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
|
||||
@@ -1228,7 +1240,7 @@ component("base") {
|
||||
|
||||
# Allow more direct string conversions on platforms with native utf8
|
||||
# strings
|
||||
- if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) {
|
||||
+ if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) {
|
||||
defines += [ "SYSTEM_NATIVE_UTF8" ]
|
||||
}
|
||||
|
||||
@@ -2187,6 +2199,43 @@ component("base") {
|
||||
}
|
||||
}
|
||||
|
||||
+ if (is_bsd) {
|
||||
+ sources -= [
|
||||
+ "files/file_path_watcher_inotify.cc",
|
||||
+ "files/scoped_file_linux.cc",
|
||||
+ "process/process_linux.cc",
|
||||
+ "system/sys_info_linux.cc",
|
||||
+ "process/process_iterator_linux.cc",
|
||||
+ "process/process_metrics_linux.cc",
|
||||
+ "process/process_handle_linux.cc",
|
||||
+ "profiler/stack_copier_signal.cc",
|
||||
+ "profiler/stack_copier_signal.h",
|
||||
+ "profiler/thread_delegate_posix.cc",
|
||||
+ "profiler/thread_delegate_posix.h",
|
||||
+ ]
|
||||
+ sources += [
|
||||
+ "files/file_path_watcher_kqueue.cc",
|
||||
+ "files/file_path_watcher_kqueue.h",
|
||||
+ "files/file_path_watcher_bsd.cc",
|
||||
+ ]
|
||||
+ }
|
||||
+
|
||||
+ if (is_openbsd) {
|
||||
+ sources += [
|
||||
+ "process/process_handle_openbsd.cc",
|
||||
+ "process/process_iterator_openbsd.cc",
|
||||
+ "process/process_metrics_openbsd.cc",
|
||||
+ "system/sys_info_openbsd.cc",
|
||||
+ ]
|
||||
+ } else if (is_freebsd) {
|
||||
+ sources += [
|
||||
+ "process/process_handle_freebsd.cc",
|
||||
+ "process/process_iterator_freebsd.cc",
|
||||
+ "process/process_metrics_freebsd.cc",
|
||||
+ "system/sys_info_freebsd.cc",
|
||||
+ ]
|
||||
+ }
|
||||
+
|
||||
# iOS
|
||||
if (is_ios) {
|
||||
sources += [
|
||||
@@ -2287,7 +2336,7 @@ component("base") {
|
||||
}
|
||||
|
||||
if (dep_libevent) {
|
||||
- deps += [ "//third_party/libevent" ]
|
||||
+ public_deps += [ "//third_party/libevent" ]
|
||||
}
|
||||
|
||||
if (use_libevent) {
|
||||
@@ -3621,7 +3670,7 @@ test("base_unittests") {
|
||||
]
|
||||
}
|
||||
|
||||
- if (is_linux || is_chromeos) {
|
||||
+ if ((is_linux || is_chromeos) && !is_bsd) {
|
||||
sources += [
|
||||
"debug/proc_maps_linux_unittest.cc",
|
||||
"files/scoped_file_linux_unittest.cc",
|
||||
@@ -3642,7 +3691,7 @@ test("base_unittests") {
|
||||
"posix/file_descriptor_shuffle_unittest.cc",
|
||||
"posix/unix_domain_socket_unittest.cc",
|
||||
]
|
||||
- if (!is_nacl && !is_apple) {
|
||||
+ if (!is_nacl && !is_apple && !is_bsd) {
|
||||
sources += [
|
||||
"profiler/stack_base_address_posix_unittest.cc",
|
||||
"profiler/stack_copier_signal_unittest.cc",
|
||||
@@ -3653,7 +3702,7 @@ test("base_unittests") {
|
||||
|
||||
# Allow more direct string conversions on platforms with native utf8
|
||||
# strings
|
||||
- if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) {
|
||||
+ if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) {
|
||||
defines += [ "SYSTEM_NATIVE_UTF8" ]
|
||||
}
|
||||
|
||||
@@ -3909,7 +3958,7 @@ test("base_unittests") {
|
||||
}
|
||||
}
|
||||
|
||||
- if (is_fuchsia || is_linux || is_chromeos) {
|
||||
+ if ((is_fuchsia || is_linux || is_chromeos) && !is_bsd) {
|
||||
sources += [
|
||||
"debug/elf_reader_unittest.cc",
|
||||
"debug/test_elf_image_builder.cc",
|
11
devel/electron26/files/patch-base_allocator_dispatcher_tls.h
Normal file
11
devel/electron26/files/patch-base_allocator_dispatcher_tls.h
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/allocator/dispatcher/tls.h.orig 2023-05-25 00:41:37 UTC
|
||||
+++ base/allocator/dispatcher/tls.h
|
||||
@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator {
|
||||
partition_alloc::PartitionPageSize();
|
||||
#elif BUILDFLAG(IS_APPLE)
|
||||
constexpr static size_t AllocationChunkSize = 16384;
|
||||
-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
|
||||
constexpr static size_t AllocationChunkSize = 16384;
|
||||
#else
|
||||
constexpr static size_t AllocationChunkSize = 4096;
|
@ -0,0 +1,20 @@
|
||||
--- base/allocator/partition_allocator/address_space_randomization.h.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/allocator/partition_allocator/address_space_randomization.h
|
||||
@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
|
||||
|
||||
#if defined(ARCH_CPU_64_BITS)
|
||||
|
||||
- #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
|
||||
+ #if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) && !defined(OS_BSD)
|
||||
|
||||
// We shouldn't allocate system pages at all for sanitizer builds. However,
|
||||
// we do, and if random hint addresses interfere with address ranges
|
||||
@@ -124,7 +124,7 @@ AslrMask(uintptr_t bits) {
|
||||
return AslrAddress(0x20000000ULL);
|
||||
}
|
||||
|
||||
- #elif BUILDFLAG(IS_LINUX)
|
||||
+ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
|
||||
// Linux on arm64 can use 39, 42, 48, or 52-bit user space, depending on
|
||||
// page size and number of levels of translation pages used. We use
|
@ -0,0 +1,11 @@
|
||||
--- base/allocator/partition_allocator/page_allocator.h.orig 2023-08-10 01:48:30 UTC
|
||||
+++ base/allocator/partition_allocator/page_allocator.h
|
||||
@@ -245,7 +245,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
|
||||
// recommitted. Do not assume that this will not change over time.
|
||||
constexpr PA_COMPONENT_EXPORT(
|
||||
PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
|
||||
-#if BUILDFLAG(IS_APPLE)
|
||||
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
|
||||
return false;
|
||||
#else
|
||||
return true;
|
@ -0,0 +1,38 @@
|
||||
--- base/allocator/partition_allocator/page_allocator_constants.h.orig 2023-05-25 00:41:37 UTC
|
||||
+++ base/allocator/partition_allocator/page_allocator_constants.h
|
||||
@@ -25,7 +25,7 @@
|
||||
// elimination.
|
||||
#define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const))
|
||||
|
||||
-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
|
||||
// This should work for all POSIX (if needed), but currently all other
|
||||
// supported OS/architecture combinations use either hard-coded values
|
||||
// (such as x86) or have means to determine these values without needing
|
||||
@@ -81,7 +81,7 @@ PageAllocationGranularityShift() {
|
||||
return 14; // 16kB
|
||||
#elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)
|
||||
return static_cast<size_t>(vm_page_shift);
|
||||
-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
|
||||
// arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16)
|
||||
// page sizes. Retrieve from or initialize cache.
|
||||
size_t shift = page_characteristics.shift.load(std::memory_order_relaxed);
|
||||
@@ -102,7 +102,7 @@ PageAllocationGranularity() {
|
||||
// This is literally equivalent to |1 << PageAllocationGranularityShift()|
|
||||
// below, but was separated out for IS_APPLE to avoid << on a non-constexpr.
|
||||
return vm_page_size;
|
||||
-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
|
||||
// arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or
|
||||
// initialize cache.
|
||||
size_t size = page_characteristics.size.load(std::memory_order_relaxed);
|
||||
@@ -141,7 +141,7 @@ SystemPageShift() {
|
||||
PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
|
||||
SystemPageSize() {
|
||||
#if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
|
||||
- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
|
||||
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
|
||||
// This is literally equivalent to |1 << SystemPageShift()| below, but was
|
||||
// separated out for 64-bit IS_APPLE and arm64 on Linux to avoid << on a
|
||||
// non-constexpr.
|
@ -0,0 +1,16 @@
|
||||
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-08-10 01:48:30 UTC
|
||||
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
|
||||
@@ -396,8 +396,12 @@ bool TryRecommitSystemPagesInternal(
|
||||
|
||||
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
|
||||
void* ptr = reinterpret_cast<void*>(address);
|
||||
-#if BUILDFLAG(IS_APPLE)
|
||||
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+ int ret = madvise(ptr, length, MADV_FREE);
|
||||
+#else
|
||||
int ret = madvise(ptr, length, MADV_FREE_REUSABLE);
|
||||
+#endif
|
||||
if (ret) {
|
||||
// MADV_FREE_REUSABLE sometimes fails, so fall back to MADV_DONTNEED.
|
||||
ret = madvise(ptr, length, MADV_DONTNEED);
|
@ -0,0 +1,11 @@
|
||||
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-08-10 01:48:30 UTC
|
||||
+++ base/allocator/partition_allocator/partition_address_space.cc
|
||||
@@ -420,7 +420,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
|
||||
|
||||
PageCharacteristics page_characteristics;
|
||||
|
@ -0,0 +1,11 @@
|
||||
--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-08-10 01:48:30 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc.gni
|
||||
@@ -317,7 +317,7 @@ declare_args() {
|
||||
# pkeys support is explicitly disabled in all Cronet builds, as some test
|
||||
# dependencies that use partition_allocator are compiled in AOSP against a
|
||||
# version of glibc that does not include pkeys syscall numbers.
|
||||
- enable_pkeys = is_linux && target_cpu == "x64" && !is_cronet_build
|
||||
+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build
|
||||
}
|
||||
assert(!enable_pkeys || (is_linux && target_cpu == "x64"),
|
||||
"Pkeys are only supported on x64 linux")
|
@ -0,0 +1,32 @@
|
||||
--- base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h.orig 2023-05-25 00:41:37 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h
|
||||
@@ -24,9 +24,9 @@
|
||||
// Annotate a function indicating it should not be inlined.
|
||||
// Use like:
|
||||
// NOINLINE void DoStuff() { ... }
|
||||
-#if defined(__clang__) && PA_HAS_ATTRIBUTE(noinline)
|
||||
+#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(noinline)
|
||||
#define PA_NOINLINE [[clang::noinline]]
|
||||
-#elif defined(COMPILER_GCC) && PA_HAS_ATTRIBUTE(noinline)
|
||||
+#elif (defined(COMPILER_GCC) || defined(__clang__)) && PA_HAS_ATTRIBUTE(noinline)
|
||||
#define PA_NOINLINE __attribute__((noinline))
|
||||
#elif defined(COMPILER_MSVC)
|
||||
#define PA_NOINLINE __declspec(noinline)
|
||||
@@ -34,7 +34,7 @@
|
||||
#define PA_NOINLINE
|
||||
#endif
|
||||
|
||||
-#if defined(__clang__) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
|
||||
+#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
|
||||
#define PA_ALWAYS_INLINE [[clang::always_inline]] inline
|
||||
#elif defined(COMPILER_GCC) && defined(NDEBUG) && \
|
||||
PA_HAS_ATTRIBUTE(always_inline)
|
||||
@@ -53,7 +53,7 @@
|
||||
// prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
|
||||
// Use like:
|
||||
// void NOT_TAIL_CALLED FooBar();
|
||||
-#if defined(__clang__) && PA_HAS_ATTRIBUTE(not_tail_called)
|
||||
+#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(not_tail_called)
|
||||
#define PA_NOT_TAIL_CALLED [[clang::not_tail_called]]
|
||||
#else
|
||||
#define PA_NOT_TAIL_CALLED
|
@ -0,0 +1,13 @@
|
||||
--- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2022-07-22 17:30:31 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc
|
||||
@@ -86,6 +86,10 @@ void RandBytes(void* output, size_t output_length) {
|
||||
if (getentropy(output, output_length) == 0) {
|
||||
return;
|
||||
}
|
||||
+#elif BUILDFLAG(IS_BSD)
|
||||
+ if (getentropy(output, output_length) == 0) {
|
||||
+ return;
|
||||
+ }
|
||||
#endif
|
||||
|
||||
// If the OS-specific mechanisms didn't work, fall through to reading from
|
@ -0,0 +1,11 @@
|
||||
--- base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2022-07-22 17:30:31 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
namespace partition_alloc::internal::base::internal {
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// Current thread id is cached in thread local storage for performance reasons.
|
||||
// In some rare cases it's important to invalidate that cache explicitly (e.g.
|
||||
// after going through clone() syscall which does not call pthread_atfork()
|
@ -0,0 +1,11 @@
|
||||
--- base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc.orig 2022-07-22 17:30:31 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc
|
||||
@@ -17,7 +17,7 @@
|
||||
#include "base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
#include <sys/syscall.h>
|
||||
#include <atomic>
|
||||
#endif
|
@ -0,0 +1,29 @@
|
||||
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-08-10 01:48:30 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc_config.h
|
||||
@@ -94,7 +94,7 @@ static_assert(sizeof(void*) != 8, "");
|
||||
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
|
||||
// features such as futex(2).
|
||||
#define PA_CONFIG_HAS_LINUX_KERNEL() \
|
||||
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID))
|
||||
+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD))
|
||||
|
||||
// On some platforms, we implement locking by spinning in userspace, then going
|
||||
// into the kernel only if there is contention. This requires platform support,
|
||||
@@ -234,7 +234,7 @@ constexpr bool kUseLazyCommit = false;
|
||||
// On these platforms, lock all the partitions before fork(), and unlock after.
|
||||
// This may be required on more platforms in the future.
|
||||
#define PA_CONFIG_HAS_ATFORK_HANDLER() \
|
||||
- (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
|
||||
+ (BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
|
||||
|
||||
// PartitionAlloc uses PartitionRootEnumerator to acquire all
|
||||
// PartitionRoots at BeforeFork and to release at AfterFork.
|
||||
@@ -279,7 +279,7 @@ constexpr bool kUseLazyCommit = false;
|
||||
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
|
||||
// larger slot spans.
|
||||
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \
|
||||
- (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)))
|
||||
+ (BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD))
|
||||
|
||||
// Enable shadow metadata.
|
||||
//
|
@ -0,0 +1,21 @@
|
||||
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-08-10 01:48:30 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc_constants.h
|
||||
@@ -92,7 +92,7 @@ PartitionPageShift() {
|
||||
return 18; // 256 KiB
|
||||
}
|
||||
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
|
||||
- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
|
||||
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
|
||||
PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
|
||||
PartitionPageShift() {
|
||||
return PageAllocationGranularityShift() + 2;
|
||||
@@ -294,7 +294,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
|
||||
// 8GB for each of the glued pools).
|
||||
#if BUILDFLAG(HAS_64_BIT_POINTERS)
|
||||
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
|
||||
- BUILDFLAG(ENABLE_POINTER_COMPRESSION)
|
||||
+ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || \
|
||||
+ BUILDFLAG(IS_BSD)
|
||||
constexpr size_t kPoolMaxSize = 8 * kGiB;
|
||||
#else
|
||||
constexpr size_t kPoolMaxSize = 16 * kGiB;
|
@ -0,0 +1,16 @@
|
||||
--- base/allocator/partition_allocator/partition_alloc_forward.h.orig 2023-08-10 01:48:30 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc_forward.h
|
||||
@@ -28,9 +28,13 @@ namespace internal {
|
||||
// the second one 16. We could technically return something different for
|
||||
// malloc() and operator new(), but this would complicate things, and most of
|
||||
// our allocations are presumably coming from operator new() anyway.
|
||||
+#if defined(__i386__) && defined(OS_FREEBSD)
|
||||
+constexpr size_t kAlignment = 8;
|
||||
+#else
|
||||
constexpr size_t kAlignment =
|
||||
std::max(alignof(max_align_t),
|
||||
static_cast<size_t>(__STDCPP_DEFAULT_NEW_ALIGNMENT__));
|
||||
+#endif
|
||||
static_assert(kAlignment <= 16,
|
||||
"PartitionAlloc doesn't support a fundamental alignment larger "
|
||||
"than 16 bytes.");
|
@ -0,0 +1,11 @@
|
||||
--- base/allocator/partition_allocator/partition_page_constants.h.orig 2023-08-10 01:48:30 UTC
|
||||
+++ base/allocator/partition_allocator/partition_page_constants.h
|
||||
@@ -16,7 +16,7 @@ namespace partition_alloc::internal {
|
||||
// (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And
|
||||
// PartitionPageSize() is 4 times the OS page size.
|
||||
static constexpr size_t kMaxSlotsPerSlotSpan = 4 * (1 << 14) / kSmallestBucket;
|
||||
-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
|
||||
// System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
|
||||
// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
|
||||
// so we use the 16 kiB maximum (64 kiB will crash).
|
@ -0,0 +1,38 @@
|
||||
--- base/allocator/partition_allocator/partition_root.cc.orig 2023-08-10 01:48:30 UTC
|
||||
+++ base/allocator/partition_allocator/partition_root.cc
|
||||
@@ -46,7 +46,7 @@
|
||||
#include "wow64apiset.h"
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
@@ -284,7 +284,7 @@ void PartitionAllocMallocInitOnce() {
|
||||
return;
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// When fork() is called, only the current thread continues to execute in the
|
||||
// child process. If the lock is held, but *not* by this thread when fork() is
|
||||
// called, we have a deadlock.
|
||||
@@ -376,7 +376,7 @@ static size_t PartitionPurgeSlotSpan(internal::SlotSpa
|
||||
constexpr size_t kMaxSlotCount =
|
||||
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
|
||||
MinPurgeableSlotSize();
|
||||
-#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
|
||||
+#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
|
||||
// It's better for slot_usage to be stack-allocated and fixed-size, which
|
||||
// demands that its size be constexpr. On IS_APPLE and Linux on arm64,
|
||||
// PartitionPageSize() is always SystemPageSize() << 2, so regardless of
|
||||
@@ -853,7 +853,7 @@ void PartitionRoot::Init(PartitionOptions opts) {
|
||||
// apple OSes.
|
||||
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
|
||||
(internal::SystemPageSize() == (size_t{1} << 14)));
|
||||
-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
|
||||
// Check runtime pagesize. Though the code is currently the same, it is
|
||||
// not merged with the IS_APPLE case above as a 1 << 16 case needs to be
|
||||
// added here in the future, to allow 64 kiB pagesize. That is only
|
@ -0,0 +1,53 @@
|
||||
--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2023-05-25 00:41:37 UTC
|
||||
+++ base/allocator/partition_allocator/spinning_mutex.cc
|
||||
@@ -18,7 +18,16 @@
|
||||
|
||||
#if PA_CONFIG(HAS_LINUX_KERNEL)
|
||||
#include <errno.h>
|
||||
+#if defined(OS_OPENBSD)
|
||||
+#include <sys/time.h>
|
||||
+#include <sys/futex.h>
|
||||
+#elif defined(OS_FREEBSD)
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/thr.h>
|
||||
+#include <sys/umtx.h>
|
||||
+#else
|
||||
#include <linux/futex.h>
|
||||
+#endif
|
||||
#include <sys/syscall.h>
|
||||
#include <unistd.h>
|
||||
#endif // PA_CONFIG(HAS_LINUX_KERNEL)
|
||||
@@ -108,8 +117,16 @@ void SpinningMutex::FutexWait() {
|
||||
// |kLockedContended| anymore. Note that even without spurious wakeups, the
|
||||
// value of |state_| is not guaranteed when this returns, as another thread
|
||||
// may get the lock before we get to run.
|
||||
+#if defined(OS_FREEBSD)
|
||||
+ int err = _umtx_op(&state_, UMTX_OP_WAIT_UINT_PRIVATE,
|
||||
+ kLockedContended, nullptr, nullptr);
|
||||
+#elif defined(OS_OPENBSD)
|
||||
+ int err = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAIT | FUTEX_PRIVATE_FLAG,
|
||||
+ kLockedContended, nullptr, nullptr);
|
||||
+#else
|
||||
int err = syscall(SYS_futex, &state_, FUTEX_WAIT | FUTEX_PRIVATE_FLAG,
|
||||
kLockedContended, nullptr, nullptr, 0);
|
||||
+#endif
|
||||
|
||||
if (err) {
|
||||
// These are programming error, check them.
|
||||
@@ -121,8 +138,16 @@ void SpinningMutex::FutexWait() {
|
||||
|
||||
void SpinningMutex::FutexWake() {
|
||||
int saved_errno = errno;
|
||||
+#if defined(OS_FREEBSD)
|
||||
+ long retval = _umtx_op(&state_, UMTX_OP_WAKE_PRIVATE,
|
||||
+ 1 /* wake up a single waiter */, nullptr, nullptr);
|
||||
+#elif defined(OS_OPENBSD)
|
||||
+ long retval = futex(reinterpret_cast<volatile unsigned int *>(&state_), FUTEX_WAKE | FUTEX_PRIVATE_FLAG,
|
||||
+ 1 /* wake up a single waiter */, nullptr, nullptr);
|
||||
+#else
|
||||
long retval = syscall(SYS_futex, &state_, FUTEX_WAKE | FUTEX_PRIVATE_FLAG,
|
||||
1 /* wake up a single waiter */, nullptr, nullptr, 0);
|
||||
+#endif
|
||||
PA_CHECK(retval != -1);
|
||||
errno = saved_errno;
|
||||
}
|
@ -0,0 +1,50 @@
|
||||
--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/allocator/partition_allocator/starscan/stack/stack.cc
|
||||
@@ -18,6 +18,10 @@
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
+#if defined(OS_BSD)
|
||||
+#include <pthread_np.h>
|
||||
+#endif
|
||||
+
|
||||
#if defined(LIBC_GLIBC)
|
||||
extern "C" void* __libc_stack_end;
|
||||
#endif
|
||||
@@ -48,6 +52,36 @@ void* GetStackTop() {
|
||||
|
||||
void* GetStackTop() {
|
||||
return pthread_get_stackaddr_np(pthread_self());
|
||||
+}
|
||||
+
|
||||
+#elif defined(OS_OPENBSD)
|
||||
+
|
||||
+void* GetStackTop() {
|
||||
+ stack_t ss;
|
||||
+ if (pthread_stackseg_np(pthread_self(), &ss) != 0)
|
||||
+ return nullptr;
|
||||
+ return reinterpret_cast<uint8_t*>(ss.ss_sp);
|
||||
+}
|
||||
+
|
||||
+#elif defined(OS_FREEBSD)
|
||||
+
|
||||
+void* GetStackTop() {
|
||||
+ pthread_attr_t attr;
|
||||
+ int error = pthread_attr_init(&attr);
|
||||
+ if (error) {
|
||||
+ return nullptr;
|
||||
+ }
|
||||
+ error = pthread_attr_get_np(pthread_self(), &attr);
|
||||
+ if (!error) {
|
||||
+ void* base;
|
||||
+ size_t size;
|
||||
+ error = pthread_attr_getstack(&attr, &base, &size);
|
||||
+ PA_CHECK(!error);
|
||||
+ pthread_attr_destroy(&attr);
|
||||
+ return reinterpret_cast<uint8_t*>(base) + size;
|
||||
+ }
|
||||
+ pthread_attr_destroy(&attr);
|
||||
+ return nullptr;
|
||||
}
|
||||
|
||||
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
|
14
devel/electron26/files/patch-base_atomicops.h
Normal file
14
devel/electron26/files/patch-base_atomicops.h
Normal file
@ -0,0 +1,14 @@
|
||||
--- base/atomicops.h.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/atomicops.h
|
||||
@@ -71,7 +71,11 @@ typedef intptr_t Atomic64;
|
||||
|
||||
// Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
|
||||
// Atomic64 routines below, depending on your architecture.
|
||||
+#if !defined(OS_OPENBSD) && defined(__i386__)
|
||||
+typedef Atomic32 AtomicWord;
|
||||
+#else
|
||||
typedef intptr_t AtomicWord;
|
||||
+#endif
|
||||
|
||||
// Atomically execute:
|
||||
// result = *ptr;
|
98
devel/electron26/files/patch-base_base__paths__posix.cc
Normal file
98
devel/electron26/files/patch-base_base__paths__posix.cc
Normal file
@ -0,0 +1,98 @@
|
||||
--- base/base_paths_posix.cc.orig 2022-02-28 16:54:41 UTC
|
||||
+++ base/base_paths_posix.cc
|
||||
@@ -15,6 +15,7 @@
|
||||
#include <ostream>
|
||||
#include <string>
|
||||
|
||||
+#include "base/command_line.h"
|
||||
#include "base/environment.h"
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/files/file_util.h"
|
||||
@@ -25,9 +26,13 @@
|
||||
#include "base/process/process_metrics.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
-#if BUILDFLAG(IS_FREEBSD)
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
#include <sys/param.h>
|
||||
#include <sys/sysctl.h>
|
||||
+#if BUILDFLAG(IS_OPENBSD)
|
||||
+#include <kvm.h>
|
||||
+#define MAXTOKENS 2
|
||||
+#endif
|
||||
#elif BUILDFLAG(IS_SOLARIS) || BUILDFLAG(IS_AIX)
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
@@ -68,13 +73,65 @@ bool PathProviderPosix(int key, FilePath* result) {
|
||||
*result = FilePath(bin_dir);
|
||||
return true;
|
||||
#elif BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_AIX)
|
||||
- // There is currently no way to get the executable path on OpenBSD
|
||||
- char* cpath;
|
||||
- if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
|
||||
- *result = FilePath(cpath);
|
||||
- else
|
||||
- *result = FilePath("/usr/local/chrome/chrome");
|
||||
- return true;
|
||||
+ char *cpath;
|
||||
+#if !BUILDFLAG(IS_AIX)
|
||||
+ struct kinfo_file *files;
|
||||
+ kvm_t *kd = NULL;
|
||||
+ char errbuf[_POSIX2_LINE_MAX];
|
||||
+ static char retval[PATH_MAX];
|
||||
+ int cnt;
|
||||
+ struct stat sb;
|
||||
+ pid_t cpid = getpid();
|
||||
+ bool ret = false;
|
||||
+
|
||||
+ const base::CommandLine* command_line =
|
||||
+ base::CommandLine::ForCurrentProcess();
|
||||
+
|
||||
+ VLOG(1) << "PathProviderPosix argv: " << command_line->argv()[0];
|
||||
+
|
||||
+ if (realpath(command_line->argv()[0].c_str(), retval) == NULL)
|
||||
+ goto out;
|
||||
+
|
||||
+ if (stat(command_line->argv()[0].c_str(), &sb) < 0)
|
||||
+ goto out;
|
||||
+
|
||||
+ if (!command_line->HasSwitch("no-sandbox")) {
|
||||
+ ret = true;
|
||||
+ *result = FilePath(retval);
|
||||
+ VLOG(1) << "PathProviderPosix (sandbox) result: " << retval;
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL)
|
||||
+ goto out;
|
||||
+
|
||||
+ if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, cpid,
|
||||
+ sizeof(struct kinfo_file), &cnt)) == NULL)
|
||||
+ goto out;
|
||||
+
|
||||
+ for (int i = 0; i < cnt; i++) {
|
||||
+ if (files[i].fd_fd == KERN_FILE_TEXT &&
|
||||
+ files[i].va_fsid == static_cast<uint32_t>(sb.st_dev) &&
|
||||
+ files[i].va_fileid == sb.st_ino) {
|
||||
+ ret = true;
|
||||
+ *result = FilePath(retval);
|
||||
+ VLOG(1) << "PathProviderPosix result: " << retval;
|
||||
+ }
|
||||
+ }
|
||||
+out:
|
||||
+ if (kd)
|
||||
+ kvm_close(kd);
|
||||
+ if (!ret) {
|
||||
+#endif
|
||||
+ if ((cpath = getenv("CHROME_EXE_PATH")) != NULL)
|
||||
+ *result = FilePath(cpath);
|
||||
+ else
|
||||
+ *result = FilePath("/usr/local/chrome/chrome");
|
||||
+ return true;
|
||||
+#if !BUILDFLAG(IS_AIX)
|
||||
+ }
|
||||
+ return ret;
|
||||
+#endif
|
||||
#endif
|
||||
}
|
||||
case DIR_SRC_TEST_DATA_ROOT: {
|
11
devel/electron26/files/patch-base_base__switches.cc
Normal file
11
devel/electron26/files/patch-base_base__switches.cc
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/base_switches.cc.orig 2023-05-25 00:41:37 UTC
|
||||
+++ base/base_switches.cc
|
||||
@@ -167,7 +167,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
|
||||
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when
|
||||
// Crashpad is fully enabled on Linux. Indicates that Crashpad should be
|
||||
// enabled.
|
11
devel/electron26/files/patch-base_base__switches.h
Normal file
11
devel/electron26/files/patch-base_base__switches.h
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/base_switches.h.orig 2023-05-25 00:41:37 UTC
|
||||
+++ base/base_switches.h
|
||||
@@ -57,7 +57,7 @@ extern const char kEnableIdleTracing[];
|
||||
extern const char kForceFieldTrialParams[];
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when
|
||||
// Crashpad is fully enabled on Linux.
|
||||
extern const char kEnableCrashpad[];
|
35
devel/electron26/files/patch-base_compiler__specific.h
Normal file
35
devel/electron26/files/patch-base_compiler__specific.h
Normal file
@ -0,0 +1,35 @@
|
||||
--- base/compiler_specific.h.orig 2023-05-25 00:41:37 UTC
|
||||
+++ base/compiler_specific.h
|
||||
@@ -41,9 +41,9 @@
|
||||
// Annotate a function indicating it should not be inlined.
|
||||
// Use like:
|
||||
// NOINLINE void DoStuff() { ... }
|
||||
-#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
|
||||
+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(noinline)
|
||||
#define NOINLINE [[clang::noinline]]
|
||||
-#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
|
||||
+#elif (defined(COMPILER_GCC) || defined(__clang__)) && HAS_ATTRIBUTE(noinline)
|
||||
#define NOINLINE __attribute__((noinline))
|
||||
#elif defined(COMPILER_MSVC)
|
||||
#define NOINLINE __declspec(noinline)
|
||||
@@ -51,9 +51,9 @@
|
||||
#define NOINLINE
|
||||
#endif
|
||||
|
||||
-#if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
|
||||
+#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
|
||||
#define ALWAYS_INLINE [[clang::always_inline]] inline
|
||||
-#elif defined(COMPILER_GCC) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
|
||||
+#elif (defined(COMPILER_GCC) || defined(__clang__)) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
|
||||
#define ALWAYS_INLINE inline __attribute__((__always_inline__))
|
||||
#elif defined(COMPILER_MSVC) && defined(NDEBUG)
|
||||
#define ALWAYS_INLINE __forceinline
|
||||
@@ -69,7 +69,7 @@
|
||||
// prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
|
||||
// Use like:
|
||||
// NOT_TAIL_CALLED void FooBar();
|
||||
-#if defined(__clang__) && HAS_ATTRIBUTE(not_tail_called)
|
||||
+#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(not_tail_called)
|
||||
#define NOT_TAIL_CALLED [[clang::not_tail_called]]
|
||||
#else
|
||||
#define NOT_TAIL_CALLED
|
68
devel/electron26/files/patch-base_debug_debugger__posix.cc
Normal file
68
devel/electron26/files/patch-base_debug_debugger__posix.cc
Normal file
@ -0,0 +1,68 @@
|
||||
--- base/debug/debugger_posix.cc.orig 2022-04-21 18:48:31 UTC
|
||||
+++ base/debug/debugger_posix.cc
|
||||
@@ -35,6 +35,10 @@
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
+#if BUILDFLAG(IS_OPENBSD)
|
||||
+#include <sys/proc.h>
|
||||
+#endif
|
||||
+
|
||||
#if BUILDFLAG(IS_FREEBSD)
|
||||
#include <sys/user.h>
|
||||
#endif
|
||||
@@ -95,32 +99,51 @@ bool BeingDebugged() {
|
||||
|
||||
// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
|
||||
// binary interfaces may change.
|
||||
+#if BUILDFLAG(IS_OPENBSD)
|
||||
+ struct kinfo_proc *info;
|
||||
+ size_t info_size;
|
||||
+#else
|
||||
struct kinfo_proc info;
|
||||
size_t info_size = sizeof(info);
|
||||
+#endif
|
||||
|
||||
#if BUILDFLAG(IS_OPENBSD)
|
||||
if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0)
|
||||
return -1;
|
||||
|
||||
mib[5] = (info_size / sizeof(struct kinfo_proc));
|
||||
+ if ((info = reinterpret_cast<kinfo_proc*>(malloc(info_size))) == NULL) {
|
||||
+ is_set = true;
|
||||
+ being_debugged = false;
|
||||
+ return being_debugged;
|
||||
+ }
|
||||
+
|
||||
+ int sysctl_result = sysctl(mib, std::size(mib), info, &info_size, NULL, 0);
|
||||
#endif
|
||||
|
||||
+#if !BUILDFLAG(IS_OPENBSD)
|
||||
int sysctl_result = sysctl(mib, std::size(mib), &info, &info_size, NULL, 0);
|
||||
+#endif
|
||||
DCHECK_EQ(sysctl_result, 0);
|
||||
if (sysctl_result != 0) {
|
||||
is_set = true;
|
||||
being_debugged = false;
|
||||
- return being_debugged;
|
||||
+ goto out;
|
||||
}
|
||||
|
||||
// This process is being debugged if the P_TRACED flag is set.
|
||||
is_set = true;
|
||||
#if BUILDFLAG(IS_FREEBSD)
|
||||
being_debugged = (info.ki_flag & P_TRACED) != 0;
|
||||
-#elif BUILDFLAG(IS_BSD)
|
||||
- being_debugged = (info.p_flag & P_TRACED) != 0;
|
||||
+#elif BUILDFLAG(IS_OPENBSD)
|
||||
+ being_debugged = (info->p_psflags & PS_TRACED) != 0;
|
||||
#else
|
||||
being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
|
||||
+#endif
|
||||
+
|
||||
+out:
|
||||
+#if BUILDFLAG(IS_OPENBSD)
|
||||
+ free(info);
|
||||
#endif
|
||||
return being_debugged;
|
||||
}
|
18
devel/electron26/files/patch-base_debug_elf__reader.cc
Normal file
18
devel/electron26/files/patch-base_debug_elf__reader.cc
Normal file
@ -0,0 +1,18 @@
|
||||
--- base/debug/elf_reader.cc.orig 2022-08-31 12:19:35 UTC
|
||||
+++ base/debug/elf_reader.cc
|
||||
@@ -78,6 +78,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
|
||||
bool found = false;
|
||||
while (current_section < section_end) {
|
||||
current_note = reinterpret_cast<const Nhdr*>(current_section);
|
||||
+#if !defined(OS_BSD)
|
||||
if (current_note->n_type == NT_GNU_BUILD_ID) {
|
||||
StringPiece note_name(current_section + sizeof(Nhdr),
|
||||
current_note->n_namesz);
|
||||
@@ -87,6 +88,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
|
||||
break;
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
|
||||
size_t section_size = bits::AlignUp(current_note->n_namesz, 4u) +
|
||||
bits::AlignUp(current_note->n_descsz, 4u) +
|
11
devel/electron26/files/patch-base_debug_proc__maps__linux.cc
Normal file
11
devel/electron26/files/patch-base_debug_proc__maps__linux.cc
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/debug/proc_maps_linux.cc.orig 2022-02-28 16:54:41 UTC
|
||||
+++ base/debug/proc_maps_linux.cc
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "base/strings/string_split.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
#include <inttypes.h>
|
||||
#endif
|
||||
|
21
devel/electron26/files/patch-base_debug_stack__trace.cc
Normal file
21
devel/electron26/files/patch-base_debug_stack__trace.cc
Normal file
@ -0,0 +1,21 @@
|
||||
--- base/debug/stack_trace.cc.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/debug/stack_trace.cc
|
||||
@@ -273,7 +273,9 @@ void StackTrace::Print() const {
|
||||
}
|
||||
|
||||
void StackTrace::OutputToStream(std::ostream* os) const {
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
OutputToStreamWithPrefix(os, nullptr);
|
||||
+#endif
|
||||
}
|
||||
|
||||
std::string StackTrace::ToString() const {
|
||||
@@ -281,7 +283,7 @@ std::string StackTrace::ToString() const {
|
||||
}
|
||||
std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
|
||||
std::stringstream stream;
|
||||
-#if !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#if !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD)
|
||||
OutputToStreamWithPrefix(&stream, prefix_string);
|
||||
#endif
|
||||
return stream.str();
|
@ -0,0 +1,38 @@
|
||||
--- base/debug/stack_trace_posix.cc.orig 2023-08-10 01:48:30 UTC
|
||||
+++ base/debug/stack_trace_posix.cc
|
||||
@@ -41,7 +41,7 @@
|
||||
// execinfo.h and backtrace(3) are really only present in glibc and in macOS
|
||||
// libc.
|
||||
#if BUILDFLAG(IS_APPLE) || \
|
||||
- (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__AIX))
|
||||
+ (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__AIX) && !BUILDFLAG(IS_BSD))
|
||||
#define HAVE_BACKTRACE
|
||||
#include <execinfo.h>
|
||||
#endif
|
||||
@@ -59,7 +59,7 @@
|
||||
#include <AvailabilityMacros.h>
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
#include "base/debug/proc_maps_linux.h"
|
||||
#endif
|
||||
|
||||
@@ -798,6 +798,9 @@ class SandboxSymbolizeHelper {
|
||||
// for the modules that are loaded in the current process.
|
||||
// Returns true on success.
|
||||
bool CacheMemoryRegions() {
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+ return false;
|
||||
+#else
|
||||
// Reads /proc/self/maps.
|
||||
std::string contents;
|
||||
if (!ReadProcMaps(&contents)) {
|
||||
@@ -815,6 +818,7 @@ class SandboxSymbolizeHelper {
|
||||
|
||||
is_initialized_ = true;
|
||||
return true;
|
||||
+#endif
|
||||
}
|
||||
|
||||
// Opens all object files and caches their file descriptors.
|
39
devel/electron26/files/patch-base_files_dir__reader__linux.h
Normal file
39
devel/electron26/files/patch-base_files_dir__reader__linux.h
Normal file
@ -0,0 +1,39 @@
|
||||
--- base/files/dir_reader_linux.h.orig 2022-08-31 12:19:35 UTC
|
||||
+++ base/files/dir_reader_linux.h
|
||||
@@ -16,10 +16,16 @@
|
||||
#include "base/logging.h"
|
||||
#include "base/posix/eintr_wrapper.h"
|
||||
|
||||
+#include "build/build_config.h"
|
||||
+
|
||||
// See the comments in dir_reader_posix.h about this.
|
||||
|
||||
namespace base {
|
||||
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+#include <dirent.h>
|
||||
+typedef struct dirent linux_dirent;
|
||||
+#else
|
||||
struct linux_dirent {
|
||||
uint64_t d_ino;
|
||||
int64_t d_off;
|
||||
@@ -27,6 +33,7 @@ struct linux_dirent {
|
||||
unsigned char d_type;
|
||||
char d_name[0];
|
||||
};
|
||||
+#endif
|
||||
|
||||
class DirReaderLinux {
|
||||
public:
|
||||
@@ -61,7 +68,11 @@ class DirReaderLinux {
|
||||
if (offset_ != size_)
|
||||
return true;
|
||||
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+ const int r = getdents(fd_, reinterpret_cast<char *>(buf_), sizeof(buf_));
|
||||
+#else
|
||||
const long r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_));
|
||||
+#endif
|
||||
if (r == 0)
|
||||
return false;
|
||||
if (r < 0) {
|
20
devel/electron26/files/patch-base_files_dir__reader__posix.h
Normal file
20
devel/electron26/files/patch-base_files_dir__reader__posix.h
Normal file
@ -0,0 +1,20 @@
|
||||
--- base/files/dir_reader_posix.h.orig 2022-06-17 14:20:10 UTC
|
||||
+++ base/files/dir_reader_posix.h
|
||||
@@ -17,7 +17,7 @@
|
||||
// seems worse than falling back to enumerating all file descriptors so we will
|
||||
// probably never implement this on the Mac.
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
#include "base/files/dir_reader_linux.h"
|
||||
#else
|
||||
#include "base/files/dir_reader_fallback.h"
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
namespace base {
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
typedef DirReaderLinux DirReaderPosix;
|
||||
#else
|
||||
typedef DirReaderFallback DirReaderPosix;
|
@ -0,0 +1,11 @@
|
||||
--- base/files/file_path_watcher.h.orig 2023-02-01 18:43:07 UTC
|
||||
+++ base/files/file_path_watcher.h
|
||||
@@ -59,7 +59,7 @@ class BASE_EXPORT FilePathWatcher {
|
||||
Type type = Type::kNonRecursive;
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
- BUILDFLAG(IS_FUCHSIA)
|
||||
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
||||
// The callback will return the full path to a changed file instead of
|
||||
// the watched path supplied as |path| when Watch is called.
|
||||
// So the full path can be different from the watched path when a folder is
|
@ -0,0 +1,57 @@
|
||||
--- base/files/file_path_watcher_bsd.cc.orig 2022-10-24 13:33:33 UTC
|
||||
+++ base/files/file_path_watcher_bsd.cc
|
||||
@@ -0,0 +1,54 @@
|
||||
+// Copyright 2021 The Chromium Authors. All rights reserved.
|
||||
+// Use of this source code is governed by a BSD-style license that can be
|
||||
+// found in the LICENSE file.
|
||||
+
|
||||
+#include <memory>
|
||||
+
|
||||
+#include "base/files/file_path_watcher.h"
|
||||
+#include "base/files/file_path_watcher_kqueue.h"
|
||||
+#include "base/memory/ptr_util.h"
|
||||
+#include "build/build_config.h"
|
||||
+
|
||||
+namespace base {
|
||||
+
|
||||
+namespace {
|
||||
+
|
||||
+class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
|
||||
+ public:
|
||||
+ FilePathWatcherImpl() = default;
|
||||
+ FilePathWatcherImpl(const FilePathWatcherImpl&) = delete;
|
||||
+ FilePathWatcherImpl& operator=(const FilePathWatcherImpl&) = delete;
|
||||
+ ~FilePathWatcherImpl() override = default;
|
||||
+
|
||||
+ bool Watch(const FilePath& path,
|
||||
+ Type type,
|
||||
+ const FilePathWatcher::Callback& callback) override {
|
||||
+ DCHECK(!impl_.get());
|
||||
+ if (type == Type::kRecursive) {
|
||||
+ if (!FilePathWatcher::RecursiveWatchAvailable())
|
||||
+ return false;
|
||||
+ } else {
|
||||
+ impl_ = std::make_unique<FilePathWatcherKQueue>();
|
||||
+ }
|
||||
+ DCHECK(impl_.get());
|
||||
+ return impl_->Watch(path, type, callback);
|
||||
+ }
|
||||
+
|
||||
+ void Cancel() override {
|
||||
+ if (impl_.get())
|
||||
+ impl_->Cancel();
|
||||
+ set_cancelled();
|
||||
+ }
|
||||
+
|
||||
+ private:
|
||||
+ std::unique_ptr<PlatformDelegate> impl_;
|
||||
+};
|
||||
+
|
||||
+} // namespace
|
||||
+
|
||||
+FilePathWatcher::FilePathWatcher() {
|
||||
+ DETACH_FROM_SEQUENCE(sequence_checker_);
|
||||
+ impl_ = std::make_unique<FilePathWatcherImpl>();
|
||||
+}
|
||||
+
|
||||
+} // namespace base
|
@ -0,0 +1,10 @@
|
||||
--- base/files/file_path_watcher_kqueue.h.orig 2022-02-07 13:39:41 UTC
|
||||
+++ base/files/file_path_watcher_kqueue.h
|
||||
@@ -5,6 +5,7 @@
|
||||
#ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
|
||||
#define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
|
||||
|
||||
+#include <sys/time.h>
|
||||
#include <sys/event.h>
|
||||
|
||||
#include <memory>
|
@ -0,0 +1,29 @@
|
||||
--- base/files/file_path_watcher_unittest.cc.orig 2023-08-10 01:48:30 UTC
|
||||
+++ base/files/file_path_watcher_unittest.cc
|
||||
@@ -479,7 +479,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
|
||||
VLOG(1) << "Waiting for file1 creation";
|
||||
ASSERT_TRUE(WaitForEvent());
|
||||
|
||||
-#if !BUILDFLAG(IS_APPLE)
|
||||
+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
|
||||
// Mac implementation does not detect files modified in a directory.
|
||||
ASSERT_TRUE(WriteFile(file1, "content v2"));
|
||||
VLOG(1) << "Waiting for file1 modification";
|
||||
@@ -1281,7 +1281,7 @@ enum Permission {
|
||||
Execute
|
||||
};
|
||||
|
||||
-#if BUILDFLAG(IS_APPLE)
|
||||
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
|
||||
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
|
||||
struct stat stat_buf;
|
||||
|
||||
@@ -1312,7 +1312,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
|
||||
}
|
||||
#endif // BUILDFLAG(IS_APPLE)
|
||||
|
||||
-#if BUILDFLAG(IS_APPLE)
|
||||
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
|
||||
// Linux implementation of FilePathWatcher doesn't catch attribute changes.
|
||||
// http://crbug.com/78043
|
||||
// Windows implementation of FilePathWatcher catches attribute changes that
|
52
devel/electron26/files/patch-base_files_file__util__posix.cc
Normal file
52
devel/electron26/files/patch-base_files_file__util__posix.cc
Normal file
@ -0,0 +1,52 @@
|
||||
--- base/files/file_util_posix.cc.orig 2023-05-25 00:41:38 UTC
|
||||
+++ base/files/file_util_posix.cc
|
||||
@@ -756,32 +756,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
|
||||
File::Error* error) {
|
||||
ScopedBlockingCall scoped_blocking_call(
|
||||
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
|
||||
+ const FilePath kFileSystemRoot("/");
|
||||
std::vector<FilePath> subpaths;
|
||||
|
||||
// Collect a list of all parent directories.
|
||||
FilePath last_path = full_path;
|
||||
- subpaths.push_back(full_path);
|
||||
+ if (full_path != kFileSystemRoot)
|
||||
+ subpaths.push_back(full_path);
|
||||
for (FilePath path = full_path.DirName();
|
||||
- path.value() != last_path.value(); path = path.DirName()) {
|
||||
+ (path.value() != last_path.value() &&
|
||||
+ (path != kFileSystemRoot)); path = path.DirName()) {
|
||||
subpaths.push_back(path);
|
||||
last_path = path;
|
||||
}
|
||||
|
||||
// Iterate through the parents and create the missing ones.
|
||||
for (const FilePath& subpath : base::Reversed(subpaths)) {
|
||||
- if (DirectoryExists(subpath))
|
||||
- continue;
|
||||
- if (mkdir(subpath.value().c_str(), 0700) == 0)
|
||||
- continue;
|
||||
- // Mkdir failed, but it might have failed with EEXIST, or some other error
|
||||
- // due to the directory appearing out of thin air. This can occur if
|
||||
- // two processes are trying to create the same file system tree at the same
|
||||
- // time. Check to see if it exists and make sure it is a directory.
|
||||
- int saved_errno = errno;
|
||||
- if (!DirectoryExists(subpath)) {
|
||||
- if (error)
|
||||
- *error = File::OSErrorToFileError(saved_errno);
|
||||
- return false;
|
||||
+ if (!PathExists(subpath)) {
|
||||
+ if ((mkdir(subpath.value().c_str(), 0700) == -1) &&
|
||||
+ ((full_path != subpath) ? (errno != ENOENT) : (-1))) {
|
||||
+ int saved_errno = errno;
|
||||
+ if (error)
|
||||
+ *error = File::OSErrorToFileError(saved_errno);
|
||||
+ return false;
|
||||
+ }
|
||||
+ } else if (!DirectoryExists(subpath)) {
|
||||
+ if (error)
|
||||
+ *error = File::OSErrorToFileError(ENOTDIR);
|
||||
+ return false;
|
||||
}
|
||||
}
|
||||
return true;
|
@ -0,0 +1,20 @@
|
||||
--- base/files/file_util_unittest.cc.orig 2023-05-25 00:41:38 UTC
|
||||
+++ base/files/file_util_unittest.cc
|
||||
@@ -3871,7 +3871,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
|
||||
}
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE)
|
||||
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
|
||||
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
|
||||
FilePath file_path("/proc/cpuinfo");
|
||||
std::string data = "temp";
|
||||
@@ -4594,7 +4594,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
|
||||
NULL);
|
||||
#else
|
||||
size_t bytes_written =
|
||||
- ::write(::fileno(output_file.get()), content.c_str(), content.length());
|
||||
+ ::write(fileno(output_file.get()), content.c_str(), content.length());
|
||||
#endif
|
||||
EXPECT_EQ(content.length(), bytes_written);
|
||||
::fflush(output_file.get());
|
@ -0,0 +1,12 @@
|
||||
--- base/files/important_file_writer_cleaner.cc.orig 2022-02-28 16:54:41 UTC
|
||||
+++ base/files/important_file_writer_cleaner.cc
|
||||
@@ -25,7 +25,8 @@ namespace base {
|
||||
namespace {
|
||||
|
||||
base::Time GetUpperBoundTime() {
|
||||
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA)
|
||||
+// needed because of .CreationTime() pledge
|
||||
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
||||
// If process creation time is not available then use instance creation
|
||||
// time as the upper-bound for old files. Modification times may be
|
||||
// rounded-down to coarse-grained increments, e.g. FAT has 2s granularity,
|
11
devel/electron26/files/patch-base_files_scoped__file.cc
Normal file
11
devel/electron26/files/patch-base_files_scoped__file.cc
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/files/scoped_file.cc.orig 2022-02-28 16:54:41 UTC
|
||||
+++ base/files/scoped_file.cc
|
||||
@@ -31,7 +31,7 @@ void ScopedFDCloseTraits::Free(int fd) {
|
||||
int ret = IGNORE_EINTR(close(fd));
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
|
||||
- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
|
||||
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
// NB: Some file descriptors can return errors from close() e.g. network
|
||||
// filesystems such as NFS and Linux input devices. On Linux, macOS, and
|
||||
// Fuchsia's POSIX layer, errors from close other than EBADF do not indicate
|
@ -0,0 +1,11 @@
|
||||
--- base/functional/unretained_traits.h.orig 2023-02-01 18:43:07 UTC
|
||||
+++ base/functional/unretained_traits.h
|
||||
@@ -130,7 +130,7 @@ struct TypeSupportsUnretained {
|
||||
// official builds, and then in non-test code as well.
|
||||
#if !defined(UNIT_TEST) && !defined(OFFICIAL_BUILD)
|
||||
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
|
||||
- defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS)
|
||||
+ || BUILDFLAGS(IS_BSD) || defined(FORCE_UNRETAINED_COMPLETENESS_CHECKS_FOR_TESTS)
|
||||
static_assert(IsCompleteTypeV<T> ||
|
||||
IsIncompleteTypeSafeForUnretained<std::remove_cv_t<T>>,
|
||||
"T must be fully defined.");
|
20
devel/electron26/files/patch-base_i18n_icu__util.cc
Normal file
20
devel/electron26/files/patch-base_i18n_icu__util.cc
Normal file
@ -0,0 +1,20 @@
|
||||
--- base/i18n/icu_util.cc.orig 2023-02-01 18:43:07 UTC
|
||||
+++ base/i18n/icu_util.cc
|
||||
@@ -51,7 +51,7 @@
|
||||
#include "third_party/icu/source/common/unicode/unistr.h"
|
||||
#endif
|
||||
|
||||
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
|
||||
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) || \
|
||||
BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
|
||||
#include "third_party/icu/source/i18n/unicode/timezone.h"
|
||||
#endif
|
||||
@@ -340,7 +340,7 @@ void InitializeIcuTimeZone() {
|
||||
FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
|
||||
icu::TimeZone::adoptDefault(
|
||||
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
|
||||
-#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
|
||||
+#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
|
||||
// To respond to the time zone change properly, the default time zone
|
||||
// cache in ICU has to be populated on starting up.
|
||||
// See TimeZoneMonitorLinux::NotifyClientsFromImpl().
|
28
devel/electron26/files/patch-base_linux__util.cc
Normal file
28
devel/electron26/files/patch-base_linux__util.cc
Normal file
@ -0,0 +1,28 @@
|
||||
--- base/linux_util.cc.orig 2022-08-31 12:19:35 UTC
|
||||
+++ base/linux_util.cc
|
||||
@@ -15,6 +15,7 @@
|
||||
|
||||
#include <iomanip>
|
||||
#include <memory>
|
||||
+#include <sstream>
|
||||
|
||||
#include "base/base_export.h"
|
||||
#include "base/files/dir_reader_posix.h"
|
||||
@@ -135,6 +136,9 @@ void SetLinuxDistro(const std::string& distro) {
|
||||
}
|
||||
|
||||
bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) {
|
||||
+#if defined(OS_BSD)
|
||||
+ return false;
|
||||
+#else
|
||||
// 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22
|
||||
char buf[25];
|
||||
strings::SafeSPrintf(buf, "/proc/%d/task", pid);
|
||||
@@ -152,6 +156,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t
|
||||
}
|
||||
|
||||
return true;
|
||||
+#endif
|
||||
}
|
||||
|
||||
pid_t FindThreadIDWithSyscall(pid_t pid, const std::string& expected_data,
|
31
devel/electron26/files/patch-base_logging__unittest.cc
Normal file
31
devel/electron26/files/patch-base_logging__unittest.cc
Normal file
@ -0,0 +1,31 @@
|
||||
--- base/logging_unittest.cc.orig 2023-02-01 18:43:07 UTC
|
||||
+++ base/logging_unittest.cc
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "base/posix/eintr_wrapper.h"
|
||||
#endif // BUILDFLAG(IS_POSIX)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD)
|
||||
#include <ucontext.h>
|
||||
#endif
|
||||
|
||||
@@ -575,14 +575,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
|
||||
// need the arch-specific boilerplate below, which is inspired by breakpad.
|
||||
// At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
|
||||
uintptr_t crash_addr = 0;
|
||||
-#if BUILDFLAG(IS_MAC)
|
||||
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FREEBSD)
|
||||
crash_addr = reinterpret_cast<uintptr_t>(info->si_addr);
|
||||
#else // OS_*
|
||||
ucontext_t* context = reinterpret_cast<ucontext_t*>(context_ptr);
|
||||
#if defined(ARCH_CPU_X86)
|
||||
crash_addr = static_cast<uintptr_t>(context->uc_mcontext.gregs[REG_EIP]);
|
||||
#elif defined(ARCH_CPU_X86_64)
|
||||
+#if BUILDFLAG(IS_OPENBSD)
|
||||
+ crash_addr = static_cast<uintptr_t>(context->sc_rip);
|
||||
+#else
|
||||
crash_addr = static_cast<uintptr_t>(context->uc_mcontext.gregs[REG_RIP]);
|
||||
+#endif
|
||||
#elif defined(ARCH_CPU_ARMEL)
|
||||
crash_addr = static_cast<uintptr_t>(context->uc_mcontext.arm_pc);
|
||||
#elif defined(ARCH_CPU_ARM64)
|
@ -0,0 +1,38 @@
|
||||
--- base/memory/discardable_memory.cc.orig 2022-11-30 08:12:58 UTC
|
||||
+++ base/memory/discardable_memory.cc
|
||||
@@ -26,7 +26,7 @@ BASE_FEATURE(kMadvFreeDiscardableMemory,
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
#endif // BUILDFLAG(IS_POSIX)
|
||||
|
||||
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
BASE_FEATURE(kDiscardableMemoryBackingTrial,
|
||||
"DiscardableMemoryBackingTrial",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
@@ -52,7 +52,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup>
|
||||
|
||||
namespace {
|
||||
|
||||
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
|
||||
DiscardableMemoryBacking GetBackingForFieldTrial() {
|
||||
DiscardableMemoryTrialGroup trial_group =
|
||||
@@ -71,7 +71,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() {
|
||||
|
||||
} // namespace
|
||||
|
||||
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
|
||||
// Probe capabilities of this device to determine whether we should participate
|
||||
// in the discardable memory backing trial.
|
||||
@@ -101,7 +101,7 @@ DiscardableMemory::DiscardableMemory() = default;
|
||||
DiscardableMemory::~DiscardableMemory() = default;
|
||||
|
||||
DiscardableMemoryBacking GetDiscardableMemoryBacking() {
|
||||
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
if (DiscardableMemoryBackingFieldTrialIsEnabled()) {
|
||||
return GetBackingForFieldTrial();
|
||||
}
|
@ -0,0 +1,11 @@
|
||||
--- base/memory/discardable_memory_internal.h.orig 2022-02-28 16:54:41 UTC
|
||||
+++ base/memory/discardable_memory_internal.h
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "base/metrics/field_trial_params.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
|
||||
namespace base {
|
||||
|
@ -0,0 +1,21 @@
|
||||
--- base/memory/madv_free_discardable_memory_posix.cc.orig 2023-05-25 00:41:38 UTC
|
||||
+++ base/memory/madv_free_discardable_memory_posix.cc
|
||||
@@ -306,6 +306,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
|
||||
|
||||
bool MadvFreeDiscardableMemoryPosix::IsResident() const {
|
||||
DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
|
||||
+// XXX mincore
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+ return false;
|
||||
+#else
|
||||
#if BUILDFLAG(IS_APPLE)
|
||||
std::vector<char> vec(allocated_pages_);
|
||||
#else
|
||||
@@ -321,6 +325,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
+#endif
|
||||
}
|
||||
|
||||
bool MadvFreeDiscardableMemoryPosix::IsDiscarded() const {
|
@ -0,0 +1,29 @@
|
||||
--- base/memory/platform_shared_memory_region.h.orig 2023-08-10 01:48:30 UTC
|
||||
+++ base/memory/platform_shared_memory_region.h
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
namespace content {
|
||||
class SandboxIPCHandler;
|
||||
}
|
||||
@@ -83,7 +83,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
|
||||
kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
|
||||
};
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// Structure to limit access to executable region creation.
|
||||
struct ExecutableRegion {
|
||||
private:
|
||||
@@ -215,7 +215,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
|
||||
CheckPlatformHandlePermissionsCorrespondToMode);
|
||||
static PlatformSharedMemoryRegion Create(Mode mode,
|
||||
size_t size
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
,
|
||||
bool executable = false
|
||||
#endif
|
@ -0,0 +1,29 @@
|
||||
--- base/memory/platform_shared_memory_region_posix.cc.orig 2023-02-01 18:43:07 UTC
|
||||
+++ base/memory/platform_shared_memory_region_posix.cc
|
||||
@@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) {
|
||||
|
||||
} // namespace
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// static
|
||||
ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) {
|
||||
PlatformSharedMemoryRegion region =
|
||||
@@ -168,7 +168,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() {
|
||||
// static
|
||||
PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode,
|
||||
size_t size
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
,
|
||||
bool executable
|
||||
#endif
|
||||
@@ -197,7 +197,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion:
|
||||
// flag.
|
||||
FilePath directory;
|
||||
if (!GetShmemTempDir(
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
executable,
|
||||
#else
|
||||
false /* executable */,
|
@ -0,0 +1,28 @@
|
||||
--- base/message_loop/message_pump_glib.cc.orig 2022-08-31 12:19:35 UTC
|
||||
+++ base/message_loop/message_pump_glib.cc
|
||||
@@ -8,6 +8,11 @@
|
||||
#include <glib.h>
|
||||
#include <math.h>
|
||||
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+#include <pthread.h>
|
||||
+#include <pthread_np.h>
|
||||
+#endif
|
||||
+
|
||||
#include "base/logging.h"
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "base/notreached.h"
|
||||
@@ -51,9 +56,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti
|
||||
}
|
||||
|
||||
bool RunningOnMainThread() {
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+ return pthread_main_np();
|
||||
+#else
|
||||
auto pid = getpid();
|
||||
auto tid = PlatformThread::CurrentId();
|
||||
return pid > 0 && tid > 0 && pid == tid;
|
||||
+#endif
|
||||
}
|
||||
|
||||
// A brief refresher on GLib:
|
11
devel/electron26/files/patch-base_native__library__posix.cc
Normal file
11
devel/electron26/files/patch-base_native__library__posix.cc
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/native_library_posix.cc.orig 2022-05-19 14:06:27 UTC
|
||||
+++ base/native_library_posix.cc
|
||||
@@ -33,7 +33,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP
|
||||
// http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892,
|
||||
// and http://crbug.com/40794.
|
||||
int flags = RTLD_LAZY;
|
||||
-#if BUILDFLAG(IS_ANDROID) || !defined(RTLD_DEEPBIND)
|
||||
+#if BUILDFLAG(IS_ANDROID) || !defined(RTLD_DEEPBIND) || BUILDFLAG(IS_BSD)
|
||||
// Certain platforms don't define RTLD_DEEPBIND. Android dlopen() requires
|
||||
// further investigation, as it might vary across versions. Crash here to
|
||||
// warn developers that they're trying to rely on uncertain behavior.
|
@ -0,0 +1,11 @@
|
||||
--- base/native_library_unittest.cc.orig 2022-10-24 13:33:33 UTC
|
||||
+++ base/native_library_unittest.cc
|
||||
@@ -134,7 +134,7 @@ TEST(NativeLibraryTest, LoadLibrary) {
|
||||
// versions with respect to symbol resolution scope.
|
||||
// TSan and MSan error out on RTLD_DEEPBIND, https://crbug.com/705255
|
||||
#if !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \
|
||||
- !defined(MEMORY_SANITIZER)
|
||||
+ !defined(MEMORY_SANITIZER) && !BUILDFLAG(IS_BSD)
|
||||
|
||||
// Verifies that the |prefer_own_symbols| option satisfies its guarantee that
|
||||
// a loaded library will always prefer local symbol resolution before
|
@ -0,0 +1,16 @@
|
||||
--- base/posix/can_lower_nice_to.cc.orig 2022-02-28 16:54:41 UTC
|
||||
+++ base/posix/can_lower_nice_to.cc
|
||||
@@ -11,8 +11,12 @@
|
||||
|
||||
#include "build/build_config.h"
|
||||
|
||||
+#if BUILDFLAG(IS_FREEBSD)
|
||||
+#include <sys/param.h>
|
||||
+#endif
|
||||
+
|
||||
// Not defined on AIX by default.
|
||||
-#if BUILDFLAG(IS_AIX)
|
||||
+#if BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
#if defined(RLIMIT_NICE)
|
||||
#error Assumption about OS_AIX is incorrect
|
||||
#endif
|
@ -0,0 +1,39 @@
|
||||
--- base/posix/unix_domain_socket.cc.orig 2022-08-31 12:19:35 UTC
|
||||
+++ base/posix/unix_domain_socket.cc
|
||||
@@ -51,7 +51,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) {
|
||||
|
||||
// static
|
||||
bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
|
||||
-#if !BUILDFLAG(IS_APPLE)
|
||||
+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
|
||||
const int enable = 1;
|
||||
return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0;
|
||||
#else
|
||||
@@ -149,7 +149,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
|
||||
|
||||
const size_t kControlBufferSize =
|
||||
CMSG_SPACE(sizeof(int) * kMaxFileDescriptors)
|
||||
-#if !BUILDFLAG(IS_APPLE)
|
||||
+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
|
||||
// macOS does not support ucred.
|
||||
// macOS supports xucred, but this structure is insufficient.
|
||||
+ CMSG_SPACE(sizeof(struct ucred))
|
||||
@@ -177,7 +177,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
|
||||
wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg));
|
||||
wire_fds_len = payload_len / sizeof(int);
|
||||
}
|
||||
-#if !BUILDFLAG(IS_APPLE)
|
||||
+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)
|
||||
// macOS does not support SCM_CREDENTIALS.
|
||||
if (cmsg->cmsg_level == SOL_SOCKET &&
|
||||
cmsg->cmsg_type == SCM_CREDENTIALS) {
|
||||
@@ -211,6 +211,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd,
|
||||
socklen_t pid_size = sizeof(pid);
|
||||
if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0)
|
||||
pid = -1;
|
||||
+#elif BUILDFLAG(IS_BSD)
|
||||
+ NOTIMPLEMENTED();
|
||||
+ pid = -1;
|
||||
#else
|
||||
// |pid| will legitimately be -1 if we read EOF, so only DCHECK if we
|
||||
// actually received a message. Unfortunately, Linux allows sending zero
|
@ -0,0 +1,11 @@
|
||||
--- base/posix/unix_domain_socket_unittest.cc.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/posix/unix_domain_socket_unittest.cc
|
||||
@@ -10,6 +10,8 @@
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
+#include <signal.h>
|
||||
+
|
||||
#include "base/files/file_util.h"
|
||||
#include "base/files/scoped_file.h"
|
||||
#include "base/functional/bind.h"
|
11
devel/electron26/files/patch-base_process_kill.h
Normal file
11
devel/electron26/files/patch-base_process_kill.h
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/process/kill.h.orig 2022-05-19 14:06:27 UTC
|
||||
+++ base/process/kill.h
|
||||
@@ -113,7 +113,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro
|
||||
BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus(
|
||||
ProcessHandle handle, int* exit_code);
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// Spawns a thread to wait asynchronously for the child |process| to exit
|
||||
// and then reaps it.
|
||||
BASE_EXPORT void EnsureProcessGetsReaped(Process process);
|
11
devel/electron26/files/patch-base_process_kill__posix.cc
Normal file
11
devel/electron26/files/patch-base_process_kill__posix.cc
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/process/kill_posix.cc.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/process/kill_posix.cc
|
||||
@@ -157,7 +157,7 @@ void EnsureProcessTerminated(Process process) {
|
||||
0, new BackgroundReaper(std::move(process), Seconds(2)));
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
void EnsureProcessGetsReaped(Process process) {
|
||||
DCHECK(!process.is_current());
|
||||
|
11
devel/electron26/files/patch-base_process_launch.h
Normal file
11
devel/electron26/files/patch-base_process_launch.h
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/process/launch.h.orig 2023-05-25 00:41:38 UTC
|
||||
+++ base/process/launch.h
|
||||
@@ -200,7 +200,7 @@ struct BASE_EXPORT LaunchOptions {
|
||||
bool clear_environment = false;
|
||||
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// If non-zero, start the process using clone(), using flags as provided.
|
||||
// Unlike in clone, clone_flags may not contain a custom termination signal
|
||||
// that is sent to the parent when the child dies. The termination signal will
|
12
devel/electron26/files/patch-base_process_launch__posix.cc
Normal file
12
devel/electron26/files/patch-base_process_launch__posix.cc
Normal file
@ -0,0 +1,12 @@
|
||||
--- base/process/launch_posix.cc.orig 2022-08-31 12:19:35 UTC
|
||||
+++ base/process/launch_posix.cc
|
||||
@@ -64,6 +64,9 @@
|
||||
#error "macOS should use launch_mac.cc"
|
||||
#endif
|
||||
|
||||
+#if defined(OS_FREEBSD)
|
||||
+#pragma weak environ
|
||||
+#endif
|
||||
extern char** environ;
|
||||
|
||||
namespace base {
|
44
devel/electron26/files/patch-base_process_memory__linux.cc
Normal file
44
devel/electron26/files/patch-base_process_memory__linux.cc
Normal file
@ -0,0 +1,44 @@
|
||||
--- base/process/memory_linux.cc.orig 2023-02-01 18:43:07 UTC
|
||||
+++ base/process/memory_linux.cc
|
||||
@@ -20,6 +20,7 @@
|
||||
|
||||
namespace base {
|
||||
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
namespace {
|
||||
|
||||
void ReleaseReservationOrTerminate() {
|
||||
@@ -29,12 +30,14 @@ void ReleaseReservationOrTerminate() {
|
||||
}
|
||||
|
||||
} // namespace
|
||||
+#endif
|
||||
|
||||
void EnableTerminationOnHeapCorruption() {
|
||||
// On Linux, there nothing to do AFAIK.
|
||||
}
|
||||
|
||||
void EnableTerminationOnOutOfMemory() {
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
// Set the new-out of memory handler.
|
||||
std::set_new_handler(&ReleaseReservationOrTerminate);
|
||||
// If we're using glibc's allocator, the above functions will override
|
||||
@@ -43,8 +46,10 @@ void EnableTerminationOnOutOfMemory() {
|
||||
#if BUILDFLAG(USE_ALLOCATOR_SHIM)
|
||||
allocator_shim::SetCallNewHandlerOnMallocFailure(true);
|
||||
#endif
|
||||
+#endif
|
||||
}
|
||||
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
// ScopedAllowBlocking() has private constructor and it can only be used in
|
||||
// friend classes/functions. Declaring a class is easier in this situation to
|
||||
// avoid adding more dependency to thread_restrictions.h because of the
|
||||
@@ -104,6 +109,7 @@ bool AdjustOOMScoreHelper::AdjustOOMScore(ProcessId pr
|
||||
bool AdjustOOMScore(ProcessId process, int score) {
|
||||
return AdjustOOMScoreHelper::AdjustOOMScore(process, score);
|
||||
}
|
||||
+#endif
|
||||
|
||||
bool UncheckedMalloc(size_t size, void** result) {
|
||||
#if BUILDFLAG(USE_ALLOCATOR_SHIM)
|
11
devel/electron26/files/patch-base_process_process__handle.cc
Normal file
11
devel/electron26/files/patch-base_process_process__handle.cc
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/process/process_handle.cc.orig 2022-02-28 16:54:41 UTC
|
||||
+++ base/process/process_handle.cc
|
||||
@@ -30,7 +30,7 @@ UniqueProcId GetUniqueIdForProcess() {
|
||||
: UniqueProcId(GetCurrentProcId());
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_AIX)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
|
||||
void InitUniqueIdForProcessInPidNamespace(ProcessId pid_outside_of_namespace) {
|
||||
DCHECK(pid_outside_of_namespace != kNullProcessId);
|
11
devel/electron26/files/patch-base_process_process__handle.h
Normal file
11
devel/electron26/files/patch-base_process_process__handle.h
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/process/process_handle.h.orig 2022-02-28 16:54:41 UTC
|
||||
+++ base/process/process_handle.h
|
||||
@@ -106,7 +106,7 @@ BASE_EXPORT ProcessId GetCurrentProcId();
|
||||
// processes may be reused.
|
||||
BASE_EXPORT UniqueProcId GetUniqueIdForProcess();
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// When a process is started in a different PID namespace from the browser
|
||||
// process, this function must be called with the process's PID in the browser's
|
||||
// PID namespace in order to initialize its unique ID. Not thread safe.
|
@ -0,0 +1,25 @@
|
||||
--- base/process/process_handle_freebsd.cc.orig 2022-04-21 18:48:31 UTC
|
||||
+++ base/process/process_handle_freebsd.cc
|
||||
@@ -3,6 +3,7 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "base/process/process_handle.h"
|
||||
+#include "base/files/file_util.h"
|
||||
|
||||
#include <limits.h>
|
||||
#include <stddef.h>
|
||||
@@ -15,10 +16,13 @@ namespace base {
|
||||
|
||||
ProcessId GetParentProcessId(ProcessHandle process) {
|
||||
struct kinfo_proc info;
|
||||
- size_t length;
|
||||
+ size_t length = sizeof(struct kinfo_proc);
|
||||
int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process };
|
||||
|
||||
if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
|
||||
+ return -1;
|
||||
+
|
||||
+ if (length < sizeof(struct kinfo_proc))
|
||||
return -1;
|
||||
|
||||
return info.ki_ppid;
|
@ -0,0 +1,89 @@
|
||||
--- base/process/process_handle_openbsd.cc.orig 2022-04-21 18:48:31 UTC
|
||||
+++ base/process/process_handle_openbsd.cc
|
||||
@@ -3,8 +3,11 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "base/process/process_handle.h"
|
||||
+#include "base/files/file_util.h"
|
||||
|
||||
#include <stddef.h>
|
||||
+#include <sys/param.h>
|
||||
+#include <sys/proc.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
@@ -12,39 +15,59 @@
|
||||
namespace base {
|
||||
|
||||
ProcessId GetParentProcessId(ProcessHandle process) {
|
||||
- struct kinfo_proc info;
|
||||
+ struct kinfo_proc *info;
|
||||
size_t length;
|
||||
+ pid_t ppid;
|
||||
int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process,
|
||||
sizeof(struct kinfo_proc), 0 };
|
||||
|
||||
if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0)
|
||||
return -1;
|
||||
|
||||
+ info = (struct kinfo_proc *)malloc(length);
|
||||
+
|
||||
mib[5] = (length / sizeof(struct kinfo_proc));
|
||||
|
||||
- if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
|
||||
- return -1;
|
||||
+ if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) {
|
||||
+ ppid = -1;
|
||||
+ goto out;
|
||||
+ }
|
||||
|
||||
- return info.p_ppid;
|
||||
+ ppid = info->p_ppid;
|
||||
+
|
||||
+out:
|
||||
+ free(info);
|
||||
+ return ppid;
|
||||
}
|
||||
|
||||
FilePath GetProcessExecutablePath(ProcessHandle process) {
|
||||
- struct kinfo_proc kp;
|
||||
- size_t len;
|
||||
+ struct kinfo_proc *info;
|
||||
+ size_t length;
|
||||
+ char *path = NULL;
|
||||
int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process,
|
||||
sizeof(struct kinfo_proc), 0 };
|
||||
|
||||
- if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1)
|
||||
+ if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) == -1)
|
||||
return FilePath();
|
||||
- mib[5] = (len / sizeof(struct kinfo_proc));
|
||||
- if (sysctl(mib, std::size(mib), &kp, &len, NULL, 0) < 0)
|
||||
- return FilePath();
|
||||
- if ((kp.p_flag & P_SYSTEM) != 0)
|
||||
- return FilePath();
|
||||
- if (strcmp(kp.p_comm, "chrome") == 0)
|
||||
- return FilePath(kp.p_comm);
|
||||
|
||||
- return FilePath();
|
||||
+ info = (struct kinfo_proc *)malloc(length);
|
||||
+
|
||||
+ mib[5] = (length / sizeof(struct kinfo_proc));
|
||||
+
|
||||
+ if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0)
|
||||
+ goto out;
|
||||
+
|
||||
+ if ((info->p_flag & P_SYSTEM) != 0)
|
||||
+ goto out;
|
||||
+
|
||||
+ if (strcmp(info->p_comm, "chrome") == 0) {
|
||||
+ path = info->p_comm;
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+out:
|
||||
+ free(info);
|
||||
+ return FilePath(path);
|
||||
}
|
||||
|
||||
} // namespace base
|
@ -0,0 +1,51 @@
|
||||
--- base/process/process_iterator_freebsd.cc.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/process/process_iterator_freebsd.cc
|
||||
@@ -18,7 +18,7 @@ namespace base {
|
||||
|
||||
ProcessIterator::ProcessIterator(const ProcessFilter* filter)
|
||||
: filter_(filter) {
|
||||
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid() };
|
||||
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, (int) getuid() };
|
||||
|
||||
bool done = false;
|
||||
int try_num = 1;
|
||||
@@ -37,7 +37,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
|
||||
num_of_kinfo_proc += 16;
|
||||
kinfo_procs_.resize(num_of_kinfo_proc);
|
||||
len = num_of_kinfo_proc * sizeof(struct kinfo_proc);
|
||||
- if (sysctl(mib, std::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) {
|
||||
+ if (sysctl(mib, std::size(mib), kinfo_procs_.data(), &len, NULL, 0) < 0) {
|
||||
// If we get a mem error, it just means we need a bigger buffer, so
|
||||
// loop around again. Anything else is a real error and give up.
|
||||
if (errno != ENOMEM) {
|
||||
@@ -47,7 +47,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
|
||||
}
|
||||
} else {
|
||||
// Got the list, just make sure we're sized exactly right
|
||||
- size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
|
||||
+ num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
|
||||
kinfo_procs_.resize(num_of_kinfo_proc);
|
||||
done = true;
|
||||
}
|
||||
@@ -68,18 +68,13 @@ bool ProcessIterator::CheckForNextProcess() {
|
||||
for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
|
||||
size_t length;
|
||||
struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];
|
||||
- int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid };
|
||||
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, kinfo.ki_pid };
|
||||
|
||||
if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB))
|
||||
continue;
|
||||
|
||||
- length = 0;
|
||||
- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) {
|
||||
- LOG(ERROR) << "failed to figure out the buffer size for a command line";
|
||||
- continue;
|
||||
- }
|
||||
-
|
||||
- data.resize(length);
|
||||
+ data.resize(ARG_MAX);
|
||||
+ length = ARG_MAX;
|
||||
|
||||
if (sysctl(mib, std::size(mib), &data[0], &length, NULL, 0) < 0) {
|
||||
LOG(ERROR) << "failed to fetch a commandline";
|
@ -0,0 +1,45 @@
|
||||
--- base/process/process_iterator_openbsd.cc.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/process/process_iterator_openbsd.cc
|
||||
@@ -6,6 +6,9 @@
|
||||
|
||||
#include <errno.h>
|
||||
#include <stddef.h>
|
||||
+#include <unistd.h>
|
||||
+#include <sys/param.h>
|
||||
+#include <sys/proc.h>
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
#include "base/logging.h"
|
||||
@@ -16,12 +19,13 @@ namespace base {
|
||||
|
||||
ProcessIterator::ProcessIterator(const ProcessFilter* filter)
|
||||
: filter_(filter) {
|
||||
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, getuid(),
|
||||
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_UID, static_cast<int>(getuid()),
|
||||
sizeof(struct kinfo_proc), 0 };
|
||||
|
||||
bool done = false;
|
||||
int try_num = 1;
|
||||
const int max_tries = 10;
|
||||
+ size_t num_of_kinfo_proc;
|
||||
|
||||
do {
|
||||
size_t len = 0;
|
||||
@@ -30,7 +34,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
|
||||
kinfo_procs_.resize(0);
|
||||
done = true;
|
||||
} else {
|
||||
- size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
|
||||
+ num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
|
||||
// Leave some spare room for process table growth (more could show up
|
||||
// between when we check and now)
|
||||
num_of_kinfo_proc += 16;
|
||||
@@ -46,7 +50,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
|
||||
}
|
||||
} else {
|
||||
// Got the list, just make sure we're sized exactly right
|
||||
- size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
|
||||
+ num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
|
||||
kinfo_procs_.resize(num_of_kinfo_proc);
|
||||
done = true;
|
||||
}
|
@ -0,0 +1,54 @@
|
||||
--- base/process/process_metrics.cc.orig 2023-05-25 00:41:38 UTC
|
||||
+++ base/process/process_metrics.cc
|
||||
@@ -17,7 +17,7 @@ namespace base {
|
||||
namespace {
|
||||
|
||||
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
- BUILDFLAG(IS_AIX)
|
||||
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
int CalculateEventsPerSecond(uint64_t event_count,
|
||||
uint64_t* last_event_count,
|
||||
base::TimeTicks* last_calculated) {
|
||||
@@ -54,7 +54,7 @@ SystemMetrics SystemMetrics::Sample() {
|
||||
SystemMetrics system_metrics;
|
||||
|
||||
system_metrics.committed_memory_ = GetSystemCommitCharge();
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
GetSystemMemoryInfo(&system_metrics.memory_info_);
|
||||
GetVmStatInfo(&system_metrics.vmstat_info_);
|
||||
GetSystemDiskInfo(&system_metrics.disk_info_);
|
||||
@@ -73,7 +73,7 @@ Value::Dict SystemMetrics::ToDict() const {
|
||||
Value::Dict res;
|
||||
|
||||
res.Set("committed_memory", static_cast<int>(committed_memory_));
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
Value::Dict meminfo = memory_info_.ToDict();
|
||||
meminfo.Merge(vmstat_info_.ToDict());
|
||||
res.Set("meminfo", std::move(meminfo));
|
||||
@@ -100,7 +100,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
|
||||
#endif // !BUILDFLAG(IS_MAC)
|
||||
}
|
||||
|
||||
-#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX)
|
||||
double ProcessMetrics::GetPlatformIndependentCPUUsage(
|
||||
TimeDelta cumulative_cpu) {
|
||||
TimeTicks time = TimeTicks::Now();
|
||||
@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
|
||||
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
|
||||
return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage());
|
||||
}
|
||||
-#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) {
|
||||
@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
- BUILDFLAG(IS_AIX)
|
||||
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
int ProcessMetrics::CalculateIdleWakeupsPerSecond(
|
||||
uint64_t absolute_idle_wakeups) {
|
||||
return CalculateEventsPerSecond(absolute_idle_wakeups,
|
120
devel/electron26/files/patch-base_process_process__metrics.h
Normal file
120
devel/electron26/files/patch-base_process_process__metrics.h
Normal file
@ -0,0 +1,120 @@
|
||||
--- base/process/process_metrics.h.orig 2023-08-10 01:48:31 UTC
|
||||
+++ base/process/process_metrics.h
|
||||
@@ -38,7 +38,7 @@
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
- BUILDFLAG(IS_AIX)
|
||||
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
@@ -53,7 +53,7 @@ struct IoCounters;
|
||||
|
||||
class ProcessMetricsAppleInternal;
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
// Minor and major page fault counts since the process creation.
|
||||
// Both counts are process-wide, and exclude child processes.
|
||||
//
|
||||
@@ -108,7 +108,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
// convenience wrapper for CreateProcessMetrics().
|
||||
static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
// Resident Set Size is a Linux/Android specific memory concept. Do not
|
||||
// attempt to extend this to other platforms.
|
||||
BASE_EXPORT size_t GetResidentSetSize() const;
|
||||
@@ -166,7 +166,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
- BUILDFLAG(IS_AIX)
|
||||
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
// Emits the cumulative CPU usage for all currently active threads since they
|
||||
// were started into the output parameter (replacing its current contents).
|
||||
// Threads that have already terminated will not be reported. Thus, the sum of
|
||||
@@ -226,7 +226,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
int GetOpenFdSoftLimit() const;
|
||||
#endif // BUILDFLAG(IS_POSIX)
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
// Bytes of swap as reported by /proc/[pid]/status.
|
||||
uint64_t GetVmSwapBytes() const;
|
||||
|
||||
@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
#endif // !BUILDFLAG(IS_MAC)
|
||||
|
||||
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
- BUILDFLAG(IS_AIX)
|
||||
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
|
||||
#endif
|
||||
#if BUILDFLAG(IS_APPLE)
|
||||
@@ -266,9 +266,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
// Used to store the previous times and CPU usage counts so we can
|
||||
// compute the CPU usage between calls.
|
||||
TimeTicks last_cpu_time_;
|
||||
-#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX)
|
||||
TimeDelta last_cumulative_cpu_;
|
||||
-#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
TimeTicks last_cpu_time_for_precise_cpu_usage_;
|
||||
@@ -276,7 +274,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
- BUILDFLAG(IS_AIX)
|
||||
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
// Same thing for idle wakeups.
|
||||
TimeTicks last_idle_wakeups_time_;
|
||||
uint64_t last_absolute_idle_wakeups_;
|
||||
@@ -313,7 +311,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
|
||||
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
|
||||
- BUILDFLAG(IS_FUCHSIA)
|
||||
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
||||
// Data about system-wide memory consumption. Values are in KB. Available on
|
||||
// Windows, Mac, Linux, Android and Chrome OS.
|
||||
//
|
||||
@@ -348,7 +346,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
- BUILDFLAG(IS_AIX)
|
||||
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
// This provides an estimate of available memory as described here:
|
||||
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
|
||||
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
|
||||
@@ -363,7 +361,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
- BUILDFLAG(IS_AIX) || BUILDFLAG(IS_FUCHSIA)
|
||||
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
||||
int buffers = 0;
|
||||
int cached = 0;
|
||||
int active_anon = 0;
|
||||
@@ -400,7 +398,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
|
||||
// BUILDFLAG(IS_FUCHSIA)
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
- BUILDFLAG(IS_AIX)
|
||||
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
// Parse the data found in /proc/<pid>/stat and return the sum of the
|
||||
// CPU-related ticks. Returns -1 on parse error.
|
||||
// Exposed for testing.
|
||||
@@ -588,7 +586,7 @@ class BASE_EXPORT SystemMetrics {
|
||||
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
|
||||
|
||||
size_t committed_memory_;
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
SystemMemoryInfoKB memory_info_;
|
||||
VmStatInfo vmstat_info_;
|
||||
SystemDiskInfo disk_info_;
|
@ -0,0 +1,305 @@
|
||||
--- base/process/process_metrics_freebsd.cc.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/process/process_metrics_freebsd.cc
|
||||
@@ -3,20 +3,39 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "base/process/process_metrics.h"
|
||||
+#include "base/notreached.h"
|
||||
|
||||
#include <stddef.h>
|
||||
+#include <sys/types.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/user.h>
|
||||
#include <unistd.h>
|
||||
|
||||
+#include <fcntl.h> /* O_RDONLY */
|
||||
+#include <kvm.h>
|
||||
+#include <libutil.h>
|
||||
+
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "base/process/process_metrics_iocounters.h"
|
||||
+#include "base/values.h"
|
||||
|
||||
namespace base {
|
||||
+namespace {
|
||||
+int GetPageShift() {
|
||||
+ int pagesize = getpagesize();
|
||||
+ int pageshift = 0;
|
||||
|
||||
+ while (pagesize > 1) {
|
||||
+ pageshift++;
|
||||
+ pagesize >>= 1;
|
||||
+ }
|
||||
+
|
||||
+ return pageshift;
|
||||
+}
|
||||
+}
|
||||
+
|
||||
ProcessMetrics::ProcessMetrics(ProcessHandle process)
|
||||
- : process_(process),
|
||||
- last_cpu_(0) {}
|
||||
+ : process_(process) {}
|
||||
|
||||
// static
|
||||
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
|
||||
@@ -24,22 +43,19 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
|
||||
return WrapUnique(new ProcessMetrics(process));
|
||||
}
|
||||
|
||||
-double ProcessMetrics::GetPlatformIndependentCPUUsage() {
|
||||
+TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
|
||||
struct kinfo_proc info;
|
||||
- int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_};
|
||||
- size_t length = sizeof(info);
|
||||
+ size_t length = sizeof(struct kinfo_proc);
|
||||
+ struct timeval tv;
|
||||
|
||||
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ };
|
||||
+
|
||||
if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
|
||||
- return 0;
|
||||
+ return TimeDelta();
|
||||
|
||||
- return (info.ki_pctcpu / FSCALE) * 100.0;
|
||||
+ return Microseconds(info.ki_runtime);
|
||||
}
|
||||
|
||||
-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
|
||||
- NOTREACHED();
|
||||
- return TimeDelta();
|
||||
-}
|
||||
-
|
||||
bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
|
||||
return false;
|
||||
}
|
||||
@@ -65,6 +81,230 @@ size_t GetSystemCommitCharge() {
|
||||
pagesize = getpagesize();
|
||||
|
||||
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
|
||||
+}
|
||||
+
|
||||
+int64_t GetNumberOfThreads(ProcessHandle process) {
|
||||
+ // Taken from FreeBSD top (usr.bin/top/machine.c)
|
||||
+
|
||||
+ kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open");
|
||||
+ if (kd == NULL)
|
||||
+ return 0;
|
||||
+
|
||||
+ struct kinfo_proc* pbase;
|
||||
+ int nproc;
|
||||
+ pbase = kvm_getprocs(kd, KERN_PROC_PID, process, &nproc);
|
||||
+ if (pbase == NULL)
|
||||
+ return 0;
|
||||
+
|
||||
+ if (kvm_close(kd) == -1)
|
||||
+ return 0;
|
||||
+
|
||||
+ return nproc;
|
||||
+}
|
||||
+
|
||||
+bool GetSystemMemoryInfo(SystemMemoryInfoKB *meminfo) {
|
||||
+ unsigned int mem_total, mem_free, swap_total, swap_used;
|
||||
+ size_t length;
|
||||
+ int pagesizeKB;
|
||||
+
|
||||
+ pagesizeKB = getpagesize() / 1024;
|
||||
+
|
||||
+ length = sizeof(mem_total);
|
||||
+ if (sysctlbyname("vm.stats.vm.v_page_count", &mem_total,
|
||||
+ &length, NULL, 0) != 0 || length != sizeof(mem_total))
|
||||
+ return false;
|
||||
+
|
||||
+ length = sizeof(mem_free);
|
||||
+ if (sysctlbyname("vm.stats.vm.v_free_count", &mem_free, &length, NULL, 0)
|
||||
+ != 0 || length != sizeof(mem_free))
|
||||
+ return false;
|
||||
+
|
||||
+ length = sizeof(swap_total);
|
||||
+ if (sysctlbyname("vm.swap_size", &swap_total, &length, NULL, 0)
|
||||
+ != 0 || length != sizeof(swap_total))
|
||||
+ return false;
|
||||
+
|
||||
+ length = sizeof(swap_used);
|
||||
+ if (sysctlbyname("vm.swap_anon_use", &swap_used, &length, NULL, 0)
|
||||
+ != 0 || length != sizeof(swap_used))
|
||||
+ return false;
|
||||
+
|
||||
+ meminfo->total = mem_total * pagesizeKB;
|
||||
+ meminfo->free = mem_free * pagesizeKB;
|
||||
+ meminfo->swap_total = swap_total * pagesizeKB;
|
||||
+ meminfo->swap_free = (swap_total - swap_used) * pagesizeKB;
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+int ProcessMetrics::GetOpenFdCount() const {
|
||||
+ struct kinfo_file * kif;
|
||||
+ int cnt;
|
||||
+
|
||||
+ if ((kif = kinfo_getfile(process_, &cnt)) == NULL)
|
||||
+ return -1;
|
||||
+
|
||||
+ free(kif);
|
||||
+
|
||||
+ return cnt;
|
||||
+}
|
||||
+
|
||||
+int ProcessMetrics::GetOpenFdSoftLimit() const {
|
||||
+ size_t length;
|
||||
+ int total_count = 0;
|
||||
+ int mib[] = { CTL_KERN, KERN_MAXFILESPERPROC };
|
||||
+
|
||||
+ length = sizeof(total_count);
|
||||
+
|
||||
+ if (sysctl(mib, std::size(mib), &total_count, &length, NULL, 0) < 0) {
|
||||
+ total_count = -1;
|
||||
+ }
|
||||
+
|
||||
+ return total_count;
|
||||
+}
|
||||
+
|
||||
+size_t ProcessMetrics::GetResidentSetSize() const {
|
||||
+ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open");
|
||||
+
|
||||
+ if (kd == nullptr)
|
||||
+ return 0;
|
||||
+
|
||||
+ struct kinfo_proc *pp;
|
||||
+ int nproc;
|
||||
+
|
||||
+ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) {
|
||||
+ kvm_close(kd);
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ size_t rss;
|
||||
+
|
||||
+ if (nproc > 0) {
|
||||
+ rss = pp->ki_rssize << GetPageShift();
|
||||
+ } else {
|
||||
+ rss = 0;
|
||||
+ }
|
||||
+
|
||||
+ kvm_close(kd);
|
||||
+ return rss;
|
||||
+}
|
||||
+
|
||||
+uint64_t ProcessMetrics::GetVmSwapBytes() const {
|
||||
+ kvm_t *kd = kvm_open(nullptr, "/dev/null", nullptr, O_RDONLY, "kvm_open");
|
||||
+
|
||||
+ if (kd == nullptr)
|
||||
+ return 0;
|
||||
+
|
||||
+ struct kinfo_proc *pp;
|
||||
+ int nproc;
|
||||
+
|
||||
+ if ((pp = kvm_getprocs(kd, KERN_PROC_PID, process_, &nproc)) == nullptr) {
|
||||
+ kvm_close(kd);
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ size_t swrss;
|
||||
+
|
||||
+ if (nproc > 0) {
|
||||
+ swrss = pp->ki_swrss > pp->ki_rssize
|
||||
+ ? (pp->ki_swrss - pp->ki_rssize) << GetPageShift()
|
||||
+ : 0;
|
||||
+ } else {
|
||||
+ swrss = 0;
|
||||
+ }
|
||||
+
|
||||
+ kvm_close(kd);
|
||||
+ return swrss;
|
||||
+}
|
||||
+
|
||||
+int ProcessMetrics::GetIdleWakeupsPerSecond() {
|
||||
+ NOTIMPLEMENTED();
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) {
|
||||
+ NOTIMPLEMENTED();
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+bool GetVmStatInfo(VmStatInfo* vmstat) {
|
||||
+ NOTIMPLEMENTED();
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+SystemDiskInfo::SystemDiskInfo() {
|
||||
+ reads = 0;
|
||||
+ reads_merged = 0;
|
||||
+ sectors_read = 0;
|
||||
+ read_time = 0;
|
||||
+ writes = 0;
|
||||
+ writes_merged = 0;
|
||||
+ sectors_written = 0;
|
||||
+ write_time = 0;
|
||||
+ io = 0;
|
||||
+ io_time = 0;
|
||||
+ weighted_io_time = 0;
|
||||
+}
|
||||
+
|
||||
+SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo& other) = default;
|
||||
+
|
||||
+SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default;
|
||||
+
|
||||
+Value::Dict SystemDiskInfo::ToDict() const {
|
||||
+ Value::Dict res;
|
||||
+
|
||||
+ // Write out uint64_t variables as doubles.
|
||||
+ // Note: this may discard some precision, but for JS there's no other option.
|
||||
+ res.Set("reads", static_cast<double>(reads));
|
||||
+ res.Set("reads_merged", static_cast<double>(reads_merged));
|
||||
+ res.Set("sectors_read", static_cast<double>(sectors_read));
|
||||
+ res.Set("read_time", static_cast<double>(read_time));
|
||||
+ res.Set("writes", static_cast<double>(writes));
|
||||
+ res.Set("writes_merged", static_cast<double>(writes_merged));
|
||||
+ res.Set("sectors_written", static_cast<double>(sectors_written));
|
||||
+ res.Set("write_time", static_cast<double>(write_time));
|
||||
+ res.Set("io", static_cast<double>(io));
|
||||
+ res.Set("io_time", static_cast<double>(io_time));
|
||||
+ res.Set("weighted_io_time", static_cast<double>(weighted_io_time));
|
||||
+
|
||||
+ NOTIMPLEMENTED();
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+
|
||||
+Value::Dict SystemMemoryInfoKB::ToDict() const {
|
||||
+ Value::Dict res;
|
||||
+ res.Set("total", total);
|
||||
+ res.Set("free", free);
|
||||
+ res.Set("available", available);
|
||||
+ res.Set("buffers", buffers);
|
||||
+ res.Set("cached", cached);
|
||||
+ res.Set("active_anon", active_anon);
|
||||
+ res.Set("inactive_anon", inactive_anon);
|
||||
+ res.Set("active_file", active_file);
|
||||
+ res.Set("inactive_file", inactive_file);
|
||||
+ res.Set("swap_total", swap_total);
|
||||
+ res.Set("swap_free", swap_free);
|
||||
+ res.Set("swap_used", swap_total - swap_free);
|
||||
+ res.Set("dirty", dirty);
|
||||
+ res.Set("reclaimable", reclaimable);
|
||||
+
|
||||
+ NOTIMPLEMENTED();
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+
|
||||
+Value::Dict VmStatInfo::ToDict() const {
|
||||
+ Value::Dict res;
|
||||
+ // TODO(crbug.com/1334256): Make base::Value able to hold uint64_t and remove
|
||||
+ // casts below.
|
||||
+ res.Set("pswpin", static_cast<int>(pswpin));
|
||||
+ res.Set("pswpout", static_cast<int>(pswpout));
|
||||
+ res.Set("pgmajfault", static_cast<int>(pgmajfault));
|
||||
+
|
||||
+ NOTIMPLEMENTED();
|
||||
+
|
||||
+ return res;
|
||||
}
|
||||
|
||||
} // namespace base
|
@ -0,0 +1,215 @@
|
||||
--- base/process/process_metrics_openbsd.cc.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/process/process_metrics_openbsd.cc
|
||||
@@ -6,14 +6,23 @@
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
+#include <fcntl.h>
|
||||
#include <sys/param.h>
|
||||
#include <sys/sysctl.h>
|
||||
+#include <sys/vmmeter.h>
|
||||
|
||||
+#include <kvm.h>
|
||||
+
|
||||
#include "base/memory/ptr_util.h"
|
||||
#include "base/process/process_metrics_iocounters.h"
|
||||
+#include "base/values.h"
|
||||
+#include "base/notreached.h"
|
||||
|
||||
namespace base {
|
||||
|
||||
+ProcessMetrics::ProcessMetrics(ProcessHandle process)
|
||||
+ : process_(process) {}
|
||||
+
|
||||
// static
|
||||
std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(
|
||||
ProcessHandle process) {
|
||||
@@ -24,49 +33,23 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun
|
||||
return false;
|
||||
}
|
||||
|
||||
-static int GetProcessCPU(pid_t pid) {
|
||||
+TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
|
||||
struct kinfo_proc info;
|
||||
- size_t length;
|
||||
- int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid,
|
||||
- sizeof(struct kinfo_proc), 0 };
|
||||
+ size_t length = sizeof(struct kinfo_proc);
|
||||
+ struct timeval tv;
|
||||
|
||||
- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0)
|
||||
- return -1;
|
||||
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_,
|
||||
+ sizeof(struct kinfo_proc), 1 };
|
||||
|
||||
- mib[5] = (length / sizeof(struct kinfo_proc));
|
||||
-
|
||||
if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0)
|
||||
- return 0;
|
||||
+ return TimeDelta();
|
||||
|
||||
- return info.p_pctcpu;
|
||||
-}
|
||||
+ tv.tv_sec = info.p_rtime_sec;
|
||||
+ tv.tv_usec = info.p_rtime_usec;
|
||||
|
||||
-double ProcessMetrics::GetPlatformIndependentCPUUsage() {
|
||||
- TimeTicks time = TimeTicks::Now();
|
||||
-
|
||||
- if (last_cpu_time_.is_zero()) {
|
||||
- // First call, just set the last values.
|
||||
- last_cpu_time_ = time;
|
||||
- return 0;
|
||||
- }
|
||||
-
|
||||
- int cpu = GetProcessCPU(process_);
|
||||
-
|
||||
- last_cpu_time_ = time;
|
||||
- double percentage = static_cast<double>((cpu * 100.0) / FSCALE);
|
||||
-
|
||||
- return percentage;
|
||||
+ return Microseconds(TimeValToMicroseconds(tv));
|
||||
}
|
||||
|
||||
-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() {
|
||||
- NOTREACHED();
|
||||
- return TimeDelta();
|
||||
-}
|
||||
-
|
||||
-ProcessMetrics::ProcessMetrics(ProcessHandle process)
|
||||
- : process_(process),
|
||||
- last_cpu_(0) {}
|
||||
-
|
||||
size_t GetSystemCommitCharge() {
|
||||
int mib[] = { CTL_VM, VM_METER };
|
||||
int pagesize;
|
||||
@@ -84,6 +67,129 @@ size_t GetSystemCommitCharge() {
|
||||
pagesize = getpagesize();
|
||||
|
||||
return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
|
||||
+}
|
||||
+
|
||||
+int ProcessMetrics::GetOpenFdCount() const {
|
||||
+ struct kinfo_file *files;
|
||||
+ kvm_t *kd = NULL;
|
||||
+ int total_count = 0;
|
||||
+ char errbuf[_POSIX2_LINE_MAX];
|
||||
+
|
||||
+ if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL)
|
||||
+ goto out;
|
||||
+
|
||||
+ if ((files = kvm_getfiles(kd, KERN_FILE_BYPID, process_,
|
||||
+ sizeof(struct kinfo_file), &total_count)) == NULL) {
|
||||
+ total_count = 0;
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ kvm_close(kd);
|
||||
+
|
||||
+out:
|
||||
+ return total_count;
|
||||
+}
|
||||
+
|
||||
+int ProcessMetrics::GetOpenFdSoftLimit() const {
|
||||
+ return GetMaxFds();
|
||||
+}
|
||||
+
|
||||
+uint64_t ProcessMetrics::GetVmSwapBytes() const {
|
||||
+ NOTIMPLEMENTED();
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) {
|
||||
+ NOTIMPLEMENTED_LOG_ONCE();
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) {
|
||||
+ NOTIMPLEMENTED();
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+bool GetVmStatInfo(VmStatInfo* vmstat) {
|
||||
+ NOTIMPLEMENTED();
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+int ProcessMetrics::GetIdleWakeupsPerSecond() {
|
||||
+ NOTIMPLEMENTED();
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+Value::Dict SystemMemoryInfoKB::ToDict() const {
|
||||
+ Value::Dict res;
|
||||
+ res.Set("total", total);
|
||||
+ res.Set("free", free);
|
||||
+ res.Set("available", available);
|
||||
+ res.Set("buffers", buffers);
|
||||
+ res.Set("cached", cached);
|
||||
+ res.Set("active_anon", active_anon);
|
||||
+ res.Set("inactive_anon", inactive_anon);
|
||||
+ res.Set("active_file", active_file);
|
||||
+ res.Set("inactive_file", inactive_file);
|
||||
+ res.Set("swap_total", swap_total);
|
||||
+ res.Set("swap_free", swap_free);
|
||||
+ res.Set("swap_used", swap_total - swap_free);
|
||||
+ res.Set("dirty", dirty);
|
||||
+ res.Set("reclaimable", reclaimable);
|
||||
+
|
||||
+ NOTIMPLEMENTED();
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+
|
||||
+Value::Dict VmStatInfo::ToDict() const {
|
||||
+ Value::Dict res;
|
||||
+ res.Set("pswpin", static_cast<int>(pswpin));
|
||||
+ res.Set("pswpout", static_cast<int>(pswpout));
|
||||
+ res.Set("pgmajfault", static_cast<int>(pgmajfault));
|
||||
+
|
||||
+ NOTIMPLEMENTED();
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+
|
||||
+SystemDiskInfo::SystemDiskInfo() {
|
||||
+ reads = 0;
|
||||
+ reads_merged = 0;
|
||||
+ sectors_read = 0;
|
||||
+ read_time = 0;
|
||||
+ writes = 0;
|
||||
+ writes_merged = 0;
|
||||
+ sectors_written = 0;
|
||||
+ write_time = 0;
|
||||
+ io = 0;
|
||||
+ io_time = 0;
|
||||
+ weighted_io_time = 0;
|
||||
+}
|
||||
+
|
||||
+SystemDiskInfo::SystemDiskInfo(const SystemDiskInfo&) = default;
|
||||
+
|
||||
+SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default;
|
||||
+
|
||||
+Value::Dict SystemDiskInfo::ToDict() const {
|
||||
+ Value::Dict res;
|
||||
+
|
||||
+ // Write out uint64_t variables as doubles.
|
||||
+ // Note: this may discard some precision, but for JS there's no other option.
|
||||
+ res.Set("reads", static_cast<double>(reads));
|
||||
+ res.Set("reads_merged", static_cast<double>(reads_merged));
|
||||
+ res.Set("sectors_read", static_cast<double>(sectors_read));
|
||||
+ res.Set("read_time", static_cast<double>(read_time));
|
||||
+ res.Set("writes", static_cast<double>(writes));
|
||||
+ res.Set("writes_merged", static_cast<double>(writes_merged));
|
||||
+ res.Set("sectors_written", static_cast<double>(sectors_written));
|
||||
+ res.Set("write_time", static_cast<double>(write_time));
|
||||
+ res.Set("io", static_cast<double>(io));
|
||||
+ res.Set("io_time", static_cast<double>(io_time));
|
||||
+ res.Set("weighted_io_time", static_cast<double>(weighted_io_time));
|
||||
+
|
||||
+ NOTIMPLEMENTED();
|
||||
+
|
||||
+ return res;
|
||||
}
|
||||
|
||||
} // namespace base
|
@ -0,0 +1,20 @@
|
||||
--- base/process/process_metrics_posix.cc.orig 2023-08-10 01:48:31 UTC
|
||||
+++ base/process/process_metrics_posix.cc
|
||||
@@ -21,6 +21,8 @@
|
||||
|
||||
#if BUILDFLAG(IS_APPLE)
|
||||
#include <malloc/malloc.h>
|
||||
+#elif BUILDFLAG(IS_OPENBSD)
|
||||
+#include <stdlib.h>
|
||||
#else
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
@@ -134,7 +136,7 @@ size_t ProcessMetrics::GetMallocUsage() {
|
||||
return stats.size_in_use;
|
||||
#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
return GetMallocUsageMallinfo();
|
||||
-#elif BUILDFLAG(IS_FUCHSIA)
|
||||
+#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
||||
// TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
|
||||
return 0;
|
||||
#endif
|
@ -0,0 +1,20 @@
|
||||
--- base/process/process_metrics_unittest.cc.orig 2022-09-24 10:57:32 UTC
|
||||
+++ base/process/process_metrics_unittest.cc
|
||||
@@ -44,7 +44,7 @@ namespace debug {
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \
|
||||
- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
|
||||
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -347,7 +347,7 @@ TEST_F(SystemMetricsTest, ParseVmstat) {
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \
|
||||
- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
|
||||
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
||||
|
||||
// Test that ProcessMetrics::GetPlatformIndependentCPUUsage() doesn't return
|
||||
// negative values when the number of threads running on the process decreases
|
93
devel/electron26/files/patch-base_process_process__posix.cc
Normal file
93
devel/electron26/files/patch-base_process_process__posix.cc
Normal file
@ -0,0 +1,93 @@
|
||||
--- base/process/process_posix.cc.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/process/process_posix.cc
|
||||
@@ -23,10 +23,15 @@
|
||||
#include "base/trace_event/base_tracing.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
-#if BUILDFLAG(IS_MAC)
|
||||
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
||||
#include <sys/event.h>
|
||||
#endif
|
||||
|
||||
+#if defined(OS_BSD)
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/sysctl.h>
|
||||
+#endif
|
||||
+
|
||||
#if BUILDFLAG(CLANG_PROFILING)
|
||||
#include "base/test/clang_profiling.h"
|
||||
#endif
|
||||
@@ -93,7 +98,7 @@ bool WaitpidWithTimeout(base::ProcessHandle handle,
|
||||
return ret_pid > 0;
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_MAC)
|
||||
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
||||
// Using kqueue on Mac so that we can wait on non-child processes.
|
||||
// We can't use kqueues on child processes because we need to reap
|
||||
// our own children using wait.
|
||||
@@ -198,7 +203,7 @@ bool WaitForExitWithTimeoutImpl(base::ProcessHandle ha
|
||||
const bool exited = (parent_pid < 0);
|
||||
|
||||
if (!exited && parent_pid != our_pid) {
|
||||
-#if BUILDFLAG(IS_MAC)
|
||||
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
|
||||
// On Mac we can wait on non child processes.
|
||||
return WaitForSingleNonChildProcess(handle, timeout);
|
||||
#else
|
||||
@@ -387,7 +392,55 @@ void Process::Exited(int exit_code) const {
|
||||
|
||||
int Process::GetPriority() const {
|
||||
DCHECK(IsValid());
|
||||
+// avoid pledge(2) violation
|
||||
+#if defined(OS_BSD)
|
||||
+ return 0;
|
||||
+#else
|
||||
return getpriority(PRIO_PROCESS, static_cast<id_t>(process_));
|
||||
+#endif
|
||||
+}
|
||||
+
|
||||
+Time Process::CreationTime() const {
|
||||
+// avoid ps pledge in the network process
|
||||
+#if !defined(OS_BSD)
|
||||
+ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid(),
|
||||
+ sizeof(struct kinfo_proc), 0 };
|
||||
+ struct kinfo_proc *info = nullptr;
|
||||
+ size_t info_size;
|
||||
+#endif
|
||||
+ Time ct = Time();
|
||||
+
|
||||
+#if !defined(OS_BSD)
|
||||
+ if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0)
|
||||
+ goto out;
|
||||
+
|
||||
+ mib[5] = (info_size / sizeof(struct kinfo_proc));
|
||||
+ if ((info = reinterpret_cast<kinfo_proc*>(malloc(info_size))) == NULL)
|
||||
+ goto out;
|
||||
+
|
||||
+ if (sysctl(mib, std::size(mib), info, &info_size, NULL, 0) < 0)
|
||||
+ goto out;
|
||||
+
|
||||
+ ct = Time::FromTimeT(info->p_ustart_sec);
|
||||
+
|
||||
+out:
|
||||
+ if (info)
|
||||
+ free(info);
|
||||
+#endif
|
||||
+ return ct;
|
||||
+}
|
||||
+
|
||||
+bool Process::IsProcessBackgrounded() const {
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+bool Process::SetProcessBackgrounded(bool value) {
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+// static
|
||||
+bool Process::CanBackgroundProcesses() {
|
||||
+ return false;
|
||||
}
|
||||
|
||||
} // namespace base
|
@ -0,0 +1,11 @@
|
||||
--- base/process/process_unittest.cc.orig 2023-05-25 00:41:38 UTC
|
||||
+++ base/process/process_unittest.cc
|
||||
@@ -195,7 +195,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
|
||||
// was spawned and a time recorded after it was spawned. However, since the
|
||||
// base::Time and process creation clocks don't match, tolerate some error.
|
||||
constexpr base::TimeDelta kTolerance =
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// On Linux, process creation time is relative to boot time which has a
|
||||
// 1-second resolution. Tolerate 1 second for the imprecise boot time and
|
||||
// 100 ms for the imprecise clock.
|
11
devel/electron26/files/patch-base_profiler_module__cache.cc
Normal file
11
devel/electron26/files/patch-base_profiler_module__cache.cc
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/profiler/module_cache.cc.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/profiler/module_cache.cc
|
||||
@@ -37,7 +37,7 @@ std::string TransformModuleIDToSymbolServerFormat(Stri
|
||||
// Android and Linux Chrome builds use the "breakpad" format to index their
|
||||
// build id, so we transform the build id for these platforms. All other
|
||||
// platforms keep their symbols indexed by the original build ID.
|
||||
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
|
||||
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
|
||||
// Linux ELF module IDs are 160bit integers, which we need to mangle
|
||||
// down to 128bit integers to match the id that Breakpad outputs.
|
||||
// Example on version '66.0.3359.170' x64:
|
@ -0,0 +1,20 @@
|
||||
--- base/profiler/sampling_profiler_thread_token.cc.orig 2023-02-01 18:43:07 UTC
|
||||
+++ base/profiler/sampling_profiler_thread_token.cc
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#include "build/build_config.h"
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
#include <pthread.h>
|
||||
|
||||
#include "base/profiler/stack_base_address_posix.h"
|
||||
@@ -18,7 +18,7 @@ SamplingProfilerThreadToken GetSamplingProfilerCurrent
|
||||
PlatformThreadId id = PlatformThread::CurrentId();
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
return {id, pthread_self()};
|
||||
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
absl::optional<uintptr_t> maybe_stack_base =
|
||||
GetThreadStackBaseAddress(id, pthread_self());
|
||||
return {id, maybe_stack_base};
|
@ -0,0 +1,20 @@
|
||||
--- base/profiler/sampling_profiler_thread_token.h.orig 2023-02-01 18:43:07 UTC
|
||||
+++ base/profiler/sampling_profiler_thread_token.h
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
#include <pthread.h>
|
||||
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
@@ -26,7 +26,7 @@ struct SamplingProfilerThreadToken {
|
||||
PlatformThreadId id;
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
pthread_t pthread_id;
|
||||
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// Due to the sandbox, we can only retrieve the stack base address for the
|
||||
// current thread. We must grab it during
|
||||
// GetSamplingProfilerCurrentThreadToken() and not try to get it later.
|
@ -0,0 +1,50 @@
|
||||
--- base/profiler/stack_base_address_posix.cc.orig 2023-02-01 18:43:07 UTC
|
||||
+++ base/profiler/stack_base_address_posix.cc
|
||||
@@ -17,6 +17,10 @@
|
||||
#include "base/files/scoped_file.h"
|
||||
#endif
|
||||
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+#include <pthread_np.h>
|
||||
+#endif
|
||||
+
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
extern "C" void* __libc_stack_end;
|
||||
#endif
|
||||
@@ -45,7 +49,21 @@ absl::optional<uintptr_t> GetAndroidMainThreadStackBas
|
||||
|
||||
#if !BUILDFLAG(IS_LINUX)
|
||||
uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthread_id) {
|
||||
+#if BUILDFLAG(IS_OPENBSD)
|
||||
+ stack_t ss;
|
||||
+ void *address;
|
||||
+ size_t size;
|
||||
+ if (pthread_stackseg_np(pthread_id, &ss) != 0)
|
||||
+ return 0;
|
||||
+ size = ss.ss_size;
|
||||
+ address = (void*)((size_t) ss.ss_sp - ss.ss_size);
|
||||
+#else
|
||||
pthread_attr_t attr;
|
||||
+#if BUILDFLAG(IS_FREEBSD)
|
||||
+ int result;
|
||||
+ pthread_attr_init(&attr);
|
||||
+ pthread_attr_get_np(pthread_id, &attr);
|
||||
+#else
|
||||
// pthread_getattr_np will crash on ChromeOS & Linux if we are in the sandbox
|
||||
// and pthread_id refers to a different thread, due to the use of
|
||||
// sched_getaffinity().
|
||||
@@ -58,12 +76,14 @@ uintptr_t GetThreadStackBaseAddressImpl(pthread_t pthr
|
||||
<< logging::SystemErrorCodeToString(result);
|
||||
// See crbug.com/617730 for limitations of this approach on Linux-like
|
||||
// systems.
|
||||
+#endif
|
||||
void* address;
|
||||
size_t size;
|
||||
result = pthread_attr_getstack(&attr, &address, &size);
|
||||
CHECK_EQ(result, 0) << "pthread_attr_getstack returned "
|
||||
<< logging::SystemErrorCodeToString(result);
|
||||
pthread_attr_destroy(&attr);
|
||||
+#endif
|
||||
const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
|
||||
return base_address;
|
||||
}
|
@ -0,0 +1,11 @@
|
||||
--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2023-05-25 00:41:38 UTC
|
||||
+++ base/profiler/stack_sampling_profiler_test_util.cc
|
||||
@@ -36,7 +36,7 @@
|
||||
// Fortunately, it provides _alloca, which functions identically.
|
||||
#include <malloc.h>
|
||||
#define alloca _alloca
|
||||
-#else
|
||||
+#elif !BUILDFLAG(IS_BSD)
|
||||
#include <alloca.h>
|
||||
#endif
|
||||
|
@ -0,0 +1,11 @@
|
||||
--- base/profiler/stack_sampling_profiler_unittest.cc.orig 2022-02-28 16:54:41 UTC
|
||||
+++ base/profiler/stack_sampling_profiler_unittest.cc
|
||||
@@ -41,7 +41,7 @@
|
||||
#include <intrin.h>
|
||||
#include <malloc.h>
|
||||
#include <windows.h>
|
||||
-#else
|
||||
+#elif !BUILDFLAG(IS_BSD)
|
||||
#include <alloca.h>
|
||||
#endif
|
||||
|
@ -0,0 +1,20 @@
|
||||
--- base/profiler/thread_delegate_posix.cc.orig 2022-10-24 13:33:33 UTC
|
||||
+++ base/profiler/thread_delegate_posix.cc
|
||||
@@ -13,7 +13,7 @@
|
||||
#include "build/build_config.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.h"
|
||||
|
||||
-#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
|
||||
+#if !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
|
||||
#include "base/profiler/stack_base_address_posix.h"
|
||||
#endif
|
||||
|
||||
@@ -22,7 +22,7 @@ namespace base {
|
||||
std::unique_ptr<ThreadDelegatePosix> ThreadDelegatePosix::Create(
|
||||
SamplingProfilerThreadToken thread_token) {
|
||||
absl::optional<uintptr_t> base_address;
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
base_address = thread_token.stack_base_address;
|
||||
#else
|
||||
base_address =
|
11
devel/electron26/files/patch-base_rand__util.h
Normal file
11
devel/electron26/files/patch-base_rand__util.h
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/rand_util.h.orig 2023-05-25 00:41:38 UTC
|
||||
+++ base/rand_util.h
|
||||
@@ -121,7 +121,7 @@ void RandomShuffle(Itr first, Itr last) {
|
||||
std::shuffle(first, last, RandomBitGenerator());
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_POSIX)
|
||||
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_BSD)
|
||||
BASE_EXPORT int GetUrandomFD();
|
||||
#endif
|
||||
|
62
devel/electron26/files/patch-base_rand__util__posix.cc
Normal file
62
devel/electron26/files/patch-base_rand__util__posix.cc
Normal file
@ -0,0 +1,62 @@
|
||||
--- base/rand_util_posix.cc.orig 2022-11-30 08:12:58 UTC
|
||||
+++ base/rand_util_posix.cc
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "base/time/time.h"
|
||||
#include "build/build_config.h"
|
||||
|
||||
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL)
|
||||
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
|
||||
#include "third_party/lss/linux_syscall_support.h"
|
||||
#elif BUILDFLAG(IS_MAC)
|
||||
// TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK.
|
||||
@@ -46,6 +46,7 @@ static constexpr int kOpenFlags = O_RDONLY;
|
||||
static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC;
|
||||
#endif
|
||||
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
// We keep the file descriptor for /dev/urandom around so we don't need to
|
||||
// reopen it (which is expensive), and since we may not even be able to reopen
|
||||
// it if we are later put in a sandbox. This class wraps the file descriptor so
|
||||
@@ -63,10 +64,11 @@ class URandomFd {
|
||||
private:
|
||||
const int fd_;
|
||||
};
|
||||
+#endif
|
||||
|
||||
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
BUILDFLAG(IS_ANDROID)) && \
|
||||
- !BUILDFLAG(IS_NACL)
|
||||
+ !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
|
||||
// TODO(pasko): Unify reading kernel version numbers in:
|
||||
// mojo/core/channel_linux.cc
|
||||
// chrome/browser/android/seccomp_support_detector.cc
|
||||
@@ -176,6 +178,7 @@ bool UseBoringSSLForRandBytes() {
|
||||
namespace {
|
||||
|
||||
void RandBytes(void* output, size_t output_length, bool avoid_allocation) {
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
#if !BUILDFLAG(IS_NACL)
|
||||
// The BoringSSL experiment takes priority over everything else.
|
||||
if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) {
|
||||
@@ -214,6 +217,9 @@ void RandBytes(void* output, size_t output_length, boo
|
||||
const bool success =
|
||||
ReadFromFD(urandom_fd, static_cast<char*>(output), output_length);
|
||||
CHECK(success);
|
||||
+#else
|
||||
+ arc4random_buf(static_cast<char*>(output), output_length);
|
||||
+#endif
|
||||
}
|
||||
|
||||
} // namespace
|
||||
@@ -233,9 +239,11 @@ void RandBytes(void* output, size_t output_length) {
|
||||
RandBytes(output, output_length, /*avoid_allocation=*/false);
|
||||
}
|
||||
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
int GetUrandomFD() {
|
||||
static NoDestructor<URandomFd> urandom_fd;
|
||||
return urandom_fd->fd();
|
||||
}
|
||||
+#endif
|
||||
|
||||
} // namespace base
|
@ -0,0 +1,18 @@
|
||||
--- base/strings/safe_sprintf_unittest.cc.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/strings/safe_sprintf_unittest.cc
|
||||
@@ -733,6 +733,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
|
||||
#endif
|
||||
}
|
||||
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
TEST(SafeSPrintfTest, EmitNULL) {
|
||||
char buf[40];
|
||||
#if defined(__GNUC__)
|
||||
@@ -749,6 +750,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
}
|
||||
+#endif
|
||||
|
||||
TEST(SafeSPrintfTest, PointerSize) {
|
||||
// The internal data representation is a 64bit value, independent of the
|
@ -0,0 +1,23 @@
|
||||
--- base/synchronization/lock_impl.h.orig 2023-03-30 00:33:38 UTC
|
||||
+++ base/synchronization/lock_impl.h
|
||||
@@ -104,6 +104,10 @@ void LockImpl::Unlock() {
|
||||
}
|
||||
|
||||
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
|
||||
+#if BUILDFLAG(IS_FREEBSD)
|
||||
+#pragma GCC diagnostic push
|
||||
+#pragma GCC diagnostic ignored "-Wthread-safety-analysis"
|
||||
+#endif
|
||||
|
||||
#if DCHECK_IS_ON()
|
||||
BASE_EXPORT void dcheck_trylock_result(int rv);
|
||||
@@ -124,6 +128,9 @@ void LockImpl::Unlock() {
|
||||
dcheck_unlock_result(rv);
|
||||
#endif
|
||||
}
|
||||
+#if BUILDFLAG(IS_FREEBSD)
|
||||
+#pragma GCC diagnostic pop
|
||||
+#endif
|
||||
#endif
|
||||
|
||||
// This is an implementation used for AutoLock templated on the lock type.
|
20
devel/electron26/files/patch-base_syslog__logging.cc
Normal file
20
devel/electron26/files/patch-base_syslog__logging.cc
Normal file
@ -0,0 +1,20 @@
|
||||
--- base/syslog_logging.cc.orig 2022-02-28 16:54:41 UTC
|
||||
+++ base/syslog_logging.cc
|
||||
@@ -15,7 +15,7 @@
|
||||
#include "base/strings/string_util.h"
|
||||
#include "base/win/scoped_handle.h"
|
||||
#include "base/win/win_util.h"
|
||||
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
// <syslog.h> defines LOG_INFO, LOG_WARNING macros that could conflict with
|
||||
// base::LOG_INFO, base::LOG_WARNING.
|
||||
#include <syslog.h>
|
||||
@@ -147,7 +147,7 @@ EventLogMessage::~EventLogMessage() {
|
||||
|
||||
if (user_sid != nullptr)
|
||||
::LocalFree(user_sid);
|
||||
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
const char kEventSource[] = "chrome";
|
||||
openlog(kEventSource, LOG_NOWAIT | LOG_PID, LOG_USER);
|
||||
// We can't use the defined names for the logging severity from syslog.h
|
11
devel/electron26/files/patch-base_system_sys__info.cc
Normal file
11
devel/electron26/files/patch-base_system_sys__info.cc
Normal file
@ -0,0 +1,11 @@
|
||||
--- base/system/sys_info.cc.orig 2023-08-10 01:48:31 UTC
|
||||
+++ base/system/sys_info.cc
|
||||
@@ -155,7 +155,7 @@ std::string SysInfo::HardwareModelName() {
|
||||
#endif
|
||||
|
||||
void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) {
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
|
||||
constexpr base::TaskTraits kTraits = {base::MayBlock()};
|
||||
#else
|
||||
constexpr base::TaskTraits kTraits = {};
|
20
devel/electron26/files/patch-base_system_sys__info.h
Normal file
20
devel/electron26/files/patch-base_system_sys__info.h
Normal file
@ -0,0 +1,20 @@
|
||||
--- base/system/sys_info.h.orig 2023-08-10 01:48:31 UTC
|
||||
+++ base/system/sys_info.h
|
||||
@@ -261,6 +261,8 @@ class BASE_EXPORT SysInfo {
|
||||
static void ResetCpuSecurityMitigationsEnabledForTesting();
|
||||
#endif
|
||||
|
||||
+ static uint64_t MaxSharedMemorySize();
|
||||
+
|
||||
private:
|
||||
friend class test::ScopedAmountOfPhysicalMemoryOverride;
|
||||
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
|
||||
@@ -273,7 +275,7 @@ class BASE_EXPORT SysInfo {
|
||||
static HardwareInfo GetHardwareInfoSync();
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
- BUILDFLAG(IS_AIX)
|
||||
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
static uint64_t AmountOfAvailablePhysicalMemory(
|
||||
const SystemMemoryInfoKB& meminfo);
|
||||
#endif
|
115
devel/electron26/files/patch-base_system_sys__info__freebsd.cc
Normal file
115
devel/electron26/files/patch-base_system_sys__info__freebsd.cc
Normal file
@ -0,0 +1,115 @@
|
||||
--- base/system/sys_info_freebsd.cc.orig 2022-09-01 17:22:07 UTC
|
||||
+++ base/system/sys_info_freebsd.cc
|
||||
@@ -9,30 +9,106 @@
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
#include "base/notreached.h"
|
||||
+#include "base/process/process_metrics.h"
|
||||
+#include "base/strings/string_util.h"
|
||||
|
||||
namespace base {
|
||||
|
||||
-int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
|
||||
- int pages, page_size;
|
||||
+int SysInfo::NumberOfProcessors() {
|
||||
+ int mib[] = {CTL_HW, HW_NCPU};
|
||||
+ int ncpu;
|
||||
+ size_t size = sizeof(ncpu);
|
||||
+ if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) {
|
||||
+ NOTREACHED();
|
||||
+ return 1;
|
||||
+ }
|
||||
+ return ncpu;
|
||||
+}
|
||||
+
|
||||
+uint64_t SysInfo::AmountOfPhysicalMemoryImpl() {
|
||||
+ int pages, page_size, r = 0;
|
||||
size_t size = sizeof(pages);
|
||||
- sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
|
||||
- sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
|
||||
- if (pages == -1 || page_size == -1) {
|
||||
+
|
||||
+ if (r == 0)
|
||||
+ r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
|
||||
+ if (r == 0)
|
||||
+ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
|
||||
+
|
||||
+ if (r == -1) {
|
||||
NOTREACHED();
|
||||
return 0;
|
||||
}
|
||||
- return static_cast<int64_t>(pages) * page_size;
|
||||
+
|
||||
+ return static_cast<uint64_t>(pages) * page_size;
|
||||
}
|
||||
|
||||
+uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
|
||||
+ int page_size, r = 0;
|
||||
+ unsigned int pgfree, pginact, pgcache;
|
||||
+ size_t size = sizeof(page_size);
|
||||
+ size_t szpg = sizeof(pgfree);
|
||||
+
|
||||
+ if (r == 0)
|
||||
+ r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
|
||||
+ if (r == 0)
|
||||
+ r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0);
|
||||
+ if (r == 0)
|
||||
+ r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0);
|
||||
+ if (r == 0)
|
||||
+ r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
|
||||
+
|
||||
+ if (r == -1) {
|
||||
+ NOTREACHED();
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ return static_cast<uint64_t>((pgfree + pginact + pgcache) * page_size);
|
||||
+}
|
||||
+
|
||||
// static
|
||||
+uint64_t SysInfo::AmountOfAvailablePhysicalMemory(const SystemMemoryInfoKB& info) {
|
||||
+ uint64_t res_kb = info.available != 0
|
||||
+ ? info.available - info.active_file
|
||||
+ : info.free + info.reclaimable + info.inactive_file;
|
||||
+ return res_kb * 1024;
|
||||
+}
|
||||
+
|
||||
+// static
|
||||
+std::string SysInfo::CPUModelName() {
|
||||
+ int mib[] = { CTL_HW, HW_MODEL };
|
||||
+ char name[256];
|
||||
+ size_t size = std::size(name);
|
||||
+
|
||||
+ if (sysctl(mib, std::size(mib), &name, &size, NULL, 0) == 0) {
|
||||
+ return name;
|
||||
+ }
|
||||
+
|
||||
+ return std::string();
|
||||
+}
|
||||
+
|
||||
+// static
|
||||
uint64_t SysInfo::MaxSharedMemorySize() {
|
||||
size_t limit;
|
||||
size_t size = sizeof(limit);
|
||||
+
|
||||
if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
|
||||
NOTREACHED();
|
||||
return 0;
|
||||
}
|
||||
+
|
||||
return static_cast<uint64_t>(limit);
|
||||
+}
|
||||
+
|
||||
+SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() {
|
||||
+ HardwareInfo info;
|
||||
+
|
||||
+ info.manufacturer = "FreeBSD";
|
||||
+ info.model = HardwareModelName();
|
||||
+
|
||||
+ DCHECK(IsStringUTF8(info.manufacturer));
|
||||
+ DCHECK(IsStringUTF8(info.model));
|
||||
+
|
||||
+ return info;
|
||||
}
|
||||
|
||||
} // namespace base
|
@ -0,0 +1,94 @@
|
||||
--- base/system/sys_info_openbsd.cc.orig 2022-08-31 12:19:35 UTC
|
||||
+++ base/system/sys_info_openbsd.cc
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
#include "base/notreached.h"
|
||||
+#include "base/strings/string_util.h"
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -26,9 +27,15 @@ uint64_t AmountOfMemory(int pages_name) {
|
||||
|
||||
namespace base {
|
||||
|
||||
+// pledge(2)
|
||||
+int64_t aofpmem = 0;
|
||||
+int64_t aofapmem = 0;
|
||||
+int64_t shmmax = 0;
|
||||
+char cpumodel[256];
|
||||
+
|
||||
// static
|
||||
int SysInfo::NumberOfProcessors() {
|
||||
- int mib[] = {CTL_HW, HW_NCPU};
|
||||
+ int mib[] = {CTL_HW, HW_NCPUONLINE};
|
||||
int ncpu;
|
||||
size_t size = sizeof(ncpu);
|
||||
if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) {
|
||||
@@ -40,10 +47,26 @@ int SysInfo::NumberOfProcessors() {
|
||||
|
||||
// static
|
||||
uint64_t SysInfo::AmountOfPhysicalMemoryImpl() {
|
||||
- return AmountOfMemory(_SC_PHYS_PAGES);
|
||||
+ // pledge(2)
|
||||
+ if (!aofpmem)
|
||||
+ aofpmem = AmountOfMemory(_SC_PHYS_PAGES);
|
||||
+ return aofpmem;
|
||||
}
|
||||
|
||||
// static
|
||||
+std::string SysInfo::CPUModelName() {
|
||||
+ int mib[] = {CTL_HW, HW_MODEL};
|
||||
+ size_t len = std::size(cpumodel);
|
||||
+
|
||||
+ if (cpumodel[0] == '\0') {
|
||||
+ if (sysctl(mib, std::size(mib), cpumodel, &len, NULL, 0) < 0)
|
||||
+ return std::string();
|
||||
+ }
|
||||
+
|
||||
+ return std::string(cpumodel, len - 1);
|
||||
+}
|
||||
+
|
||||
+// static
|
||||
uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
|
||||
// We should add inactive file-backed memory also but there is no such
|
||||
// information from OpenBSD unfortunately.
|
||||
@@ -55,23 +78,28 @@ uint64_t SysInfo::MaxSharedMemorySize() {
|
||||
int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX};
|
||||
size_t limit;
|
||||
size_t size = sizeof(limit);
|
||||
+ // pledge(2)
|
||||
+ if (shmmax)
|
||||
+ goto out;
|
||||
if (sysctl(mib, std::size(mib), &limit, &size, NULL, 0) < 0) {
|
||||
NOTREACHED();
|
||||
return 0;
|
||||
}
|
||||
- return static_cast<uint64_t>(limit);
|
||||
+ shmmax = static_cast<uint64_t>(limit);
|
||||
+out:
|
||||
+ return shmmax;
|
||||
}
|
||||
|
||||
// static
|
||||
-std::string SysInfo::CPUModelName() {
|
||||
- int mib[] = {CTL_HW, HW_MODEL};
|
||||
- char name[256];
|
||||
- size_t len = std::size(name);
|
||||
- if (sysctl(mib, std::size(mib), name, &len, NULL, 0) < 0) {
|
||||
- NOTREACHED();
|
||||
- return std::string();
|
||||
- }
|
||||
- return name;
|
||||
+SysInfo::HardwareInfo SysInfo::GetHardwareInfoSync() {
|
||||
+ HardwareInfo info;
|
||||
+ // Set the manufacturer to "OpenBSD" and the model to
|
||||
+ // an empty string.
|
||||
+ info.manufacturer = "OpenBSD";
|
||||
+ info.model = HardwareModelName();
|
||||
+ DCHECK(IsStringUTF8(info.manufacturer));
|
||||
+ DCHECK(IsStringUTF8(info.model));
|
||||
+ return info;
|
||||
}
|
||||
|
||||
} // namespace base
|
29
devel/electron26/files/patch-base_system_sys__info__posix.cc
Normal file
29
devel/electron26/files/patch-base_system_sys__info__posix.cc
Normal file
@ -0,0 +1,29 @@
|
||||
--- base/system/sys_info_posix.cc.orig 2023-08-10 01:48:31 UTC
|
||||
+++ base/system/sys_info_posix.cc
|
||||
@@ -117,7 +117,7 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
|
||||
|
||||
namespace base {
|
||||
|
||||
-#if !BUILDFLAG(IS_OPENBSD)
|
||||
+#if !BUILDFLAG(IS_BSD)
|
||||
int SysInfo::NumberOfProcessors() {
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
absl::optional<int> number_of_physical_cores =
|
||||
@@ -161,7 +161,7 @@ int SysInfo::NumberOfProcessors() {
|
||||
|
||||
return num_cpus;
|
||||
}
|
||||
-#endif // !BUILDFLAG(IS_OPENBSD)
|
||||
+#endif // !BUILDFLAG(IS_BSD)
|
||||
|
||||
// static
|
||||
uint64_t SysInfo::AmountOfVirtualMemory() {
|
||||
@@ -251,6 +251,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
|
||||
arch = "x86";
|
||||
} else if (arch == "amd64") {
|
||||
arch = "x86_64";
|
||||
+ } else if (arch == "arm64") {
|
||||
+ arch = "aarch64";
|
||||
} else if (std::string(info.sysname) == "AIX") {
|
||||
arch = "ppc64";
|
||||
}
|
@ -0,0 +1,20 @@
|
||||
--- base/system/sys_info_unittest.cc.orig 2023-08-10 01:48:31 UTC
|
||||
+++ base/system/sys_info_unittest.cc
|
||||
@@ -263,12 +263,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
|
||||
EXPECT_TRUE(IsStringUTF8(hardware_info->model));
|
||||
bool empty_result_expected =
|
||||
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \
|
||||
- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
|
||||
+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \
|
||||
+ BUILDFLAG(IS_BSD)
|
||||
false;
|
||||
#else
|
||||
true;
|
||||
#endif
|
||||
EXPECT_EQ(hardware_info->manufacturer.empty(), empty_result_expected);
|
||||
+#if BUILDFLAG(IS_BSD)
|
||||
+ empty_result_expected = true;
|
||||
+#endif
|
||||
EXPECT_EQ(hardware_info->model.empty(), empty_result_expected);
|
||||
}
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user