Skip to content

refactor: change ExporterManager #1613

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

Draft
KowalskiThomas wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor: change ExporterManager #1613

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
18 changes: 8 additions & 10 deletions libdd-profiling/src/exporter/exporter_manager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

use super::ProfileExporter;
use crate::{exporter::File, internal::EncodedProfile};
use anyhow::Context;
use crossbeam_channel::{Receiver, Sender};
use libdd_common::tag::Tag;
use reqwest::RequestBuilder;
Expand All @@ -15,7 +14,7 @@ pub enum ExporterManager {
Active {
cancel: CancellationToken,
exporter: ProfileExporter,
handle: JoinHandle<anyhow::Result<()>>,
handle: JoinHandle<()>,
sender: Sender<RequestBuilder>,
receiver: Receiver<RequestBuilder>,
},
Expand All @@ -35,9 +34,13 @@ impl ExporterManager {
let cloned_receiver: Receiver<RequestBuilder> = receiver.clone();
let cloned_cancel = cancel.clone();
let handle = std::thread::spawn(move || {
let runtime = tokio::runtime::Builder::new_current_thread()
let Ok(runtime) = tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()?;
.build()
else {
return;
};

runtime.block_on(async {
loop {
let Ok(msg) = cloned_receiver.recv() else {
Expand All @@ -53,7 +56,6 @@ impl ExporterManager {
// TODO: Add logging for failed uploads.
}
});
Ok(())
});
Ok(Self::Active {
cancel,
Expand Down Expand Up @@ -84,14 +86,10 @@ impl ExporterManager {
drop(sender);

match handle.join() {
Ok(Ok(())) => {
Ok(()) => {
*self = Self::Suspended { exporter, inflight };
Ok(())
}
Ok(Err(e)) => {
*self = Self::Suspended { exporter, inflight };
Err(e).context("worker thread returned error")
}
Err(_) => {
*self = Self::Suspended { exporter, inflight };
Err(anyhow::anyhow!("unable to join thread"))
Expand Down
Loading