Merge remote-tracking branch 'upstream/v1.x' into v1.x

Author: TheTechsTech

.github/workflows/CI-unix.yml

@@ -80,7 +80,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14]
+        os: [macos-14, macos-15, macos-15-intel]
     steps:
       - uses: actions/checkout@v6
       - name: Envinfo
@@ -107,6 +107,11 @@ jobs:
         run: |
           ./build/uv_run_tests_a platform_output
       - name: Test
+        if: ${{ matrix.os == 'macos-15' || matrix.os == 'macos-15-intel' }}
+        run: |
+          cd build && sudo UV_RUN_AS_ROOT=1 ctest -V
+      - name: Test
+        if: ${{ matrix.os != 'macos-15' && matrix.os != 'macos-15-intel' }}
         run: |
           cd build && ctest -V
       - name: Autotools configure
@@ -122,7 +127,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, macos-14]
+        os: [macos-14, macos-15]
     steps:
       - uses: actions/checkout@v6
       - name: Configure

.github/workflows/CI-win.yml

@@ -97,7 +97,7 @@ jobs:
              `${{ matrix.config.arch }}-w64-mingw32-gcc -print-file-name=libatomic-1.dll` \
              build/usr/bin
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
           name: mingw-${{ matrix.config.arch }}
           path: build/usr/**/*
@@ -115,7 +115,7 @@ jobs:
           - {arch: x86_64, server: 2022}
     steps:
       - name: Download build artifacts
-        uses: actions/download-artifact@v6
+        uses: actions/download-artifact@v7
         with:
           name: mingw-${{ matrix.config.arch }}
       - name: Test

.github/workflows/sanitizer.yml

@@ -55,7 +55,7 @@ jobs:
           fi
 
   sanitizers-macos:
-    runs-on: macos-13
+    runs-on: macos-14
     strategy:
       matrix:
         config:

README.md

@@ -215,7 +215,7 @@ $ cmake ../..                 \
 $ brew install --HEAD libuv
 ```
 
-Note to OS X users:
+Note to macOS users:
 
 Make sure that you specify the architecture you wish to build for in the
 "ARCHS" flag. You can specify more than one by delimiting with a space

docs/src/design.rst

@@ -36,6 +36,31 @@ Requests represent (typically) short-lived operations. These operations can be p
 handle: write requests are used to write data on a handle; or standalone: getaddrinfo requests
 don't need a handle they run directly on the loop.
 
+Guidelines for dealing with handles and requests:
+
+1. If `uv_foo_init()` succeeds in initializing the handle, you must call
+   :c:func:`uv_close()`. If the handle's init function errors, you don't
+   need to do anything.
+
+2. Only handles are closed, not requests. For example, :c:type:`uv_tcp_t`
+   is a handle, :c:type:`uv_write_t` is a request.
+
+3. The handle's memory can only be reclaimed or reused from inside the
+   :c:type:`uv_close_cb` or afterwards, not before.
+
+4. Most handles have init + start/stop functions; some handles don't.
+   Example: :c:type:`uv_tcp_t` vs. :c:type:`uv_process_t`; :c:func:`uv_spawn()`
+   combines handle initialization and process start into one.
+
+5. Requests are closed automatically when they complete, or when they are
+   cancelled with :c:func:`uv_cancel()`.
+
+6. No additional cleanup is needed except for :c:type:`uv_fs_t` and
+   :c:type:`uv_getaddrinfo_t` requests. For :c:type:`uv_fs_t`, call
+   :c:func:`uv_fs_req_cleanup()` once you are done with it; for
+   :c:type:`uv_getaddrinfo_t`, that's :c:func:`uv_freeaddrinfo()`.
+
+7. The request's memory can only be reclaimed or reused from that point onward.
 
 The I/O loop
 ^^^^^^^^^^^^

docs/src/misc.rst

@@ -892,6 +892,16 @@ API
 
     .. versionadded:: 1.34.0
 
+.. code-block:: c
+    #include <uv.h>
+    #include <stdio.h>
+    int main() {
+        printf("Sleeping for 1 second...\n");
+        uv_sleep(1000);
+        printf("Awake!\n");
+        return 0;
+    }
+
 String manipulation functions
 -----------------------------
 

src/unix/core.c

@@ -1533,7 +1533,7 @@ int uv_os_environ(uv_env_item_t** envitems, int* count) {
 
 fail:
   for (i = 0; i < cnt; i++) {
-    envitem = &(*envitems)[cnt];
+    envitem = &(*envitems)[i];
     uv__free(envitem->name);
   }
   uv__free(*envitems);

src/unix/fs.c

@@ -224,13 +224,6 @@ static struct timespec uv__fs_to_timespec(double time) {
   ts.tv_sec  = time;
   ts.tv_nsec = (time - ts.tv_sec) * 1e9;
 
- /* TODO(bnoordhuis) Remove this. utimesat() has nanosecond resolution but we
-  * stick to microsecond resolution for the sake of consistency with other
-  * platforms. I'm the original author of this compatibility hack but I'm
-  * less convinced it's useful nowadays.
-  */
-  ts.tv_nsec -= ts.tv_nsec % 1000;
-
   if (ts.tv_nsec < 0) {
     ts.tv_nsec += 1e9;
     ts.tv_sec -= 1;

src/unix/linux.c

@@ -875,7 +875,7 @@ int uv__iou_fs_ftruncate(uv_loop_t* loop, uv_fs_t* req) {
     return 0;
 
   sqe->fd = req->file;
-  sqe->len = req->off;
+  sqe->off = req->off;
   sqe->opcode = UV__IORING_OP_FTRUNCATE;
   uv__iou_submit(iou);
 

src/unix/process.c

@@ -1073,6 +1073,7 @@ int uv_spawn(uv_loop_t* loop,
   return exec_errorno;
 
 error:
+  uv__queue_remove(&process->handle_queue);
   if (pipes != NULL) {
     for (i = 0; i < stdio_count; i++) {
       if (i < options->stdio_count)