searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-03 20:07:09 +02:00
Code Issues Releases Wiki Activity

Switch to tokio channel

Browse source
This commit is contained in:
Louis Dureuil 2024-01-23 16:52:48 +01:00
parent b141c82a04
commit 8febbf64ce
No known key found for this signature in database
4 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tracing-trace/src/layer.rs
View file

@ -19,7 +19,7 @@ use crate::{Error, Trace};
/// Layer that measures the time spent in spans.
pub struct TraceLayer<A: GlobalAlloc + 'static = System> {
sender: std::sync::mpsc::Sender<Entry>,
sender: tokio::sync::mpsc::UnboundedSender<Entry>,
callsites: RwLock<HashMap<OpaqueIdentifier, ResourceId>>,
start_time: std::time::Instant,
memory_allocator: Option<&'static StatsAlloc<A>>,
@ -27,7 +27,7 @@ pub struct TraceLayer<A: GlobalAlloc + 'static = System> {
impl<W: Write> Trace<W> {
pub fn new(writer: W) -> (Self, TraceLayer<System>) {
let (sender, receiver) = std::sync::mpsc::channel();
let (sender, receiver) = tokio::sync::mpsc::unbounded_channel();
let trace = Trace { writer, receiver };
let layer = TraceLayer {
sender,
@ -42,7 +42,7 @@ impl<W: Write> Trace<W> {
writer: W,
stats_alloc: &'static StatsAlloc<A>,
) -> (Self, TraceLayer<A>) {
let (sender, receiver) = std::sync::mpsc::channel();
let (sender, receiver) = tokio::sync::mpsc::unbounded_channel();
let trace = Trace { writer, receiver };
let layer = TraceLayer {
sender,
@ -53,8 +53,17 @@ impl<W: Write> Trace<W> {
(trace, layer)
}
pub fn receive(&mut self) -> Result<ControlFlow<(), ()>, Error> {
let Ok(entry) = self.receiver.recv() else {
pub async fn receive(&mut self) -> Result<ControlFlow<(), ()>, Error> {
let Some(entry) = self.receiver.recv().await else {
return Ok(ControlFlow::Break(()));
};
self.write(entry)?;
Ok(ControlFlow::Continue(()))
}
/// Panics if called from an asynchronous context
pub fn blocking_receive(&mut self) -> Result<ControlFlow<(), ()>, Error> {
let Some(entry) = self.receiver.blocking_recv() else {
return Ok(ControlFlow::Break(()));
};
self.write(entry)?;