Remove wezterm fork from dependencie (#8998)
Improves build time by removing wezterm dependency ([#8604](https://github.com/zed-industries/zed/issues/8604)). Release Notes: - N/A
This commit is contained in:
parent
e7289c385d
commit
41d8ba12ec
8 changed files with 183 additions and 110 deletions
134
crates/terminal/src/pty_info.rs
Normal file
134
crates/terminal/src/pty_info.rs
Normal file
|
@ -0,0 +1,134 @@
|
|||
use alacritty_terminal::tty::Pty;
|
||||
#[cfg(target_os = "windows")]
|
||||
use std::num::NonZeroU32;
|
||||
#[cfg(unix)]
|
||||
use std::os::fd::AsRawFd;
|
||||
use std::path::PathBuf;
|
||||
|
||||
#[cfg(target_os = "windows")]
|
||||
use windows::Win32::{Foundation::HANDLE, System::Threading::GetProcessId};
|
||||
|
||||
use sysinfo::{Pid, Process, ProcessRefreshKind, RefreshKind, System, UpdateKind};
|
||||
|
||||
struct ProcessIdGetter {
|
||||
handle: i32,
|
||||
fallback_pid: u32,
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
impl ProcessIdGetter {
|
||||
fn new(pty: &Pty) -> ProcessIdGetter {
|
||||
ProcessIdGetter {
|
||||
handle: pty.file().as_raw_fd(),
|
||||
fallback_pid: pty.child().id(),
|
||||
}
|
||||
}
|
||||
|
||||
fn pid(&self) -> Option<Pid> {
|
||||
let pid = unsafe { libc::tcgetpgrp(self.handle) };
|
||||
if pid < 0 {
|
||||
return Some(Pid::from_u32(self.fallback_pid));
|
||||
}
|
||||
Some(Pid::from_u32(pid as u32))
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
impl ProcessIdGetter {
|
||||
fn new(pty: &Pty) -> ProcessIdGetter {
|
||||
let child = pty.child_watcher();
|
||||
let handle = child.raw_handle();
|
||||
let fallback_pid = child
|
||||
.pid()
|
||||
.unwrap_or_else(|| unsafe { NonZeroU32::new_unchecked(GetProcessId(HANDLE(handle))) });
|
||||
|
||||
ProcessIdGetter {
|
||||
handle: handle as i32,
|
||||
fallback_pid: u32::from(fallback_pid),
|
||||
}
|
||||
}
|
||||
|
||||
fn pid(&self) -> Option<Pid> {
|
||||
let pid = unsafe { GetProcessId(HANDLE(self.handle as _)) };
|
||||
// the GetProcessId may fail and returns zero, which will lead to a stack overflow issue
|
||||
if pid == 0 {
|
||||
// in the builder process, there is a small chance, almost negligible,
|
||||
// that this value could be zero, which means child_watcher returns None,
|
||||
// GetProcessId returns 0.
|
||||
if self.fallback_pid == 0 {
|
||||
return None;
|
||||
}
|
||||
return Some(Pid::from_u32(self.fallback_pid));
|
||||
}
|
||||
Some(Pid::from_u32(pid as u32))
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
pub struct ProcessInfo {
|
||||
pub name: String,
|
||||
pub cwd: PathBuf,
|
||||
pub argv: Vec<String>,
|
||||
}
|
||||
|
||||
/// Fetches Zed-relevant Pseudo-Terminal (PTY) process information
|
||||
pub struct PtyProcessInfo {
|
||||
system: System,
|
||||
refresh_kind: ProcessRefreshKind,
|
||||
pid_getter: ProcessIdGetter,
|
||||
pub current: Option<ProcessInfo>,
|
||||
}
|
||||
|
||||
impl PtyProcessInfo {
|
||||
pub fn new(pty: &Pty) -> PtyProcessInfo {
|
||||
let process_refresh_kind = ProcessRefreshKind::new()
|
||||
.with_cmd(UpdateKind::Always)
|
||||
.with_cwd(UpdateKind::Always)
|
||||
.with_exe(UpdateKind::Always);
|
||||
let refresh_kind = RefreshKind::new().with_processes(process_refresh_kind);
|
||||
let system = System::new_with_specifics(refresh_kind);
|
||||
|
||||
PtyProcessInfo {
|
||||
system,
|
||||
refresh_kind: process_refresh_kind,
|
||||
pid_getter: ProcessIdGetter::new(pty),
|
||||
current: None,
|
||||
}
|
||||
}
|
||||
|
||||
fn refresh(&mut self) -> Option<&Process> {
|
||||
let pid = self.pid_getter.pid()?;
|
||||
self.system.refresh_processes_specifics(self.refresh_kind);
|
||||
self.system.process(pid)
|
||||
}
|
||||
|
||||
fn load(&mut self) -> Option<ProcessInfo> {
|
||||
let process = self.refresh()?;
|
||||
let cwd = process
|
||||
.cwd()
|
||||
.take()
|
||||
.map_or(PathBuf::new(), |p| p.to_owned());
|
||||
|
||||
let info = ProcessInfo {
|
||||
name: process.name().to_owned(),
|
||||
cwd,
|
||||
argv: process.cmd().to_vec(),
|
||||
};
|
||||
self.current = Some(info.clone());
|
||||
Some(info)
|
||||
}
|
||||
|
||||
/// Updates the cached process info, returns whether the Zed-relevant info has changed
|
||||
pub fn has_changed(&mut self) -> bool {
|
||||
let current = self.load();
|
||||
let has_changed = match (self.current.as_ref(), current.as_ref()) {
|
||||
(None, None) => false,
|
||||
(Some(prev), Some(now)) => prev.cwd != now.cwd || prev.name != now.name,
|
||||
_ => true,
|
||||
};
|
||||
if has_changed {
|
||||
self.current = current;
|
||||
}
|
||||
has_changed
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue