Skip to content

Commit e0644b1

Browse files
committed
Use our own AtomicU64 on targets with target_has_atomic less than 64
1 parent 81e3cab commit e0644b1

File tree

5 files changed

+91
-2
lines changed

5 files changed

+91
-2
lines changed

.github/workflows/ci.yml

+33
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,39 @@ jobs:
4545
command: test
4646
args: --all --features unstable
4747

48+
cross:
49+
name: Cross compile
50+
runs-on: ubuntu-latest
51+
strategy:
52+
matrix:
53+
target:
54+
- i686-unknown-linux-gnu
55+
- powerpc-unknown-linux-gnu
56+
- powerpc64-unknown-linux-gnu
57+
- mips-unknown-linux-gnu
58+
- arm-linux-androideabi
59+
60+
steps:
61+
- uses: actions/checkout@master
62+
63+
- name: Install nightly
64+
uses: actions-rs/toolchain@v1
65+
with:
66+
toolchain: nightly
67+
override: true
68+
69+
- name: Install cross
70+
run: cargo install cross
71+
72+
- name: check
73+
run: cross check --all --target ${{ matrix.target }}
74+
75+
- name: check unstable
76+
run: cross check --all --features unstable --target ${{ matrix.target }}
77+
78+
- name: test
79+
run: cross test --all --features unstable --target ${{ matrix.target }}
80+
4881
check_fmt_and_docs:
4982
name: Checking fmt and docs
5083
runs-on: ubuntu-latest

src/sync/atomic.rs

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
pub(crate) use self::imp::AtomicU64;
2+
3+
// `AtomicU64` can only be used on targets with `target_has_atomic` is 64 or greater.
4+
// Once `cfg_target_has_atomic` feature is stable, we can replace it with
5+
// `#[cfg(target_has_atomic = "64")]`.
6+
// Refs: https://github.com/rust-lang/rust/tree/master/src/librustc_target
7+
#[cfg(not(any(target_arch = "arm", target_arch = "mips", target_arch = "powerpc")))]
8+
mod imp {
9+
pub(crate) use std::sync::atomic::AtomicU64;
10+
}
11+
12+
#[cfg(any(target_arch = "arm", target_arch = "mips", target_arch = "powerpc"))]
13+
mod imp {
14+
use std::sync::atomic::Ordering;
15+
use std::sync::Mutex;
16+
17+
#[derive(Debug)]
18+
pub(crate) struct AtomicU64(Mutex<u64>);
19+
20+
impl AtomicU64 {
21+
pub(crate) fn new(val: u64) -> Self {
22+
Self(Mutex::new(val))
23+
}
24+
25+
pub(crate) fn load(&self, _: Ordering) -> u64 {
26+
*self.0.lock().unwrap()
27+
}
28+
29+
pub(crate) fn fetch_add(&self, val: u64, _: Ordering) -> u64 {
30+
let mut lock = self.0.lock().unwrap();
31+
let prev = *lock;
32+
*lock = prev + val;
33+
prev
34+
}
35+
36+
pub(crate) fn fetch_sub(&self, val: u64, _: Ordering) -> u64 {
37+
let mut lock = self.0.lock().unwrap();
38+
let prev = *lock;
39+
*lock = prev - val;
40+
prev
41+
}
42+
}
43+
}

src/sync/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ pub use std::sync::{Arc, Weak};
3535
pub use mutex::{Mutex, MutexGuard};
3636
pub use rwlock::{RwLock, RwLockReadGuard, RwLockWriteGuard};
3737

38+
pub(crate) mod atomic;
3839
mod mutex;
3940
mod rwlock;
4041

src/task/blocking.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
11
//! A thread pool for running blocking functions asynchronously.
22
3-
use std::sync::atomic::{AtomicU64, Ordering};
3+
use std::sync::atomic::Ordering;
44
use std::thread;
55
use std::time::Duration;
66

77
use crossbeam_channel::{bounded, Receiver, Sender};
88
use lazy_static::lazy_static;
99

10+
use crate::sync::atomic::AtomicU64;
1011
use crate::task::task::{JoinHandle, Tag};
1112
use crate::utils::abort_on_panic;
1213

1314
const MAX_THREADS: u64 = 10_000;
1415

16+
#[cfg(any(target_arch = "arm", target_arch = "mips", target_arch = "powerpc"))]
17+
lazy_static! {
18+
static ref DYNAMIC_THREAD_COUNT: AtomicU64 = AtomicU64::new(0);
19+
}
20+
#[cfg(not(any(target_arch = "arm", target_arch = "mips", target_arch = "powerpc")))]
1521
static DYNAMIC_THREAD_COUNT: AtomicU64 = AtomicU64::new(0);
1622

1723
struct Pool {

src/task/task.rs

+7-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ use std::i64;
44
use std::mem;
55
use std::num::NonZeroU64;
66
use std::pin::Pin;
7-
use std::sync::atomic::{AtomicU64, AtomicUsize, Ordering};
7+
use std::sync::atomic::{AtomicUsize, Ordering};
88
use std::sync::Arc;
99

1010
use super::task_local;
11+
use crate::sync::atomic::AtomicU64;
1112
use crate::task::{Context, Poll};
1213

1314
/// A handle to a task.
@@ -112,6 +113,11 @@ pub struct TaskId(NonZeroU64);
112113

113114
impl TaskId {
114115
pub(crate) fn new() -> TaskId {
116+
#[cfg(any(target_arch = "arm", target_arch = "mips", target_arch = "powerpc"))]
117+
lazy_static::lazy_static! {
118+
static ref COUNTER: AtomicU64 = AtomicU64::new(1);
119+
}
120+
#[cfg(not(any(target_arch = "arm", target_arch = "mips", target_arch = "powerpc")))]
115121
static COUNTER: AtomicU64 = AtomicU64::new(1);
116122

117123
let id = COUNTER.fetch_add(1, Ordering::Relaxed);

0 commit comments

Comments
 (0)