fluencelabs/rust-libp2p
1
0
Fork 0
mirror of https://github.com/fluencelabs/rust-libp2p synced 2025-06-30 02:01:35 +00:00
Code Issues Projects Releases Wiki Activity

Drop atomic dependency (#2643)

Browse Source 
Replace `atomic::Atomic<u64>` by `std::sync::atomic:AtomicU64`.

The original motivation of using `atomic::Atomic<u64>` instead of
`std`'s version in #1670 was the following:

> I used the atomic crate and an Atomic<u64> because the AtomicU64 type
> isn't available on all architectures. The atomic crate automatically
> falls back to using a Mutex on platforms that don't support AtomicU64.

This argumentation is moot because the crate directly depends on
`libp2p-core` which also uses `AtomicU64`.
This commit is contained in:
hrxi
2022-05-12 06:05:33 +02:00
committed by GitHub
parent f04f6bb4fc
commit d69681b27c
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -69,7 +69,6 @@ serde = ["libp2p-core/serde", "libp2p-kad/serde", "libp2p-gossipsub/serde"]
all-features = true all-features = true
[dependencies] [dependencies]
atomic = "0.5.0"
bytes = "1" bytes = "1"
futures = "0.3.1" futures = "0.3.1"
futures-timer = "3.0.2" # Explicit dependency to be used in `wasm-bindgen` feature futures-timer = "3.0.2" # Explicit dependency to be used in `wasm-bindgen` feature

14
src/bandwidth.rs
View File

@ -26,7 +26,6 @@ use crate::{
Multiaddr, Multiaddr,
}; };
use atomic::Atomic;
use futures::{ use futures::{
io::{IoSlice, IoSliceMut}, io::{IoSlice, IoSliceMut},
prelude::*, prelude::*,
@ -36,7 +35,10 @@ use std::{
convert::TryFrom as _, convert::TryFrom as _,
io, io,
pin::Pin, pin::Pin,
sync::{atomic::Ordering, Arc}, sync::{
atomic::{AtomicU64, Ordering},
Arc,
},
task::{Context, Poll}, task::{Context, Poll},
}; };
@ -52,8 +54,8 @@ impl<TInner> BandwidthLogging<TInner> {
/// Creates a new [`BandwidthLogging`] around the transport. /// Creates a new [`BandwidthLogging`] around the transport.
pub fn new(inner: TInner) -> (Self, Arc<BandwidthSinks>) { pub fn new(inner: TInner) -> (Self, Arc<BandwidthSinks>) {
let sink = Arc::new(BandwidthSinks { let sink = Arc::new(BandwidthSinks {
inbound: Atomic::new(0), inbound: AtomicU64::new(0),
outbound: Atomic::new(0), outbound: AtomicU64::new(0),
}); });
let trans = BandwidthLogging { let trans = BandwidthLogging {
@ -165,8 +167,8 @@ impl<TInner: TryFuture> Future for BandwidthFuture<TInner> {
/// Allows obtaining the average bandwidth of the connections created from a [`BandwidthLogging`]. /// Allows obtaining the average bandwidth of the connections created from a [`BandwidthLogging`].
pub struct BandwidthSinks { pub struct BandwidthSinks {
inbound: Atomic<u64>, inbound: AtomicU64,
outbound: Atomic<u64>, outbound: AtomicU64,
} }
impl BandwidthSinks { impl BandwidthSinks {