Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
80 changes: 40 additions & 40 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions examples/postgres/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ use std::str::FromStr;
use std::sync::Arc;
use std::time::Duration;

use fastpool::ObjectStatus;
use fastpool::bounded::Object;
use fastpool::bounded::Pool;
use fastpool::bounded::PoolConfig;
use fastpool::ObjectStatus;
use futures::future::BoxFuture;
use sqlx::postgres::PgConnectOptions;
use sqlx::Acquire;
use sqlx::ConnectOptions;
use sqlx::Connection;
use sqlx::PgConnection;
use sqlx::TransactionManager;
use sqlx::postgres::PgConnectOptions;

#[derive(Debug, Clone)]
pub struct ConnectionPool {
Expand All @@ -46,6 +46,10 @@ impl ConnectionPool {
tokio::time::sleep(REAP_IDLE_INTERVAL).await;
if let Some(pool) = weak_pool.upgrade() {
pool.retain(|_, m| m.last_used().elapsed() < IDLE_TIMEOUT);

let status = pool.status();
let gap = status.max_size - status.current_size;
pool.replenish(gap).await;
} else {
break;
}
Expand Down
2 changes: 1 addition & 1 deletion fastpool/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ repository.workspace = true
rust-version.workspace = true

[dependencies]
mea = { version = "0.3.2" }
mea = { version = "0.3.7" }
scopeguard = { version = "1.2.0" }

[dev-dependencies]
Expand Down
68 changes: 68 additions & 0 deletions fastpool/src/bounded.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,74 @@ impl<M: ManageObject> Pool<M> {
})
}

/// Replenishes the pool with at most `most` number of new objects.
///
/// Returns the number of objects that are actually replenished to the pool.
pub async fn replenish(&self, most: usize) -> usize {
let mut permit = {
let mut n = most;
loop {
match self.permits.try_acquire(n) {
Some(permit) => break permit,
None => {
n = n.min(self.permits.available_permits());
continue;
}
}
}
};

if permit.permits() == 0 {
return 0;
}

let gap = {
let idles = self.slots.lock().deque.len();
if idles >= permit.permits() {
return 0;
}

match permit.split(idles) {
None => unreachable!(
"idles ({}) should be less than permits ({})",
idles,
permit.permits()
),
Some(p) => {
// reduced by existing idle objects and release the corresponding permits
drop(p);
}
}

permit.permits()
};

let mut replenished = 0;
for _ in 0..gap {
if let Ok(o) = self.manager.create().await {
let status = ObjectStatus::default();
let state = ObjectState { o, status };

let mut slots = self.slots.lock();
slots.current_size += 1;
slots.deque.push_back(state);
drop(slots);

replenished += 1;
}

match permit.split(1) {
None => unreachable!("permit must be greater than 0 at this point"),
Some(p) => {
// always release one permit to unblock other waiters
drop(p);
}
}
}

replenished
}

/// Retrieves an [`Object`] from this [`Pool`].
///
/// This method should be called with a pool wrapped in an [`Arc`]. If the pool reaches the
Expand Down
Loading
Loading