Skip to content

perf: spawn desktop components concurrently #151

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

Open
wants to merge 1 commit into
base: socket-activation
Choose a base branch
from
+31 −87
Open

perf: spawn desktop components concurrently #151

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
118 changes: 31 additions & 87 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use color_eyre::{Result, eyre::WrapErr};
use comp::create_privileged_socket;
use cosmic_notifications_util::{DAEMON_NOTIFICATIONS_FD, PANEL_NOTIFICATIONS_FD};
use futures_util::StreamExt;
use futures_util::stream::FuturesUnordered;
#[cfg(feature = "autostart")]
use itertools::Itertools;
use launch_pad::{ProcessManager, process::Process};
Expand All @@ -32,6 +33,7 @@ use std::{
};
#[cfg(feature = "systemd")]
use systemd::{get_systemd_env, is_systemd_used, spawn_scope};
use tokio::sync::mpsc::UnboundedSender;
use tokio::{
net::UnixStream,
sync::{
Expand Down Expand Up @@ -338,93 +340,7 @@ async fn start(
);
drop(guard);

let span = info_span!(parent: None, "cosmic-app-library");
start_component(
"cosmic-app-library",
span,
&process_manager,
&env_vars,
&socket_tx,
Vec::new(),
)
.await;

let span = info_span!(parent: None, "cosmic-launcher");
start_component(
"cosmic-launcher",
span,
&process_manager,
&env_vars,
&socket_tx,
Vec::new(),
)
.await;

let span = info_span!(parent: None, "cosmic-workspaces");
start_component(
"cosmic-workspaces",
span,
&process_manager,
&env_vars,
&socket_tx,
Vec::new(),
)
.await;

let span = info_span!(parent: None, "cosmic-osd");
start_component(
"cosmic-osd",
span,
&process_manager,
&env_vars,
&socket_tx,
Vec::new(),
)
.await;

let span = info_span!(parent: None, "cosmic-bg");
start_component(
"cosmic-bg",
span,
&process_manager,
&env_vars,
&socket_tx,
Vec::new(),
)
.await;

let span = info_span!(parent: None, "cosmic-greeter");
start_component(
"cosmic-greeter",
span,
&process_manager,
&env_vars,
&socket_tx,
Vec::new(),
)
.await;

let span = info_span!(parent: None, "cosmic-files-applet");
start_component(
"cosmic-files-applet",
span,
&process_manager,
&env_vars,
&socket_tx,
Vec::new(),
)
.await;

let span = info_span!(parent: None, "cosmic-idle");
start_component(
"cosmic-idle",
span,
&process_manager,
&env_vars,
&socket_tx,
Vec::new(),
)
.await;
spawn_components(&process_manager, &env_vars, &socket_tx).await;

#[cfg(feature = "autostart")]
if !*is_systemd_used() {
Expand Down Expand Up @@ -576,6 +492,34 @@ async fn start(
Ok(status)
}

/// Spawn desktop components concurrently with the process manager.
async fn spawn_components(
process_manager: &ProcessManager,
env_vars: &[(String, String)],
socket_tx: &UnboundedSender<Vec<UnixStream>>,
) {
let components = [
"cosmic-app-library",
"cosmic-bg",
"cosmic-files-applet",
"cosmic-greeter",
"cosmic-idle",
"cosmic-launcher",
"cosmic-osd",
"cosmic-workspaces",
];

components
.into_iter()
.map(|name| async move {
let span = info_span!(parent: None, "{}", name);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does creating an info_span! in a loop like this work properly?

https://docs.rs/tracing/0.1.41/tracing/struct.Span.html takes &'static Metadata<'static> , and macro_rules! span in https://github.com/tokio-rs/tracing/blob/main/tracing/src/macros.rs includes a definition of a static.

start_component(name, span, process_manager, env_vars, socket_tx, Vec::new()).await;
})
.collect::<FuturesUnordered<_>>()
.collect::<Vec<()>>()
.await;
}

async fn start_component(
cmd: impl Into<Cow<'static, str>>,
span: tracing::Span,
Expand Down