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

Use cosmic::SingleThreadExecutor

Browse source 
This cuts down the number of threads per applet process. This is probably
no benefit to having multiple tokio worker threads for a typical applet.
This commit is contained in:
Ian Douglas Scott 2023-01-18 16:51:30 -08:00 • committed by Ashley Wulber
parent acc639f5e7
commit 72a75eabc7
10 changed files with 32 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Cargo.lock generated
View file

@ -673,7 +673,7 @@ dependencies = [
[[package]] [[package]]
name = "cosmic-panel-config" name = "cosmic-panel-config"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/cosmic-panel#b4e60dc30bb798d59cc57957291609e794d38821" source = "git+https://github.com/pop-os/cosmic-panel#310139295f0d3748f49d8bb13edfe659d3f80c4b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"ron", "ron",
@ -1038,7 +1038,7 @@ dependencies = [
[[package]] [[package]]
name = "directories" name = "directories"
version = "4.0.1" version = "4.0.1"
source = "git+https://github.com/edfloreshz/directories-rs#b93c018bc319f066fbeadcd8e3b865f1fccaaa8c" source = "git+https://github.com/edfloreshz/directories-rs#6a6d83d853a35ee3273034215c4defaf61286fe5"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"dirs-sys", "dirs-sys",
@ -2011,7 +2011,7 @@ dependencies = [
[[package]] [[package]]
name = "iced" name = "iced"
version = "0.6.0" version = "0.6.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#3bb193c3d2f41f87359d80e3eebba365425c4018" source = "git+https://github.com/pop-os/libcosmic/?branch=master#cd19bbf37aa23954bb3dbd8599543bf705aa41a1"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"iced_futures", "iced_futures",
@ -2028,7 +2028,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_core" name = "iced_core"
version = "0.6.2" version = "0.6.2"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#3bb193c3d2f41f87359d80e3eebba365425c4018" source = "git+https://github.com/pop-os/libcosmic/?branch=master#cd19bbf37aa23954bb3dbd8599543bf705aa41a1"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"palette", "palette",
@ -2038,7 +2038,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_futures" name = "iced_futures"
version = "0.5.1" version = "0.5.1"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#3bb193c3d2f41f87359d80e3eebba365425c4018" source = "git+https://github.com/pop-os/libcosmic/?branch=master#cd19bbf37aa23954bb3dbd8599543bf705aa41a1"
dependencies = [ dependencies = [
"futures", "futures",
"log", "log",
@ -2050,7 +2050,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_glow" name = "iced_glow"
version = "0.5.1" version = "0.5.1"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#3bb193c3d2f41f87359d80e3eebba365425c4018" source = "git+https://github.com/pop-os/libcosmic/?branch=master#cd19bbf37aa23954bb3dbd8599543bf705aa41a1"
dependencies = [ dependencies = [
"bytemuck", "bytemuck",
"euclid", "euclid",
@ -2065,7 +2065,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_graphics" name = "iced_graphics"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#3bb193c3d2f41f87359d80e3eebba365425c4018" source = "git+https://github.com/pop-os/libcosmic/?branch=master#cd19bbf37aa23954bb3dbd8599543bf705aa41a1"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"bytemuck", "bytemuck",
@ -2085,7 +2085,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_lazy" name = "iced_lazy"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#3bb193c3d2f41f87359d80e3eebba365425c4018" source = "git+https://github.com/pop-os/libcosmic/?branch=master#cd19bbf37aa23954bb3dbd8599543bf705aa41a1"
dependencies = [ dependencies = [
"iced_native", "iced_native",
"ouroboros 0.13.0", "ouroboros 0.13.0",
@ -2094,7 +2094,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_native" name = "iced_native"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#3bb193c3d2f41f87359d80e3eebba365425c4018" source = "git+https://github.com/pop-os/libcosmic/?branch=master#cd19bbf37aa23954bb3dbd8599543bf705aa41a1"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"iced_futures", "iced_futures",
@ -2108,7 +2108,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_sctk" name = "iced_sctk"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#3bb193c3d2f41f87359d80e3eebba365425c4018" source = "git+https://github.com/pop-os/libcosmic/?branch=master#cd19bbf37aa23954bb3dbd8599543bf705aa41a1"
dependencies = [ dependencies = [
"enum-repr", "enum-repr",
"futures", "futures",
@ -2127,7 +2127,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_softbuffer" name = "iced_softbuffer"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#3bb193c3d2f41f87359d80e3eebba365425c4018" source = "git+https://github.com/pop-os/libcosmic/?branch=master#cd19bbf37aa23954bb3dbd8599543bf705aa41a1"
dependencies = [ dependencies = [
"cosmic-text", "cosmic-text",
"iced_graphics", "iced_graphics",
@ -2142,7 +2142,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_style" name = "iced_style"
version = "0.5.1" version = "0.5.1"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#3bb193c3d2f41f87359d80e3eebba365425c4018" source = "git+https://github.com/pop-os/libcosmic/?branch=master#cd19bbf37aa23954bb3dbd8599543bf705aa41a1"
dependencies = [ dependencies = [
"iced_core", "iced_core",
"once_cell", "once_cell",
@ -2152,7 +2152,7 @@ dependencies = [
[[package]] [[package]]
name = "iced_wgpu" name = "iced_wgpu"
version = "0.7.0" version = "0.7.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#3bb193c3d2f41f87359d80e3eebba365425c4018" source = "git+https://github.com/pop-os/libcosmic/?branch=master#cd19bbf37aa23954bb3dbd8599543bf705aa41a1"
dependencies = [ dependencies = [
"bitflags", "bitflags",
"bytemuck", "bytemuck",
@ -2342,7 +2342,7 @@ checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]] [[package]]
name = "libcosmic" name = "libcosmic"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/pop-os/libcosmic/?branch=master#3bb193c3d2f41f87359d80e3eebba365425c4018" source = "git+https://github.com/pop-os/libcosmic/?branch=master#cd19bbf37aa23954bb3dbd8599543bf705aa41a1"
dependencies = [ dependencies = [
"apply", "apply",
"cosmic-panel-config", "cosmic-panel-config",
@ -2353,11 +2353,13 @@ dependencies = [
"iced_core", "iced_core",
"iced_lazy", "iced_lazy",
"iced_native", "iced_native",
"iced_sctk",
"iced_style", "iced_style",
"lazy_static", "lazy_static",
"palette", "palette",
"slotmap", "slotmap",
"smithay-client-toolkit", "smithay-client-toolkit",
"tokio",
] ]
[[package]] [[package]]
@ -3974,9 +3976,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.24.1" version = "1.24.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" checksum = "597a12a59981d9e3c38d216785b0c37399f6e415e8d0712047620f189371b0bb"
dependencies = [ dependencies = [
"autocfg", "autocfg",
"bytes", "bytes",

4
cosmic-app-list/src/app.rs
View file

@ -19,7 +19,7 @@ use cosmic::iced::wayland::popup::get_popup;
use cosmic::iced::wayland::SurfaceIdWrapper; use cosmic::iced::wayland::SurfaceIdWrapper;
use cosmic::iced::widget::mouse_listener; use cosmic::iced::widget::mouse_listener;
use cosmic::iced::widget::{column, row}; use cosmic::iced::widget::{column, row};
use cosmic::iced::{executor, window, Application, Command, Subscription}; use cosmic::iced::{window, Application, Command, Subscription};
use cosmic::iced_native::alignment::Horizontal; use cosmic::iced_native::alignment::Horizontal;
use cosmic::iced_native::subscription::events_with; use cosmic::iced_native::subscription::events_with;
use cosmic::iced_native::widget::vertical_space; use cosmic::iced_native::widget::vertical_space;
@ -162,7 +162,7 @@ fn desktop_info_for_app_ids(mut app_ids: Vec<String>) -> Vec<DesktopInfo> {
impl Application for CosmicAppList { impl Application for CosmicAppList {
type Message = Message; type Message = Message;
type Theme = Theme; type Theme = Theme;
type Executor = executor::Default; type Executor = cosmic::SingleThreadExecutor;
type Flags = (); type Flags = ();
fn new(_flags: ()) -> (Self, Command<Message>) { fn new(_flags: ()) -> (Self, Command<Message>) {

4
cosmic-applet-audio/src/main.rs
View file

@ -9,7 +9,7 @@ use cosmic::widget::{button, icon};
use cosmic::Renderer; use cosmic::Renderer;
use cosmic::iced::{ use cosmic::iced::{
self, executor, self,
widget::{column, horizontal_rule, row, slider, text, toggler}, widget::{column, horizontal_rule, row, slider, text, toggler},
window, Alignment, Application, Command, Length, Subscription, window, Alignment, Application, Command, Length, Subscription,
}; };
@ -69,7 +69,7 @@ enum Message {
impl Application for Audio { impl Application for Audio {
type Message = Message; type Message = Message;
type Theme = Theme; type Theme = Theme;
type Executor = executor::Default; type Executor = cosmic::SingleThreadExecutor;
type Flags = (); type Flags = ();
fn new(_flags: ()) -> (Audio, Command<Message>) { fn new(_flags: ()) -> (Audio, Command<Message>) {

3
cosmic-applet-battery/src/app.rs
View file

@ -15,7 +15,6 @@ use cosmic::iced::alignment::Horizontal;
use cosmic::iced::wayland::popup::{destroy_popup, get_popup}; use cosmic::iced::wayland::popup::{destroy_popup, get_popup};
use cosmic::iced::wayland::SurfaceIdWrapper; use cosmic::iced::wayland::SurfaceIdWrapper;
use cosmic::iced::{ use cosmic::iced::{
executor,
widget::{column, container, row, slider, text}, widget::{column, container, row, slider, text},
window, Alignment, Application, Command, Length, Subscription, window, Alignment, Application, Command, Length, Subscription,
}; };
@ -94,7 +93,7 @@ enum Message {
impl Application for CosmicBatteryApplet { impl Application for CosmicBatteryApplet {
type Message = Message; type Message = Message;
type Theme = Theme; type Theme = Theme;
type Executor = executor::Default; type Executor = cosmic::SingleThreadExecutor;
type Flags = (); type Flags = ();
fn new(_flags: ()) -> (Self, Command<Message>) { fn new(_flags: ()) -> (Self, Command<Message>) {

2
cosmic-applet-graphics/src/window.rs
View file

@ -60,7 +60,7 @@ pub enum Message {
} }
impl Application for Window { impl Application for Window {
type Executor = iced::executor::Default; type Executor = cosmic::SingleThreadExecutor;
type Flags = (); type Flags = ();
type Message = Message; type Message = Message;
type Theme = Theme; type Theme = Theme;

3
cosmic-applet-network/src/app.rs
View file

@ -2,7 +2,6 @@ use cosmic::iced_style;
use cosmic::{ use cosmic::{
applet::CosmicAppletHelper, applet::CosmicAppletHelper,
iced::{ iced::{
executor,
wayland::{ wayland::{
popup::{destroy_popup, get_popup}, popup::{destroy_popup, get_popup},
SurfaceIdWrapper, SurfaceIdWrapper,
@ -117,7 +116,7 @@ enum Message {
impl Application for CosmicNetworkApplet { impl Application for CosmicNetworkApplet {
type Message = Message; type Message = Message;
type Theme = Theme; type Theme = Theme;
type Executor = executor::Default; type Executor = cosmic::SingleThreadExecutor;
type Flags = (); type Flags = ();
fn new(_flags: ()) -> (Self, Command<Message>) { fn new(_flags: ()) -> (Self, Command<Message>) {

3
cosmic-applet-notifications/src/main.rs
View file

@ -4,7 +4,6 @@ use cosmic::iced::wayland::{
SurfaceIdWrapper, SurfaceIdWrapper,
}; };
use cosmic::iced::{ use cosmic::iced::{
executor,
widget::{button, column, horizontal_rule, row, text, Row, Space}, widget::{button, column, horizontal_rule, row, text, Row, Space},
window, Alignment, Application, Color, Command, Length, Subscription, window, Alignment, Application, Color, Command, Length, Subscription,
}; };
@ -46,7 +45,7 @@ enum Message {
impl Application for Notifications { impl Application for Notifications {
type Message = Message; type Message = Message;
type Theme = Theme; type Theme = Theme;
type Executor = executor::Default; type Executor = cosmic::SingleThreadExecutor;
type Flags = (); type Flags = ();
fn new(_flags: ()) -> (Notifications, Command<Message>) { fn new(_flags: ()) -> (Notifications, Command<Message>) {

3
cosmic-applet-power/src/main.rs
View file

@ -9,7 +9,6 @@ use cosmic::widget::{button, horizontal_rule, icon};
use cosmic::Renderer; use cosmic::Renderer;
use cosmic::iced::{ use cosmic::iced::{
executor,
widget::{self, column, container, row, Row}, widget::{self, column, container, row, Row},
window, Alignment, Application, Command, Length, Subscription, window, Alignment, Application, Command, Length, Subscription,
}; };
@ -60,7 +59,7 @@ enum Message {
impl Application for Power { impl Application for Power {
type Message = Message; type Message = Message;
type Theme = Theme; type Theme = Theme;
type Executor = executor::Default; type Executor = cosmic::SingleThreadExecutor;
type Flags = (); type Flags = ();
fn new(_flags: ()) -> (Power, Command<Message>) { fn new(_flags: ()) -> (Power, Command<Message>) {

4
cosmic-applet-time/src/main.rs
View file

@ -4,7 +4,7 @@ use cosmic::iced::wayland::{
SurfaceIdWrapper, SurfaceIdWrapper,
}; };
use cosmic::iced::{ use cosmic::iced::{
executor, time, time,
widget::{button, column, text}, widget::{button, column, text},
window, Alignment, Application, Color, Command, Length, Subscription, window, Alignment, Application, Color, Command, Length, Subscription,
}; };
@ -60,7 +60,7 @@ enum Message {
impl Application for Time { impl Application for Time {
type Message = Message; type Message = Message;
type Theme = Theme; type Theme = Theme;
type Executor = executor::Default; type Executor = cosmic::SingleThreadExecutor;
type Flags = (); type Flags = ();
fn new(_flags: ()) -> (Time, Command<Message>) { fn new(_flags: ()) -> (Time, Command<Message>) {

6
cosmic-applet-workspaces/src/components/app.rs
View file

@ -7,8 +7,8 @@ use cosmic::iced::wayland::actions::window::SctkWindowSettings;
use cosmic::iced::wayland::{window::resize_window, InitialSurface, SurfaceIdWrapper}; use cosmic::iced::wayland::{window::resize_window, InitialSurface, SurfaceIdWrapper};
use cosmic::iced::widget::{column, container, row, text}; use cosmic::iced::widget::{column, container, row, text};
use cosmic::iced::{ use cosmic::iced::{
executor, subscription, widget::button, window, Application, Command, Event::Mouse, Length, subscription, widget::button, window, Application, Command, Event::Mouse, Length, Settings,
Settings, Subscription, Subscription,
}; };
use cosmic::iced_style::application::{self, Appearance}; use cosmic::iced_style::application::{self, Appearance};
use cosmic::iced_style::Color; use cosmic::iced_style::Color;
@ -60,7 +60,7 @@ enum Message {
impl Application for IcedWorkspacesApplet { impl Application for IcedWorkspacesApplet {
type Message = Message; type Message = Message;
type Theme = Theme; type Theme = Theme;
type Executor = executor::Default; type Executor = cosmic::SingleThreadExecutor;
type Flags = (); type Flags = ();
fn new(_flags: ()) -> (Self, Command<Message>) { fn new(_flags: ()) -> (Self, Command<Message>) {