|
1 |
| -use crate::core::{ |
2 |
| - Config, Error, Killable, ProcessId, ProcessIds, ProcessInfo, ProcessInfos, Result, |
| 1 | +use crate::{ |
| 2 | + core::{ |
| 3 | + Config, Error, KillableBuildable, ProcessId, ProcessIds, ProcessInfo, ProcessInfos, Result, |
| 4 | + }, |
| 5 | + unix::Killer, |
3 | 6 | };
|
4 | 7 | use tracing::{debug, instrument};
|
5 | 8 |
|
@@ -129,26 +132,45 @@ pub(crate) struct KillerBuilder {}
|
129 | 132 | impl KillableBuildable for KillerBuilder {
|
130 | 133 | fn new_killable(&self, config: &Config) -> Result<Killer> {
|
131 | 134 | let killer_builder = crate::unix::KillerBuilder {};
|
132 |
| - killer_builder.new_killer(config) |
| 135 | + killer_builder.new_killable(config) |
133 | 136 | }
|
134 | 137 | }
|
135 | 138 |
|
136 | 139 | #[cfg(feature = "blocking")]
|
137 | 140 | pub(crate) mod blocking {
|
138 | 141 | use super::{ProcessInfos, Result};
|
| 142 | + use crate::core::blocking::ProcessInfosProvidable; |
139 | 143 |
|
140 | 144 | pub(crate) fn get_process_infos() -> Result<ProcessInfos> {
|
141 | 145 | crate::macos::get_process_infos()
|
142 | 146 | }
|
| 147 | + |
| 148 | + pub(crate) struct ProcessInfosProvider {} |
| 149 | + |
| 150 | + impl ProcessInfosProvidable for ProcessInfosProvider { |
| 151 | + fn get_process_infos(&self) -> Result<ProcessInfos> { |
| 152 | + crate::macos::blocking::get_process_infos() |
| 153 | + } |
| 154 | + } |
143 | 155 | }
|
144 | 156 |
|
145 | 157 | #[cfg(feature = "tokio")]
|
146 | 158 | pub(crate) mod tokio {
|
| 159 | + use crate::core::tokio::ProcessInfosProvidable; |
| 160 | + |
147 | 161 | use super::{ProcessInfos, Result};
|
148 | 162 |
|
149 | 163 | pub(crate) async fn get_process_infos() -> Result<ProcessInfos> {
|
150 | 164 | crate::macos::get_process_infos()
|
151 | 165 | }
|
| 166 | + |
| 167 | + pub(crate) struct ProcessInfosProvider {} |
| 168 | + |
| 169 | + impl ProcessInfosProvidable for ProcessInfosProvider { |
| 170 | + async fn get_process_infos(&self) -> Result<ProcessInfos> { |
| 171 | + crate::macos::tokio::get_process_infos().await |
| 172 | + } |
| 173 | + } |
152 | 174 | }
|
153 | 175 |
|
154 | 176 | #[allow(warnings)]
|
|
0 commit comments