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.

Sign up for GitHub

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

Add debouncer for proc macros #32

Merged
merged 1 commit into from
Dec 5, 2024
Merged

Add debouncer for proc macros #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions src/lang/proc_macros/controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ use crate::lang::proc_macros::plugins::proc_macro_plugin_suite;
use crate::server::client::Notifier;
use crate::toolchain::scarb::ScarbToolchain;

const RATE_LIMITER_PERIOD_SEC: u64 = 180;
const RATE_LIMITER_RETRIES: u32 = 5;
const RESTART_RATE_LIMITER_PERIOD_SEC: u64 = 180;
const RESTART_RATE_LIMITER_RETRIES: u32 = 5;

const RESPONSE_RATE_LIMITER_PERIOD_SEC: u64 = 3;

/// Manages lifecycle of proc-macro-server client.
///
Expand All @@ -52,6 +54,7 @@ pub struct ProcMacroClientController {
notifier: Notifier,
plugin_suite: Option<PluginSuite>,
initialization_retries: RateLimiter<NotKeyed, InMemoryState, QuantaClock>,
response_resolving_limiter: RateLimiter<NotKeyed, InMemoryState, QuantaClock>,
channels: ProcMacroChannels,
}

Expand All @@ -67,14 +70,22 @@ impl ProcMacroClientController {
plugin_suite: Default::default(),
initialization_retries: RateLimiter::direct(
Quota::with_period(Duration::from_secs(
RATE_LIMITER_PERIOD_SEC / RATE_LIMITER_RETRIES as u64,
RESTART_RATE_LIMITER_PERIOD_SEC / RESTART_RATE_LIMITER_RETRIES as u64,
))
.unwrap()
.allow_burst(
// All retries can be used as fast as possible.
NonZeroU32::new(RATE_LIMITER_RETRIES).unwrap(),
NonZeroU32::new(RESTART_RATE_LIMITER_RETRIES).unwrap(),
),
),
response_resolving_limiter: RateLimiter::direct(
Quota::with_period(Duration::from_secs(RESPONSE_RATE_LIMITER_PERIOD_SEC))
.unwrap()
.allow_burst(
// Don't allow any burst.
NonZeroU32::new(1).unwrap(),
),
),
channels: ProcMacroChannels::new(),
}
}
Expand Down Expand Up @@ -116,6 +127,11 @@ impl ProcMacroClientController {

/// If the client is ready, apply all available responses.
pub fn on_response(&mut self, db: &mut AnalysisDatabase, config: &Config) {
if self.response_resolving_limiter.check().is_err() {
let _ = self.channels.response_sender.try_send(());
return;
}

match db.proc_macro_client_status() {
ClientStatus::Starting(client) => {
let Ok(defined_macros) = client.finish_initialize() else {
Expand Down Expand Up @@ -310,8 +326,9 @@ impl Display for InitializationFailedInfo {
InitializationFailedInfo::NoMoreRetries => {
write!(
f,
"Starting proc-macro-server failed {RATE_LIMITER_RETRIES} times in {} minutes.",
RATE_LIMITER_PERIOD_SEC / 60
"Starting proc-macro-server failed {RESTART_RATE_LIMITER_RETRIES} times in {} \
minutes.",
RESTART_RATE_LIMITER_PERIOD_SEC / 60
)
}
InitializationFailedInfo::SpawnFail => {
Expand Down
Loading