mirror of
https://github.com/openai/codex.git
synced 2026-10-27 16:02:59 +00:00
## What changed - Add `McpRefresh` to own the pending invalidation state and serialize MCP runtime refreshes. - Keep cancellation recovery alongside the refresh state so a claimed refresh is marked pending again if publication does not complete. - Update session initialization, shutdown, refresh paths, and tests to use the new abstraction. GitOrigin-RevId: 915b28fa8b98a4f4c87ce8f2aa0d0ff99b57577d
55 lines
1.3 KiB
Rust
55 lines
1.3 KiB
Rust
use std::sync::atomic::AtomicBool;
|
|
use std::sync::atomic::Ordering;
|
|
use tokio::sync::AcquireError;
|
|
use tokio::sync::Semaphore;
|
|
use tokio::sync::SemaphorePermit;
|
|
|
|
/// Owns MCP invalidation and the single gate used to publish runtime updates.
|
|
pub(super) struct McpRefresh {
|
|
pending: AtomicBool,
|
|
gate: Semaphore,
|
|
}
|
|
|
|
impl McpRefresh {
|
|
pub(super) fn new() -> Self {
|
|
Self {
|
|
pending: AtomicBool::new(false),
|
|
gate: Semaphore::new(/*permits*/ 1),
|
|
}
|
|
}
|
|
|
|
pub(super) fn invalidate(&self) {
|
|
self.pending.store(true, Ordering::Release);
|
|
}
|
|
|
|
pub(super) fn is_pending(&self) -> bool {
|
|
self.pending.load(Ordering::Acquire)
|
|
}
|
|
|
|
pub(super) fn claim(&self) -> bool {
|
|
self.pending.swap(false, Ordering::AcqRel)
|
|
}
|
|
|
|
pub(super) async fn acquire(&self) -> Result<SemaphorePermit<'_>, AcquireError> {
|
|
self.gate.acquire().await
|
|
}
|
|
|
|
pub(super) fn close(&self) {
|
|
self.gate.close();
|
|
}
|
|
}
|
|
|
|
/// Restores a claimed refresh when its task is cancelled before publication.
|
|
pub(super) struct McpRefreshInvalidationGuard<'a> {
|
|
pub(super) refresh: &'a McpRefresh,
|
|
pub(super) published: bool,
|
|
}
|
|
|
|
impl Drop for McpRefreshInvalidationGuard<'_> {
|
|
fn drop(&mut self) {
|
|
if !self.published {
|
|
self.refresh.invalidate();
|
|
}
|
|
}
|
|
}
|