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

Merge recent changes from maint-0.5 branch into master #45

Merged
merged 21 commits into from
Sep 18, 2021

Conversation

tatsuya6502
Copy link
Member

@tatsuya6502 tatsuya6502 commented Sep 18, 2021

This PR includes changes from the following PRs: #39, #40, #42 and #44.

tatsuya6502 and others added 21 commits September 9, 2021 23:26
These platforms does not provide `std::sync::atomic::AtomicU64`.

- Add a cargo feature "quanta" and make it a default feature.
- Add a module `common::time` and conditionally choose the source file
  from "time_quanta.rs" or "time_compat.rs".
    - time_quanta.rs file has type aliases to `quanta::{Instant, Clock, Mock}`.
      It also has `AtomicInstant` holding an `AtomicU64`.
    - time_compat.rs file has `Instant` based on `std::time::Instant`
      and quanta-like `Clock` and `Mock`. It also has `AtomicInstant`
      holding a `RwLock<Option<Instant>>`.
- Update Cache, etc. modules to use `common::time` instead of `quanta`.
- Add a step to GitHub Actions to test future feature without quanta/
  `AtomicU64`.
Remove some old codes.
Remove target_arch = "mips" from the cfg_attr for the time module. (It will
not work when quanta feature is still enabled it Cargo.toml)
Add a section to the README to explain that `default-features = false` will
be needed on these platforms.
- Rename the Cargo feature "quanta" to "atomic64".
- Update the change log and readme.
- Update a comment in the yml for GitHub Actions.
Ensure to set num threads to 1 for thread pools when `num_cpus::get()` returns 0.
Support Linux on MIPS and ARMv5TE
CI: Add cross-compile tests for some Linux targets
Restore quanta on 32-bit MIPS and ARMv5TE
Remove quanta from the "Resolving compile errors" section.
Conflicts:
    CHANGELOG.md
    Cargo.toml
@tatsuya6502 tatsuya6502 added this to the v0.6.0 milestone Sep 18, 2021
Copy link
Member Author

@tatsuya6502 tatsuya6502 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merging.

@tatsuya6502 tatsuya6502 merged commit 19c0528 into master Sep 18, 2021
@tatsuya6502 tatsuya6502 deleted the merge-maint-0.5 branch September 18, 2021 04:08
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.

2 participants