kata-containers/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2026-08-05 02:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

rate_limiter: trim qualified paths

Browse Source 
Import the std modules used in the crate instead of spelling the full
paths at every use site.

Signed-off-by: Henry Hrvoje Tonkovac <htonkovac@gmail.com>
Assisted-by: Claude:Opus-4.8
This commit is contained in:
Henry Hrvoje Tonkovac
2026-06-14 17:54:28 +02:00
committed by Rob Bradford
parent 0e4e3277a9
commit fffa200240
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rate_limiter/src/group.rs
View File

@@ -8,7 +8,7 @@ use core::panic::AssertUnwindSafe;
use std::fs::File; use std::fs::File;
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd}; use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
use std::{io, result, thread}; use std::{io, panic, result, thread};
use log::{error, info, warn}; use log::{error, info, warn};
use thiserror::Error; use thiserror::Error;
@@ -222,7 +222,7 @@ impl RateLimiterGroup {
thread::Builder::new() thread::Builder::new()
.name(format!("rate-limit-group-{}", inner.id)) .name(format!("rate-limit-group-{}", inner.id))
.spawn(move || { .spawn(move || {
let res = std::panic::catch_unwind(AssertUnwindSafe(move || { let res = panic::catch_unwind(AssertUnwindSafe(move || {
const EPOLL_EVENTS_LEN: usize = 2; const EPOLL_EVENTS_LEN: usize = 2;
let mut events = let mut events =

14
rate_limiter/src/lib.rs
View File

@@ -44,11 +44,11 @@
//! trait and provides an *event-handler* as part of its API. This *event-handler* //! trait and provides an *event-handler* as part of its API. This *event-handler*
//! needs to be called by the user on every event on the rate limiter's `AsRawFd` FD. //! needs to be called by the user on every event on the rate limiter's `AsRawFd` FD.
use std::io;
use std::os::unix::io::{AsRawFd, RawFd}; use std::os::unix::io::{AsRawFd, RawFd};
use std::sync::Mutex; use std::sync::Mutex;
use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::atomic::{AtomicBool, Ordering};
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
use std::{cmp, io};
use log::error; use log::error;
use thiserror::Error; use thiserror::Error;
@@ -65,7 +65,7 @@ pub enum Error {
SpuriousRateLimiterEvent(&'static str), SpuriousRateLimiterEvent(&'static str),
/// The event handler encounters while TimerFd::wait() /// The event handler encounters while TimerFd::wait()
#[error("Failed to wait for the timer")] #[error("Failed to wait for the timer")]
TimerFdWaitError(#[source] std::io::Error), TimerFdWaitError(#[source] io::Error),
} }
// Interval at which the refill timer will run when limiter is at capacity. // Interval at which the refill timer will run when limiter is at capacity.
@@ -220,7 +220,7 @@ impl TokenBucket {
self.one_time_burst += tokens; self.one_time_burst += tokens;
return; return;
} }
self.budget = std::cmp::min(self.budget + tokens, self.size); self.budget = cmp::min(self.budget + tokens, self.size);
} }
/// Returns the capacity of the token bucket. /// Returns the capacity of the token bucket.
@@ -359,7 +359,7 @@ impl RateLimiter {
libc::fcntl(fd, libc::F_SETFL, flags) libc::fcntl(fd, libc::F_SETFL, flags)
}; };
if ret < 0 { if ret < 0 {
return Err(std::io::Error::last_os_error()); return Err(io::Error::last_os_error());
} }
Ok(RateLimiter { Ok(RateLimiter {
@@ -463,10 +463,10 @@ impl RateLimiter {
// `timer_fd::wait()` won't block (which is different from its default behavior.) // `timer_fd::wait()` won't block (which is different from its default behavior.)
match guard.timer_fd.wait() { match guard.timer_fd.wait() {
Err(e) => { Err(e) => {
let err: std::io::Error = e.into(); let err: io::Error = e.into();
match err.kind() { match err.kind() {
std::io::ErrorKind::Interrupted => (), io::ErrorKind::Interrupted => (),
std::io::ErrorKind::WouldBlock => { io::ErrorKind::WouldBlock => {
return Err(Error::SpuriousRateLimiterEvent( return Err(Error::SpuriousRateLimiterEvent(
"Rate limiter event handler called without a present timer", "Rate limiter event handler called without a present timer",
)); ));