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

add try/catch around scheduler to reset sleep state #54721

Merged
merged 2 commits into from
Jun 8, 2024
Merged

Conversation

vtjnash
Copy link
Member

@vtjnash vtjnash commented Jun 6, 2024

Fixes #54700

Mostly just an indentation change, so recommend viewing with whitespace hidden

@vtjnash vtjnash added bugfix This change fixes an existing bug backport 1.11 Change should be backported to release-1.11 labels Jun 6, 2024
@vtjnash vtjnash requested a review from Keno June 6, 2024 23:49
@vtjnash
Copy link
Member Author

vtjnash commented Jun 6, 2024

I am somewhat uncertain what happens with all of the control flow here (continue, break, return). The analyzers seem okay with it, but do I need to manually insert a jl_eh_restore_state(__eh_ct, &__eh) before each of those?

@KristofferC KristofferC mentioned this pull request Jun 7, 2024
60 tasks
@Keno
Copy link
Member

Keno commented Jun 7, 2024

I don't know enough about this code, but CI seems unhappy:


[25707] signal 11 (2): Segmentation fault: 11
--
  | in expression starting at none:1
  | ijl_eh_restore_state_noexcept at /Users/julia/.julia/scratchspaces/a66863c6-20e8-4ff4-8a62-49f30b1f605e/agent-cache/default-honeycrisp-HL2F7YQ3XH.0/build/default-honeycrisp-HL2F7YQ3XH-0/julialang/julia-master/src/rtutils.c:300 [inlined]
  | ijl_pop_handler_noexcept at /Users/julia/.julia/scratchspaces/a66863c6-20e8-4ff4-8a62-49f30b1f605e/agent-cache/default-honeycrisp-HL2F7YQ3XH.0/build/default-honeycrisp-HL2F7YQ3XH-0/julialang/julia-master/src/rtutils.c:321
  | #wait#733 at ./condition.jl:139
  | Allocations: 13066918 (Pool: 13066786; Big: 132); GC: 69


@vtjnash
Copy link
Member Author

vtjnash commented Jun 7, 2024

Good point. I added those calls where I think I could see they may be necessary, and now CI seems okay?

@vtjnash
Copy link
Member Author

vtjnash commented Jun 7, 2024

This still feels wrong though, since JL_TRY changes the meaning of continue to mean "jump to end", which may already call jl_eh_restore_state. It is idempotent currently, but perhaps undesirable to rely on that?

src/scheduler.c Outdated Show resolved Hide resolved
@vtjnash vtjnash added the merge me PR is reviewed. Merge when all tests are passing label Jun 7, 2024
@vtjnash vtjnash merged commit b1e5a86 into master Jun 8, 2024
6 of 8 checks passed
@vtjnash vtjnash deleted the jn/54700 branch June 8, 2024 00:54
@oscardssmith oscardssmith removed the merge me PR is reviewed. Merge when all tests are passing label Jun 8, 2024
@KristofferC
Copy link
Member

This has some merge conflicts merging it into backports-release-1.11

vtjnash added a commit that referenced this pull request Jun 13, 2024
Fixes #54700

Mostly just an indentation change, so recommend viewing with whitespace
hidden (or if backporting).

(cherry picked from commit b1e5a86)
@vtjnash
Copy link
Member Author

vtjnash commented Jun 13, 2024

Visual Studio Code editor almost successfully figured out the merge, it just wasn't sure how much of the last block of code it was supposed to duplicate.

KristofferC pushed a commit that referenced this pull request Jun 18, 2024
Fixes #54700

Mostly just an indentation change, so recommend viewing with whitespace
hidden (or if backporting).

