Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to libuv 1.43.0 #328

Merged
merged 7 commits into from
Jan 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
httpuv 1.6.5.9000
============

* Updated to libuv 1.43.0. (#328)

httpuv 1.6.5
============
Expand Down
12 changes: 4 additions & 8 deletions src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,13 @@ To update libuv to a new version, do the following:

```
# Fix for unnamed structs on MinGW
git cherry-pick 327a0a9
git cherry-pick 7106577
# Fix for empty translation unit warning on Windows with -pedantic
git cherry-pick d5a24b7
git cherry-pick 8ab31ef
# Fix for Solaris
git cherry-pick fea361c
# Use C-style comments
git cherry-pick bf9dd71
# Workaround for warning on Windows about no return statement
git cherry-pick 7648442
git cherry-pick 1898a29
# Workaround for pragma NOTE
git cherry-pick 577fe91
git cherry-pick 421f092
```

* If the cherry-picked commits needed any modification, update this README to refer to the new cherry-picked commits, then commit.
Expand Down
2 changes: 1 addition & 1 deletion src/libuv/.github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
If you want to report a bug, you are in the right place!

If you need help or have a question, go here:
https://github.com/libuv/help/issues/new
https://github.com/libuv/libuv/discussions

If you are reporting a libuv test failure, please ensure that you are not
running the test as root.
Expand Down
7 changes: 3 additions & 4 deletions src/libuv/.github/stale.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 21
daysUntilStale: 28
# Number of days of inactivity before a stale issue is closed
# Set to false to disable. If disabled, issues still need to be closed
# manually, but will remain marked as stale.
daysUntilClose: 120
daysUntilClose: false
# Issues with these labels will never be considered stale
exemptLabels:
- v2
Expand All @@ -18,7 +18,6 @@ staleLabel: stale
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
recent activity. Thank you for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
118 changes: 118 additions & 0 deletions src/libuv/.github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
name: CI

on: [push, pull_request]

jobs:
build-windows:
runs-on: windows-${{ matrix.config.server }}
name: build-${{ matrix.config.toolchain}}-${{ matrix.config.arch}}
strategy:
fail-fast: false
matrix:
config:
- {toolchain: Visual Studio 15 2017, arch: Win32, server: 2016}
- {toolchain: Visual Studio 15 2017, arch: x64, server: 2016}
- {toolchain: Visual Studio 16 2019, arch: Win32, server: 2019}
- {toolchain: Visual Studio 16 2019, arch: x64, server: 2019}
- {toolchain: Visual Studio 17 2022, arch: Win32, server: 2022}
- {toolchain: Visual Studio 17 2022, arch: x64, server: 2022}
steps:
- uses: actions/checkout@v2
- name: Envinfo
run: npx envinfo
- name: Build
shell: cmd
run: |
mkdir -p build
cd build
cmake .. -DBUILD_TESTING=ON -G "${{ matrix.config.toolchain }}" -A ${{ matrix.config.arch }}
cmake --build .
- name: Test
shell: cmd
run: |
cd build
ctest -C Debug --output-on-failure

build-android:
runs-on: ubuntu-latest
container: reactnativecommunity/react-native-android:2020-5-20
steps:
- uses: actions/checkout@v2
- name: Envinfo
run: npx envinfo
- name: Build android arm64
# see build options you can use in https://developer.android.com/ndk/guides/cmake
run: |
mkdir build && cd build
$ANDROID_HOME/cmake/3.10.2.4988404/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$ANDROID_HOME/ndk/20.0.5594570/build/cmake/android.toolchain.cmake -DCMAKE_BUILD_TYPE=Release -DANDROID_ABI="arm64-v8a" -DANDROID_PLATFORM=android-21 ..
$ANDROID_HOME/cmake/3.10.2.4988404/bin/cmake --build .

build-macos:
runs-on: macos-10.15
steps:
- uses: actions/checkout@v2
- name: Envinfo
run: npx envinfo
- name: Setup
run: |
brew install ninja
- name: Build
run: |
mkdir build
cd build && cmake .. -DBUILD_TESTING=ON -G Ninja
cmake --build .
ls -lh
- name: Test
run: |
cd build && ctest -V

build-cross-qemu:
runs-on: ubuntu-latest
name: build-cross-qemu-${{ matrix.config.target }}

strategy:
fail-fast: false
matrix:
config:
- {target: arm, toolchain: gcc-arm-linux-gnueabi, cc: arm-linux-gnueabi-gcc, qemu: qemu-arm-static }
- {target: armhf, toolchain: gcc-arm-linux-gnueabihf, cc: arm-linux-gnueabihf-gcc, qemu: qemu-arm-static }
- {target: aarch64, toolchain: gcc-aarch64-linux-gnu, cc: aarch64-linux-gnu-gcc, qemu: qemu-aarch64-static }
- {target: riscv64, toolchain: gcc-riscv64-linux-gnu, cc: riscv64-linux-gnu-gcc, qemu: qemu-riscv64-static }
- {target: ppc, toolchain: gcc-powerpc-linux-gnu, cc: powerpc-linux-gnu-gcc, qemu: qemu-ppc-static }
- {target: ppc64, toolchain: gcc-powerpc64-linux-gnu, cc: powerpc64-linux-gnu-gcc, qemu: qemu-ppc64-static }
- {target: ppc64le, toolchain: gcc-powerpc64le-linux-gnu, cc: powerpc64le-linux-gnu-gcc, qemu: qemu-ppc64le-static }
- {target: s390x, toolchain: gcc-s390x-linux-gnu, cc: s390x-linux-gnu-gcc, qemu: qemu-s390x-static }
- {target: mips, toolchain: gcc-mips-linux-gnu, cc: mips-linux-gnu-gcc, qemu: qemu-mips-static }
- {target: mips64, toolchain: gcc-mips64-linux-gnuabi64, cc: mips64-linux-gnuabi64-gcc, qemu: qemu-mips64-static }
- {target: mipsel, toolchain: gcc-mipsel-linux-gnu, cc: mipsel-linux-gnu-gcc, qemu: qemu-mipsel-static }
- {target: mips64el,toolchain: gcc-mips64el-linux-gnuabi64, cc: mips64el-linux-gnuabi64-gcc,qemu: qemu-mips64el-static }
- {target: alpha, toolchain: gcc-alpha-linux-gnu, cc: alpha-linux-gnu-gcc, qemu: qemu-alpha-static }
- {target: arm (u64 slots), toolchain: gcc-arm-linux-gnueabi, cc: arm-linux-gnueabi-gcc, qemu: qemu-arm-static}
- {target: aarch64 (u64 slots), toolchain: gcc-aarch64-linux-gnu, cc: aarch64-linux-gnu-gcc, qemu: qemu-aarch64-static}
- {target: ppc (u64 slots), toolchain: gcc-powerpc-linux-gnu, cc: powerpc-linux-gnu-gcc, qemu: qemu-ppc-static}
- {target: ppc64 (u64 slots), toolchain: gcc-powerpc64-linux-gnu, cc: powerpc64-linux-gnu-gcc, qemu: qemu-ppc64-static}

steps:
- uses: actions/checkout@v2
- name: Install QEMU
# this ensure install latest qemu on ubuntu, apt get version is old
env:
QEMU_SRC: "http://archive.ubuntu.com/ubuntu/pool/universe/q/qemu"
QEMU_VER: "qemu-user-static_4\\.2-.*_amd64.deb$"
run: |
DEB=`curl -s $QEMU_SRC/ | grep -o -E 'href="([^"#]+)"' | cut -d'"' -f2 | grep $QEMU_VER | tail -1`
wget $QEMU_SRC/$DEB
sudo dpkg -i $DEB
- name: Install ${{ matrix.config.toolchain }}
run: |
sudo apt update
sudo apt install ${{ matrix.config.toolchain }} -y
- name: Build
run: |
mkdir build
cd build && cmake .. -DBUILD_TESTING=ON -DQEMU=ON -DCMAKE_C_COMPILER=${{ matrix.config.cc }}
cmake --build .
ls -lh
- name: Test
run: |
${{ matrix.config.qemu }} build/uv_run_tests_a
26 changes: 26 additions & 0 deletions src/libuv/.github/workflows/sanitizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Sanitizer checks

on: [push, pull_request]

jobs:
sanitizers:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup
run: |
sudo apt-get install ninja-build
- name: Envinfo
run: npx envinfo
- name: TSAN
run: |
mkdir build-tsan
(cd build-tsan && cmake .. -G Ninja -DBUILD_TESTING=ON -DTSAN=ON -DCMAKE_BUILD_TYPE=Release)
cmake --build build-tsan
./build-tsan/uv_run_tests_a || true # currently permit failures
- name: ASAN
run: |
mkdir build-asan
(cd build-asan && cmake .. -G Ninja -DBUILD_TESTING=ON -DASAN=ON -DCMAKE_BUILD_TYPE=Debug)
cmake --build build-asan
./build-asan/uv_run_tests_a
1 change: 1 addition & 0 deletions src/libuv/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ ipch

# Clion / IntelliJ project files
/.idea/
cmake-build-debug/

*.xcodeproj
*.xcworkspace
Expand Down
13 changes: 13 additions & 0 deletions src/libuv/.mailmap
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
A. Hauptmann <[email protected]>
AJ Heller <[email protected]> <[email protected]>
Aaron Bieber <[email protected]> <[email protected]>
Alan Gutierrez <[email protected]> <[email protected]>
Andrius Bentkus <[email protected]> <[email protected]>
Andy Fiddaman <[email protected]> <[email protected]>
Bert Belder <[email protected]> <[email protected]>
Bert Belder <[email protected]> <[email protected]>
Bert Belder <[email protected]> <user@ChrUbuntu.(none)>
Expand All @@ -10,6 +12,9 @@ Brian White <[email protected]>
Brian White <[email protected]> <[email protected]>
Caleb James DeLisle <[email protected]> <[email protected]>
Christoph Iserlohn <[email protected]>
Darshan Sen <[email protected]>
Darshan Sen <[email protected]> <[email protected]>
David Carlier <[email protected]>
Devchandra Meetei Leishangthem <[email protected]>
Fedor Indutny <[email protected]> <[email protected]>
Frank Denis <[email protected]>
Expand All @@ -18,6 +23,7 @@ Isaac Z. Schlueter <[email protected]>
Jason Williams <[email protected]>
Jesse Gorzinski <[email protected]>
Jesse Gorzinski <[email protected]> <[email protected]>
Juan José Arboleda <[email protected]>
Justin Venus <[email protected]> <[email protected]>
Keno Fischer <[email protected]> <[email protected]>
Keno Fischer <[email protected]> <[email protected]>
Expand All @@ -27,10 +33,12 @@ Maciej Małecki <[email protected]> <[email protected]>
Marc Schlaich <[email protected]> <[email protected]>
Michael <[email protected]>
Michael Neumann <[email protected]> <[email protected]>
Michael Penick <[email protected]> <[email protected]>
Nicholas Vavilov <[email protected]>
Nick Logan <[email protected]> <[email protected]>
Rasmus Christian Pedersen <[email protected]>
Rasmus Christian Pedersen <[email protected]> <[email protected]>
Richard Lau <[email protected]> <[email protected]>
Robert Mustacchi <[email protected]> <[email protected]>
Ryan Dahl <[email protected]> <[email protected]>
Ryan Emery <[email protected]>
Expand All @@ -41,11 +49,16 @@ Santiago Gimeno <[email protected]> <[email protected]>
Saúl Ibarra Corretgé <[email protected]>
Saúl Ibarra Corretgé <[email protected]> <[email protected]>
Shigeki Ohtsu <[email protected]> <[email protected]>
Shuowang (Wayne) Zhang <[email protected]>
TK-one <[email protected]>
Timothy J. Fontaine <[email protected]>
Yasuhiro Matsumoto <[email protected]>
Yazhong Liu <[email protected]>
Yuki Okumura <[email protected]>
cjihrig <[email protected]>
gengjiawen <[email protected]>
jBarz <[email protected]> <[email protected]>
jBarz <[email protected]> <[email protected]>
ptlomholt <[email protected]>
tjarlama <[email protected]> <[email protected]>
zlargon <[email protected]>
11 changes: 11 additions & 0 deletions src/libuv/.readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2

sphinx:
builder: html
configuration: null
fail_on_warning: false

python:
version: 3.8
install:
- requirements: docs/requirements.txt
77 changes: 74 additions & 3 deletions src/libuv/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ Dylan Cali <[email protected]>
Austin Foxley <[email protected]>
Benjamin Saunders <[email protected]>
Geoffry Song <[email protected]>
Rasmus Christian Pedersen <[email protected]>
William Light <[email protected]>
Oleg Efimov <[email protected]>
Lars Gierth <[email protected]>
Expand All @@ -123,7 +122,6 @@ Justin Venus <[email protected]>
Kristian Evensen <[email protected]>
Linus Mårtensson <[email protected]>
Navaneeth Kedaram Nambiathan <[email protected]>
Yorkie <[email protected]>
StarWing <[email protected]>
thierry-FreeBSD <[email protected]>
Isaiah Norton <[email protected]>
Expand Down Expand Up @@ -212,7 +210,7 @@ guworks <[email protected]>
RossBencina <[email protected]>
Roger A. Light <[email protected]>
chenttuuvv <[email protected]>
Richard Lau <[email protected].com>
Richard Lau <rlau@redhat.com>
ronkorving <[email protected]>
Corbin Simpson <[email protected]>
Zachary Hamm <[email protected]>
Expand Down Expand Up @@ -425,3 +423,76 @@ Sk Sajidul Kadir <[email protected]>
twosee <[email protected]>
Rikard Falkeborn <[email protected]>
Yash Ladha <[email protected]>
James Ross <[email protected]>
Colin Finck <[email protected]>
Shohei YOSHIDA <[email protected]>
Philip Chimento <[email protected]>
Michal Artazov <[email protected]>
Jeroen Roovers <[email protected]>
MasterDuke17 <[email protected]>
Alexander Tokmakov <[email protected]>
Arenoros <[email protected]>
lander0s <[email protected]>
Turbinya <[email protected]>
OleksandrKvl <[email protected]>
Carter Li <[email protected]>
Juan Sebastian velez Posada <[email protected]>
escherstair <[email protected]>
Evan Lucas <[email protected]>
tjarlama <[email protected]>
司徒玟琅 <[email protected]>
YuMeiJie <[email protected]>
Aleksej Lebedev <[email protected]>
Nikolay Mitev <[email protected]>
Ulrik Strid <[email protected]>
Elad Lahav <[email protected]>
Elad Nachmias <[email protected]>
Darshan Sen <[email protected]>
Simon Kadisch <[email protected]>
Momtchil Momtchev <[email protected]>
Ethel Weston <[email protected]>
Drew DeVault <[email protected]>
Mark Klein <[email protected]>
schamberg97 <[email protected]>
Bob Weinand <[email protected]>
Issam E. Maghni <[email protected]>
Juan Pablo Canepa <[email protected]>
Shuowang (Wayne) Zhang <[email protected]>
Ondřej Surý <[email protected]>
Juan José Arboleda <[email protected]>
Zhao Zhili <[email protected]>
Brandon Cheng <[email protected]>
Matvii Hodovaniuk <[email protected]>
Hayden <[email protected]>
yiyuaner <[email protected]>
bbara <[email protected]>
SeverinLeonhardt <[email protected]>
Andy Fiddaman <[email protected]>
Romain Roffé <[email protected]>
Eagle Liang <[email protected]>
Ricky Zhou <[email protected]>
Simon Kissane <[email protected]>
James M Snell <[email protected]>
Ali Mohammad Pur <[email protected]>
Erkhes N <[email protected]>
Joshua M. Clulow <[email protected]>
Guilherme Íscaro <[email protected]>
Martin Storsjö <[email protected]>
Claes Nästén <[email protected]>
Mohamed Edrah <[email protected]>
Supragya Raj <[email protected]>
Ikko Ashimine <[email protected]>
Sylvain Corlay <[email protected]>
earnal <[email protected]>
YAKSH BARIYA <[email protected]>
Ofek Lev <[email protected]>
~locpyl-tidnyd <[email protected]>
Evan Miller <[email protected]>
Petr Menšík <[email protected]>
Nicolas Noble <[email protected]>
AJ Heller <[email protected]>
Stacey Marshall <[email protected]>
Jesper Storm Bache <[email protected]>
Campbell He <[email protected]>
Andrey Hohutkin <[email protected]>
deal <[email protected]>
Loading