1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
use crate::utils::stream::futures_ordered_x::FuturesOrderedX;
use futures::{
ready,
stream::Fuse,
task::{Context, Poll},
Future, Stream, StreamExt,
};
use pin_project::pin_project;
use std::pin::Pin;
#[pin_project]
#[must_use = "streams do nothing unless polled"]
pub struct BufferedX<St>
where
St: Stream,
St::Item: Future,
{
#[pin]
stream: Fuse<St>,
in_progress_queue: FuturesOrderedX<St::Item>,
max: usize,
}
impl<St> std::fmt::Debug for BufferedX<St>
where
St: Stream + std::fmt::Debug,
St::Item: Future,
{
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("BufferedX")
.field("stream", &self.stream)
.field("in_progress_queue", &self.in_progress_queue)
.field("max", &self.max)
.finish()
}
}
impl<St> BufferedX<St>
where
St: Stream,
St::Item: Future,
{
pub(super) fn new(stream: St, n: usize, max_in_progress: usize) -> BufferedX<St> {
assert!(n > 0);
BufferedX {
stream: stream.fuse(),
in_progress_queue: FuturesOrderedX::new(max_in_progress),
max: n,
}
}
}
impl<St> Stream for BufferedX<St>
where
St: Stream,
St::Item: Future,
{
type Item = <St::Item as Future>::Output;
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
let mut this = self.project();
while this.in_progress_queue.len() < *this.max {
match this.stream.as_mut().poll_next(cx) {
Poll::Ready(Some(fut)) => this.in_progress_queue.push(fut),
Poll::Ready(None) | Poll::Pending => break,
}
}
let res = this.in_progress_queue.poll_next_unpin(cx);
if let Some(val) = ready!(res) {
return Poll::Ready(Some(val));
}
if this.stream.is_done() {
Poll::Ready(None)
} else {
Poll::Pending
}
}
fn size_hint(&self) -> (usize, Option<usize>) {
let queue_len = self.in_progress_queue.len();
let (lower, upper) = self.stream.size_hint();
let lower = lower.saturating_add(queue_len);
let upper = match upper {
Some(x) => x.checked_add(queue_len),
None => None,
};
(lower, upper)
}
}
#[cfg(test)]
mod tests {
use super::super::StreamX;
use futures::StreamExt;
use proptest::{collection::vec, prelude::*};
use tokio::{runtime::Runtime, time::Duration};
proptest! {
#[test]
fn test_run(
sleeps_ms in vec(0u64..10, 0..100),
buffer_size in 1usize..100,
max_in_progress in 1usize..100,
) {
let rt = Runtime::new().unwrap();
rt.block_on(async {
let num_sleeps = sleeps_ms.len();
let outputs = futures::stream::iter(
sleeps_ms.into_iter().enumerate().map(|(n, sleep_ms)| async move {
tokio::time::sleep(Duration::from_millis(sleep_ms)).await;
n
})
).buffered_x(buffer_size, max_in_progress)
.collect::<Vec<_>>().await;
assert_eq!(
outputs,
(0..num_sleeps).collect::<Vec<_>>()
);
});
}
}
}