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

eio_linux: allow alloc_fixed_or_wait to be cancelled #753

Merged
merged 1 commit into from
Sep 6, 2024

Conversation

talex5
Copy link
Collaborator

@talex5 talex5 commented Sep 5, 2024

As noted in #752, waiting for a fixed buffer couldn't be cancelled. This adds support for that.

I'm using this PR to test out the Picos style of cancellation. Normally, Eio programs set a cancel function to be invoked immediately when the fiber is cancelled, but Picos instead just schedules the cancelled fiber to be resumed and the clean-up actions happen later.

The new style introduces an annoying extra state, where the operation is half-cancelled (the cancellation has happened, but the fiber is still registered as waiting for a buffer), and we need to handle that by retrying. On the other hand, it means no user code runs in the scheduler's context, and potentially allows cancellation from another domain.

@talex5 talex5 force-pushed the cancel-alloc-fixed branch 2 times, most recently from a987a18 to 2fbb2b6 Compare September 6, 2024 16:11
@talex5 talex5 force-pushed the cancel-alloc-fixed branch from 2fbb2b6 to 0c41432 Compare September 6, 2024 16:11
@talex5 talex5 merged commit e2dc1d7 into ocaml-multicore:main Sep 6, 2024
4 of 5 checks passed
@talex5 talex5 deleted the cancel-alloc-fixed branch September 6, 2024 16:23
talex5 added a commit to talex5/opam-repository that referenced this pull request Nov 23, 2024
CHANGES:

Changes:

- Make `fork_action.h` a public header (@patricoferris ocaml-multicore/eio#769, reviewed by @talex5).
  Allows other libraries to add new actions.

- Record trace event when spawning processes (@talex5 ocaml-multicore/eio#749).
  Spawning a subprocess can take a long time in some cases, so show it clearly in the traces.

- Eio_unix.Net: make some return types more polymorphic (@talex5 ocaml-multicore/eio#744).

Bug fixes:

- Preserve backtraces in `fork_daemon` (@talex5 ocaml-multicore/eio#779).

- Eio.Path: always use "/" as separator (@talex5 ocaml-multicore/eio#743).

Linux backend:

- Allow `alloc_fixed_or_wait` to be cancelled (@talex5 ocaml-multicore/eio#753).

- Avoid triggering a (harmless) TSan warning (@talex5 ocaml-multicore/eio#754, reported by @avsm).

Windows backend:

- Unregister FDs on cancel (@talex5 ocaml-multicore/eio#756).
  Fixes `exception Unix.Unix_error(Unix.ENOTSOCK, "select", "")`.

- Work around problems in `Unix.getaddrinfo` (@talex5 ocaml-multicore/eio#780).
  Fixes e.g. `No addresses found for host name "127.0.0.1"`.

- Group `ECONNABORTED` with other connection reset errors (@talex5 ocaml-multicore/eio#783).

- Check `has_symlink` for tests (@create2000 ocaml-multicore/eio#771, reviewed by @patricoferris and @talex5).

- Improve `openat` error handling (@talex5 ocaml-multicore/eio#742, reported by @kentookura).
  Fixes `exception Unix.Unix_error(Unix.ENOENT, "openat", "")`.

Documentation:

- examples/fs: show how to read files while scanning (@talex5 ocaml-multicore/eio#745).

- Add example to `Buf_read.seq` documentation (@talex5 ocaml-multicore/eio#739, requested by @darrenldl and @rizo).

Build and test:

- Fix tests on OpenBSD (@talex5 ocaml-multicore/eio#782).

- Add advice about using AI for code generation (@patricoferris ocaml-multicore/eio#765, reviewed by @avsm and @talex5).

- Minor code cleanups (@talex5 ocaml-multicore/eio#755).

- Define `struct clone_args` for linux-lts versions that don't have it (@copy ocaml-multicore/eio#741, reviewed by @talex5).

- eio_linux: refactor fixed buffer code (@talex5 ocaml-multicore/eio#752).
talex5 added a commit to talex5/opam-repository that referenced this pull request Nov 23, 2024
CHANGES:

Changes:

- Make `fork_action.h` a public header (@patricoferris ocaml-multicore/eio#769, reviewed by @talex5).
  Allows other libraries to add new actions.

- Record trace event when spawning processes (@talex5 ocaml-multicore/eio#749).
  Spawning a subprocess can take a long time in some cases, so show it clearly in the traces.

- Eio_unix.Net: make some return types more polymorphic (@talex5 ocaml-multicore/eio#744).

Bug fixes:

- Preserve backtraces in `fork_daemon` (@talex5 ocaml-multicore/eio#779).

- Eio.Path: always use "/" as separator (@talex5 ocaml-multicore/eio#743).

Linux backend:

- Allow `alloc_fixed_or_wait` to be cancelled (@talex5 ocaml-multicore/eio#753).

- Avoid triggering a (harmless) TSan warning (@talex5 ocaml-multicore/eio#754, reported by @avsm).

Windows backend:

- Unregister FDs on cancel (@talex5 ocaml-multicore/eio#756).
  Fixes `exception Unix.Unix_error(Unix.ENOTSOCK, "select", "")`.

- Work around problems in `Unix.getaddrinfo` (@talex5 ocaml-multicore/eio#780).
  Fixes e.g. `No addresses found for host name "127.0.0.1"`.

- Group `ECONNABORTED` with other connection reset errors (@talex5 ocaml-multicore/eio#783).

- Check `has_symlink` for tests (@create2000 ocaml-multicore/eio#771, reviewed by @patricoferris and @talex5).

- Improve `openat` error handling (@talex5 ocaml-multicore/eio#742, reported by @kentookura).
  Fixes `exception Unix.Unix_error(Unix.ENOENT, "openat", "")`.

Documentation:

- examples/fs: show how to read files while scanning (@talex5 ocaml-multicore/eio#745).

- Add example to `Buf_read.seq` documentation (@talex5 ocaml-multicore/eio#739, requested by @darrenldl and @rizo).

Build and test:

- Fix tests on OpenBSD (@talex5 ocaml-multicore/eio#782).

- Add advice about using AI for code generation (@patricoferris ocaml-multicore/eio#765, reviewed by @avsm and @talex5).

- Minor code cleanups (@talex5 ocaml-multicore/eio#755).

- Define `struct clone_args` for linux-lts versions that don't have it (@copy ocaml-multicore/eio#741, reviewed by @talex5).

- eio_linux: refactor fixed buffer code (@talex5 ocaml-multicore/eio#752).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant