Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Track open buffers when handling sync requests

Browse source 
When a host sends a buffer to a guest for the first time, they record that
they have done so in a set tied to that guest's peer id. When the guest
reconnects and syncs buffers, they do so under a different peer id, so we
need to be sure we track which buffers we have sent them to avoid sending
them the same buffer twice, which violates the guest's assumptions.
This commit is contained in:
Nathan Sobo 2023-01-02 20:12:00 -07:00
parent 74843493f4
commit a6ffcdd0cf
3 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
crates/project/src/project.rs
View file

@ -62,7 +62,7 @@ use std::{
time::Instant,
};
use terminal::{Terminal, TerminalBuilder};
use util::{defer, post_inc, ResultExt, TryFutureExt as _};
use util::{debug_panic, defer, post_inc, ResultExt, TryFutureExt as _};
pub use fs::*;
pub use worktree::*;
@ -1501,16 +1501,20 @@ impl Project {
}
Some(OpenBuffer::Weak(existing_handle)) => {
if existing_handle.upgrade(cx).is_some() {
debug_panic!("already registered buffer with remote id {}", remote_id);
Err(anyhow!(
"already registered buffer with remote id {}",
remote_id
))?
}
}
Some(OpenBuffer::Strong(_)) => Err(anyhow!(
"already registered buffer with remote id {}",
remote_id
))?,
Some(OpenBuffer::Strong(_)) => {
debug_panic!("already registered buffer with remote id {}", remote_id);
Err(anyhow!(
"already registered buffer with remote id {}",
remote_id
))?
}
}
cx.subscribe(buffer, |this, buffer, event, cx| {
this.on_buffer_event(buffer, event, cx);
@ -5150,18 +5154,28 @@ impl Project {
this: ModelHandle<Self>,
envelope: TypedEnvelope<proto::SynchronizeBuffers>,
_: Arc<Client>,
cx: AsyncAppContext,
mut cx: AsyncAppContext,
) -> Result<proto::SynchronizeBuffersResponse> {
let project_id = envelope.payload.project_id;
let mut response = proto::SynchronizeBuffersResponse {
buffers: Default::default(),
};
this.read_with(&cx, |this, cx| {
this.update(&mut cx, |this, cx| {
let Some(guest_id) = envelope.original_sender_id else {
log::error!("missing original_sender_id on SynchronizeBuffers request");
return;
};
for buffer in envelope.payload.buffers {
let buffer_id = buffer.id;
let remote_version = language::proto::deserialize_version(buffer.version);
if let Some(buffer) = this.buffer_for_id(buffer_id, cx) {
this.shared_buffers
.entry(guest_id)
.or_default()
.insert(buffer_id);
let buffer = buffer.read(cx);
response.buffers.push(proto::BufferVersion {
id: buffer_id,