leyoda/cosmic-session
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup: remove unnessecary use of Arc and Mutex

Browse source
This commit is contained in:
Ashley Wulber 2023-07-07 16:53:58 -04:00 • committed by Ashley Wulber
parent 9e47459047
commit ac889a2d57
1 changed files with 3 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/main.rs
View file

@ -8,10 +8,7 @@ mod process;
mod service; mod service;
mod systemd; mod systemd;
use std::{ use std::os::fd::AsRawFd;
os::fd::AsRawFd,
sync::{Arc, Mutex},
};
use async_signals::Signals; use async_signals::Signals;
use color_eyre::{eyre::WrapErr, Result}; use color_eyre::{eyre::WrapErr, Result};
@ -84,7 +81,6 @@ async fn main() -> Result<()> {
panel_notifications_fd.as_raw_fd().to_string(), panel_notifications_fd.as_raw_fd().to_string(),
)); ));
let panel_notifications_fd_pre = Arc::new(Mutex::new(panel_notifications_fd));
let span = info_span!(parent: None, "cosmic-panel"); let span = info_span!(parent: None, "cosmic-panel");
let stdout_span = span.clone(); let stdout_span = span.clone();
let stderr_span = span; let stderr_span = span;
@ -92,11 +88,7 @@ async fn main() -> Result<()> {
.start( .start(
Process::new() Process::new()
.with_executable("cosmic-panel") .with_executable("cosmic-panel")
.with_fds(move || { .with_fds(move || vec![panel_notifications_fd.as_raw_fd()])
let panel_notifications_fd = panel_notifications_fd_pre.clone();
let fd = panel_notifications_fd.lock().unwrap();
vec![fd.as_raw_fd()]
})
.with_on_stdout(move |_, _, line| { .with_on_stdout(move |_, _, line| {
let stdout_span = stdout_span.clone(); let stdout_span = stdout_span.clone();
async move { async move {
@ -124,18 +116,12 @@ async fn main() -> Result<()> {
let span = info_span!(parent: None, "cosmic-notifications"); let span = info_span!(parent: None, "cosmic-notifications");
let stdout_span = span.clone(); let stdout_span = span.clone();
let stderr_span = span; let stderr_span = span;
let daemon_notifications_fd_pre = Arc::new(Mutex::new(daemon_notifications_fd));
process_manager process_manager
.start( .start(
Process::new() Process::new()
.with_executable("cosmic-notifications") .with_executable("cosmic-notifications")
// XXX this should be safe because cosmic-session runs on a single thread .with_fds(move || vec![daemon_notifications_fd.as_raw_fd()])
.with_fds(move || {
let daemon_notifications_fd = daemon_notifications_fd_pre.clone();
let fd = daemon_notifications_fd.lock().unwrap();
vec![fd.as_raw_fd()]
})
.with_on_stdout(move |_, _, line| { .with_on_stdout(move |_, _, line| {
let stdout_span = stdout_span.clone(); let stdout_span = stdout_span.clone();
async move { async move {