Enhance rand to support macos #159
Open
+17
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jiangliu
force-pushed
the
macos-rand
branch
7 times, most recently
from
bdfa3f2
to
db643da
Compare
The rand::timestamp_cycles() may return duplicated value on non-x86 architectures, so fixes it by retry. Signed-off-by: Liu Jiang <[email protected]>
Some assumptions in unit test cases are not suitable for Darwin/macos, so relax those test cases. Signed-off-by: Liu Jiang <[email protected]>
| @@ -144,6 +144,7 @@ mod tests { | |||
| let path = t.as_path(); | |||
| assert!(path.exists()); | |||
| assert!(path.is_dir()); | |||
| #[cfg(not(target_os = "macos"))] | |||
There was a problem hiding this comment.
Can we instead check that the path is in the equivalent temp_dir for mac os? Otherwise this test is not very useful.
| @@ -185,12 +186,14 @@ mod tests { | |||
| let path = t.as_path(); | |||
| assert!(path.exists()); | |||
| assert!(path.is_dir()); | |||
| #[cfg(not(target_os = "macos"))] | |||
There was a problem hiding this comment.
Can we add an equivalent check here instead?
mjt0k
reviewed
Apr 16, 2023
There was a problem hiding this comment.
FWIW, not all platforms have 64bit atomic types. There's configuration to check: cfg(target_has_atomic = "64"). I just submitted an issue to omit compilation of src/metrics.rs if target does not have 64bit atomics. Examples of such platforms are armel, mipsel and (surprize!) x32 (tho I think this last one is due to lack of proper rust support there, since i386 does have 64bit atomics).
| @@ -24,17 +24,28 @@ pub fn timestamp_cycles() -> u64 { | |||
|
|
|||
| #[cfg(not(target_arch = "x86_64"))] | |||
| { | |||
| use std::sync::atomic::{AtomicU64, Ordering}; | |||
| static TIMESTAMP: AtomicU64 = AtomicU64::new(0); | |||
There was a problem hiding this comment.
Does this need to be static?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary of the PR
Enhance rand to support macos, also fixes some failure in unit tests on macos
Requirements
Before submitting your PR, please make sure you addressed the following
requirements:
git commit -s), and the commitmessage has max 60 characters for the summary and max 75 characters for each
description line.
test.
unsafecode is properly documented.