parent
20a6c5bd04
commit
16af155a80
|
@ -1,6 +1,7 @@
|
|||
PORTNAME= vsearch
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 2.24.0
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= biology
|
||||
|
||||
MAINTAINER= jwb@FreeBSD.org
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
PORTNAME= xcircuit
|
||||
PORTVERSION= 3.10.30
|
||||
PORTREVISION= 1
|
||||
PORTEPOCH= 1
|
||||
CATEGORIES= cad
|
||||
MASTER_SITES= http://opencircuitdesign.com/xcircuit/archive/ \
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
PORTREVISION= 3
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= chinese
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= fldigi
|
||||
DISTVERSION= 4.2.02
|
||||
DISTVERSION= 4.2.03
|
||||
CATEGORIES= comms hamradio
|
||||
MASTER_SITES= SF/fldigi/${PORTNAME} \
|
||||
http://www.w1hkj.com/files/fldigi/
|
||||
|
@ -8,6 +8,8 @@ MAINTAINER= hamradio@FreeBSD.org
|
|||
COMMENT= Digital decoder for psk, cw, psk31, olivia
|
||||
WWW= http://www.w1hkj.com
|
||||
|
||||
BROKEN_FreeBSD_12= no hid support
|
||||
|
||||
LICENSE= GPLv3
|
||||
|
||||
BUILD_DEPENDS= asciidoc:textproc/asciidoc \
|
||||
|
@ -19,7 +21,8 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \
|
|||
libpng.so:graphics/png \
|
||||
libportaudio.so:audio/portaudio \
|
||||
libsamplerate.so:audio/libsamplerate \
|
||||
libsndfile.so:audio/libsndfile
|
||||
libsndfile.so:audio/libsndfile \
|
||||
libudev.so:devel/libudev-devd
|
||||
|
||||
USES= autoreconf compiler:c++11-lib desktop-file-utils gmake jpeg \
|
||||
perl5 pkgconfig shebangfix xorg
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1698762993
|
||||
SHA256 (fldigi-4.2.02.tar.gz) = f50386f3c3bd063b4c34d01ac439ff8d41ec1b7c12e3c2c252f307ef3a5a6b9e
|
||||
SIZE (fldigi-4.2.02.tar.gz) = 4979638
|
||||
TIMESTAMP = 1698927901
|
||||
SHA256 (fldigi-4.2.03.tar.gz) = b5c258a487858280be8d721dbdcd62c7effabfda0f71c7f18106cbd3020829a6
|
||||
SIZE (fldigi-4.2.03.tar.gz) = 4979861
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
--- configure.ac.orig 2021-07-01 20:36:20 UTC
|
||||
+++ configure.ac
|
||||
@@ -309,11 +309,6 @@ AC_FLDIGI_INTL
|
||||
# Set ac_cv_udev to yes/no
|
||||
# Define USE_LIBHID in config.h
|
||||
# Substitute LIBHID_CFLAGS and LIBHID_LIBS in Makefile
|
||||
-#if test "x$ac_cv_want_fldigi" = "xyes"; then
|
||||
-#AC_FLDIGI_PKG_CHECK([libhid], [libhid], [no], [no],
|
||||
-# [use udev libraries @<:@autodetect@:>@],
|
||||
-# [ENABLE_LIBHID])
|
||||
-#fi
|
||||
|
||||
### asciidoc
|
||||
# substitute ASCIIDOC and A2X in doc/Makefile
|
|
@ -1,11 +0,0 @@
|
|||
--- m4/build.m4.orig 2021-07-01 21:41:53 UTC
|
||||
+++ m4/build.m4
|
||||
@@ -94,7 +94,7 @@ $BFD_CFLAGS -pipe -Wall -fexceptions $OPT_CFLAGS $DEBU
|
||||
else if test "x$target_mingw32" = "xyes"; then
|
||||
FLDIGI_BUILD_LDADD="$FLDIGI_BUILD_LDADD -lsetupapi -lhid"
|
||||
else
|
||||
- FLDIGI_BUILD_LDADD="$FLDIGI_BUILD_LDADD -ludev"
|
||||
+ FLDIGI_BUILD_LDADD="$FLDIGI_BUILD_LDADD"
|
||||
fi
|
||||
fi
|
||||
|
|
@ -1,29 +0,0 @@
|
|||
--- src/Makefile.am.orig 2022-03-18 02:06:06 UTC
|
||||
+++ src/Makefile.am
|
||||
@@ -503,8 +503,6 @@ fldigi_SOURCES += \
|
||||
|
||||
# Sources that we build. It is OK to have headers here.
|
||||
fldigi_SOURCES += \
|
||||
- cmedia/cmedia.cxx \
|
||||
- cmedia/hid.cxx \
|
||||
combo/combo.cxx \
|
||||
config_script/create_default_script.cxx \
|
||||
config_script/run_script.h \
|
||||
@@ -709,9 +707,6 @@ EXTRA_fldigi_SOURCES += \
|
||||
EXTRA_fldigi_SOURCES += \
|
||||
blank/blank.cxx \
|
||||
blank/blank.h \
|
||||
- cmedia/hid_lin.cxx \
|
||||
- cmedia/hid_mac.cxx \
|
||||
- cmedia/hid_win.cxx \
|
||||
dialogs/fl_digi_main.cxx \
|
||||
dxcluster/arc-help.cxx \
|
||||
dxcluster/CCC_Commands.cxx \
|
||||
@@ -764,7 +759,6 @@ EXTRA_fldigi_SOURCES += \
|
||||
include/calendar.h \
|
||||
include/charsetdistiller.h \
|
||||
include/charsetlist.h \
|
||||
- include/cmedia.h \
|
||||
include/colorbox.h \
|
||||
include/combo.h \
|
||||
include/complex.h \
|
|
@ -0,0 +1,23 @@
|
|||
--- src/cmedia/hid_lin.cxx.orig 2023-08-04 01:13:37 UTC
|
||||
+++ src/cmedia/hid_lin.cxx
|
||||
@@ -35,10 +35,20 @@
|
||||
#include <fcntl.h>
|
||||
#include <poll.h>
|
||||
|
||||
+#ifdef __FreeBSD__
|
||||
+typedef unsigned short uint16_t;
|
||||
+typedef unsigned char __u8;
|
||||
+typedef unsigned long __u32;
|
||||
+#include <dev/hid/hidraw.h>
|
||||
+/* These are from linux */
|
||||
+#define BUS_USB 0x03
|
||||
+#define BUS_BLUETOOTH 0x05
|
||||
+#else
|
||||
/* Linux */
|
||||
#include <linux/hidraw.h>
|
||||
#include <linux/version.h>
|
||||
#include <linux/input.h>
|
||||
+#endif
|
||||
#include <libudev.h>
|
||||
|
||||
#include "hidapi.h"
|
|
@ -1,29 +0,0 @@
|
|||
--- src/dialogs/confdialog.cxx.orig 2023-08-31 22:56:35 UTC
|
||||
+++ src/dialogs/confdialog.cxx
|
||||
@@ -7790,7 +7790,7 @@ progdefaults.cmedia_ptt = false;
|
||||
btn_init_cmedia_PTT->redraw();
|
||||
} else {
|
||||
progdefaults.cmedia_ptt = false;
|
||||
-close_cmedia();
|
||||
+//close_cmedia();
|
||||
}
|
||||
progdefaults.changed = true;
|
||||
}
|
||||
@@ -7798,7 +7798,7 @@ static void cb_inp_cmedia_dev(Fl_ComboBox* o, void*) {
|
||||
Fl_ComboBox *inp_cmedia_dev=(Fl_ComboBox *)0;
|
||||
|
||||
static void cb_inp_cmedia_dev(Fl_ComboBox* o, void*) {
|
||||
- close_cmedia();
|
||||
+// close_cmedia();
|
||||
progdefaults.cmedia_device = o->value();
|
||||
btn_init_cmedia_PTT->labelcolor(FL_RED);
|
||||
btn_init_cmedia_PTT->redraw();
|
||||
@@ -7822,7 +7822,7 @@ static void cb_btn_test_cmedia(Fl_Button*, void*) {
|
||||
Fl_Button *btn_test_cmedia=(Fl_Button *)0;
|
||||
|
||||
static void cb_btn_test_cmedia(Fl_Button*, void*) {
|
||||
- test_hid_ptt();
|
||||
+// test_hid_ptt();
|
||||
}
|
||||
|
||||
Fl_File_Input *inp_wav_fname_regex=(Fl_File_Input *)0;
|
|
@ -1,11 +0,0 @@
|
|||
--- src/main.cxx.orig 2023-08-24 15:22:40 UTC
|
||||
+++ src/main.cxx
|
||||
@@ -1182,7 +1182,7 @@ int main (int argc, char *argv[])
|
||||
setTabColors();
|
||||
|
||||
progdefaults.testCommPorts();
|
||||
- init_hids();
|
||||
+ //init_hids();
|
||||
|
||||
#if USE_HAMLIB
|
||||
xcvr = new Rig();
|
|
@ -1,39 +0,0 @@
|
|||
--- src/rigcontrol/ptt.cxx.orig 2023-08-31 22:56:35 UTC
|
||||
+++ src/rigcontrol/ptt.cxx
|
||||
@@ -69,7 +69,7 @@
|
||||
|
||||
#include "n3fjp_logger.h"
|
||||
|
||||
-#include "cmedia.h"
|
||||
+//#include "cmedia.h"
|
||||
|
||||
LOG_FILE_SOURCE(debug::LOG_RIGCONTROL);
|
||||
|
||||
@@ -114,9 +114,11 @@ void PTT::reset(ptt_t dev)
|
||||
case PTT_TTY:
|
||||
open_tty();
|
||||
break;
|
||||
+#if 0
|
||||
case PTT_CMEDIA:
|
||||
cmedia_fd = open_cmedia(progdefaults.cmedia_device);
|
||||
break;
|
||||
+#endif
|
||||
default:
|
||||
break; // nothing to open
|
||||
}
|
||||
@@ -178,6 +180,7 @@ void PTT::set(bool ptt)
|
||||
set_uhrouter(ptt);
|
||||
break;
|
||||
#endif
|
||||
+#if 0
|
||||
case PTT_CMEDIA:
|
||||
if (cmedia_fd != -1) {
|
||||
int bitnbr = 2;
|
||||
@@ -188,6 +191,7 @@ void PTT::set(bool ptt)
|
||||
set_cmedia(bitnbr, ptt);
|
||||
}
|
||||
break;
|
||||
+#endif
|
||||
default:
|
||||
break;
|
||||
}
|
|
@ -1,8 +1,8 @@
|
|||
PORTNAME= iwmbt-firmware
|
||||
PORTVERSION= 20221109
|
||||
DEB_REVISION= 2
|
||||
DISTVERSION= 20230515
|
||||
DEB_REVISION= 3
|
||||
CATEGORIES= comms
|
||||
MASTER_SITES= DEBIAN/pool/non-free/f/firmware-nonfree/:main \
|
||||
MASTER_SITES= DEBIAN/pool/non-free-firmware/f/firmware-nonfree/:main \
|
||||
https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/intel/:old
|
||||
DISTFILES= ${MAINFW_FILE}:main \
|
||||
${OLDFW_FILE}${OLDFW_SUFX}:old
|
||||
|
@ -20,7 +20,7 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
|
|||
NO_BUILD= yes
|
||||
NO_ARCH= yes
|
||||
|
||||
MAINFW_FILE= firmware-iwlwifi_${PORTVERSION}-${DEB_REVISION}_all.deb
|
||||
MAINFW_FILE= firmware-iwlwifi_${DISTVERSION}-${DEB_REVISION}_all.deb
|
||||
OLDFW_FILE= ibt-hw-37.8.10-fw-22.50.19.14.f.bseq
|
||||
OLDFW_SUFX= ?id=6be4747ea1d731f661c5320acf3f1273a459d6da
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
TIMESTAMP = 1669462817
|
||||
SHA256 (firmware-iwlwifi_20221109-2_all.deb) = 593f01beec59fd4de2f76a907a32798bac4f4658ff5b22624f4eb8528e8c2370
|
||||
SIZE (firmware-iwlwifi_20221109-2_all.deb) = 20085936
|
||||
TIMESTAMP = 1693140290
|
||||
SHA256 (firmware-iwlwifi_20230515-3_all.deb) = bd6071baa22b43271958be577ed886032a96c6a2552cc5e476d8b960e20cc0fd
|
||||
SIZE (firmware-iwlwifi_20230515-3_all.deb) = 9445988
|
||||
SHA256 (ibt-hw-37.8.10-fw-22.50.19.14.f.bseq?id=6be4747ea1d731f661c5320acf3f1273a459d6da) = d1d25082ee30e971454e512e6a07af9c093bb8086f3b56f6afcc22de8e63d59a
|
||||
SIZE (ibt-hw-37.8.10-fw-22.50.19.14.f.bseq?id=6be4747ea1d731f661c5320acf3f1273a459d6da) = 47463
|
||||
|
|
|
@ -1,7 +1,13 @@
|
|||
%%DATADIR%%/ibt-0040-0041.ddc
|
||||
%%DATADIR%%/ibt-0040-0041.sfi
|
||||
%%DATADIR%%/ibt-0040-4150.ddc
|
||||
%%DATADIR%%/ibt-0040-4150.sfi
|
||||
%%DATADIR%%/ibt-0041-0041.ddc
|
||||
%%DATADIR%%/ibt-0041-0041.sfi
|
||||
%%DATADIR%%/ibt-1040-0041.ddc
|
||||
%%DATADIR%%/ibt-1040-0041.sfi
|
||||
%%DATADIR%%/ibt-1040-4150.ddc
|
||||
%%DATADIR%%/ibt-1040-4150.sfi
|
||||
%%DATADIR%%/ibt-11-5.ddc
|
||||
%%DATADIR%%/ibt-11-5.sfi
|
||||
%%DATADIR%%/ibt-12-16.ddc
|
||||
|
@ -18,6 +24,8 @@
|
|||
%%DATADIR%%/ibt-19-0-0.sfi
|
||||
%%DATADIR%%/ibt-19-0-1.ddc
|
||||
%%DATADIR%%/ibt-19-0-1.sfi
|
||||
%%DATADIR%%/ibt-19-0-3.ddc
|
||||
%%DATADIR%%/ibt-19-0-3.sfi
|
||||
%%DATADIR%%/ibt-19-0-4.ddc
|
||||
%%DATADIR%%/ibt-19-0-4.sfi
|
||||
%%DATADIR%%/ibt-19-16-4.ddc
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
PORTNAME= opencbm
|
||||
PORTVERSION= ${OCBM_VERSION}
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= comms archivers
|
||||
|
||||
MAINTAINER= zirias@FreeBSD.org
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
PORTNAME= keydb
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 6.3.3
|
||||
DISTVERSION= 6.3.4
|
||||
CATEGORIES= databases
|
||||
|
||||
MAINTAINER= zi@FreeBSD.org
|
||||
|
@ -15,7 +15,7 @@ LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \
|
|||
libsnappy.so:archivers/snappy \
|
||||
libzstd.so:archivers/zstd
|
||||
|
||||
USES= compiler:c11 cpe gmake pkgconfig:build tcl:test
|
||||
USES= compiler:c11 cpe gmake localbase:ldflags pkgconfig:build
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= Snapchat
|
||||
|
@ -25,8 +25,7 @@ USE_RC_SUBR= keydb keydb_sentinel
|
|||
MAKE_ENV= OPTIMIZATION= \
|
||||
V=yo
|
||||
|
||||
CFLAGS+= -I${LOCALBASE}/include
|
||||
LDFLAGS+= -lpthread -lm -lexecinfo -L${LOCALBASE}/lib
|
||||
LDFLAGS+= -lpthread -lm -lexecinfo
|
||||
|
||||
SUB_FILES= pkg-message
|
||||
SUB_LIST= PORTNAME=${PORTNAME} \
|
||||
|
@ -44,13 +43,13 @@ PLIST_SUB= KEYDB_DBDIR=${KEYDB_DBDIR} \
|
|||
KEYDB_RUNDIR=${KEYDB_RUNDIR} \
|
||||
KEYDB_USER=${USERS}
|
||||
|
||||
OPTIONS_DEFINE= TLS
|
||||
OPTIONS_DEFAULT= TLS
|
||||
OPTIONS_DEFINE= TLS
|
||||
OPTIONS_DEFAULT=TLS
|
||||
|
||||
TLS_DESC= Use TLS (openssl req.)
|
||||
|
||||
TLS_USES= ssl
|
||||
TLS_MAKE_ENV= BUILD_TLS=yes
|
||||
TLS_USES= ssl
|
||||
TLS_MAKE_ENV= BUILD_TLS=yes
|
||||
|
||||
BIN_FILES= keydb-benchmark keydb-check-aof keydb-check-rdb keydb-cli \
|
||||
keydb-sentinel keydb-server
|
||||
|
@ -87,7 +86,4 @@ do-install:
|
|||
${STAGEDIR}${KEYDB_DBDIR} \
|
||||
${STAGEDIR}${KEYDB_RUNDIR}
|
||||
|
||||
do-test:
|
||||
@cd ${WRKSRC} && ${TCLSH} tests/test_helper.tcl
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1698245036
|
||||
SHA256 (Snapchat-KeyDB-v6.3.3_GH0.tar.gz) = c6798cea3fe4ba4d1b42eea6ca2cfaee261786d12bf30aef1a53211d25ab66d9
|
||||
SIZE (Snapchat-KeyDB-v6.3.3_GH0.tar.gz) = 11541110
|
||||
TIMESTAMP = 1698955833
|
||||
SHA256 (Snapchat-KeyDB-v6.3.4_GH0.tar.gz) = 229190b251f921e05aff7b0d2f04b5676c198131e2abbec1e2cfb2e61215e2f3
|
||||
SIZE (Snapchat-KeyDB-v6.3.4_GH0.tar.gz) = 5942328
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- src/Makefile.orig 2023-10-25 15:47:51 UTC
|
||||
--- src/Makefile.orig 2023-11-02 20:13:44 UTC
|
||||
+++ src/Makefile
|
||||
@@ -138,21 +138,11 @@ endif
|
||||
@@ -138,7 +138,6 @@ endif
|
||||
# Override default settings if possible
|
||||
-include .make-settings
|
||||
|
||||
|
@ -8,41 +8,26 @@
|
|||
FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS)
|
||||
FINAL_CXXFLAGS=$(CXX_STD) $(WARN) $(OPT) $(DEBUG) $(CXXFLAGS) $(KEYDB_CFLAGS) $(REDIS_CFLAGS)
|
||||
FINAL_LDFLAGS=$(LDFLAGS) $(KEYDB_LDFLAGS) $(DEBUG)
|
||||
FINAL_LIBS+=-lm -lz -lcrypto -lbz2 -lzstd -llz4 -lsnappy
|
||||
|
||||
-ifneq ($(uname_S),Darwin)
|
||||
- FINAL_LIBS+=-latomic
|
||||
-endif
|
||||
-# Linux ARM32 needs -latomic at linking time
|
||||
-ifneq (,$(findstring armv,$(uname_M)))
|
||||
- FINAL_LIBS+=-latomic
|
||||
-endif
|
||||
-
|
||||
-
|
||||
ifeq ($(uname_S),SunOS)
|
||||
# SunOS
|
||||
ifeq ($(findstring -m32,$(FINAL_CFLAGS)),)
|
||||
@@ -211,7 +201,9 @@ ifeq ($(uname_S),NetBSD)
|
||||
else
|
||||
@@ -214,9 +213,6 @@ else
|
||||
ifeq ($(uname_S),FreeBSD)
|
||||
# FreeBSD
|
||||
- FINAL_LIBS+= -lpthread -lexecinfo
|
||||
+ FINAL_LIBS+= -lpthread -lexecinfo -luuid
|
||||
+ FINAL_CFLAGS?= $(CFLAGS) $(REDIS_CFLAGS) -I${PREFIX}/include
|
||||
+ FINAL_LDFLAGS= $(LDFLAGS) -pthread
|
||||
else
|
||||
ifeq ($(uname_S),DragonFly)
|
||||
# DragonFly
|
||||
@@ -347,7 +339,7 @@ else
|
||||
FINAL_LIBS+= -lpthread -luuid -lexecinfo
|
||||
- FINAL_CFLAGS+= -I/usr/local/include
|
||||
- FINAL_CXXFLAGS+= -I/usr/local/include
|
||||
- FINAL_LDFLAGS+= -L/usr/local/lib
|
||||
ifeq ($(USE_BACKTRACE),yes)
|
||||
FINAL_CFLAGS+= -DUSE_BACKTRACE
|
||||
endif
|
||||
@@ -355,7 +351,7 @@ else
|
||||
endif
|
||||
|
||||
# Alpine OS doesn't have support for the execinfo backtrace library we use for debug, so we provide an alternate implementation using libwunwind.
|
||||
-OS := $(shell cat /etc/os-release | grep ID= | head -n 1 | cut -d'=' -f2)
|
||||
+OS := $(shell uname -r)
|
||||
ifeq ($(OS),alpine)
|
||||
FINAL_CXXFLAGS+=-DUNW_LOCAL_ONLY -DALPINE
|
||||
FINAL_LIBS += -lunwind
|
||||
@@ -417,7 +409,6 @@ persist-settings: distclean
|
||||
FINAL_CXXFLAGS+=-DUNW_LOCAL_ONLY
|
||||
FINAL_CXXFLAGS+=-DALPINE
|
||||
@@ -426,7 +422,6 @@ persist-settings: distclean
|
||||
echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
|
||||
echo PREV_FINAL_CXXFLAGS=$(FINAL_CXXFLAGS) >> .make-settings
|
||||
echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
|
||||
|
|
|
@ -606,7 +606,6 @@
|
|||
SUBDIR += efl
|
||||
SUBDIR += egypt
|
||||
SUBDIR += eiffelstudio
|
||||
SUBDIR += electron22
|
||||
SUBDIR += electron24
|
||||
SUBDIR += electron25
|
||||
SUBDIR += electron26
|
||||
|
@ -7863,7 +7862,6 @@
|
|||
SUBDIR += xtensa-esp32-elf
|
||||
SUBDIR += xtl
|
||||
SUBDIR += xtl-quant-stack
|
||||
SUBDIR += xtoolchain-llvm-devel
|
||||
SUBDIR += xwpe
|
||||
SUBDIR += xxgdb
|
||||
SUBDIR += xxhash
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
PORTNAME= RStudio
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= 2022.12.0+353
|
||||
PORTREVISION= 5
|
||||
PORTREVISION= 6
|
||||
CATEGORIES= devel math java
|
||||
MASTER_SITES= https://s3.amazonaws.com/rstudio-buildtools/dictionaries/:dictionaries \
|
||||
https://s3.amazonaws.com/rstudio-buildtools/:buildtools
|
||||
|
@ -20,9 +20,6 @@ WWW= https://rstudio.com/
|
|||
LICENSE= AGPLv3
|
||||
LICENSE_FILE= ${WRKSRC}/COPYING
|
||||
|
||||
DEPRECATED= Depends on deprecated www/qt5-webkit
|
||||
EXPIRATION_DATE= 2023-11-26
|
||||
|
||||
BROKEN_i386= [ERROR] Line 101: Failed to resolve 'org.rstudio.studio.client.workbench.views.vcs.common.diff.LineActionButtonRenderer.GrayResources' via deferred binding
|
||||
|
||||
BUILD_DEPENDS= ant:devel/apache-ant \
|
||||
|
@ -74,7 +71,7 @@ GIN_VERSION= 2.1.2
|
|||
COMMENT+= (desktop UI version)
|
||||
USES+= desktop-file-utils qt:5 shared-mime-info
|
||||
USE_QT= core dbus declarative gui location network opengl printsupport quickcontrols sensors \
|
||||
sql svg webchannel webengine webkit widgets xml xmlpatterns buildtools:build qmake:build
|
||||
sql svg webchannel webengine widgets xml xmlpatterns buildtools:build qmake:build
|
||||
CMAKE_ARGS+= -DRSTUDIO_TARGET=Desktop
|
||||
INSTALL_SUBDIR= ${PORTNAME:tl}
|
||||
EXECUTABLE= ${PORTNAME:tl}
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
PORTNAME= aegis
|
||||
PORTVERSION= 4.25
|
||||
PORTREVISION= 1
|
||||
DISTVERSIONSUFFIX= .D510
|
||||
PORTREVISION= 14
|
||||
CATEGORIES= devel
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= log4j2
|
||||
PORTVERSION= 2.21.0
|
||||
PORTVERSION= 2.21.1
|
||||
CATEGORIES= devel java
|
||||
MASTER_SITES= APACHE/logging/log4j/${PORTVERSION}
|
||||
PKGNAMEPREFIX= apache-
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1697971857
|
||||
SHA256 (apache-log4j-2.21.0-bin.zip) = 574c32c8756d774515271c06f5d64a53e2d90844fbe9c14c3489cc7d3a69a62f
|
||||
SIZE (apache-log4j-2.21.0-bin.zip) = 3200893
|
||||
TIMESTAMP = 1698942395
|
||||
SHA256 (apache-log4j-2.21.1-bin.zip) = b24b8209454129ccbf1b0947b67305e88f8f1ea25f5f31d84dc8ce54229509f8
|
||||
SIZE (apache-log4j-2.21.1-bin.zip) = 3198627
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
PORTNAME= clojure-cider
|
||||
PORTVERSION= 1.9.0
|
||||
PORTVERSION= 1.10.0
|
||||
DISTVERSIONPREFIX= v
|
||||
CATEGORIES= devel elisp
|
||||
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1698237672
|
||||
SHA256 (clojure-emacs-cider-v1.9.0_GH0.tar.gz) = 3bc5a477bdc24d41014cb881f828adf24cae32991bcbaa511483f3e18fa5131b
|
||||
SIZE (clojure-emacs-cider-v1.9.0_GH0.tar.gz) = 7285662
|
||||
TIMESTAMP = 1698933788
|
||||
SHA256 (clojure-emacs-cider-v1.10.0_GH0.tar.gz) = 019b3d63e5f406fd92ba322fec95cbf87b363d14d3047dafbebf5c83ccd036a2
|
||||
SIZE (clojure-emacs-cider-v1.10.0_GH0.tar.gz) = 7287469
|
||||
|
|
|
@ -1,416 +0,0 @@
|
|||
PORTNAME= electron
|
||||
DISTVERSIONPREFIX= v
|
||||
DISTVERSION= ${ELECTRON_VER:S/-beta./.b/}
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= https://github.com/tagattie/FreeBSD-Electron/releases/download/v22.2.0/:chromium \
|
||||
https://commondatastorage.googleapis.com/chromium-nodejs/:chromium_node \
|
||||
https://commondatastorage.googleapis.com/chromium-fonts/:chromium_testfonts
|
||||
PKGNAMESUFFIX= ${ELECTRON_VER_MAJOR}
|
||||
DISTFILES= chromium-${CHROMIUM_VER}${EXTRACT_SUFX}:chromium \
|
||||
${CHROMIUM_NODE_MODULES_HASH}:chromium_node \
|
||||
${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
|
||||
|
||||
DEPRECATED= Depends on EOL NodeJS 16
|
||||
EXPIRATION_DATE= 2023-10-30
|
||||
|
||||
ONLY_FOR_ARCHS= aarch64 amd64 i386
|
||||
|
||||
FETCH_DEPENDS= yarn-node16>0:www/yarn-node16
|
||||
EXTRACT_DEPENDS=yarn-node16>0:www/yarn-node16
|
||||
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 \
|
||||
node16>0:www/node16 \
|
||||
npm-node16>0:www/npm-node16
|
||||
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 \
|
||||
libevent.so:devel/libevent \
|
||||
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 \
|
||||
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-node16>0:www/npm-node16
|
||||
|
||||
USES= bison compiler:c++17-lang cpe gettext-tools gl gnome \
|
||||
iconv:wchar_t jpeg localbase:ldflags ninja 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_hangout_services_extension=true \
|
||||
enable_js_type_check=false \
|
||||
enable_nacl=false \
|
||||
enable_remoting=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="none" \
|
||||
use_allocator_shim=false \
|
||||
use_aura=true \
|
||||
use_custom_libcxx=false \
|
||||
use_gnome_keyring=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_libjpeg=true \
|
||||
use_system_libwayland=true \
|
||||
use_system_wayland_scanner=true \
|
||||
use_udev=false \
|
||||
chrome_pgo_phase=0 \
|
||||
extra_cxxflags="${CXXFLAGS}" \
|
||||
extra_ldflags="${LDFLAGS}"
|
||||
|
||||
# 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
|
||||
OPTIONS_DEFAULT= CODECS CUPS DRIVER KERBEROS 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)
|
||||
|
||||
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+=ffmpeg_branding="Chrome" \
|
||||
GN_ARGS+=proprietary_codecs=true
|
||||
CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \
|
||||
GN_ARGS+=proprietary_codecs=false
|
||||
|
||||
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
|
||||
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= 108.0.5359.215
|
||||
# See ${WRKSRC}/third_party/node/node_modules.tar.gz.sha1 for CHROMIUM_NODE_MODULES_HASH
|
||||
CHROMIUM_NODE_MODULES_HASH= f8b5da24d33317766d3933fb6711b0603fc4fb6f
|
||||
# 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= 16.17.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= 1696924632
|
||||
|
||||
.include "Makefile.version"
|
||||
.include <bsd.port.pre.mk> # required for COMPILER_VERSION
|
||||
|
||||
.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} != 130
|
||||
LLVM_DEFAULT= 13
|
||||
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
|
||||
|
||||
.if ${ARCH} == "amd64"
|
||||
PLIST_SUB+= AMD64=""
|
||||
.else
|
||||
PLIST_SUB+= AMD64="@comment "
|
||||
.endif
|
||||
|
||||
.if ${ARCH} == "i386"
|
||||
PLIST_SUB+= I386=""
|
||||
.else
|
||||
PLIST_SUB+= I386="@comment "
|
||||
.endif
|
||||
|
||||
# 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}/node_modules ${WRKSRC}/third_party/node
|
||||
${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 \
|
||||
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
|
||||
.for brand in Chrome Chromium
|
||||
${CP} -R \
|
||||
${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/linux/ \
|
||||
${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/freebsd
|
||||
.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>
|
|
@ -1,2 +0,0 @@
|
|||
ELECTRON_VER= 22.3.27
|
||||
ELECTRON_VER_MAJOR= ${ELECTRON_VER:C/\..*//}
|
|
@ -1,21 +0,0 @@
|
|||
TIMESTAMP = 1696925306
|
||||
SHA256 (electron/chromium-108.0.5359.215.tar.xz) = aba0730b347269efda217affe804f6fced296aa02f810c8c9a6fd7d46cd7bf9a
|
||||
SIZE (electron/chromium-108.0.5359.215.tar.xz) = 1584734880
|
||||
SHA256 (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 63706737ca75e0e5c97885186b2a7ab019ca71d1315ee08870193bbfa7486bfc
|
||||
SIZE (electron/f8b5da24d33317766d3933fb6711b0603fc4fb6f) = 9900677
|
||||
SHA256 (electron/336e775eec536b2d785cc80eff6ac39051931286) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
|
||||
SIZE (electron/336e775eec536b2d785cc80eff6ac39051931286) = 32624734
|
||||
SHA256 (electron/electron-yarn-cache-22.3.27.tar.xz) = 6e7f0e963e6fdd14152cdb381688a0b12a3cef81f126d5246d2f4bc58d19ef9f
|
||||
SIZE (electron/electron-yarn-cache-22.3.27.tar.xz) = 38838404
|
||||
SHA256 (electron/electron-electron-v22.3.27_GH0.tar.gz) = d71d9b18fca40cc1cf8f60dedb255f4ceed570e39421b006b7d3ca7021cfab3d
|
||||
SIZE (electron/electron-electron-v22.3.27_GH0.tar.gz) = 10668381
|
||||
SHA256 (electron/nodejs-node-v16.17.1_GH0.tar.gz) = e63378aa6aa18b9e05486e46eaca6c6e09904366e5100d7e04c6dbd344a42f60
|
||||
SIZE (electron/nodejs-node-v16.17.1_GH0.tar.gz) = 90485310
|
||||
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
|
|
@ -1,26 +0,0 @@
|
|||
#! /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
|
|
@ -1,153 +0,0 @@
|
|||
{
|
||||
"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/docs-parser": "^1.0.0",
|
||||
"@electron/fiddle-core": "^1.0.4",
|
||||
"@electron/github-app-auth": "^2.0.0",
|
||||
"@electron/typescript-definitions": "^8.10.0",
|
||||
"@octokit/rest": "^19.0.7",
|
||||
"@primer/octicons": "^10.0.0",
|
||||
"@types/basic-auth": "^1.1.3",
|
||||
"@types/busboy": "^0.2.3",
|
||||
"@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": "^16.11.26",
|
||||
"@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/webpack": "^5.28.0",
|
||||
"@types/webpack-env": "^1.17.0",
|
||||
"@typescript-eslint/eslint-plugin": "^4.4.1",
|
||||
"@typescript-eslint/parser": "^4.4.1",
|
||||
"asar": "^3.1.0",
|
||||
"aws-sdk": "^2.814.0",
|
||||
"buffer": "^6.0.3",
|
||||
"check-for-leaks": "^1.2.1",
|
||||
"colors": "1.4.0",
|
||||
"dotenv-safe": "^4.0.4",
|
||||
"dugite": "^1.103.0",
|
||||
"eslint": "^7.4.0",
|
||||
"eslint-config-standard": "^14.1.1",
|
||||
"eslint-plugin-import": "^2.22.0",
|
||||
"eslint-plugin-mocha": "^7.0.1",
|
||||
"eslint-plugin-node": "^11.1.0",
|
||||
"eslint-plugin-standard": "^4.0.1",
|
||||
"eslint-plugin-typescript": "^0.14.0",
|
||||
"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",
|
||||
"markdownlint": "^0.21.1",
|
||||
"markdownlint-cli": "^0.25.0",
|
||||
"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",
|
||||
"standard-markdown": "^6.0.0",
|
||||
"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",
|
||||
"webpack": "^5.73.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:docs-relative-links && npm run lint:markdownlint",
|
||||
"lint:docs-relative-links": "python3 ./script/check-relative-doc-links.py",
|
||||
"lint:markdownlint": "markdownlint \"*.md\" \"docs/**/*.md\"",
|
||||
"lint:js-in-markdown": "standard-markdown docs",
|
||||
"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)'",
|
||||
"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",
|
||||
"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"
|
||||
}
|
||||
}
|
|
@ -1,89 +0,0 @@
|
|||
--- BUILD.gn.orig 2023-01-30 07:58:58 UTC
|
||||
+++ BUILD.gn
|
||||
@@ -59,7 +59,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)
|
||||
@@ -89,7 +89,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",
|
||||
@@ -430,7 +429,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",
|
||||
@@ -632,6 +631,15 @@ group("gn_all") {
|
||||
deps += [ "//gpu/tools/compositor_model_bench" ]
|
||||
}
|
||||
|
||||
+ 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:crash_inspector",
|
||||
@@ -680,7 +688,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)" ]
|
||||
}
|
||||
|
||||
@@ -1110,7 +1118,7 @@ if (!is_ios) {
|
||||
]
|
||||
}
|
||||
|
||||
- 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") {
|
||||
@@ -1205,7 +1213,7 @@ if (!is_ios) {
|
||||
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)" ]
|
||||
}
|
||||
@@ -1214,7 +1222,7 @@ if (!is_ios) {
|
||||
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)" ]
|
||||
}
|
||||
|
||||
@@ -1658,7 +1666,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)" ]
|
||||
}
|
|
@ -1,11 +0,0 @@
|
|||
--- 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 =
|
|
@ -1,14 +0,0 @@
|
|||
--- ash/display/mirror_window_controller.cc.orig 2022-10-24 13:33:33 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;
|
||||
}
|
|
@ -1,166 +0,0 @@
|
|||
--- base/BUILD.gn.orig 2022-11-30 08:12:58 UTC
|
||||
+++ base/BUILD.gn
|
||||
@@ -163,7 +163,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"
|
||||
@@ -1048,7 +1048,7 @@ mixed_component("base") {
|
||||
"timer/hi_res_timer_manager_posix.cc",
|
||||
]
|
||||
|
||||
- if (!is_nacl && !is_apple) {
|
||||
+ if (!is_nacl && !is_apple && !is_bsd) {
|
||||
sources += [
|
||||
"profiler/stack_base_address_posix.cc",
|
||||
"profiler/stack_base_address_posix.h",
|
||||
@@ -1059,6 +1059,14 @@ mixed_component("base") {
|
||||
"profiler/thread_delegate_posix.h",
|
||||
]
|
||||
}
|
||||
+
|
||||
+ if (is_bsd) {
|
||||
+ sources += [
|
||||
+ "profiler/stack_base_address_posix.cc",
|
||||
+ "profiler/stack_base_address_posix.h",
|
||||
+ "profiler/stack_sampler_posix.cc",
|
||||
+ ]
|
||||
+ }
|
||||
}
|
||||
|
||||
if (is_win) {
|
||||
@@ -1559,11 +1567,23 @@ mixed_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",
|
||||
@@ -1591,7 +1611,7 @@ mixed_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",
|
||||
@@ -1645,7 +1665,7 @@ mixed_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" ]
|
||||
}
|
||||
|
||||
@@ -2218,6 +2238,42 @@ mixed_component("base") {
|
||||
}
|
||||
}
|
||||
|
||||
+ if (is_bsd) {
|
||||
+ sources -= [
|
||||
+ "files/file_path_watcher_inotify.cc",
|
||||
+ "files/file_util_linux.cc",
|
||||
+ "files/scoped_file_linux.cc",
|
||||
+ "process/memory_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"
|
||||
+ ]
|
||||
+ sources += [
|
||||
+ "process/memory_stubs.cc",
|
||||
+ "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 -= [
|
||||
@@ -2315,7 +2371,7 @@ mixed_component("base") {
|
||||
}
|
||||
|
||||
if (dep_libevent) {
|
||||
- deps += [ "//third_party/libevent" ]
|
||||
+ public_deps += [ "//third_party/libevent" ]
|
||||
}
|
||||
|
||||
if (use_libevent) {
|
||||
@@ -3583,7 +3639,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",
|
||||
@@ -3629,7 +3685,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",
|
||||
@@ -3640,7 +3696,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" ]
|
||||
}
|
||||
|
||||
@@ -3832,7 +3888,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",
|
|
@ -1,20 +0,0 @@
|
|||
--- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-06-17 14:20:10 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
|
||||
@@ -128,7 +128,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
|
|
@ -1,11 +0,0 @@
|
|||
--- base/allocator/partition_allocator/page_allocator.h.orig 2022-11-30 08:12:58 UTC
|
||||
+++ base/allocator/partition_allocator/page_allocator.h
|
||||
@@ -231,7 +231,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;
|
|
@ -1,38 +0,0 @@
|
|||
--- base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-09-24 10:57:32 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() {
|
||||
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE 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.
|
|
@ -1,16 +0,0 @@
|
|||
--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-11-30 08:12:58 UTC
|
||||
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
|
||||
@@ -356,8 +356,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);
|
|
@ -1,11 +0,0 @@
|
|||
--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-11-30 08:12:58 UTC
|
||||
+++ base/allocator/partition_allocator/partition_address_space.cc
|
||||
@@ -294,7 +294,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
|
||||
setup_.configurable_pool_base_mask_ = 0;
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)
|
||||
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)
|
||||
|
||||
PageCharacteristics page_characteristics;
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
--- 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
|
|
@ -1,11 +0,0 @@
|
|||
--- 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()
|
|
@ -1,11 +0,0 @@
|
|||
--- 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
|
|
@ -1,29 +0,0 @@
|
|||
--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-10-24 13:33:33 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc_config.h
|
||||
@@ -76,7 +76,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).
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
#define PA_HAS_LINUX_KERNEL
|
||||
#endif
|
||||
|
||||
@@ -197,7 +197,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.
|
||||
-#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
|
||||
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
|
||||
#define PA_HAS_ATFORK_HANDLER
|
||||
#endif
|
||||
|
||||
@@ -238,7 +238,7 @@ constexpr bool kUseLazyCommit = false;
|
||||
//
|
||||
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
|
||||
// larger slot spans.
|
||||
-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
|
||||
+#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD)
|
||||
#define PA_PREFER_SMALLER_SLOT_SPANS
|
||||
#endif // BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-11-30 08:12:58 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc_constants.h
|
||||
@@ -91,7 +91,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))
|
||||
PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
|
||||
PartitionPageShift() {
|
||||
return PageAllocationGranularityShift() + 2;
|
||||
@@ -270,7 +270,7 @@ constexpr size_t kNumPools = 3;
|
||||
// Special-case Android and iOS, which incur test failures with larger
|
||||
// pools. Regardless, allocating >8GiB with malloc() on these platforms is
|
||||
// unrealistic as of 2022.
|
||||
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS)
|
||||
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD)
|
||||
constexpr size_t kPoolMaxSize = 8 * kGiB;
|
||||
#else
|
||||
constexpr size_t kPoolMaxSize = 16 * kGiB;
|
|
@ -1,16 +0,0 @@
|
|||
--- base/allocator/partition_allocator/partition_alloc_forward.h.orig 2022-11-06 16:08:29 UTC
|
||||
+++ base/allocator/partition_allocator/partition_alloc_forward.h
|
||||
@@ -25,9 +25,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.");
|
|
@ -1,18 +0,0 @@
|
|||
--- base/allocator/partition_allocator/partition_page.h.orig 2022-11-30 08:12:58 UTC
|
||||
+++ base/allocator/partition_allocator/partition_page.h
|
||||
@@ -138,13 +138,13 @@ struct SlotSpanMetadata {
|
||||
PartitionBucket<thread_safe>* const bucket = nullptr;
|
||||
|
||||
// CHECK()ed in AllocNewSlotSpan().
|
||||
-#if defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)
|
||||
+#if (defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE))
|
||||
// System page size is not a constant on Apple OSes, but is either 4 or 16kiB
|
||||
// (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).
|
|
@ -1,38 +0,0 @@
|
|||
--- base/allocator/partition_allocator/partition_root.cc.orig 2022-10-24 13:33:33 UTC
|
||||
+++ base/allocator/partition_allocator/partition_root.cc
|
||||
@@ -41,7 +41,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
|
||||
|
||||
@@ -238,7 +238,7 @@ void PartitionAllocMallocInitOnce() {
|
||||
if (!g_global_init_called.compare_exchange_strong(expected, true))
|
||||
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.
|
||||
@@ -331,7 +331,7 @@ static size_t PartitionPurgeSlotSpan(
|
||||
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
|
||||
@@ -734,7 +734,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
|
||||
// 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
|
|
@ -1,47 +0,0 @@
|
|||
--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-07-22 17:30:31 UTC
|
||||
+++ base/allocator/partition_allocator/spinning_mutex.cc
|
||||
@@ -18,7 +18,15 @@
|
||||
|
||||
#if defined(PA_HAS_LINUX_KERNEL)
|
||||
#include <errno.h>
|
||||
+#if defined(OS_OPENBSD)
|
||||
+#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 // defined(PA_HAS_LINUX_KERNEL)
|
||||
@@ -107,8 +115,13 @@ 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);
|
||||
+#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.
|
||||
@@ -120,8 +133,14 @@ 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);
|
||||
+#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;
|
||||
}
|
|
@ -1,50 +0,0 @@
|
|||
--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-05-19 14:06:27 UTC
|
||||
+++ base/allocator/partition_allocator/starscan/stack/stack.cc
|
||||
@@ -17,6 +17,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
|
||||
@@ -47,6 +51,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)
|
|
@ -1,14 +0,0 @@
|
|||
--- base/atomicops.h.orig 2022-05-19 14:06:27 UTC
|
||||
+++ base/atomicops.h
|
||||
@@ -56,7 +56,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;
|
|
@ -1,98 +0,0 @@
|
|||
--- 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: {
|
|
@ -1,11 +0,0 @@
|
|||
--- base/base_switches.cc.orig 2022-08-31 12:19:35 UTC
|
||||
+++ base/base_switches.cc
|
||||
@@ -170,7 +170,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.
|
|
@ -1,11 +0,0 @@
|
|||
--- base/base_switches.h.orig 2022-08-31 12:19:35 UTC
|
||||
+++ base/base_switches.h
|
||||
@@ -60,7 +60,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[];
|
|
@ -1,11 +0,0 @@
|
|||
--- base/cpu.h.orig 2022-11-30 08:12:58 UTC
|
||||
+++ base/cpu.h
|
||||
@@ -115,7 +115,7 @@ class BASE_EXPORT CPU final {
|
||||
const std::string& cpu_brand() const { return cpu_brand_; }
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
- BUILDFLAG(IS_AIX)
|
||||
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
enum class CoreType {
|
||||
kUnknown = 0,
|
||||
kOther,
|
|
@ -1,68 +0,0 @@
|
|||
--- 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;
|
||||
}
|
|
@ -1,18 +0,0 @@
|
|||
--- 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) +
|
|
@ -1,11 +0,0 @@
|
|||
--- 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
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
--- base/debug/stack_trace_posix.cc.orig 2022-10-24 13:33:33 UTC
|
||||
+++ base/debug/stack_trace_posix.cc
|
||||
@@ -39,7 +39,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
|
||||
|
||||
@@ -699,6 +699,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)) {
|
||||
@@ -716,6 +719,7 @@ class SandboxSymbolizeHelper {
|
||||
|
||||
is_initialized_ = true;
|
||||
return true;
|
||||
+#endif
|
||||
}
|
||||
|
||||
// Opens all object files and caches their file descriptors.
|
||||
@@ -872,7 +876,7 @@ size_t CollectStackTrace(void** trace, size_t count) {
|
||||
// If we do not have unwind tables, then try tracing using frame pointers.
|
||||
return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
|
||||
count, 0);
|
||||
-#elif !defined(__UCLIBC__) && !defined(_AIX)
|
||||
+#elif !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD)
|
||||
// Though the backtrace API man page does not list any possible negative
|
||||
// return values, we take no chance.
|
||||
return base::saturated_cast<size_t>(
|
|
@ -1,39 +0,0 @@
|
|||
--- 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) {
|
|
@ -1,20 +0,0 @@
|
|||
--- 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;
|
|
@ -1,57 +0,0 @@
|
|||
--- 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
|
|
@ -1,10 +0,0 @@
|
|||
--- 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>
|
|
@ -1,29 +0,0 @@
|
|||
--- base/files/file_path_watcher_unittest.cc.orig 2022-09-24 10:57:32 UTC
|
||||
+++ base/files/file_path_watcher_unittest.cc
|
||||
@@ -498,7 +498,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) {
|
||||
VLOG(1) << "Waiting for file1 creation";
|
||||
ASSERT_TRUE(WaitForEvents());
|
||||
|
||||
-#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";
|
||||
@@ -1118,7 +1118,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;
|
||||
|
||||
@@ -1149,7 +1149,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
|
|
@ -1,52 +0,0 @@
|
|||
--- base/files/file_util_posix.cc.orig 2022-08-31 12:19:35 UTC
|
||||
+++ base/files/file_util_posix.cc
|
||||
@@ -700,32 +700,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;
|
|
@ -1,20 +0,0 @@
|
|||
--- base/files/file_util_unittest.cc.orig 2022-10-24 13:33:33 UTC
|
||||
+++ base/files/file_util_unittest.cc
|
||||
@@ -3549,7 +3549,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";
|
||||
@@ -4272,7 +4272,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());
|
|
@ -1,12 +0,0 @@
|
|||
--- 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,
|
|
@ -1,11 +0,0 @@
|
|||
--- 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
|
|
@ -1,20 +0,0 @@
|
|||
--- base/i18n/icu_util.cc.orig 2022-11-30 08:12:58 UTC
|
||||
+++ base/i18n/icu_util.cc
|
||||
@@ -52,7 +52,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
|
||||
@@ -343,7 +343,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().
|
|
@ -1,28 +0,0 @@
|
|||
--- 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,
|
|
@ -1,31 +0,0 @@
|
|||
--- base/logging_unittest.cc.orig 2022-06-17 14:20:10 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
|
||||
|
||||
@@ -574,14 +574,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)
|
|
@ -1,38 +0,0 @@
|
|||
--- 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();
|
||||
}
|
|
@ -1,11 +0,0 @@
|
|||
--- 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 {
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
--- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-05-19 14:06:27 UTC
|
||||
+++ base/memory/madv_free_discardable_memory_posix.cc
|
||||
@@ -295,6 +295,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
|
||||
@@ -310,6 +314,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
+#endif
|
||||
}
|
||||
|
||||
bool MadvFreeDiscardableMemoryPosix::IsDiscarded() const {
|
|
@ -1,29 +0,0 @@
|
|||
--- base/memory/platform_shared_memory_region.h.orig 2022-06-17 14:20:10 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:
|
||||
@@ -211,7 +211,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
|
|
@ -1,29 +0,0 @@
|
|||
--- base/memory/platform_shared_memory_region_posix.cc.orig 2022-05-19 14:06:27 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 =
|
||||
@@ -171,7 +171,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
|
||||
@@ -200,7 +200,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 */,
|
|
@ -1,28 +0,0 @@
|
|||
--- 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:
|
|
@ -1,11 +0,0 @@
|
|||
--- 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.
|
|
@ -1,11 +0,0 @@
|
|||
--- 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
|
|
@ -1,16 +0,0 @@
|
|||
--- 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
|
|
@ -1,39 +0,0 @@
|
|||
--- 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
|
|
@ -1,11 +0,0 @@
|
|||
--- base/posix/unix_domain_socket_unittest.cc.orig 2022-02-28 16:54:41 UTC
|
||||
+++ base/posix/unix_domain_socket_unittest.cc
|
||||
@@ -10,6 +10,8 @@
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
+#include <signal.h>
|
||||
+
|
||||
#include "base/bind.h"
|
||||
#include "base/callback_helpers.h"
|
||||
#include "base/files/file_util.h"
|
|
@ -1,11 +0,0 @@
|
|||
--- 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);
|
|
@ -1,11 +0,0 @@
|
|||
--- base/process/kill_posix.cc.orig 2022-05-19 14:06:27 UTC
|
||||
+++ base/process/kill_posix.cc
|
||||
@@ -158,7 +158,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());
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- base/process/launch.h.orig 2022-06-17 14:20:10 UTC
|
||||
+++ base/process/launch.h
|
||||
@@ -198,7 +198,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
|
|
@ -1,12 +0,0 @@
|
|||
--- 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 {
|
|
@ -1,11 +0,0 @@
|
|||
--- base/process/memory.cc.orig 2022-10-24 13:33:33 UTC
|
||||
+++ base/process/memory.cc
|
||||
@@ -28,7 +28,7 @@ namespace base {
|
||||
// Defined in memory_mac.mm for macOS + use_allocator="none". In case of
|
||||
// USE_PARTITION_ALLOC_AS_MALLOC, no need to route the call to the system
|
||||
// default calloc of macOS.
|
||||
-#if !BUILDFLAG(IS_APPLE) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
|
||||
+#if (!BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD)) || BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
|
||||
|
||||
bool UncheckedCalloc(size_t num_items, size_t size, void** result) {
|
||||
const size_t alloc_size = num_items * size;
|
|
@ -1,11 +0,0 @@
|
|||
--- 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);
|
|
@ -1,11 +0,0 @@
|
|||
--- 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.
|
|
@ -1,25 +0,0 @@
|
|||
--- 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;
|
|
@ -1,89 +0,0 @@
|
|||
--- 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
|
|
@ -1,51 +0,0 @@
|
|||
--- base/process/process_iterator_freebsd.cc.orig 2022-04-21 18:48:31 UTC
|
||||
+++ base/process/process_iterator_freebsd.cc
|
||||
@@ -20,7 +20,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
|
||||
: index_of_kinfo_proc_(),
|
||||
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;
|
||||
@@ -39,7 +39,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) {
|
||||
@@ -49,7 +49,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;
|
||||
}
|
||||
@@ -71,18 +71,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";
|
|
@ -1,45 +0,0 @@
|
|||
--- base/process/process_iterator_openbsd.cc.orig 2022-04-21 18:48:31 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"
|
||||
@@ -18,12 +21,13 @@ ProcessIterator::ProcessIterator(const ProcessFilter*
|
||||
: index_of_kinfo_proc_(),
|
||||
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;
|
||||
@@ -32,7 +36,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;
|
||||
@@ -48,7 +52,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;
|
||||
}
|
|
@ -1,54 +0,0 @@
|
|||
--- base/process/process_metrics.cc.orig 2022-10-25 08:25:05 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 SystemMetrics::ToValue() const {
|
||||
Value res(Value::Type::DICTIONARY);
|
||||
|
||||
res.SetIntKey("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 meminfo = memory_info_.ToValue();
|
||||
Value vmstat = vmstat_info_.ToValue();
|
||||
meminfo.MergeDictionary(&vmstat);
|
||||
@@ -99,7 +99,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,
|
|
@ -1,129 +0,0 @@
|
|||
--- base/process/process_metrics.h.orig 2022-11-30 08:12:58 UTC
|
||||
+++ base/process/process_metrics.h
|
||||
@@ -36,7 +36,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>
|
||||
@@ -52,7 +52,7 @@ class Value;
|
||||
// Full declaration is in process_metrics_iocounters.h.
|
||||
struct IoCounters;
|
||||
|
||||
-#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.
|
||||
//
|
||||
@@ -107,7 +107,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;
|
||||
@@ -165,7 +165,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
|
||||
@@ -248,7 +248,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;
|
||||
|
||||
@@ -269,7 +269,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)
|
||||
@@ -280,7 +280,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
- BUILDFLAG(IS_AIX)
|
||||
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
CPU::CoreType GetCoreType(uint32_t core_index);
|
||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
|
||||
// BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX)
|
||||
@@ -294,9 +294,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_;
|
||||
@@ -304,7 +302,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_;
|
||||
@@ -347,7 +345,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.
|
||||
//
|
||||
@@ -382,7 +380,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
|
||||
@@ -397,7 +395,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;
|
||||
@@ -434,7 +432,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.
|
||||
@@ -622,7 +620,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_;
|
|
@ -1,296 +0,0 @@
|
|||
--- base/process/process_metrics_freebsd.cc.orig 2022-10-25 08:25:05 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;
|
||||
}
|
||||
@@ -67,4 +83,221 @@ size_t GetSystemCommitCharge() {
|
||||
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 SystemDiskInfo::ToValue() const {
|
||||
+ Value res(Value::Type::DICTIONARY);
|
||||
+
|
||||
+ // Write out uint64_t variables as doubles.
|
||||
+ // Note: this may discard some precision, but for JS there's no other option.
|
||||
+ res.SetDoubleKey("reads", static_cast<double>(reads));
|
||||
+ res.SetDoubleKey("reads_merged", static_cast<double>(reads_merged));
|
||||
+ res.SetDoubleKey("sectors_read", static_cast<double>(sectors_read));
|
||||
+ res.SetDoubleKey("read_time", static_cast<double>(read_time));
|
||||
+ res.SetDoubleKey("writes", static_cast<double>(writes));
|
||||
+ res.SetDoubleKey("writes_merged", static_cast<double>(writes_merged));
|
||||
+ res.SetDoubleKey("sectors_written", static_cast<double>(sectors_written));
|
||||
+ res.SetDoubleKey("write_time", static_cast<double>(write_time));
|
||||
+ res.SetDoubleKey("io", static_cast<double>(io));
|
||||
+ res.SetDoubleKey("io_time", static_cast<double>(io_time));
|
||||
+ res.SetDoubleKey("weighted_io_time", static_cast<double>(weighted_io_time));
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+
|
||||
+Value SystemMemoryInfoKB::ToValue() const {
|
||||
+ Value res(Value::Type::DICTIONARY);
|
||||
+
|
||||
+ res.SetIntKey("total", total);
|
||||
+ res.SetIntKey("free", free);
|
||||
+ res.SetIntKey("available", available);
|
||||
+ res.SetIntKey("buffers", buffers);
|
||||
+ res.SetIntKey("cached", cached);
|
||||
+ res.SetIntKey("active_anon", active_anon);
|
||||
+ res.SetIntKey("inactive_anon", inactive_anon);
|
||||
+ res.SetIntKey("active_file", active_file);
|
||||
+ res.SetIntKey("inactive_file", inactive_file);
|
||||
+ res.SetIntKey("swap_total", swap_total);
|
||||
+ res.SetIntKey("swap_free", swap_free);
|
||||
+ res.SetIntKey("swap_used", swap_total - swap_free);
|
||||
+ res.SetIntKey("dirty", dirty);
|
||||
+ res.SetIntKey("reclaimable", reclaimable);
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+
|
||||
+Value VmStatInfo::ToValue() const {
|
||||
+ Value res(Value::Type::DICTIONARY);
|
||||
+
|
||||
+ res.SetIntKey("pswpin", pswpin);
|
||||
+ res.SetIntKey("pswpout", pswpout);
|
||||
+ res.SetIntKey("pgmajfault", pgmajfault);
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
} // namespace base
|
|
@ -1,215 +0,0 @@
|
|||
--- base/process/process_metrics_openbsd.cc.orig 2022-09-24 10:57:32 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;
|
||||
+}
|
||||
+
|
||||
+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;
|
||||
+
|
||||
+bool GetSystemDiskInfo(SystemDiskInfo* diskinfo) {
|
||||
+ NOTIMPLEMENTED();
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+bool GetVmStatInfo(VmStatInfo* vmstat) {
|
||||
+ NOTIMPLEMENTED();
|
||||
+ return false;
|
||||
+}
|
||||
+
|
||||
+int ProcessMetrics::GetIdleWakeupsPerSecond() {
|
||||
+ NOTIMPLEMENTED();
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+Value SystemMemoryInfoKB::ToValue() const {
|
||||
+ Value res(Value::Type::DICTIONARY);
|
||||
+ res.SetIntKey("total", total);
|
||||
+ res.SetIntKey("free", free);
|
||||
+ res.SetIntKey("available", available);
|
||||
+ res.SetIntKey("buffers", buffers);
|
||||
+ res.SetIntKey("cached", cached);
|
||||
+ res.SetIntKey("active_anon", active_anon);
|
||||
+ res.SetIntKey("inactive_anon", inactive_anon);
|
||||
+ res.SetIntKey("active_file", active_file);
|
||||
+ res.SetIntKey("inactive_file", inactive_file);
|
||||
+ res.SetIntKey("swap_total", swap_total);
|
||||
+ res.SetIntKey("swap_free", swap_free);
|
||||
+ res.SetIntKey("swap_used", swap_total - swap_free);
|
||||
+ res.SetIntKey("dirty", dirty);
|
||||
+ res.SetIntKey("reclaimable", reclaimable);
|
||||
+
|
||||
+ NOTIMPLEMENTED();
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+
|
||||
+Value VmStatInfo::ToValue() const {
|
||||
+ Value res(Value::Type::DICTIONARY);
|
||||
+ res.SetIntKey("pswpin", pswpin);
|
||||
+ res.SetIntKey("pswpout", pswpout);
|
||||
+ res.SetIntKey("pgmajfault", pgmajfault);
|
||||
+
|
||||
+ NOTIMPLEMENTED();
|
||||
+
|
||||
+ return res;
|
||||
+}
|
||||
+
|
||||
+SystemDiskInfo& SystemDiskInfo::operator=(const SystemDiskInfo&) = default;
|
||||
+
|
||||
+Value SystemDiskInfo::ToValue() const {
|
||||
+ Value res(Value::Type::DICTIONARY);
|
||||
+
|
||||
+ // Write out uint64_t variables as doubles.
|
||||
+ // Note: this may discard some precision, but for JS there's no other option.
|
||||
+ res.SetDoubleKey("reads", static_cast<double>(reads));
|
||||
+ res.SetDoubleKey("reads_merged", static_cast<double>(reads_merged));
|
||||
+ res.SetDoubleKey("sectors_read", static_cast<double>(sectors_read));
|
||||
+ res.SetDoubleKey("read_time", static_cast<double>(read_time));
|
||||
+ res.SetDoubleKey("writes", static_cast<double>(writes));
|
||||
+ res.SetDoubleKey("writes_merged", static_cast<double>(writes_merged));
|
||||
+ res.SetDoubleKey("sectors_written", static_cast<double>(sectors_written));
|
||||
+ res.SetDoubleKey("write_time", static_cast<double>(write_time));
|
||||
+ res.SetDoubleKey("io", static_cast<double>(io));
|
||||
+ res.SetDoubleKey("io_time", static_cast<double>(io_time));
|
||||
+ res.SetDoubleKey("weighted_io_time", static_cast<double>(weighted_io_time));
|
||||
+
|
||||
+ NOTIMPLEMENTED();
|
||||
+
|
||||
+ return res;
|
||||
}
|
||||
|
||||
} // namespace base
|
|
@ -1,20 +0,0 @@
|
|||
--- base/process/process_metrics_posix.cc.orig 2022-08-31 12:19:35 UTC
|
||||
+++ base/process/process_metrics_posix.cc
|
||||
@@ -20,6 +20,8 @@
|
||||
|
||||
#if BUILDFLAG(IS_APPLE)
|
||||
#include <malloc/malloc.h>
|
||||
+#elif BUILDFLAG(IS_OPENBSD)
|
||||
+#include <stdlib.h>
|
||||
#else
|
||||
#include <malloc.h>
|
||||
#endif
|
||||
@@ -135,7 +137,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
|
|
@ -1,20 +0,0 @@
|
|||
--- 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
|
|
@ -1,93 +0,0 @@
|
|||
--- base/process/process_posix.cc.orig 2022-08-31 12:19:35 UTC
|
||||
+++ base/process/process_posix.cc
|
||||
@@ -25,10 +25,15 @@
|
||||
#include "build/build_config.h"
|
||||
#include "third_party/abseil-cpp/absl/types/optional.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
|
||||
@@ -95,7 +100,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.
|
||||
@@ -200,7 +205,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
|
||||
@@ -392,7 +397,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
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue