wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-11-27 12:23:46 +03:00
Code Issues Projects Releases Wiki Activity

mux client: add domain id to logs

Browse Source 
refs: https://github.com/wez/wezterm/issues/2616
This commit is contained in:
Wez Furlong 2022-10-11 20:24:27 -07:00
parent 0e27fe847f
commit 7ba9c00e49
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wezterm-client/src/domain.rs
View File

@ -49,13 +49,19 @@ impl ClientInner {
.lock() .lock()
.unwrap() .unwrap()
.retain( .retain(
|_remote_tab_id, local_tab_id| match mux.get_tab(*local_tab_id) { |remote_tab_id, local_tab_id| match mux.get_tab(*local_tab_id) {
Some(tab) => { Some(tab) => {
for pos in tab.iter_panes_ignoring_zoom() { for pos in tab.iter_panes_ignoring_zoom() {
if pos.pane.domain_id() == self.local_domain_id { if pos.pane.domain_id() == self.local_domain_id {
return true; return true;
} }
} }
log::trace!(
"expire_stale_mappings: domain: {}. will remove \
{remote_tab_id} -> {local_tab_id} tab mapping \
because tab contains no panes from this domain",
self.local_domain_id,
);
false false
} }
None => false, None => false,
@ -139,11 +145,13 @@ impl ClientInner {
fn record_remote_to_local_tab_mapping(&self, remote_tab_id: TabId, local_tab_id: TabId) { fn record_remote_to_local_tab_mapping(&self, remote_tab_id: TabId, local_tab_id: TabId) {
let mut map = self.remote_to_local_tab.lock().unwrap(); let mut map = self.remote_to_local_tab.lock().unwrap();
map.insert(remote_tab_id, local_tab_id); let prior = map.insert(remote_tab_id, local_tab_id);
log::trace!( log::trace!(
"record_remote_to_local_tab_mapping: {} -> {}", "record_remote_to_local_tab_mapping: {} -> {} \
(prior={prior:?}, domain={})",
remote_tab_id, remote_tab_id,
local_tab_id local_tab_id,
self.local_domain_id,
); );
} }
@ -379,7 +387,11 @@ impl ClientDomain {
mut primary_window_id: Option<WindowId>, mut primary_window_id: Option<WindowId>,
) -> anyhow::Result<()> { ) -> anyhow::Result<()> {
let mux = Mux::get().expect("to be called on main thread"); let mux = Mux::get().expect("to be called on main thread");
log::debug!("ListPanes result {:#?}", panes); log::debug!(
"domain {}: ListPanes result {:#?}",
inner.local_domain_id,
panes
);
for tabroot in panes.tabs { for tabroot in panes.tabs {
let root_size = match tabroot.root_size() { let root_size = match tabroot.root_size() {
@ -414,7 +426,7 @@ impl ClientDomain {
inner.record_remote_to_local_tab_mapping(remote_tab_id, tab.tab_id()); inner.record_remote_to_local_tab_mapping(remote_tab_id, tab.tab_id());
} }
log::debug!("tree: {:#?}", tabroot); log::debug!("domain: {} tree: {:#?}", inner.local_domain_id, tabroot);
let mut workspace = None; let mut workspace = None;
tab.sync_with_pane_tree(root_size, tabroot, |entry| { tab.sync_with_pane_tree(root_size, tabroot, |entry| {
workspace.replace(entry.workspace.clone()); workspace.replace(entry.workspace.clone());
@ -446,7 +458,8 @@ impl ClientDomain {
&entry.title, &entry.title,
)); ));
log::debug!( log::debug!(
"attaching to remote pane {:?} -> local pane_id {}", "domain: {} attaching to remote pane {:?} -> local pane_id {}",
inner.local_domain_id,
entry, entry,
pane.pane_id() pane.pane_id()
); );
@ -459,7 +472,11 @@ impl ClientDomain {
let mut window = mux let mut window = mux
.get_window_mut(local_window_id) .get_window_mut(local_window_id)
.expect("no such window!?"); .expect("no such window!?");
log::debug!("adding tab to existing local window {}", local_window_id); log::debug!(
"domain: {} adding tab to existing local window {}",
inner.local_domain_id,
local_window_id
);
if window.idx_by_id(tab.tab_id()).is_none() { if window.idx_by_id(tab.tab_id()).is_none() {
window.push(&tab); window.push(&tab);
} }