rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-17 13:10:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "async version of previous commit"

Browse Source 
This reverts commit 79c577c2eb.
This commit is contained in:
Christian Schwarz
2023-10-04 16:47:46 +00:00
parent 79c577c2eb
commit 3adaec3ab2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pageserver/src/page_cache.rs
View File

@@ -250,7 +250,7 @@ pub struct PageCache {
/// Index of the next candidate to evict, for the Clock replacement algorithm.
/// This is interpreted modulo the page cache size.
next_evict_slot: tokio::sync::Mutex<usize>,
next_evict_slot: std::sync::Mutex<usize>,
size_metrics: &'static PageCacheSizeMetrics,
}
@@ -882,7 +882,7 @@ impl PageCache {
&self,
_permit_witness: &PinnedSlotsPermit,
) -> anyhow::Result<(usize, tokio::sync::RwLockWriteGuard<SlotInner>)> {
let mut next_evict_slot = self.next_evict_slot.lock().await;
let mut next_evict_slot = self.next_evict_slot.lock().unwrap();
loop {
let slot_idx = *next_evict_slot % self.slots.len();
*next_evict_slot = next_evict_slot.wrapping_add(1);
@@ -943,7 +943,7 @@ impl PageCache {
materialized_page_map: Default::default(),
immutable_page_map: Default::default(),
slots,
next_evict_slot: tokio::sync::Mutex::new(0),
next_evict_slot: std::sync::Mutex::new(0),
size_metrics,
pinned_slots: Arc::new(tokio::sync::Semaphore::new(num_pages)),
}