Skip to content

perf(signal-cache): share cached sessions via Arc, peek without deep clone #809

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

Merged
jlucaso1 merged 1 commit into from
Jun 9, 2026
Merged

perf(signal-cache): share cached sessions via Arc, peek without deep clone #809

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
25 changes: 15 additions & 10 deletions wacore/src/store/signal_cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ pub struct SignalStoreCache {
/// Cache entry tracking whether a session is present, absent, or checked out
/// by an encrypt/decrypt operation.
enum SessionEntry {
Present(Box<SessionRecord>),
// `Arc` so `peek_session` (retry / LID-migration checks) bumps a refcount
// instead of deep-cloning the record (KBs with archived states).
Present(Arc<SessionRecord>),
Absent,
/// Taken by load_session; has_session treats as present, flush/eviction skip.
CheckedOut,
Expand Down Expand Up @@ -124,7 +126,7 @@ impl SessionStoreState {
fn put(&mut self, address: &str, record: SessionRecord) {
let addr = self.key_for(address);
self.cache
.insert(addr.clone(), SessionEntry::Present(Box::new(record)));
.insert(addr.clone(), SessionEntry::Present(Arc::new(record)));
self.dirty.insert(addr.clone());
self.deleted.remove(&addr);
}
Expand Down Expand Up @@ -349,7 +351,11 @@ impl SignalStoreCache {
else {
unreachable!()
};
return Ok(Some(*record));
// Unique unless a peek's Arc is still alive (short-lived
// inspection paths), so this is a move, not a clone.
return Ok(Some(
Arc::try_unwrap(record).unwrap_or_else(|arc| (*arc).clone()),
));
}
return Ok(None);
}
Expand Down Expand Up @@ -386,13 +392,13 @@ impl SignalStoreCache {
&self,
address: &ProtocolAddress,
backend: &dyn SignalStore,
) -> Result<Option<SessionRecord>> {
) -> Result<Option<Arc<SessionRecord>>> {
let key = address.as_str();
{
let state = self.sessions.lock().await;
if let Some(entry) = state.cache.get(key) {
return match entry {
SessionEntry::Present(record) => Ok(Some((**record).clone())),
SessionEntry::Present(record) => Ok(Some(record.clone())),
_ => Ok(None),
};
}
Expand All @@ -402,12 +408,11 @@ impl SignalStoreCache {
let mut state = self.sessions.lock().await;
match backend_result {
Some(bytes) => {
let record = SessionRecord::deserialize(&bytes)?;
let record = Arc::new(SessionRecord::deserialize(&bytes)?);
if !state.cache.contains_key(key) {
state.cache.insert(
Arc::from(key),
SessionEntry::Present(Box::new(record.clone())),
);
state
.cache
.insert(Arc::from(key), SessionEntry::Present(record.clone()));
state.evict_if_needed(self.max_entries);
}
Ok(Some(record))
Expand Down
Loading