(cherry picked from commit b1e5a86)
KristofferC added a commit that referenced this pull request Jun 25, 2024
Backported PRs:
- [x] #54361 <!-- [LBT] Upgrade to v5.9.0 -->
- [x] #54474 <!-- Unalias source from dest in copytrito -->
- [x] #54548 <!-- Fixes for bitcast bugs with LLVM 17 / opaque pointers
-->
- [x] #54191 <!-- make `AbstractPipe` public -->
- [x] #53402 <!-- Add `jl_getaffinity` and `jl_setaffinity` -->
- [x] #53356 <!-- Rename at-scriptdir project argument to at-script and
search upwards for Project.toml -->
- [x] #54545 <!-- typeintersect: fix incorrect innervar handling under
circular env -->
- [x] #54586 <!-- Set storage class of julia globals to dllimport on
windows to avoid auto-import weirdness. Forward port of #54572 -->
- [x] #54587 <!-- Accomodate for rectangular matrices in `copytrito!`
-->
- [x] #54617 <!-- CLI: Use `GetModuleHandleExW` to locate libjulia.dll
-->
- [x] #54605 <!-- Allow libquadmath to also fail as it is not available
on all systems -->
- [x] #54634 <!-- Fix trampoline assembly for build on clang 18 on apple
silicon -->
- [x] #54635 <!-- Aggressive constprop in trevc! to stabilize triangular
eigvec -->
- [x] #54645 <!-- ensure we set the right value to gc_first_tid -->
- [x] #54554 <!-- make elsize public -->
- [x] #54648 <!-- Construct LazyString in error paths for tridiag -->
- [x] #54658 <!-- fix missing uuid check on extension when finding the
location of an extension -->
- [x] #54594 <!-- Switch to Pkg mode prompt immediately and load Pkg in
the background -->
- [x] #54669 <!-- Improve error message in inplace transpose -->
- [x] #54671 <!-- Add boundscheck in bindingkey_eq to avoid OOB access
due to data race -->
- [x] #54672 <!-- make: Fix `sed` command for LLVM libraries with no
symbol versioning -->
- [x] #54624 <!-- more precise aliasing checks for SubArray -->
- [x] #54679 <!-- 🤖 [master] Bump the Distributed stdlib from 6a07d98 to
6c7cdb5 -->
- [x] #54604 <!-- Fix tbaa annotation on union selector bytes inside of
structs -->
- [x] #54690 <!-- Fix assertion/crash when optimizing function with dead
basic block -->
- [x] #54704 <!-- LazyString in reinterpretarray error messages -->
- [x] #54718 <!-- fix prepend StackOverflow issue -->
- [x] #54674 <!-- Reimplement dummy pkg prompt as standard prompt -->
- [x] #54737 <!-- LazyString in interpolated error messages involving
types -->
- [x] #54642 <!-- Document GenericMemory and AtomicMemory -->
- [x] #54713 <!-- make: use `readelf` for LLVM symbol version detection
-->
- [x] #54760 <!-- REPL: improve prompt! async function handler -->
- [x] #54606 <!-- fix double-counting and non-deterministic results in
`summarysize` -->
- [x] #54759 <!-- REPL: Fully populate the dummy Pkg prompt -->
- [x] #54702 <!-- lowering: Recognize argument destructuring inside
macro hygiene -->
- [x] #54678 <!-- Don't let setglobal! implicitly create bindings -->
- [x] #54730 <!-- Fix uuidkey of exts in fast path of `require_stdlib`
-->
- [x] #54765 <!-- Handle no-postdominator case in finalizer pass -->
- [x] #54591 <!-- Don't expose guard pages to malloc_stack API consumers
-->
- [x] #54755 <!-- [TOML] remove Dates hack, replace with explicit usage
-->
- [x] #54721 <!-- add try/catch around scheduler to reset sleep state
-->
- [x] #54631 <!-- Avoid concatenating LazyString in setindex! for
triangular matrices -->
- [x] #54322 <!-- effects: add new `@consistent_overlay` macro -->
- [x] #54785
- [x] #54865
- [x] #54815
- [x] #54795
- [x] #54779
- [x] #54837 

Contains multiple commits, manual intervention needed:
- [ ] #52694 <!-- Reinstate similar for AbstractQ for backward
compatibility -->
- [ ] #54649 <!-- Less restrictive copyto! signature for triangular
matrices -->

Non-merged PRs with backport label:
- [ ] #54779 <!-- make recommendation clearer on manifest version
mismatch -->
- [ ] #54739 <!-- finish implementation of upgradable stdlibs -->
- [ ] #54738 <!-- serialization: fix relocatability bug -->
- [ ] #54574 <!-- Make ScopedValues public -->
- [ ] #54457 <!-- Make `String(::Memory)` copy -->
- [ ] #53957 <!-- tweak how filtering is done for what packages should
be precompiled -->
- [ ] #53452 <!-- RFC: allow Tuple{Union{}}, returning Union{} -->
- [ ] #53286 <!-- Raise an error when using `include_dependency` with
non-existent file or directory -->
- [ ] #51479 <!-- prevent code loading from lookin in the versioned
environment when building Julia -->
@KristofferC KristofferC removed the backport 1.11 Change should be backported to release-1.11 label Jun 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bugfix This change fixes an existing bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

^C inside pkg-add prompt causes assertion abort
4 participants